From 7cebd39087e0c0d61b22c6893eb89fc20a2e1dc6 Mon Sep 17 00:00:00 2001 From: "Hadaq @ Hades33" Date: Wed, 5 Sep 2018 16:05:37 +0200 Subject: [PATCH] update daq config files with latest changes --- control/gui/eb/30_Prefix_NoFile | 2 +- control/gui/expert/Set_RICH_HV | 19 ++ control/gui/expert/Set_RICH_Thr | 18 ++ ecal/HowTo.txt | 40 +++ ecal/loadregisterdb.pl | 1 + ...egister_monitoring_trigger_pulsgen_ch15.db | 40 +++ ecal/startup.script | 1 + evtbuild/start_eb_gbe.pl | 4 +- evtbuild/tdc_calib_start.sh | 14 + evtbuild/tdc_calib_stop.sh | 14 + hmon/QA.pm | 2 +- hmon/hmon_adcvolt.pl | 4 +- hmon/hmon_endpoints.pl | 20 +- hmon/hmon_richrate.pl | 4 +- hmon/hmon_richrate2.pl | 135 +++++++++ hmon/hmon_startrate.pl | 24 +- hmon/index.cgi | 2 +- hmon/permanent/hmon_spill.pl | 0 hmon/rich_drawing.htm | 8 +- hmon/speakdaemon.pl | 3 +- main/data_sources.db | 24 +- nettools/nettrace.db | 256 ++++++++++++++---- oracle/boards.txt | 12 + rich/startup.script | 3 +- 24 files changed, 552 insertions(+), 98 deletions(-) create mode 100755 control/gui/expert/Set_RICH_HV create mode 100755 control/gui/expert/Set_RICH_Thr create mode 100644 ecal/HowTo.txt create mode 120000 ecal/loadregisterdb.pl create mode 100644 ecal/register_monitoring_trigger_pulsgen_ch15.db create mode 100755 evtbuild/tdc_calib_start.sh create mode 100755 evtbuild/tdc_calib_stop.sh create mode 100755 hmon/hmon_richrate2.pl mode change 100755 => 100644 hmon/permanent/hmon_spill.pl diff --git a/control/gui/eb/30_Prefix_NoFile b/control/gui/eb/30_Prefix_NoFile index a63f78b..917cfdf 100755 --- a/control/gui/eb/30_Prefix_NoFile +++ b/control/gui/eb/30_Prefix_NoFile @@ -17,7 +17,7 @@ ssh -X hadaq@lxhadesdaq " xterm -geometry 80x24 -bg orange -fg black -e bash -c ' echo "Setting file prefix be" /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt \"http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix='--'&oninit=10\" - echo set prefix te on BNET master controller + echo set prefix -- on BNET master controller sleep 2 ' " diff --git a/control/gui/expert/Set_RICH_HV b/control/gui/expert/Set_RICH_HV new file mode 100755 index 0000000..58bf5aa --- /dev/null +++ b/control/gui/expert/Set_RICH_HV @@ -0,0 +1,19 @@ +#!/bin/bash +export myvar=$(doyoureallywant.pl "to set the RICH HV and switch it on/off?") +if [ $myvar == "256" ]; then exit; fi + +xterm -geometry 80x24 -bg orange -fg black -e bash --login -c ' + ssh hadaq@lxhadeb06 " + export DAQOPSERVER=hadesp31 + echo \" Connected to lxhadeb06...\" + echo \" Setting HV...\" + cd /home/hadaq/JoF/HV_RICH/ + . epics + ./setCrate.sh 1 + ./setHV.sh gain_alignement_HV_1.5E+06.dat + ./setHVon_off.sh gain_alignement_HV_1.5E+06.dat 2 + echo \"Done\" + sleep 10 +" +' + diff --git a/control/gui/expert/Set_RICH_Thr b/control/gui/expert/Set_RICH_Thr new file mode 100755 index 0000000..f1a9c67 --- /dev/null +++ b/control/gui/expert/Set_RICH_Thr @@ -0,0 +1,18 @@ +#!/bin/bash +export myvar=$(doyoureallywant.pl "to reset the RICH thresholds?") +if [ $myvar == "256" ]; then exit; fi + +xterm -geometry 80x24 -bg orange -fg black -e bash --login -c ' + ssh hadaq@lxhadeb06 " + export DAQOPSERVER=hadesp31 + echo \" Connected to lxhadeb06...\" + echo \" Setting Thresholds...\" + cd /home/hadaq/trbsoft/daqtools/thresholds/threshold_wuppertal/trb_dirich_threshold/ + source ./setLD + #./HADESthreshscan_v1 + ./HADESthreshscan_v1 --loading-file /home/hadaq/trbsoft/daqtools/thresholds/threshold_wuppertal/trb_dirich_threshold/standard_baselines.thr -l 0 -n 0 5 + echo \"Done\" + sleep 10 +" +' + diff --git a/ecal/HowTo.txt b/ecal/HowTo.txt new file mode 100644 index 0000000..45f84b4 --- /dev/null +++ b/ecal/HowTo.txt @@ -0,0 +1,40 @@ +HowTo start ECAL cosmics after DAQ STARTUP: + +# load mult3_trigger configugration +hadaq@lxhadeb06:~/trbsoft/hadesdaq/ecal$ ../../daqtools/tools/loadregisterdb.pl register_monitoring_trigger.db + +# switch of pulser and enable PT8 trigger +PULSER: 0 +PT8 OUTPUT ENABLE: on + +# start data taking +http://lxhadeb03:8090/?browser=fix +Start ECAL file + +# write into Logbook!!! + + +# ECAL pulser +http://hades33/daqtools/addons/pulseraddon.pl?Control + + +# power switch +http://haepc15/switch.html +admin kaese + +# export perllibs +export PERL5LIB=~/trbsoft/daqtools/perllibs/ + +# load padiwa firmware +./jed_to_dump.pl ../../daq/ecal/bitfiles/padiwa_amps2_20180712.jed +./spi_slave.pl -e=0x6040 -c=0 -flashcmd=8 -enablecfgflash=1 -x=writecfgflash -f ../../daq/ecal/bitfiles/padiwa_amps2_20180712.dump + +for ((i = 1; i<=3; i++)); do echo "Test $i"; done + +# trb flash +trbflash info 0x6040 +trbflash program 0x6040 *.bit +trbcmd reload 6040 + +#padiwa:load memory (with thresholds,...) to flash +./spi_slave.pl -e=0x6041 -c=1 -flashcmd=8 -enablecfgflash=1 -x=memtoflash --range '0x00..0x2b' \ No newline at end of file diff --git a/ecal/loadregisterdb.pl b/ecal/loadregisterdb.pl new file mode 120000 index 0000000..85a9096 --- /dev/null +++ b/ecal/loadregisterdb.pl @@ -0,0 +1 @@ +/home/hadaq/trbsoft/daqtools/tools/loadregisterdb.pl \ No newline at end of file diff --git a/ecal/register_monitoring_trigger_pulsgen_ch15.db b/ecal/register_monitoring_trigger_pulsgen_ch15.db new file mode 100644 index 0000000..ada8517 --- /dev/null +++ b/ecal/register_monitoring_trigger_pulsgen_ch15.db @@ -0,0 +1,40 @@ +# TDC config registers + +!Register table +# Type # C0 # C1 # C2 # C3 # C4 # C5 # C6 # C7 # C8 # +########################################################################################################### + +# MonEnab TrgEnOut1 TrgEnOut1 TrgEnOut2 TrgEnOut2 Stretch Stretch Invert Invert +# Ch00-31 Ch32-63 Ch00-31 Ch32-63 Ch00-31 Ch32-63 Ch00-31 Ch32-63 + 0 0xdf80 0xdf00 0xdf01 0xdf04 0xdf05 0xdf20 0xdf21 0xdf24 0xdf25 + 10 0xdf80 0xdf08 0xdf09 0xdf0c 0xdf0d 0xdf20 0xdf21 0xdf24 0xdf25 + + #just enables for 32 channels + 1 0xdf00 0xdf04 + + +#multiplicity +# Enable 23..16Lim 15..8OutSel + 2 0xdf33 0xdf32 0xdf34 + +!Value table +# Fpga # Type # C0 # C1 # C2 # C3 # C4 # C5 # C6 # C7 # C8 # +######################################################################################################################################### + +# 0xfe71 10 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0xffffffff 0x0000ffff 0x00000000 0x00000000 +# 0xfe71 2 0x00ffffff 0x00030000 0x00000400 + +# 0xfe61 0 0x000fffff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 +# 0x8a00 1 0x00000015 0x00000000 +# 0x8a01 1 0x00000051 0x00015100 +# 0x8a02 1 0x00000000 0x00015400 +# 0x8a03 1 0x00000054 0x00000000 +# 0x8a04 1 0x00000015 0x00015400 +# 0x8a05 1 0x00000000 0x00015400 + #left half of crate on output 1, right half on output 2 + + 0x0100 0 0x00007cfc 0x00000080 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 + #1..6: output 1, #9..14 output 2, #7 from pulser addon + + 0x0100 2 0x00007c7c 0x00020000 0x00000000 + #2 half sectors fire, on second output diff --git a/ecal/startup.script b/ecal/startup.script index 1c3c5da..f3519cc 100644 --- a/ecal/startup.script +++ b/ecal/startup.script @@ -7,6 +7,7 @@ #exec_cmd{local} /home/hadaq/trbsoft/daq/ecal/loadregisterdb.pl /home/hadaq/trbsoft/daq/ecal/register_monitoring_trigger.db trbcmd w 0xfe71 0x7111 500 #max number of words per board +trbcmd loadbit 0xfe71 0x7114 0x00ff0000 0x00050000 #minimum event size #prepare PaDiWa-AMPS2 diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl index fd7b347..64d6910 100755 --- a/evtbuild/start_eb_gbe.pl +++ b/evtbuild/start_eb_gbe.pl @@ -606,8 +606,8 @@ my $ebproc =0; # here test special installations: my $cdworkdir = "cd /home/hadaq/oper;"; -# my $cmd_dabc = "/home/hadaq/soft/dabc/bin/dabc_exe.head "; - my $cmd_dabc = "/usr/bin/gdb -x /home/hadaq/soft/dabc/head/base/run/gdbcmd.txt --args /home/hadaq/soft/dabc/bin/dabc_exe.head "; + my $cmd_dabc = "/home/hadaq/soft/dabc/bin/dabc_exe.head "; +# my $cmd_dabc = "/usr/bin/gdb -x /home/hadaq/soft/dabc/head/base/run/gdbcmd.txt --args /home/hadaq/soft/dabc/bin/dabc_exe.head "; my $conf_bnet_inp = " BnetInputHades.head.xml"; diff --git a/evtbuild/tdc_calib_start.sh b/evtbuild/tdc_calib_start.sh new file mode 100755 index 0000000..68bdf68 --- /dev/null +++ b/evtbuild/tdc_calib_start.sh @@ -0,0 +1,14 @@ +#!/bin/bash + + echo setting CTS to calibration mode; +export DAQOPSERVER=hadesp31; + trbcmd r 0x003 0xa0c7 > /home/hadaq/tmp/precalibctsregs.txt 2> /home/hadaq/tmp/precalibctserr.txt ; + echo disabled output mask: `cat /home/hadaq/tmp/precalibctsregs.txt`; + trbcmd w 0x003 0xa0c7 0; + trbcmd setbit 0x003 0xa0c0 0x1D; + trbcmd w 0x003 0xa0e3 0x1E8480; + echo Setting file prefix tc; + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix=tc&oninit=10"; + echo set prefix tc on BNET master controller; + + diff --git a/evtbuild/tdc_calib_stop.sh b/evtbuild/tdc_calib_stop.sh new file mode 100755 index 0000000..147ca16 --- /dev/null +++ b/evtbuild/tdc_calib_stop.sh @@ -0,0 +1,14 @@ +#!/bin/bash + + echo Setting file prefix no file + /usr/bin/wget -a /tmp/EB_filestart.log -O /tmp/EB_fileres.txt "http://lxhadeb03:8090/Master/BNET/StartRun/execute?prefix='--'&oninit=10" + echo set prefix nofile on BNET master controller + sleep 2 + echo setting CTS back to regular mode + export DAQOPSERVER=hadesp31 + echo ${DAQOPSERVER} + enab="$(/bin/cat /home/hadaq/tmp/precalibctsregs.txt | /usr/bin/cut -d' ' -f3)" + echo "enabling outputs $enab" + trbcmd w 0x003 0xa0c7 $enab + trbcmd clearbit 0x003 0xa0c0 0x10 + trbcmd w 0x003 0xa0e3 0x0 diff --git a/hmon/QA.pm b/hmon/QA.pm index 0831d93..2bfa99c 100644 --- a/hmon/QA.pm +++ b/hmon/QA.pm @@ -83,7 +83,7 @@ our @CPULimits = (95, 100, 100); our @TimeoutLimits = (0, 0, 1); our @LinkErrLimits = (50, 500, 1000); our @MdcEndpMissingLimits = (0, 1, 2); -our @RichEndpMissingLimits = (23, 24, 25); #!!!! +our @RichEndpMissingLimits = (0, 1, 2); our @TofEndpMissingLimits = (0, 0, 0); our @RpcEndpMissingLimits = (0, 0, 1); our @OtherEndpMissingLimits = (0, 0, 0);#!!! diff --git a/hmon/hmon_adcvolt.pl b/hmon/hmon_adcvolt.pl index 24fd91e..df0607c 100755 --- a/hmon/hmon_adcvolt.pl +++ b/hmon/hmon_adcvolt.pl @@ -310,7 +310,7 @@ while(1) { $dirich1V->{min} = 1160; - $dirich1V->{max} = 1300; + $dirich1V->{max} = 1350; $dirich1V->{symbol} = 'mV'; $dirich1V->{title} = 'RICH 1.1V'; $dirich1V->{updatetime} = $updatetime; @@ -321,7 +321,7 @@ while(1) { close $fh; $dirich2V5->{min} = 2560; - $dirich2V5->{max} = 2700; + $dirich2V5->{max} = 2750; $dirich2V5->{symbol} = 'mV'; $dirich2V5->{title} = 'RICH 2.5V'; diff --git a/hmon/hmon_endpoints.pl b/hmon/hmon_endpoints.pl index 9ad70c8..d878a04 100755 --- a/hmon/hmon_endpoints.pl +++ b/hmon/hmon_endpoints.pl @@ -139,17 +139,17 @@ while(1) { 0x8292,0x8293,0x8294,0x8295,0x8296,0x8297,0x82a4,0x82a6, #quadratic bkpl - #0x8211,0x8250,0x8291,0x82a5,0x8298,0x825a,0x8218,0x8205, - #0x7860,0x7861,0x7870,0x7871,0x7760,0x7761,0x7770,0x7771, - #0x70a6,0x70a7,0x70b6,0x70b7,0x70a0,0x70a1,0x70b0,0x70b1, - #0x7a00,0x7a01,0x7b00,0x7b01,0x70a4,0x70a5,0x70b4,0x70b5, - #0x7864,0x7865,0x7874,0x7875,0x7764,0x7765,0x7774,0x7775, - #0x7b04,0x7b05,0x7a04,0x7a05,0x7b06,0x7b07,0x7a06,0x7a07, - #0x7a02,0x7a03,0x7b02,0x7b03,0x70a2,0x70a3,0x70b2,0x70b3, - #0x7762,0x7763,0x7772,0x7773,0x7862,0x7863,0x7872,0x7873, - #0x7766,0x7767,0x7776,0x7777,0x7866,0x7867,0x7876,0x7877, + 0x8211,0x8250,0x8291,0x82a5,0x8298,0x825a,0x8218,0x8205, + 0x7860,0x7861,0x7870,0x7871,0x7760,0x7761,0x7770,0x7771, + 0x70a6,0x70a7,0x70b6,0x70b7,0x70a0,0x70a1,0x70b0,0x70b1, + 0x7a00,0x7a01,0x7b00,0x7b01,0x70b4,0x70b5, #0x70a4,0x70a5, + 0x7864,0x7865,0x7764,0x7765, #0x7874,0x7875,0x7774,0x7775, + 0x7b04,0x7b05,0x7b06,0x7b07, #0x7a04,0x7a05,0x7a06,0x7a07, + 0x7a02,0x7a03,0x7b02,0x7b03,0x70b2,0x70b3, #0x70a2,0x70a3, + 0x7762,0x7763,0x7772,0x7773,0x7862,0x7863,0x7872,0x7873, + 0x7766,0x7767,0x7776,0x7777,0x7866,0x7867,0x7876,0x7877, - #0x7000,0x7001,0x7002,0x7003,0x7004,0x7005,0x7006,0x7007, §in the beamline? + 0x8251,0x8260,0x8240, 0x71a6,0x71a7,0x71b6,0x71b7,0x71a0,0x71a1,0x71b0,0x71b1, diff --git a/hmon/hmon_richrate.pl b/hmon/hmon_richrate.pl index ac8934a..8706539 100755 --- a/hmon/hmon_richrate.pl +++ b/hmon/hmon_richrate.pl @@ -141,7 +141,7 @@ while(1) { my $o = trb_register_read_mem(0xfe51,0xc000,0,33) or die trb_strerror() or sleep 5 and next; if (defined $old) { - my $tdiff = time() - $oldtime; + my $tdiff = (time() - $oldtime)|1; foreach my $b (keys %$o) { #my $ratesum = 0; my $sec = ($b>>1) & 0x3; @@ -151,7 +151,7 @@ while(1) { 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); + $diff->{$b}->[$v+1] = $vdiff/$tdiff; #$ratesum += $diff->{$b}->[$v+1]; HPlot::PlotFill('RichRateQ'.$sec,$diff->{$b}->[$v+1],$xpos,$v); } diff --git a/hmon/hmon_richrate2.pl b/hmon/hmon_richrate2.pl new file mode 100755 index 0000000..7e02f4a --- /dev/null +++ b/hmon/hmon_richrate2.pl @@ -0,0 +1,135 @@ +#!/usr/bin/perl -w + +use warnings; +use strict; +use Data::Dumper; +use Data::TreeDumper; +use Hmon; +use QA; +use HADES::TrbNet; +use HPlot; +use Time::HiRes qw(usleep time); +use List::Util qw[min max]; + +use Encode qw(encode from_to); +use JSON::XS; + + +my $plot0 = { +name => "RichRate", +file => "files/RichRate", +title => "RICH Rate", +entries => 193, +curves => 193, +type => HPlot::TYPE_HEATMAP, +output => HPlot::OUT_PNG, +zlabel => "Hitrate", +sizex => 800, +sizey => 700, +nokey => 1, +buffer => 1, +xmin => -1.5, +xmax => 192.5, +ymin => -1.5, +ymax => 192.5, +cbmax => "100<*<1E5", +cbmin => 0.0, +noinit => 1, +additional => "set logscale cb;set xrange [192.5:-1.5] reverse", +showvalues => 0, }; +HPlot::PlotInit($plot0); + + +my $str = Hmon::MakeTitle(11, 16, "RICH Hit Rate v2",0); +$str .= qq@
\n@; +$str .= Hmon::MakeFooter(); +Hmon::WriteFile("RichRatev2",$str); + + +my $old; +my $oldtime = time(); +my $time = time(); +my $diff; +my $iter = 0; + + + +trb_init_ports() or die trb_strerror(); + + my $filename = 'rich_pmt_parameters_xy.geo'; + open(my $fh, '<:encoding(UTF-8)', $filename) + or die "Could not open file '$filename' $!"; + + my @pos; + + while (my $row = <$fh>) { + chomp $row; + my @words = split / /, $row; + if ($words[0] eq "Di-Rich") {next;} + if (defined $words[0]) { + + my $dirich= ((hex $words[0])&0xfff); + my $ch=int $words[1]; + $pos[$dirich][$ch][0]=int $words[4]; + $pos[$dirich][$ch][1]=int $words[5]; + + } + } + + +while(1) { + #my $data; + #my $max = 0 ; + #my $min = 5E9; + + my $o = trb_register_read_mem(0xfe51,0xc000,0,33) or die trb_strerror() or sleep 5 and next; + + if (defined $old) { + my $tdiff = time() - $oldtime; + foreach my $b (keys %$o) { + #my $ratesum = 0; + #my $sec = ($b>>1) & 0x3; + #my $xpos = (($b>>8)&0xF)*24 + (($b>>4)&0xF)*2 + ($b&1); + + for my $v (0..31) { + 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); + #$ratesum += $diff->{$b}->[$v+1]; + if (defined $pos[$b&0xfff][$v+1][0] && defined $pos[$b&0xfff][$v+1][1]) { + HPlot::PlotFill('RichRate',$diff->{$b}->[$v+1],$pos[$b&0xfff][$v+1][0],$pos[$b&0xfff][$v+1][1]); + } + } + } + + HPlot::PlotDraw('RichRate'); + + + + + # $data->{max} = $max; + # $data->{min} = $min; + # $data->{symbol} = " Hits/s"; + # $data->{title} = "Mean DiRICH TDC Rate"; + + # my $timeStamp = localtime(); + + # my @months = qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ); + # my @days = qw(Sun Mon Tue Wed Thu Fri Sat Sun); + # my ($sec,$minute,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(); + # my $updatetime = sprintf("%03s, %02d %s %04d - %02d:%02d:%02d",$days[$wday], $mday, $months[$mon], 1900 + $year, $hour, $minute, $sec); + + # $data->{updatetime} = $updatetime; + + #print Dumper $data; + # my $fh; + # open($fh, ">", Hmon::HMONDIR."/files/richMeanRateDiRICH.json"); + # print $fh encode_json($data); + # close $fh; + } + + $old = $o; + $oldtime = time(); + sleep 2; + } diff --git a/hmon/hmon_startrate.pl b/hmon/hmon_startrate.pl index b6f41c0..6f87849 100755 --- a/hmon/hmon_startrate.pl +++ b/hmon/hmon_startrate.pl @@ -200,14 +200,14 @@ HPlot::PlotInit({ entries => 500, type => HPlot::TYPE_HISTORY, output => HPlot::OUT_PNG, - titles => ["X position","Y position"], + titles => ["X position","Y position","Xrms","Yrms"], xlabel => "Seconds", - ylabel => "Strip", + ylabel => "Strips", sizex => 950, sizey => 330, ymin => "-0.5", ymax => "15.5", - curves => 2, + curves => 4, xscale => 5, buffer => 1, }); @@ -263,7 +263,7 @@ while(1) { $oldtime->{$b} = $o->{$b}{time}[0]; } - my ($sumx,$sumy,$avgx,$avgy) = (0,0,0,0); + my ($sumx,$sumy,$avgx,$avgy,$rmsx,$rmsy) = (0,0,0,0,0,0); for my $c (1..16) { HPlot::PlotAdd("StartRateXhist",$diff->{0x5000}[$c],$chan[$c]); @@ -283,12 +283,24 @@ while(1) { $avgx /= $sumx if($sumx !=0); $avgy /= $sumy if($sumy !=0); + for my $c (1..16) { + $rmsx += $diff->{0x5000}[$c]*($chan[$c]/$avgx)**2 ; + $rmsy += $diff->{0x5001}[$c]*($chan[$c]/$avgy)**2 ; + } + $rmsx = sqrt($rmsx/$sumx); + $rmsy = sqrt($rmsy/$sumy); + + $avgx = "NaN" if $sumx < 50; $avgy = "NaN" if $sumy < 50; - + $rmsx = "NaN" if $sumx < 50; + $rmsy = "NaN" if $sumy < 50; + HPlot::PlotAdd("StartPosition",$avgx,0); HPlot::PlotAdd("StartPosition",$avgy,1); - + HPlot::PlotAdd("StartPosition",$rmsx,2); + HPlot::PlotAdd("StartPosition",$rmsy,3); + for my $c (1..8) { HPlot::PlotAdd("VetoRatehist",$diff->{0x5002}[$c],$chanveto[$c]); HPlot::PlotAdd("VetoRatehistbar",$diff->{0x5002}[$c],$chanveto[$c]); diff --git a/hmon/index.cgi b/hmon/index.cgi index 76d5ed4..843603c 100755 --- a/hmon/index.cgi +++ b/hmon/index.cgi @@ -32,7 +32,7 @@ function openwin(url) {
  • Logfile (most important messages)
  • Chat Log
  • Web Tools
    • -
  • Eventbuilder Monitor and control
    • +
  • Eventbuilder Monitor and control

    • Other Ressources

      diff --git a/hmon/permanent/hmon_spill.pl b/hmon/permanent/hmon_spill.pl old mode 100755 new mode 100644 diff --git a/hmon/rich_drawing.htm b/hmon/rich_drawing.htm index 09210d8..da0ddfe 100644 --- a/hmon/rich_drawing.htm +++ b/hmon/rich_drawing.htm @@ -1315,10 +1315,10 @@ td { 0x8291 - 0x7864 - 0x7865 - 0x7764 - 0x7765 + 0x7866 + 0x7867 + 0x7766 + 0x7767 0x8200 0x7666 diff --git a/hmon/speakdaemon.pl b/hmon/speakdaemon.pl index 75435bd..d405734 100755 --- a/hmon/speakdaemon.pl +++ b/hmon/speakdaemon.pl @@ -24,7 +24,8 @@ if($f) { open(FTRB, "$cmd|"); while(my $a = ) { if ($inhibit == 0) { - system("espeak -vus-mbrola-1 -s125 \"$a\" 2>/dev/null #-ven+m2 -s 130 -g 1 "); +# system("espeak -vus-mbrola-1 -s125 \"$a\" 2>/dev/null #-ven+m2 -s 130 -g 1 "); + system("espeak -ven+m2 -s 130 -g 1 \"$a\" 2>/dev/null"); } } } diff --git a/main/data_sources.db b/main/data_sources.db index faabcd2..d793212 100644 --- a/main/data_sources.db +++ b/main/data_sources.db @@ -29,15 +29,15 @@ 0x8a03 1 ECal3 mid 0x8a04 1 ECal4 mid 0x8a05 1 ECal5 mid -0x83c0 0 RICH0 mid -0x83c1 0 RICH1 mid -0x83c2 0 RICH2 mid -0x83c3 0 RICH3 mid -0x83c4 0 RICH4 mid -0x83c5 0 RICH5 mid -0x83c6 0 RICH6 mid -0x83c7 0 RICH7 mid -0x83c8 0 RICH8 mid -0x83c9 0 RICH9 mid -0x83ca 0 RICHa mid -0x83cb 0 RICHb mid +0x83c0 1 RICH0 mid +0x83c1 1 RICH1 mid +0x83c2 1 RICH2 mid +0x83c3 1 RICH3 mid +0x83c4 1 RICH4 mid +0x83c5 1 RICH5 mid +0x83c6 1 RICH6 mid +0x83c7 1 RICH7 mid +0x83c8 1 RICH8 mid +0x83c9 1 RICH9 mid +0x83ca 1 RICHa mid +0x83cb 1 RICHb mid diff --git a/nettools/nettrace.db b/nettools/nettrace.db index fcccc4c..1c24119 100644 --- a/nettools/nettrace.db +++ b/nettools/nettrace.db @@ -13,9 +13,23 @@ '10' => 29056, '5' => 29329 }, + '33297' => { + '3' => 30817, + '7' => 30576, + '9' => 30833, + '2' => 30561, + '8' => 30577, + '4' => 30816, + '1' => 30560, + '10' => 30832 + }, '33730' => { + '1' => 33361, + '4' => 33297, '0' => 33348, - '3' => 33313 + '3' => 33313, + '2' => 33360, + '5' => 33344 }, '35329' => { '6' => 24596, @@ -173,6 +187,20 @@ '2' => 8193, '5' => 8196 }, + '33344' => { + '6' => 29600, + '11' => 29617, + '3' => 29345, + '7' => 29104, + '9' => 29361, + '2' => 29089, + '12' => 29616, + '8' => 29105, + '1' => 29088, + '4' => 29344, + '10' => 29360, + '5' => 29601 + }, '4387' => { '6' => 8740, '3' => 8750, @@ -184,6 +212,7 @@ '5' => 8741 }, '33728' => { + '6' => 33285, '4' => 33299, '1' => 33316, '0' => 33349, @@ -287,7 +316,9 @@ '6' => 33352, '4' => 33351, '1' => 33319, + '0' => 33370, '3' => 33320, + '2' => 33304, '5' => 33350 }, '33364' => { @@ -381,13 +412,18 @@ '5' => 30211 }, '33446' => { - '8' => 31252, - '1' => 31509, + '6' => 31541, '11' => 31284, + '3' => 31524, '7' => 31253, - '10' => 31269, '9' => 31268, - '12' => 31285 + '2' => 31508, + '12' => 31285, + '8' => 31252, + '4' => 31525, + '1' => 31509, + '10' => 31269, + '5' => 31540 }, '33426' => { '6' => 31063, @@ -443,6 +479,16 @@ '10' => 28755, '5' => 28772 }, + '33285' => { + '3' => 31235, + '7' => 31489, + '9' => 31491, + '2' => 31232, + '8' => 31488, + '4' => 31234, + '1' => 31233, + '10' => 31490 + }, '33315' => { '6' => 30256, '11' => 30273, @@ -548,6 +594,16 @@ '33808' => { '2' => 33809 }, + '33360' => { + '3' => 28833, + '7' => 28854, + '9' => 28849, + '2' => 28839, + '8' => 28855, + '4' => 28832, + '1' => 28838, + '10' => 28848 + }, '35330' => { '8' => 24614, '6' => 24612, @@ -586,9 +642,11 @@ '5' => 29591 }, '33733' => { - '4' => 33377, + '6' => 33425, '1' => 33409, - '0' => 33393 + '3' => 33393, + '0' => 33376, + '5' => 33377 }, '32789' => { '1' => 4112, @@ -705,6 +763,12 @@ '7' => 24661, '5' => 24659 }, + '33432' => { + '4' => 30821, + '1' => 30565, + '3' => 30820, + '2' => 30564 + }, '33410' => { '6' => 30311, '11' => 30294, @@ -734,12 +798,13 @@ '5' => 29586 }, '4371' => { - '8' => 8728, - '4' => 8732, - '1' => 8735, + '6' => 8730, '3' => 8733, '7' => 8729, '2' => 8734, + '8' => 8728, + '1' => 8735, + '4' => 8732, '5' => 8731 }, '4100' => { @@ -943,7 +1008,8 @@ '5' => 29844 }, '34816' => { - '0' => 2 + '0' => 2, + '2' => 288 }, '33348' => { '6' => 29456, @@ -992,12 +1058,22 @@ '6' => 8533, '3' => 8530, '7' => 8470, - '2' => 8529, + '2' => 8528, '8' => 8471, '4' => 8531, - '1' => 8528, + '1' => 8529, '5' => 8532 }, + '4114' => { + '6' => 8541, + '3' => 8538, + '7' => 8542, + '2' => 8537, + '8' => 8543, + '1' => 8536, + '4' => 8539, + '5' => 8540 + }, '4146' => { '6' => 8220, '4' => 8218, @@ -1013,16 +1089,6 @@ '3' => 4372, '2' => 4371 }, - '4114' => { - '6' => 8541, - '3' => 8538, - '7' => 8542, - '2' => 8537, - '8' => 8543, - '1' => 8536, - '4' => 8539, - '5' => 8540 - }, '33411' => { '6' => 30279, '11' => 30262, @@ -1086,6 +1152,7 @@ '33731' => { '6' => 33381, '1' => 33413, + '4' => 33445, '0' => 33430, '3' => 33380, '5' => 33446 @@ -1113,20 +1180,6 @@ '2' => 33346, '5' => 33314 }, - '33302' => { - '6' => 31026, - '11' => 31011, - '3' => 30771, - '7' => 30498, - '9' => 30755, - '12' => 31010, - '2' => 30515, - '8' => 30499, - '1' => 30514, - '4' => 30770, - '10' => 30754, - '5' => 31027 - }, '33319' => { '6' => 30274, '11' => 30259, @@ -1141,6 +1194,20 @@ '10' => 30002, '5' => 30275 }, + '33302' => { + '6' => 31026, + '11' => 31011, + '3' => 30771, + '7' => 30498, + '9' => 30755, + '12' => 31010, + '2' => 30515, + '8' => 30499, + '1' => 30514, + '4' => 30770, + '10' => 30754, + '5' => 31027 + }, '33354' => { '6' => 29618, '11' => 29603, @@ -1174,12 +1241,18 @@ '5' => 8460 }, '33284' => { - '8' => 31249, + '6' => 31536, '11' => 31281, + '3' => 31521, '7' => 31248, - '10' => 31264, '9' => 31265, - '12' => 31280 + '2' => 31505, + '12' => 31280, + '8' => 31249, + '4' => 31520, + '1' => 31504, + '10' => 31264, + '5' => 31537 }, '33303' => { '6' => 31058, @@ -1195,6 +1268,12 @@ '10' => 30786, '5' => 31059 }, + '33445' => { + '8' => 31493, + '7' => 31492, + '9' => 31495, + '10' => 31494 + }, '4099' => { '6' => 8485, '3' => 8482, @@ -1206,14 +1285,14 @@ '5' => 8484 }, '4385' => { - '6' => 9002, + '6' => 9003, '3' => 9005, '7' => 9001, '2' => 9006, '8' => 9000, '1' => 9007, '4' => 9004, - '5' => 9003 + '5' => 9002 }, '4404' => { '6' => 8754, @@ -1267,6 +1346,20 @@ '4' => 8971, '5' => 8972 }, + '33376' => { + '6' => 29623, + '11' => 29606, + '3' => 29366, + '7' => 29095, + '9' => 29350, + '2' => 29110, + '12' => 29607, + '8' => 29094, + '4' => 29367, + '1' => 29111, + '10' => 29351, + '5' => 29622 + }, '4417' => { '6' => 9029, '3' => 9026, @@ -1277,6 +1370,16 @@ '1' => 9024, '5' => 9028 }, + '33304' => { + '3' => 30835, + '7' => 30562, + '9' => 30819, + '2' => 30579, + '8' => 30563, + '1' => 30578, + '4' => 30834, + '10' => 30818 + }, '33329' => { '6' => 29840, '11' => 29585, @@ -1331,10 +1434,16 @@ }, '33286' => { '6' => 31283, - '1' => 31251, - '4' => 31267, + '11' => 31538, '3' => 31266, + '7' => 31507, + '9' => 31522, '2' => 31250, + '12' => 31539, + '8' => 31506, + '1' => 31251, + '4' => 31267, + '10' => 31523, '5' => 31282 }, '4352' => { @@ -1363,13 +1472,6 @@ '10' => 29184, '5' => 29443 }, - '33737' => { - '6' => 33382, - '4' => 33415, - '0' => 33414, - '3' => 33431, - '2' => 33383 - }, '4419' => { '6' => 8773, '3' => 8770, @@ -1380,6 +1482,14 @@ '4' => 8771, '5' => 8772 }, + '33737' => { + '6' => 33382, + '1' => 33432, + '4' => 33415, + '0' => 33414, + '3' => 33431, + '2' => 33383 + }, '4130' => { '6' => 8205, '4' => 8203, @@ -1407,10 +1517,10 @@ '6' => 8525, '3' => 8522, '7' => 8526, - '2' => 8521, + '2' => 8520, '8' => 8527, + '1' => 8521, '4' => 8523, - '1' => 8520, '5' => 8524 }, '35328' => { @@ -1459,12 +1569,28 @@ }, '33444' => { '6' => 31286, - '1' => 31254, - '4' => 31270, + '11' => 31543, '3' => 31271, + '7' => 31510, + '9' => 31527, + '12' => 31542, '2' => 31255, + '8' => 31511, + '4' => 31270, + '1' => 31254, + '10' => 31526, '5' => 31287 }, + '33425' => { + '3' => 30838, + '7' => 30567, + '9' => 30822, + '2' => 30582, + '8' => 30566, + '4' => 30839, + '1' => 30583, + '10' => 30823 + }, '4354' => { '6' => 8716, '3' => 8714, @@ -1475,6 +1601,12 @@ '1' => 8712, '5' => 8717 }, + '33370' => { + '8' => 28850, + '7' => 28851, + '9' => 28852, + '10' => 28853 + }, '33431' => { '6' => 31045, '11' => 31060, @@ -1625,6 +1757,20 @@ '10' => 30342, '5' => 30103 }, + '33361' => { + '6' => 28816, + '11' => 28823, + '3' => 28801, + '7' => 28790, + '9' => 28807, + '12' => 28822, + '2' => 28785, + '8' => 28791, + '1' => 28784, + '4' => 28800, + '10' => 28806, + '5' => 28817 + }, '33347' => { '6' => 29488, '11' => 29505, diff --git a/oracle/boards.txt b/oracle/boards.txt index 640ba69..3460a70 100644 --- a/oracle/boards.txt +++ b/oracle/boards.txt @@ -990,6 +990,7 @@ DiRich 700 9200000a49110f28 7221 DiRich 702 4100000a48ff0028 7201 DiRich 704 dc00000a4906e228 7a24 + DiRich 705 a800000a4949b628 7b06 DiRich 706 9100000a49074628 7216 DiRich 708 ee00000a499e2d28 7713 DiRich 709 7800000a499e2428 7226 @@ -1149,6 +1150,17 @@ DiRich 898 d000000a48ac0d28 73b0 DiRich 900 bb00000a48f85728 7b33 DiRich 901 4b00000a49dc2728 71a1 + DiRich 903 f400000a48ac0228 7872 + DiRich 904 1300000a518b7e28 7a35 + DiRich 908 ac00000a4931cc28 70b4 + DiRich 909 9000000a48b35128 7773 + DiRich 910 9100000a498fa228 7b07 + DiRich 911 b200000a48f71928 70b3 + DiRich 912 d600000a4907a428 7b04 + DiRich 914 bd00000a48f86228 70b5 + DiRich 917 9c00000a4941e928 7762 + DiRich 918 2000000a49966a28 7865 + DiRich 923 7100000a49e0e728 70b2 DiRich 1038 5300000a49d52228 7056 DiRich 1039 1b00000a49d36a28 7057 DiRich 1040 5700000a49d35228 7873 diff --git a/rich/startup.script b/rich/startup.script index 17ed7f9..2884b43 100644 --- a/rich/startup.script +++ b/rich/startup.script @@ -6,6 +6,7 @@ trbcmd loadbit 0xfe52 0xd580 0x6 0x2 #switch trigger input correctly -trbcmd loadbit 0xfe51 0x7111 0x0000ffff 170 +trbcmd loadbit 0xfe51 0x7111 0x0000ffff 170 #max event size +trbcmd loadbit 0xfe51 0x7114 0x00ff0000 0x00050000 #minimum event size load_register register_tdc_rich.db -- 2.43.0