current beam status, mt

diff --git a/perllibs/ChannelMapping.pm b/perllibs/ChannelMapping.pm
index dc585e9a8f91e16ac10be8d9a17f70b80c8d3f9c..9a6dcf2c7d135cd44559402ad5694dd989ea8f4e 120000 (symlink)
--- a/perllibs/ChannelMapping.pm
+++ b/perllibs/ChannelMapping.pm
@@ -1 +1 @@
-../users/cern_cbmrich/ChannelMapping.pm
\ No newline at end of file
+../users/gsi_dirc/ChannelMapping.pm
\ No newline at end of file

diff --git a/tools/padiwa.pl b/tools/padiwa.pl
index 67cafccfb8bafe21614b70991ef172e775c4cf75..d8f3cd3921a0807ceeef310422beae921fffb588 100755 (executable)
--- a/tools/padiwa.pl
+++ b/tools/padiwa.pl
@@ -251,7 +251,7 @@ if ($ARGV[2] eq "ledoff") {
 
   my $unix_compile_time = $ids->{$board}->{1}*2**16+$ids->{$board}->{0};
   if ($unix_compile_time >= 0x546f1960) {
-    $mask = 0x1;
+    $mask = 0x0;
   }
   else {
     $mask =0x10;

diff --git a/users/gsi_dirc/EventBuilder.xml b/users/gsi_dirc/EventBuilder.xml
index c1a79c3507a236ad8c23284f3a382ce06eb25872..ba6595a2c79636db05a1ca2cd3cbfc8ed9ac917f 100644 (file)
--- a/users/gsi_dirc/EventBuilder.xml
+++ b/users/gsi_dirc/EventBuilder.xml
@@ -34,7 +34,7 @@ store data in lmd files.
 
     <Module name="Combiner" class="hadaq::CombinerModule">    
         <!-- these parameters will force to create inputs/oputputs of module -->
-       <NumInputs value="23"/>
+       <NumInputs value="13"/>
        <NumOutputs value="2"/>
 
        <InputPort name="Input0"  url="hadaq://host:50000" thread="UdpThread1"/>
@@ -49,7 +49,8 @@ store data in lmd files.
        <InputPort name="Input9"  url="hadaq://host:50009" thread="UdpThread2"/>
        <InputPort name="Input10" url="hadaq://host:50010" thread="UdpThread3"/>
        <InputPort name="Input11" url="hadaq://host:50011" thread="UdpThread4"/>
-       <InputPort name="Input12" url="hadaq://host:50012" thread="UdpThread1"/>
+       <InputPort name="Input12" url="hadaq://host:49999" thread="UdpThread1"/>
+
        <InputPort name="Input13" url="hadaq://host:50013" thread="UdpThread2"/>
        <InputPort name="Input14" url="hadaq://host:50014" thread="UdpThread3"/>
        <InputPort name="Input15" url="hadaq://host:50015" thread="UdpThread4"/>
@@ -68,7 +69,7 @@ store data in lmd files.
           <FlushTimeout value="2.0"/>   
        </InputPort>
        
-       <OutputPort name="Output1" url="hld:///d/dabc.hld?maxsize=1500"/>
+       <OutputPort name="Output1" url="hld:///d/may2015/dabc.hld?maxsize=1500"/>
 
        <DoShmControl value="false"/>  
        <FlushTimeout value="2.0"/>   
@@ -93,7 +94,7 @@ store data in lmd files.
 
        <InputPort name="Input0" url="Combiner/Output0" queue="10"/>
 
-       <OutputPort name="Output0" url="mbs://Stream"/>
+       <OutputPort name="Output0" url="mbs://Stream:6789"/>
        <OutputPort name="Output1" url="lmd://test.lmd?maxsize=30&log=2"/>
 
        <!-- this is 32-bit MBS subevent id, which than can be seen in the analysis. Here procid=0x1f is configured -->

diff --git a/users/gsi_dirc/dmon_config.pl b/users/gsi_dirc/dmon_config.pl
index 64e260236aafd3900b71b63ec454ff317fc99957..d703a55ad641d0746a5ef3f415d246b2fa6775c3 100755 (executable)
--- a/users/gsi_dirc/dmon_config.pl
+++ b/users/gsi_dirc/dmon_config.pl
@@ -80,7 +80,9 @@ UserDirectory => '/home/hadaq/trbsoft/daqtools/users/gsi_dirc/',
 #BarrelDirc Heatmap settings
 HeatmapDirc => {
   # upper limit for high end of color scale
-  max_count_uclamp => 100000,
+##  max_count_uclamp => 1000000,
+  max_count_uclamp => 2000,
+#  max_count_uclamp => 20000,
   # lower limit for high end of color scale
   max_count_lclamp => 10,
   
@@ -109,6 +111,7 @@ HeatmapFlash => {
 HeatmapDiscDirc => {
   # upper limit for high end of color scale
   max_count_uclamp => 100000,
+##  max_count_uclamp => 100,
   # lower limit for high end of color scale
   max_count_lclamp => 30,
   

diff --git a/users/gsi_dirc/dmon_restart.pl b/users/gsi_dirc/dmon_restart.pl
index 2620a7c000933d79a141f7e4a51c32211ba6dcf0..7bcffe4d68c2b6a9af85e8224aab6cd99e052e37 100755 (executable)
--- a/users/gsi_dirc/dmon_restart.pl
+++ b/users/gsi_dirc/dmon_restart.pl
@@ -3,3 +3,5 @@
 cd ../../dmon
 ./stop.pl
 ./start.pl ../users/gsi_dirc/dmon_config.pl
+
+

diff --git a/users/gsi_dirc/register_config_tdc.db b/users/gsi_dirc/register_config_tdc.db
index 8f5ddf1ea65d754fc58792e06588fce3c3345977..8a78e0c91de0b604baef40d30efd23745f5f935f 100644 (file)
--- a/users/gsi_dirc/register_config_tdc.db
+++ b/users/gsi_dirc/register_config_tdc.db
@@ -20,7 +20,7 @@
   0x2016   0         0xffffffff           0x00000000
   0x2017   0         0x0000ffff           0x00000000
 
-# TOF3
+# TOF2
 
   0x2018   0         0x0000ffff           0x00000000
   0x2019   0         0xffffffff           0x00000000
@@ -34,11 +34,12 @@
   0x201e   0         0x00000000           0x00000000
   0x201f   0         0x00000000           0x00000000
 
-#DISC DIRC
-  0x2029   0         0x00000000           0x00000000
-  0x202a   0         0x00000000           0x00000000
+# EDD
   0x202b   0         0x00000000           0x00000000
 
+#DISC-DIRC
+  0x2026   0         0xfffffff           0x0000ffff
+
 # AUX
   0x202c   0         0xffffffff           0x00000000
   0x202d   0         0xffffffff           0x00000000

diff --git a/users/gsi_dirc/register_configgbe.db b/users/gsi_dirc/register_configgbe.db
index af8961d851a9252a04e148326d8dfded6aa1a7b8..5589179f80184125858106f90d4b2ce09147b850 100755 (executable)
--- a/users/gsi_dirc/register_configgbe.db
+++ b/users/gsi_dirc/register_configgbe.db
@@ -11,19 +11,19 @@
 #               SubEvtId    SubEvtDec     QueDec      PackSize     FrameSize   UseGbE   MultiQueue   Enable RX   Add.Slw.Head   TType_inserted
 # Hub  # Type #   C0     #     C1     #     C2     #     C3     #     C4     #    C5  #     C6    #     C7     #     C8       #        C9      #  
 ###################################################################################################################################################
- 0x7999     0     0x7999    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x1 
- 0x8000     0     0x8000    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8001     0     0x8001    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8002     0     0x8002    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8003     0     0x8003    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8004     0     0x8004    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8005     0     0x8005    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8006     0     0x8006    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8007     0     0x8007    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8008     0     0x8008    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x8009     0     0x8009    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x800a     0     0x800a    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
- 0x800b     0     0x800b    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
+ 0x7999     0     0x7999    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x1 
+ 0x8000     0     0x8000    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8001     0     0x8001    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8002     0     0x8002    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8003     0     0x8003    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8004     0     0x8004    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8005     0     0x8005    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8006     0     0x8006    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8007     0     0x8007    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8008     0     0x8008    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x8009     0     0x8009    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x800a     0     0x800a    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
+ 0x800b     0     0x800b    0x00020001   0x00030064     0x1DE8       0x578         1          1           1            1                0x0 
 # 0x8012     0     0x8012    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
 # 0x8013     0     0x8013    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 
 # 0x8014     0     0x8014    0x00020001   0x00030064     0x1DE8       0x578         1          0           1            1                0x0 

diff --git a/users/gsi_dirc/start_readout.pl b/users/gsi_dirc/start_readout.pl
index a75a21611729f1738f4a9f5805464f771c3de1b2..d04931878421e015aa48dfe3ccfc081c5e046f26 100755 (executable)
--- a/users/gsi_dirc/start_readout.pl
+++ b/users/gsi_dirc/start_readout.pl
@@ -8,10 +8,12 @@ my $dataPath = "/d/may2015/";
 my $label = "test";
 my $time = -1;
 my $name = "cc";
+my $dabc;
 my $c;
 
 my $result = GetOptions (
     "h|help"    => \$help,
+    "d|dabc"    => \$dabc,
     "t|time=i"  => \$time,
     "l|label=s" => \$label,
     "n|filename=s" => \$name,
@@ -34,26 +36,34 @@ $c=qq|pkill -f "daq_evtbuild -S $label"|; qx($c); # if any, kill existing daq_ev
 $c=qq|pkill -f "daq_netmem -S $label"|;   qx($c); # if any, kill existing daq_netmem
 
 
-$c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 13 -x $name --filesize 512 -d file -o $dataPath'|;
-#$c=qq|xterm -geometry 122x16-0+0 -e bash -c 'daq_evtbuild -S $label -m 23 -x $name -d file -o $dataPath'|;
-#print $c;
+if(defined $dabc) {
 
-system("$c &");
+    $c=qq|perl -p -e 's/dabc.hld/$name.hld/' EventBuilderNew.xml > EventBuilder_autogenerated.xml|;
+    qx($c);
 
-sleep 1;
-$c=qq"xterm -geometry 82x45-0+210 -e bash -c 'daq_netmem -S $label -m 13 -i UDP:127.0.0.1:49999 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008 -i UDP:127.0.0.1:50009 -i UDP:127.0.0.1:50010 -i UDP:127.0.0.1:50011'";
+    $c=qq|urxvt -geometry 80x27-0+0 -e bash -c 'dabc_exe EventBuilder_autogenerated.xml'|;
+    system("$c &");
 
+}
+else {
 
+    $c=qq|xterm -geometry 122x15-0+0 -e bash -c 'daq_evtbuild -S $label -m 13 -x $name --filesize 1536 -d file -o $dataPath'|;
+    #$c=qq|xterm -geometry 122x16-0+0 -e bash -c 'daq_evtbuild -S $label -m 23 -x $name -d file -o $dataPath'|;
+    #print $c;
 
+    system("$c &");
 
+    sleep 1;
+    $c=qq"xterm -geometry 82x45-0+210 -e bash -c 'daq_netmem -S $label -m 13 -i UDP:127.0.0.1:49999 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008 -i UDP:127.0.0.1:50009 -i UDP:127.0.0.1:50010 -i UDP:127.0.0.1:50011'";
 
-#$c=qq"xterm -geometry 82x44-0+234 -e bash -c 'daq_netmem -S $label -m 23 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008 -i UDP:127.0.0.1:50009 -i UDP:127.0.0.1:50010 -i UDP:127.0.0.1:50011 -i UDP:127.0.0.1:50012 -i UDP:127.0.0.1:50013 -i UDP:127.0.0.1:50014 -i UDP:127.0.0.1:50015 -i UDP:127.0.0.1:50016 -i UDP:127.0.0.1:50017 -i UDP:127.0.0.1:50018 -i UDP:127.0.0.1:50019 -i UDP:127.0.0.1:50020 -i UDP:127.0.0.1:50021 -i UDP:127.0.0.1:50022; sleep 2'";
 
+    #$c=qq"xterm -geometry 82x44-0+234 -e bash -c 'daq_netmem -S $label -m 23 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50001 -i UDP:127.0.0.1:50002 -i UDP:127.0.0.1:50003 -i UDP:127.0.0.1:50004 -i UDP:127.0.0.1:50005 -i UDP:127.0.0.1:50006 -i UDP:127.0.0.1:50007 -i UDP:127.0.0.1:50008 -i UDP:127.0.0.1:50009 -i UDP:127.0.0.1:50010 -i UDP:127.0.0.1:50011 -i UDP:127.0.0.1:50012 -i UDP:127.0.0.1:50013 -i UDP:127.0.0.1:50014 -i UDP:127.0.0.1:50015 -i UDP:127.0.0.1:50016 -i UDP:127.0.0.1:50017 -i UDP:127.0.0.1:50018 -i UDP:127.0.0.1:50019 -i UDP:127.0.0.1:50020 -i UDP:127.0.0.1:50021 -i UDP:127.0.0.1:50022; sleep 2'";
 
-#$c=qq"xterm -geometry 82x17-0+210 -e bash -c 'daq_netmem -S $label -m 2 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50002'";
-system("$c &");
+    #$c=qq"xterm -geometry 82x17-0+210 -e bash -c 'daq_netmem -S $label -m 2 -i UDP:127.0.0.1:50000 -i UDP:127.0.0.1:50002'";
+    system("$c &");
 
-print "Saving data to $dataPath\n";
+    print "Saving data to $dataPath\n";
+}
 
 if($time == -1) {
     print "Data taking will run until manual quit with Ctrl+C\n\n";

diff --git a/users/gsi_dirc/startup.sh b/users/gsi_dirc/startup.sh
index a01112535769472ac46439ac7005ffac1056f3bc..a4bbd4d88cf7d6996ef4e712926286d3f4c1a80a 100755 (executable)
--- a/users/gsi_dirc/startup.sh
+++ b/users/gsi_dirc/startup.sh
@@ -43,6 +43,7 @@ trbcmd w 0xff7f 0x830e 0x10
 ##################################################
 
 # standard TDCs
+trbcmd clearbit 0xfe4c 0xc800 0x2000 ## clear bit to reset the epoch and coarse counters
 trbcmd w 0xfe4c 0xc800 0x00002000 ## Triggered mode
 #trbcmd w 0xfe4c 0xc800 0x00003000 ## Triggerless   mode
 #trbcmd w 0xfe4c 0xc801 0x000f0005 ## trigger window enable & trigger window width
@@ -59,6 +60,7 @@ trbcmd w 0xfe4c 0xc804 0x0000007c ## data transfer limit
 
 
 # special Matthias TDCs
+trbcmd clearbit 0xfe48 0xc800 0x2000 ## clear bit to reset the epoch and coarse counters
 trbcmd w 0xfe48 0xc800 0x00002000 ## Triggered mode
 trbcmd w 0xfe48 0xc801 0x80c600c6 ##  triggerwindow +/-990ns ;5ns granularity
 trbcmd w 0xfe48 0xc802 0xffffffff ## channel 01-32 enable
@@ -67,6 +69,7 @@ trbcmd w 0xfe48 0xc804 0x0000007c ## data transfer limit
 
 
 # AUX TDCs
+trbcmd clearbit 0xfe4a 0xc800 0x2000 ## clear bit to reset the epoch and coarse counters
 trbcmd w 0xfe4a 0xc800 0x00002000 ## Triggered mode
 trbcmd w 0xfe4a 0xc801 0x80c600c6 ##  triggerwindow +/-990ns ;5ns granularity
 trbcmd w 0xfe4a 0xc802 0x00000000 ## channel 33-64 enable
@@ -111,8 +114,8 @@ trbcmd i 0xffff | wc -l
 #trbcmd w 0xffff 0x20 0x33
 
 # Barrel DIRC
-prepare_padiwas_invert_leds.pl --endpoints=0x2000-0x2013 --chains=0..2 --invert=0xffff --stretch=0x0000
-padiwa_led_off.pl
+prepare_padiwas_invert_leds.pl --endpoints=0x2000-0x2013 --chains=0..2 --invert=0xffff --stretch=0xffff
+#padiwa_led_off.pl
 
 # Beam
 prepare_padiwas_invert_leds.pl --endpoints=0x2014-0x201f --chains=0..2 --invert=0xffff
@@ -138,13 +141,22 @@ cd ~/trbsoft/daqtools/thresholds/
 ## 2015 ./load_thresh_mcptof.sh  1500 1500 1500 1500 
 
 #MCP-TOF, SciTils
-./write_thresholds.pl mcptof_mcpout_zero.log -o 2000 >> /dev/null # =14 mV after amp
-./write_thresholds.pl mcptof_pixels_zero.log -o 2000 >> /dev/null # =14 mV after amp
-./write_thresholds.pl mcptof_scitil_zero.log -o 2000 >> /dev/null # =20 mV after amp
-./write_thresholds.pl mcptof_hodo_zero.log -o 1000 >> /dev/null # =7 mV after amp
+./write_thresholds.pl mcptof_mcpout_zero.log -o 0 >> /dev/null # =10 mV before amp
+./write_thresholds.pl mcptof_pixels_zero.log -o 0 >> /dev/null # =10 mV before amp
+./write_thresholds.pl mcptof_scitil_zero.log -o 0 >> /dev/null # =10 mV before amp
+./write_thresholds.pl mcptof_hodo_zero.log -o 0 >> /dev/null # =7 mV before amp
+./write_thresholds.pl mcptof_mcpout_zero.log -o 1500 >> /dev/null # =10 mV before amp
+./write_thresholds.pl mcptof_pixels_zero.log -o 1500 >> /dev/null # =10 mV before amp
+./write_thresholds.pl mcptof_scitil_zero.log -o 1500 >> /dev/null # =10 mV before amp
+./write_thresholds.pl mcptof_hodo_zero.log -o 1000 >> /dev/null # =7 mV before amp
+
+
 
 ## Barrel DIRC
-./write_thresholds.pl ~/trbsoft/daqtools/users/gsi_dirc/thresh/201505101447.thr -o 600 >> /dev/null # 1.5mV at plug
+#./write_thresholds.pl ~/trbsoft/daqtools/users/gsi_dirc/thresh/201505101447.thr -o 600 >> /dev/null # 1.5mV at plug
+#./write_thresholds.pl padiwa_threshold_results_20150511_2.log -o 400 > /dev/null # 1mV at plug
+./write_thresholds.pl padiwa_threshold_results_20150516_high_stretch_CS.log -o 400 > /dev/null # 1mV at plug
+./padiwa_led_off_MT.sh > /dev/null
 
 cd -
 

diff --git a/web/htdocs/network/map.pl b/web/htdocs/network/map.pl
index 4a438901b65cdb14b1fb03f7af7e0842755f17ab..9147a7fe4ad27d1161d64d29dbf9bbd8615c5b80 100755 (executable)
--- a/web/htdocs/network/map.pl
+++ b/web/htdocs/network/map.pl
@@ -3,9 +3,10 @@ if ($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i) {
     print "HTTP/1.0 200 OK\n";
     print "Content-type: text/html\r\n\r\n";
 }
+
 else {
     use lib '..';
-#  use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
+    use if (!($ENV{'SERVER_SOFTWARE'} =~ /HTTPi/i)), apacheEnv;
     print "Content-type: text/html\n\n";
 }