From: Jan Michel Date: Mon, 2 Jul 2018 12:03:28 +0000 (+0200) Subject: update hmon scripts X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=593cbfccf5f22e6f241b31fb69902156d82c0261;p=hadesdaq.git update hmon scripts --- diff --git a/hmon/HPlot.pm b/hmon/HPlot.pm index 394a345..f57e824 100755 --- a/hmon/HPlot.pm +++ b/hmon/HPlot.pm @@ -173,7 +173,7 @@ sub PlotInit { plot_write($fh,', ',1) if $j; plot_write($fh,"'".$p->{$name}->{bartitle}->[$j]."' $j ",1); } - plot_write($fh,") offset 2.5,0 scale 0"); + plot_write($fh,") offset ".($p->{$name}->{xtickoffset}//0).",0 scale 0"); } plot_write($fh,"set style histogram title offset character 0, 0, 0"); plot_write($fh,"set style data histograms"); @@ -253,7 +253,7 @@ sub PlotDraw { if($p->{$name}->{type} == TYPE_HEATMAP) { for(my $j=0; $j<$p->{$name}->{curves}; $j++) { for(my $i=0; $i< $p->{$name}->{entries}; $i++) { - plot_write($p->{$name}->{fh},($p->{$name}->{value}->[$j]->[$i]//"NaN")." ",1); + plot_write($p->{$name}->{fh},($p->{$name}->{value}->[$j]->[$i]//'NaN')." ",1);#"NaN" } plot_write($p->{$name}->{fh}," ",0); } diff --git a/hmon/hmon_busynew.pl b/hmon/hmon_busynew.pl index 841d387..966695f 100755 --- a/hmon/hmon_busynew.pl +++ b/hmon/hmon_busynew.pl @@ -41,33 +41,25 @@ $plot->{buffer} = 1; $plot->{storable} = 1; HPlot::PlotInit($plot); -my $plot2 = (); -$plot2->{name} = "BusyTimeBars"; -$plot2->{file} = "files/BusyTimeBars"; -$plot2->{curves} = 9; -$plot2->{type} = HPlot::TYPE_BARGRAPH; -$plot2->{output} = HPlot::OUT_PNG; -$plot2->{ylabel} = "Deadtime (%)"; -$plot2->{colors} = ['#0000ff','#d8d8d8','#e0e0e0','#e8e8e8','#f0f0f0','#f8f8f8','#f0f0f0','#e8e8e8','#e0e0e0']; -$plot2->{sizex} = 580; -$plot2->{sizey} = 265; -$plot2->{nokey} = 1; -$plot2->{entries} = 10; -$plot2->{ymin} = -1; -$plot2->{ymax} = 101; -$plot2->{bartitle}->[0] = "M12"; -$plot2->{bartitle}->[1] = "M34"; -$plot2->{bartitle}->[2] = "ECa"; -$plot2->{bartitle}->[3] = "RPC"; -$plot2->{bartitle}->[4] = "Ric"; -$plot2->{bartitle}->[5] = "TOF"; -$plot2->{bartitle}->[6] = "FW"; -$plot2->{bartitle}->[7] = "Cts"; -$plot2->{bartitle}->[8] = "St"; -# $plot2->{bartitle}->[9] = "Pi"; -$plot2->{buffer} = 1; -$plot2->{storable} = 0; -HPlot::PlotInit($plot2); +HPlot::PlotInit({ + name => "BusyTimeBars", + file => "files/BusyTimeBars", + curves => 8, + type => HPlot::TYPE_BARGRAPH, + output => HPlot::OUT_PNG, + ylabel => "Deadtime (%)", + colors => ['#0000ff','#d8d8d8','#e0e0e0','#e8e8e8','#f0f0f0','#f8f8f8','#f0f0f0','#e8e8e8','#e0e0e0'], + sizex => 580, + sizey => 265, + nokey => 1, + entries => 10, + ymin => -1, + ymax => 101, + bartitle => ["M12","M34","ECa","RPC","Ric1","Ric2","TOF","FW","Cts","St"], + buffer => 1, + storable => 0, + bargap => 5, + }); my $str = Hmon::MakeTitle(12,9,"Busy Times",0); $str .= qq@@; @@ -95,7 +87,7 @@ for my $p (0..8) { while (1) { my $o; - foreach my $b (0x8000,0x8012,0x8013,0x8015,0x8016) { + foreach my $b (0x8000,0x8012,0x8013,0x8015,0x8016,0x8017,0x8018) { my $t = trb_registertime_read_mem($b,0x4030,0,10); $o->{$b} = $t->{$b}; } @@ -112,6 +104,9 @@ while (1) { } } + my $rich1max = max($diff->{0x8017}->[0],$diff->{0x8017}->[1],$diff->{0x8017}->[2],$diff->{0x8017}->[3],$diff->{0x8017}->[4],$diff->{0x8017}->[5]); + my $rich2max = max($diff->{0x8018}->[0],$diff->{0x8018}->[1],$diff->{0x8018}->[2],$diff->{0x8018}->[3],$diff->{0x8018}->[4],$diff->{0x8018}->[5]); + HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[5],0); #MDC12 HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[6],1); #MDC34 HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[3],2); #ECal @@ -120,7 +115,7 @@ while (1) { HPlot::PlotAdd('BusyTimes',$diff->{0x8012}->[1],5); #Tof HPlot::PlotAdd('BusyTimes',$diff->{0x8012}->[0],6); #Wall HPlot::PlotAdd('BusyTimes',$diff->{0x8000}->[1],7); #Cts - HPlot::PlotAdd('BusyTimes',max($diff->{0x8012}->[4],$diff->{0x8012}->[5]),8); #Start TRB3 + HPlot::PlotAdd('BusyTimes',$diff->{0x8018}->[6],8); #Start TRB3 # HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),9); #Pion #Default plots @@ -128,11 +123,12 @@ while (1) { HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[6],1); #MDC34 HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[3],2); #ECal HPlot::PlotFill('BusyTimeBars',max($diff->{0x8012}->[2],$diff->{0x8012}->[3]),3); #RPC - HPlot::PlotFill('BusyTimeBars',max($diff->{0x8000}->[7],$diff->{0x8000}->[8]),4); #Rich - HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[1],5); #Tof - HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[0],6); #Wall - HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[1],7); #Cts - HPlot::PlotFill('BusyTimeBars',max($diff->{0x8012}->[4],$diff->{0x8012}->[5]),8); #Start TRB3 + HPlot::PlotFill('BusyTimeBars',$rich1max,4); #Rich + HPlot::PlotFill('BusyTimeBars',$rich2max,5); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[1],6); #Tof + HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[0],7); #Wall + HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[1],8); #Cts + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[6],9); #Start TRB3 # HPlot::PlotAdd('BusyTimes',max($diff->{0x8003}->[1],$diff->{0x8003}->[2]),9); #Pion #Extended view @@ -156,14 +152,26 @@ while (1) { HPlot::PlotFill('BusyTimeBars',$diff->{0x8013}->[5],2,1); #ECal HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[2],3,5); #RPC HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[3],3,4); #RPC - HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[7],4,5); #Rich - HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[8],4,4); #Rich -# HPlot::PlotFill('BusyTimeBars',$diff->{0x8001}->[6],4,3); #Rich -# HPlot::PlotFill('BusyTimeBars',$diff->{0x8801}->[1],7,5); #Start +# HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[7],4,5); #Rich +# HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[8],4,4); #Rich + + HPlot::PlotFill('BusyTimeBars',$diff->{0x8017}->[0],4,6); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8017}->[1],4,5); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8017}->[2],4,4); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8017}->[3],4,3); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8017}->[4],4,2); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8017}->[5],4,1); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[0],5,6); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[1],5,5); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[2],5,4); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[3],5,3); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[4],5,2); #Rich + HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[5],5,1); #Rich + +# HPlot::PlotFill('BusyTimeBars',$diff->{0x8018}->[6],7,5); #Start +# HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[1],9,5); #Cts + # HPlot::PlotFill('BusyTimeBars',$diff->{0x8801}->[2],7,4); #Veto - HPlot::PlotFill('BusyTimeBars',$diff->{0x8000}->[1],7,5); #Cts - HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[4],8,5); #Start TRB3 - HPlot::PlotFill('BusyTimeBars',$diff->{0x8012}->[5],8,4); #Start TRB3 # HPlot::PlotFill('BusyTimeBars',$diff->{0x8003}->[1],9,5); #Pion # HPlot::PlotFill('BusyTimeBars',$diff->{0x8003}->[2],9,4); #Pion diff --git a/hmon/hmon_eb_rate.pl b/hmon/hmon_eb_rate.pl index c129b41..3912a47 100755 --- a/hmon/hmon_eb_rate.pl +++ b/hmon/hmon_eb_rate.pl @@ -75,8 +75,8 @@ while (1) { $ctr++; } - my $tottime = time() - $starttime; - my $rate_eb = $evtrate_eb_tot / $ctr; + my $tottime = (time() - $starttime) * $NUM_AVERAGES/($NUM_AVERAGES+$offset); + my $rate_eb = $evtrate_eb_tot / ($ctr-$offset); my $rate_eb_str = sprintf "%.1f", $rate_eb; my $rate_endp = $evtrate_endp_tot / $tottime; my $rate_endp_str = sprintf "%.1f", $rate_endp; diff --git a/hmon/hmon_ecalrate.pl b/hmon/hmon_ecalrate.pl index d292311..b77407a 100755 --- a/hmon/hmon_ecalrate.pl +++ b/hmon/hmon_ecalrate.pl @@ -30,7 +30,7 @@ for my $i (0..5) { ymin => 7.5, ymax => -0.5, cbmax => "100<*<100000", - cbmin => 0, + cbmin => 0.1, noinit => 1, additional => "set logscale cb;", showvalues => 0, }); @@ -54,7 +54,7 @@ for my $i (0..5) { ymin => 7.5, ymax => -0.5, cbmax => "100<*<100000", - cbmin => 0, + cbmin => 0.1, noinit => 1, additional => "set logscale cb;", showvalues => 0, }); diff --git a/hmon/hmon_rich_temp_backplane.pl b/hmon/hmon_rich_temp_backplane.pl index 18fbe2e..0853df2 100755 --- a/hmon/hmon_rich_temp_backplane.pl +++ b/hmon/hmon_rich_temp_backplane.pl @@ -81,7 +81,7 @@ while (1) { #-------Interlock workaround-------# #var $Interlock = 0; - if ($max > 38.0 ) { + if ($max > 35.0 ) { #printf "Off\n"; #my $s = sprintf("HADES:RICH:HV:CR1:0:1000:PowerOn"); my $s = sprintf("HAD:RICH:PS:17:SETONOFF"); diff --git a/hmon/hmon_richrate.pl b/hmon/hmon_richrate.pl index 0b3c046..e89c725 100755 --- a/hmon/hmon_richrate.pl +++ b/hmon/hmon_richrate.pl @@ -16,22 +16,23 @@ my $plot1 = { name => "RichRateQ1", file => "files/RichRateQ1", title => "RICH Q1", -entries => 288, +entries => 271, curves => 32, type => HPlot::TYPE_HEATMAP, output => HPlot::OUT_PNG, zlabel => "Hitrate", -sizex => 1000, +sizex => 1030, sizey => 200, nokey => 1, buffer => 1, xmin => -0.5, -xmax => 288.5, +xmax => 270.5, ymin => 31.5, ymax => -0.5, -cbmax => "100<*", +cbmax => "100<*<1E5", cbmin => 0, noinit => 1, +additional => "set logscale cb;", showvalues => 0, }; HPlot::PlotInit($plot1); @@ -39,22 +40,23 @@ my $plot2 = { name => "RichRateQ2", file => "files/RichRateQ2", title => "RICH Q2", -entries => 288, +entries => 271, curves => 32, type => HPlot::TYPE_HEATMAP, output => HPlot::OUT_PNG, zlabel => "Hitrate", -sizex => 1000, +sizex => 1030, sizey => 200, nokey => 1, buffer => 1, xmin => -0.5, -xmax => 288.5, +xmax => 270.5, ymin => 31.5, ymax => -0.5, -cbmax => "100<*", +cbmax => "100<*<1E5", cbmin => 0, noinit => 1, +additional => "set logscale cb;", showvalues => 0, }; HPlot::PlotInit($plot2); @@ -63,22 +65,23 @@ my $plot3 = { name => "RichRateQ3", file => "files/RichRateQ3", title => "RICH Q3", -entries => 288, +entries => 271, curves => 32, type => HPlot::TYPE_HEATMAP, output => HPlot::OUT_PNG, zlabel => "Hitrate", -sizex => 1000, +sizex => 1030, sizey => 200, nokey => 1, buffer => 1, xmin => -0.5, -xmax => 288.5, +xmax => 270.5, ymin => 31.5, ymax => -0.5, -cbmax => "100<*", +cbmax => "100<*<1E5", cbmin => 0, noinit => 1, +additional => "set logscale cb;", showvalues => 0, }; HPlot::PlotInit($plot3); @@ -86,27 +89,28 @@ my $plot0 = { name => "RichRateQ0", file => "files/RichRateQ0", title => "RICH Q0", -entries => 288, +entries => 271, curves => 32, type => HPlot::TYPE_HEATMAP, output => HPlot::OUT_PNG, zlabel => "Hitrate", -sizex => 1000, +sizex => 1030, sizey => 200, nokey => 1, buffer => 1, xmin => -0.5, -xmax => 288.5, +xmax => 270.5, ymin => 31.5, ymax => -0.5, -cbmax => "100<*", +cbmax => "100<*<1E5", cbmin => 0, noinit => 1, +additional => "set logscale cb;", showvalues => 0, }; HPlot::PlotInit($plot0); -my $str = Hmon::MakeTitle(20, 17, "RICH Hit Rate",0); +my $str = Hmon::MakeTitle(13, 17, "RICH Hit Rate",0); $str .= qq@
\n@; $str .= qq@
\n@; $str .= qq@
\n@; @@ -134,8 +138,8 @@ while(1) { my $xpos = (($b>>8)&0xF)*24 + (($b>>4)&0xF)*2 + ($b&1); for my $v (0..31) { - my $vdiff = ($o->{$b}->[$v+1]&0xffffff) - ($old->{$b}->[$v+1]&0xffffff); - if ($vdiff < 0) { $vdiff += 2**24;} + my $vdiff = ($o->{$b}->[$v+1]&0xfffffff) - ($old->{$b}->[$v+1]&0xfffffff); + if ($vdiff < 0) { $vdiff += 2**28;} $diff->{$b}->[$v+1] = $vdiff/($tdiff|1); HPlot::PlotFill('RichRateQ'.$sec,$diff->{$b}->[$v+1],$xpos,$v); } diff --git a/hmon/index.cgi b/hmon/index.cgi index 27df16f..3e6abe3 100755 --- a/hmon/index.cgi +++ b/hmon/index.cgi @@ -5,7 +5,8 @@ use CGI::Carp qw(fatalsToBrowser); print "Content-type: text/html\r\n\r\n"; -print qq$ +print qq$ + Monitoring Main Control Interface @@ -30,16 +31,16 @@ function openwin(url) {
  • Tactical Overview (the central screen)
  • Logfile (most important messages)
  • Chat Log
    • -
  • Web Tools
    • -
  • Eventbuilder Monitor
    • +
  • Web Tools
    • +
  • Eventbuilder Monitor

    • Other Ressources

    @@ -101,10 +102,10 @@ function openwin(url) {

    RICH

    diff --git a/hmon/permanent/hmon_logfile.pl b/hmon/permanent/hmon_logfile.pl index d46b8f7..fbe55f2 100755 --- a/hmon/permanent/hmon_logfile.pl +++ b/hmon/permanent/hmon_logfile.pl @@ -28,18 +28,19 @@ while(my $a = ) { next if ($a =~ /discarded events: (\w+)/);# && $1 < 30); next if ($a =~ /opened connection to Data Mover/); } - if ($a =~ m/(DABC)/) { + if ($a =~ m/(BNET)/) { next if ($a =~ /Start/); next if ($a =~ /Application/); next if ($a =~ /Set/); next if ($a =~ /CTRL/); next if ($a =~ /Ctrl/); + next if ($a =~ /CONN\s/); next if ($a =~ /flushing/); next if ($a =~ /open/); next if ($a =~ /base/); next if ($a =~ /plugins/); next if ($a =~ /Worker/); - next if ($a =~ /Create/); + next if ($a =~ /Create/i); next if ($a =~ /datamover/); next if ($a =~ /Transmitter/); next if ($a =~ /HADAQ/); @@ -51,7 +52,8 @@ while(my $a = ) { next if ($a =~ /30 boards complain: error: 3000/); next if ($a =~ /30 boards complain: serious error: 3000/); $a =~ s/3000 3001 3002 3003 3004 3010 3011 3012 3013 3014 3020 3021 3022 3023 3024 3030 3031 3032 3033 3034 3040 3041 3042 3043 3044 3050 3051 3052 3053 3054/RICH, /; - $a =~ s/0x2000 0x2001 0x2002 0x2003 0x2004 0x2005 0x2006 0x2007 0x2008 0x2009 0x200a 0x200b 0x200c 0x200d 0x2010 0x2011 0x2012 0x2013 0x2014 0x2015 0x2016 0x2017 0x2018 0x2019 0x201a 0x201b 0x201c 0x201d 0x2020 0x2021 0x2022 0x2023 0x2024 0x2025 0x2026 0x2027 0x2028 0x2029 0x202a 0x202b 0x202c 0x202d 0x2030 0x2031 0x2032 0x2033 0x2034 0x2035 0x2036 0x2037 0x2038 0x2039 0x203a 0x203b 0x203c 0x203d 0x2040 0x2041 0x2042 0x2043 0x2044 0x2045 0x2046 0x2047 0x2048 0x2049 0x204a 0x204b 0x204c 0x204d 0x2050 0x2051 0x2052 0x2053 0x2054 0x2055 0x2056 0x2057 0x2058 0x2059 0x205a 0x205b 0x205c 0x205d 0x2100 0x2101 0x2102 0x2103 0x2104 0x2105 0x2106 0x2107 0x2108 0x2109 0x210a 0x210b 0x210c 0x210d 0x210e 0x210f 0x2110 0x2111 0x2112 0x2113 0x2114 0x2115 0x2116 0x2117 0x2118 0x2119 0x211a 0x211b 0x211c 0x211d 0x211e 0x211f 0x2120 0x2121 0x2122 0x2123 0x2124 0x2125 0x2126 0x2127 0x2128 0x2129 0x212a 0x212b 0x212c 0x212d 0x212e 0x212f 0x2130 0x2131 0x2132 0x2133 0x2134 0x2135 0x2136 0x2137 0x2138 0x2139 0x213a 0x213b/MDC missing/; + $a =~ s/0x2000 0x2001 0x2002 0x2003 0x2004 0x2005 0x2006 0x2007 0x2008 0x2009 0x200a 0x200b 0x200c 0x200d 0x2010 0x2011 0x2012 0x2013 0x2014 0x2015 0x2016 0x2017 0x2018 0x2019 0x201a 0x201b 0x201c 0x201d 0x2020 0x2021 0x2022 0x2023 0x2024 0x2025 0x2026 0x2027 0x2028 0x2029 0x202a 0x202b 0x202c 0x202d 0x2030 0x2031 0x2032 0x2033 0x2034 0x2035 0x2036 0x2037 0x2038 0x2039 0x203a 0x203b 0x203c 0x203d 0x2040 0x2041 0x2042 0x2043 0x2044 0x2045 0x2046 0x2047 0x2048 0x2049 0x204a 0x204b 0x204c 0x204d 0x2050 0x2051 0x2052 0x2053 0x2054 0x2055 0x2056 0x2057 0x2058 0x2059 0x205a 0x205b 0x205c 0x205d 0x2100 0x2101 0x2102 0x2103 0x2104 0x2105 0x2106 0x2107 0x2108 0x2109 0x210a 0x210b 0x210c 0x210d 0x210e 0x210f 0x2110 0x2111 0x2112 0x2113 0x2114 0x2115 0x2116 0x2117 0x2118 0x2119 0x211a 0x211b 0x211c 0x211d 0x211e 0x211f 0x2120 0x2121 0x2122 0x2123 0x2124 0x2125 0x2126 0x2127 0x2128 0x2129 0x212a 0x212b 0x212c 0x212d 0x212e 0x212f 0x2130 0x2131 0x2132 0x2133 0x2134 0x2135 0x2136 0x2137 0x2138 0x2139 0x213a 0x213b/ +MDC missing/; if (($month,$day,$time,$PC,$who,$level,$message) = $a =~ m/(\w+)\s+(\d+)\s+(\d\d:\d\d:\d\d)\s+(\w+)\s+\w+.?\w?.?:\s+(\w+-?\w?\w?-?\d?\d?)\s+.(\w).\s+(.*)/) { $msg = ""; diff --git a/hmon/permanent/hmon_richTempHisto.pl b/hmon/permanent/hmon_richTempHisto.pl index 881be25..bf5f8f2 100755 --- a/hmon/permanent/hmon_richTempHisto.pl +++ b/hmon/permanent/hmon_richTempHisto.pl @@ -33,6 +33,7 @@ my $plot = { curves => 18, xscale => 30, storable=> 1, + buffer => 1, colors => ["#333333","#00ff00","#ff0000","#0022ff","#9a176d","#b844b8","#555555","#22ff22","#ffaaaa","#2222ff","#2d9c94","#777777","#55ff77","#ff7755","#7575ff","#aadd47","#aa0033","#316022","#09b9df"], additional => "set offsets 0,0,1.5,1.5" # colors => ["#333333","#00ff00","#ff0000"] @@ -92,13 +93,13 @@ while(1) { } #my $data = Perl2Epics::GetAll(); - $str = "\n\n\n\n"; - $str .= Hmon::MakeTitle(12, 8, "RICH Temp DiRICH", 1, ""); +# $str = "\n\n\n\n"; + $str = Hmon::MakeTitle(12, 8, "RICH Temp DiRICH", 1, ""); $str .= qq@\n@; $str .= Hmon::MakeFooter(); - $str .= ""; - $str .= ""; +# $str .= ""; +# $str .= ""; Hmon::WriteFile("RichTempHistoDiRICH", $str); diff --git a/hmon/styles.css b/hmon/styles.css index 35662fd..7b8ad5e 100644 --- a/hmon/styles.css +++ b/hmon/styles.css @@ -19,7 +19,10 @@ body>div>div { overflow-y:hidden; } - + +div#content { + background:transparent !important; +} div.timestamp { font-size:11px; @@ -74,6 +77,10 @@ div#content { -moz-transform:scale(1); } +div#contentback { + z-index : -1; + position:absolute; +} /* diff --git a/hub/register_configgbe_ip.db b/hub/register_configgbe_ip.db index 936bccd..6f50ef4 100644 --- a/hub/register_configgbe_ip.db +++ b/hub/register_configgbe_ip.db @@ -170,7 +170,7 @@ 0x8600 0 0xc659 0xdead8600 0xc0a86489 0xc659 0xc0a8640f 0 # tof lxhadeb05 0x8700 0 0xc65A 0xdead8700 0xc0a8648A 0xc65A 0xc0a8640f 0 # fw lxhadeb05 0x8800 0 0xc650 0xdead8800 0xc0a8648B 0xc650 0xc0a8640f 0 # central-cts lxhadeb05 - 0x8880 0 0xc65D 0xdead8A00 0xc0a8648D 0xc65D 0xc0a86409 1 # start - lxhadeb09 + 0x8880 0 0xc65D 0xdead8A00 0xc0a8648D 0xc65D 0xc0a86409 2 # start - lxhadeb09 0x8890 0 0xc65F 0xdead8890 0xc0a8648F 0xc65F 0xc0a86409 0 # veto lxhadeb09 0x8900 0 0xc65C 0xdead8900 0xc0a8648C 0xc65C 0xc0a86409 0 # pion1 lxhadeb09 0x8910 0 0xc65E 0xdead8910 0xc0a8648E 0xc65E 0xc0a86409 0 # pion2 lxhadeb09 @@ -184,9 +184,9 @@ 0x1110 0 0xc667 0xdead1110 0xc0a86497 0xc667 0xc0a86408 0 # mdc - lxhadeb08 0x1120 0 0xc668 0xdead1120 0xc0a86498 0xc668 0xc0a86409 0 # mdc - lxhadeb09 - minimum for 09 0x1130 0 0xc669 0xdead1130 0xc0a86499 0xc669 0xc0a8640a 0 # mdc - lxhadeb10 - min for 10 - 0x1140 0 0xc66A 0xdead1140 0xc0a8649A 0xc66A 0xc0a86408 0 # mdc - lxhadeb08 - 0x1150 0 0xc66B 0xdead1150 0xc0a8649B 0xc66B 0xc0a86408 0 # mdc - lxhadeb08 - 0x1160 0 0xc66C 0xdead1160 0xc0a8649C 0xc66C 0xc0a86408 0 # mdc - lxhadeb08 + 0x1140 0 0xc66A 0xdead1140 0xc0a8649A 0xc66A 0xc0a8640f 0 # mdc - lxhadeb05 + 0x1150 0 0xc66B 0xdead1150 0xc0a8649B 0xc66B 0xc0a8640f 0 # mdc - lxhadeb05 + 0x1160 0 0xc66C 0xdead1160 0xc0a8649C 0xc66C 0xc0a8640f 0 # mdc - lxhadeb05 0x8a00 0 0xc676 0xdead8a00 0xc0a864A6 0xc676 0xc0a86409 1 # ecal- all to lxhadeb09 0x8a01 0 0xc677 0xdead8a01 0xc0a864A7 0xc677 0xc0a86409 1 # ecal- all to lxhadeb09 0x8a02 0 0xc678 0xdead8a02 0xc0a864A8 0xc678 0xc0a86409 1 # ecal- all to lxhadeb09 @@ -203,8 +203,8 @@ 0x83c7 0 0xc683 0xdead83c7 0xc0a864B3 0xc683 0xc0a8640a 1 # rich - all to lxhadeb10 0x83c8 0 0xc684 0xdead83c8 0xc0a864B4 0xc684 0xc0a86408 1 # rich - all to lxhadeb08 0x83c9 0 0xc685 0xdead83c9 0xc0a864B5 0xc685 0xc0a86408 1 # rich - all to lxhadeb08 - 0x83ca 0 0xc686 0xdead83ca 0xc0a864B6 0xc686 0xc0a8640f 1 # rich - all to lxhadeb05 - 0x83cb 0 0xc687 0xdead83cb 0xc0a864B7 0xc687 0xc0a8640f 1 # rich - all to lxhadeb05 + 0x83ca 0 0xc686 0xdead83ca 0xc0a864B6 0xc686 0xc0a86408 1 # rich - to lxhadeb08 + 0x83cb 0 0xc687 0xdead83cb 0xc0a864B7 0xc687 0xc0a86408 1 # rich - all to lxhadeb08 @@ -983,9 +983,9 @@ 0x1110 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # mdc - lxhadeb08 0x1120 100 0xbaf7cfa1 0x90e2 0xc0a86409 0x0230 0x0578 # mdc - lxhadeb09 - minimum if rich is off 0x1130 100 0xbae2c995 0x90e2 0xc0a8640a 0x0230 0x0578 # mdc - lxhadeb10 - minimum if ecal is off - 0x1140 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # mdc - lxhadeb08 - 0x1150 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # mdc - lxhadeb08 - 0x1160 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # mdc - lxhadeb08 + 0x1140 100 0x2157b095 0x001B 0xc0a8640f 0x0230 0x0578 # mdc - lxhadeb05 + 0x1150 100 0x2157b095 0x001B 0xc0a8640f 0x0230 0x0578 # mdc - lxhadeb05 + 0x1160 100 0x2157b095 0x001B 0xc0a8640f 0x0230 0x0578 # mdc - lxhadeb05 0x8a00 100 0xbaf7cfa1 0x90e2 0xc0a86409 0x0230 0x0578 # ecal- all to lxhadeb09 0x8a01 100 0xbaf7cfa1 0x90e2 0xc0a86409 0x0230 0x0578 # ecal- all to lxhadeb09 0x8a02 100 0xbaf7cfa1 0x90e2 0xc0a86409 0x0230 0x0578 # ecal- all to lxhadeb09 @@ -1001,11 +1001,9 @@ 0x83c6 100 0xbae2c995 0x90e2 0xc0a8640a 0x0230 0x0578 # rich - all to lxhadeb10 0x83c7 100 0xbae2c995 0x90e2 0xc0a8640a 0x0230 0x0578 # rich - all to lxhadeb10 0x83c8 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - all to lxhadeb08 - 0x83c9 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - all to lxhadeb08 - 0x83ca 100 0x2157b095 0x001b 0xc0a8640f 0x0230 0x0578 # rich - all to lxhadeb05 - 0x83cb 100 0x2157b095 0x001b 0xc0a8640f 0x0230 0x0578 # rich - all to lxhadeb05 - - + 0x83c9 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - all to lxhadeb08 + 0x83ca 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - to lxhadeb08 + 0x83cb 100 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - to lxhadeb08 @@ -1074,8 +1072,8 @@ 0x83c7 115 0xbae2c995 0x90e2 0xc0a8640a 0x0230 0x0578 # rich - to lxhadeb10 0x83c8 115 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - to lxhadeb08 0x83c9 115 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - to lxhadeb08 - 0x83ca 115 0x2157b095 0x001B 0xc0a8640f 0x0230 0x0578 # rich - to lxhadeb05 - 0x83cb 115 0x2157b095 0x001B 0xc0a8640f 0x0230 0x0578 # rich - to lxhadeb05 + 0x83ca 115 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - to lxhadeb08 + 0x83cb 115 0xbaf79bb5 0x90e2 0xc0a86408 0x0230 0x0578 # rich - to lxhadeb08 diff --git a/main/data_sources.db b/main/data_sources.db index d793212..2cc13f7 100644 --- a/main/data_sources.db +++ b/main/data_sources.db @@ -7,7 +7,7 @@ 0x8410 1 RPC456 mid 0x8600 1 TOF low 0x8700 1 FW low -0x8880 0 StartTRB3 low +0x8880 1 StartTRB3 low 0x8890 0 VetoTRB3 low5t 0x8900 0 Pion1 mid 0x8910 0 Pion2 mid diff --git a/start/startup.script b/start/startup.script index adf1bb2..202aa2d 100644 --- a/start/startup.script +++ b/start/startup.script @@ -28,23 +28,13 @@ trbcmd setbit 0x5001 0xc800 0x40003000 trbcmd setbit 0x5002 0xc800 0x40003000 trbcmd setbit 0x5003 0xc800 0x40003000 -# -2us +2us trigger window # 2us - 200ns -trbcmd w 0x5000 0xc801 0x81900190 #0x80280190 -trbcmd w 0x5001 0xc801 0x81900190 #0x80280190 -trbcmd w 0x5002 0xc801 0x81900190 #0x80280190 -trbcmd w 0x5003 0xc801 0x81900190 #0x80280190 +# -2us +200ns trigger window +trbcmd w 0xfe48 0xc801 0x80280190 -#trbcmd w 0xfe48 0xc801 0x80280190 -#trbcmd w 0xfe4e 0xc801 0x80280190 +#Data limit +trbcmd w 0xfe48 0xc804 32 #32 words per channel +trbcmd w 0xfe48 0x7111 1024 #1024 words per FPGA -#Data limit off -trbcmd w 0x5000 0xc804 0x00000078 -trbcmd w 0x5001 0xc804 0x00000078 -trbcmd w 0x5002 0xc804 0x00000078 -trbcmd w 0x5003 0xc804 0x00000078 - -#trbcmd w 0xfe48 0xc804 0x00000080 -#trbcmd w 0xfe4e 0xc804 0x00000080 #Start inputs #trbcmd w 0x5000 0xc802 0xfffcfcfc # channel 0-31 @@ -52,8 +42,8 @@ trbcmd w 0x5003 0xc804 0x00000078 trbcmd w 0x5000 0xc802 0xffff # enable 16 channels in 0x5000 trbcmd w 0x5001 0xc802 0xffff # enable 16 channels in 0x5001 -trbcmd w 0x5002 0xc802 0xffff # enable 16 channels in 0x5002 -trbcmd w 0x5003 0xc802 0xfff # enable 12 channels in 0x5003 +trbcmd w 0x5002 0xc802 0x0000 # enable 0 channels in 0x5002 +trbcmd w 0x5003 0xc802 0x0000 # enable 0 channels in 0x5003 #Trigger Generator Settings