From: hadaq Date: Sun, 8 Nov 2020 19:02:34 +0000 (+0100) Subject: some updated files nobody checked in in a while X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3646bbac6f4c22c362934447e4110f3514f15b7f;p=hadesdaq.git some updated files nobody checked in in a while --- diff --git a/.gitignore b/.gitignore index 9bcae40..b86f0c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ hmon/qa hmon/logs hmon/vertex +hmon/archive +trbflash.log *~ *.bak *.log @@ -17,3 +19,4 @@ bitfile .limbo bak *.dev +old diff --git a/hmon/QA.pm b/hmon/QA.pm index 31ebded..4efde56 100644 --- a/hmon/QA.pm +++ b/hmon/QA.pm @@ -19,6 +19,7 @@ our $cats = {'main'=>"Main", 'rich'=>'RICH', 'ecal'=>'ECal', 'hv'=>'HV', + 'hv2'=>'HV', 'misc'=>'misc'}; # Order of categories @@ -35,6 +36,7 @@ our $entries->{'cats'} = ["main", "rich", "ecal", "hv", + "hv2", "misc", ]; @@ -48,12 +50,15 @@ $entries->{'server'} = ['fill', 'cpu', 'icinga', 'etrax', 'pwrsup']; $entries->{'eb'} = ['run', 'rate','bytes', 'lostevt', 'errbits']; $entries->{'mdc'} = ['token', 'blocked', 'temp', 'linkqual', 'voltage']; $entries->{'endp'} = ['mdc','rich', 'tof', 'rpc', 'other']; -$entries->{'feeerr'} = ['trb', 'feeerr','trginp','trgqual','richthr']; +$entries->{'feeerr'} = ['feeerr','trginp','trgqual','','']; +$entries->{'rich'} = ['temp','LV','bkpl','isob','richthr']; +$entries->{'ecal'} = ['temp','count','thr','','']; +$entries->{'hv'} = ['richhv','ecalhv','rpchv','fwhv','tofhv']; +$entries->{'hv2'} = ['mdchv','stshv','starthv','sequencer','']; +$entries->{'misc'} = ['irq','calib','magnet','env','']; + + $entries->{'pion'} = ['nxstatus', 'HV', 'HVcurr', 'cooling','seu']; -$entries->{'rich'} = ['temp','volt','curr','bkpl','isob']; -$entries->{'ecal'} = ['temp','count','thr','','starthv']; -$entries->{'hv'} = ['magnet','mdchv','richhv','ecalhv','sequencer']; -$entries->{'misc'} = ['irq','calib','tofhv','rpchv','fwhv']; our $QAServer = "hades33"; @@ -109,7 +114,7 @@ our @PionLvCurrLimits = (4,5,6); our $PadiwaECalNumber = 84; -our @PadiwaEcalLimits = (0, 1, 2); +our @PadiwaEcalLimits = (36, 37, 39); our @LimitTriggerPerSpill = (1000, 0, 0); our $AcceleratorCycle = 7; @@ -118,11 +123,11 @@ use constant {CTSAddress => 0x0003}; ############################################################################### # Switched off systems ############################################################################### -our $MdcHvOff = 0; -our $RichHvOff = 0; +our $MdcHvOff = 1; +our $RichHvOff = 1; our $TofHvOff = 0; our $RpcHvOff = 0; -our $FwHvOff = 0; +our $FwHvOff = 1; our $MagnetOff = 1; @@ -134,7 +139,7 @@ our @mdc_boards_removed =(); #(0x2257, 0x2029); # 2233 added 2014-08-28 , 2203 a our @mdc_chambers_removed =(); our @rich_boards_removed =(); our @tof_boards_removed =(); -our @rpc_boards_removed =(); +our @rpc_boards_removed =(0x6010, 0x6011, 0x6012, 0x6030, 0x6031, 0x6032, 0x6033, 0x6034, 0x6035, 0x6036, 0x6051, 0x6052, 0x6053, 0x6054, 0x6055, 0x6056, 0x8a00, 0x8a05); our @other_boards_removed =(); diff --git a/hmon/hmon_adcvolt.pl b/hmon/hmon_adcvolt.pl index 6d70d44..e665b2c 100755 --- a/hmon/hmon_adcvolt.pl +++ b/hmon/hmon_adcvolt.pl @@ -329,18 +329,18 @@ while(1) { if($min[0]<3290 || $min[1]<2260 || $min[2]<1260 || $min[3]<1160) {$status = QA::WARN} if($min[10]<3360 || $min[11]<2260 || $min[12]<1260 || $min[13]<1160) {$status = QA::WARN} - QA::WriteQALog($fqa,"rich","volt",30,$status,'Voltages',$value,$longtext); +# QA::WriteQALog($fqa,"rich","volt",30,$status,'Voltages',$value,$longtext); - $longtext = "Voltage Rail: Current
" + $longtext .= "Voltage Rail: Current
" ."1.1V: $min[20]-$max[20] --- " ."1.2V: $min[21]-$max[21]
" ."2.5V: $min[22]-$max[22] --- " ."3.3V: $min[23]-$max[23]
"; - $value = ''; - $status = QA::NOSTATE; - $status = QA::OK; - QA::WriteQALog($fqa,"rich","curr",30,$status,'Currents',$value,$longtext); +# $value .= ''; +# $status = QA::NOSTATE; +# $status = QA::OK; + QA::WriteQALog($fqa,"rich","LV",30,$status,'LV',$value,$longtext); my $timeStamp = localtime(); diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl index 06566f9..ec7b02f 100755 --- a/hmon/hmon_endpoints.pl +++ b/hmon/hmon_endpoints.pl @@ -138,12 +138,12 @@ while(1) { #TOF -> is TOF, RPC,FW my @tof_boards =( -#0x86c0,0x5c00,0x5c01,0x5c02,0x5c03, -#0x86c1,0x5c10,0x5c11,0x5c12,0x5c13, -#0x86c2,0x5c20,0x5c21,0x5c22,0x5c23, +0x86c0,0x5c00,0x5c01,0x5c02,0x5c03, +0x86c1,0x5c10,0x5c11,0x5c12,0x5c13, +0x86c2,0x5c20,0x5c21,0x5c22,0x5c23, 0x86c3,0x5c30,0x5c31,0x5c32,0x5c33, -#0x86c4,0x5c40,0x5c41,0x5c42,0x5c43, -#0x86c5,0x5c50,0x5c51,0x5c52,0x5c53, +0x86c4,0x5c40,0x5c41,0x5c42,0x5c43, +0x86c5,0x5c50,0x5c51,0x5c52,0x5c53, #0x86c6,0x5c60,0x5c61,0x5c62,0x5c63, 0x84c0,0x84c1,0x84c2,0x84c3,0x84c4,0x84c5, @@ -158,7 +158,7 @@ while(1) { #RPC -> is ECAL my @rpc_boards = ( 0x8a00,0x8a01,0x8a02,0x8a03,0x8a04,0x8a05, - #0x6000,0x6001,0x6002,0x6003,0x6004,0x6005,0x6006, +# 0x6000,0x6001,0x6002,0x6003,0x6004,0x6005,0x6006, 0x6010,0x6011,0x6012,0x6013,0x6014,0x6015,0x6016, 0x6020,0x6021,0x6022,0x6023,0x6024,0x6025,0x6026, 0x6030,0x6031,0x6032,0x6033,0x6034,0x6035,0x6036, diff --git a/hmon/hmon_haloforward.pl b/hmon/hmon_haloforward.pl old mode 100755 new mode 100644 diff --git a/hmon/hmon_rpcrate.pl b/hmon/hmon_rpcrate.pl index 357bb3f..58fe25f 100755 --- a/hmon/hmon_rpcrate.pl +++ b/hmon/hmon_rpcrate.pl @@ -106,5 +106,5 @@ while(1) { $old = $o; $oldtime = time(); - sleep 2; + sleep 1; } diff --git a/hmon/hmon_spill.pl b/hmon/hmon_spill.pl index f6dd585..510b17a 100755 --- a/hmon/hmon_spill.pl +++ b/hmon/hmon_spill.pl @@ -9,7 +9,8 @@ use Hmon; use QA; use HADES::TrbNet; use HPlot; -use Perl2Epics; +#use Perl2Epics; + use LWP::Simple; my $opt_debug = 0; @@ -57,7 +58,7 @@ trb_init_ports() or die trb_strerror(); my $masterurl = 'http://lxhadeb07:8099/'; my $url_prefix = $masterurl . 'Master/BNET/RunPrefix/get.json?field="value"'; -Perl2Epics::Connect("Rate", "HAD:DAQ:EventRate"); +#Perl2Epics::Connect("Rate", "HAD:DAQ:EventRate"); my $spillcount = 0; @@ -188,8 +189,8 @@ while (1) { $lastres = $res; print "debug: short:$qashort long:$qalong, spillcount:$spillcount\n" unless $opt_debug==0; - Perl2Epics::Put("Rate",$evtrate); - my $dataRate = Perl2Epics::GetAll(); + #Perl2Epics::Put("Rate",$evtrate); + #my $dataRate = Perl2Epics::GetAll(); usleep(250000); diff --git a/hmon/hmon_trbtdc.pl b/hmon/hmon_trbtdc.pl old mode 100755 new mode 100644 diff --git a/hmon/index.cgi b/hmon/index.cgi index aa63c9c..4a72032 100755 --- a/hmon/index.cgi +++ b/hmon/index.cgi @@ -60,7 +60,7 @@ function openwin(url) {
  • Main Screen 1 Eventrate & Busy
  • Main Screen 2 Spill Info
  • Main Screen 3 EBs
    • -
  • Main Screen 4 Tof Rpc STS Ecal rates
    • +
  • Main Screen 4 Tof Rpc STS Ecal rates

    • DAQ Network