update startup files

diff --git a/beamabort/startup.script b/beamabort/startup.script
new file mode 100644 (file)
index 0000000..71eb843
--- /dev/null
+++ b/beamabort/startup.script
@@ -0,0 +1,7 @@
+
+####################
+## Script for beam abort settings
+####################
+
+
+exec_cmd{local} trbcmd -f /home/hadaq/trbsoft/daq/beamabort/beamabort.trbcmd

diff --git a/cts/startup.script b/cts/startup.script
index 86ce2d4a0653a1c85cf556c000f0f0795fad3298..e3ba18039fc94226627f4c829ff30e17bf02a537 100644 (file)
--- a/cts/startup.script
+++ b/cts/startup.script
@@ -7,9 +7,9 @@ trbcmd w 0x0003 0xA0E1 0xcc
 trbcmd loadbit 0x003 0xA0C1 0x0000000F 0x00000004
 trbcmd setbit 0x0003 0xA0C2 0x01000000
 
-!ifndef MON_CTS
-  trbcmd         -f cts_settings.trbcmd
-!endif
+#!ifndef MON_CTS
+#  trbcmd         -f cts_settings.trbcmd
+#!endif
 
 !ifdef MON_CTS
   trbcmd         -f cts_settings_mon.trbcmd

diff --git a/ecal/addresses_ecal.db b/ecal/addresses_ecal.db
index 481be5a1f7d92b1f112cf54491d0b12594dd3f89..ff240cc3ab69de4aa51d208870da819593419ac2 100644 (file)
--- a/ecal/addresses_ecal.db
+++ b/ecal/addresses_ecal.db
@@ -11,7 +11,7 @@
     0x6010        117         1        0        0
     0x6011        165         1        0        0
     0x6012        123         1        0        0
-    0x6013        121         1        0        0
+    0x6013        107         1        0        0  #121 22-01-05
     0x6014        159         1        0        0
     0x6015        105         1        0        0
     0x6016        106         1        0        0
@@ -37,7 +37,7 @@
     0x6042        120         1        0        0
     0x6043        125         1        0        0
     0x6044        113         1        0        0
-    0x6045        133         1        0        0
+    0x6045        309         1        0        0 #133 22-01-13
     0x6046        124         1        0        0
 
     0x6050        122         1        0        0

diff --git a/ecal/register_tdc_ecal.db b/ecal/register_tdc_ecal.db
index fd617fc1abf141e061990afad84ffd156fd68835..8437eac6debde4971faf88c54d668e6b24b5a499 100644 (file)
--- a/ecal/register_tdc_ecal.db
+++ b/ecal/register_tdc_ecal.db
@@ -11,6 +11,8 @@
 # TDC    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4    #     C5     #    C6    #            
 ###########################################################################################################            
                                                                                                              
-0xfe71          0   0x50003000   0x83ff00c0   0xffffffff   0x0000ffff   0x00000010   0xaaaaaaaa   0xaaaaaaaa# trb3sc1 TDC
-
+0xfe71          0   0x50003000   0x819000c0   0xffffffff   0x0000ffff   0x0000000a    0xaaaaaaaa   0xaaaaaaaa# trb3sc1 TDC
+#0x6010          0   0x50003000   0x812c00c0   0x0000ffff   0x00000000   0x00000010   0xaaaaaaaa   0xaaaaaaaa# BROKEN TDCs OFF
+#0x6013          0   0x50003000   0x812c00c0   0xffffffff   0x00000000   0x00000010   0xaaaaaaaa   0xaaaaaaaa# BROKEN TDCs OFF
+#2021-11-18 trigger window to -960..+1500 changed
 

diff --git a/ecal/startup.script b/ecal/startup.script
index 35f044554a7aea19f654d40e65b0306ee4ed5eac..12ab0d29a83d8f0629e664e3b3c99158324697d8 100644 (file)
--- a/ecal/startup.script
+++ b/ecal/startup.script
@@ -24,8 +24,7 @@ trbcmd w 0x0120 0xa206 0x2e  #PulserWidth=47ns
 trbcmd w 0x0120 0xa207 0x2e  #PulserWidth=47ns
 trbcmd w 0x0120 0xa208 0x2e  #PulserWidth=47ns
 
-# the following is also included in ecal_set_thresholds.pl, so this is only
-# for the other systems
+
 
 trbcmd w 0xfe71 0x7111 500
 trbcmd w 0xfe71 0x7114 0x00050000 #min number of words per board
@@ -37,5 +36,7 @@ trbcmd w 0xfe71 0x7114 0x00050000 #min number of words per board
 exec_cmd{local} ecal_set_thresholds.pl
 
 #Load TDC settings
-  load_register  register_tdc_ecal.db
+load_register  register_tdc_ecal.db
 
+# set lower thresholds for sec2 and sec4
+exec_cmd{local} /home/hadaq/trbsoft/daq/ecal/ecal_set_thresholds_sec2_sec4.pl

diff --git a/evtbuild/eb.conf b/evtbuild/eb.conf
index 83f9620868153d5d03654c5932af4da5013c6cfd..868be2db3cdf52eb1521bf6164a716331b6dd589 120000 (symlink)
--- a/evtbuild/eb.conf
+++ b/evtbuild/eb.conf
@@ -1 +1 @@
-eb_2021-test.conf
\ No newline at end of file
+eb_feb22.conf
\ No newline at end of file

diff --git a/evtbuild/eb_2021-test.conf b/evtbuild/eb_2021-test.conf
index a7d4688cae0424a5b35c497e1ea197250c72b5f3..9d9d37aa0c9ad7b448fa55c2d90f0f6e928ef8c7 100644 (file)
--- a/evtbuild/eb_2021-test.conf
+++ b/evtbuild/eb_2021-test.conf
@@ -35,11 +35,15 @@ LTSM:          1  1  1  1  1  1  1  1  1  1  1  1  1  1  1  1
 # LTSM default options for all EB processes
 
 #LTSM_PATH:      /lustre/hades/raw/jun19test/default/tsm
-LTSM_PATH:      /lustre/hades/raw/jun21test
-#LTSM_PATH:      /hebetest/hades/raw/feb21/
-#LTSM_Server:  lxltsm01-tsm-server
+# beamtime config:
+LTSM_PATH:      /lustre/hades/raw/feb22
 LTSM_Server: lxltsm01
 
+# for hadestest:
+#LTSM_PATH:      /lustre/hades/raw/test
+#LTSM_Server: lxltsm02
+
+
 #LTSM_Node:    LTSM_TEST01
 #LTSM_Passwd:  LTSM_TEST01
 
@@ -61,8 +65,8 @@ LTSM_USEFSD: 0
 # we need at least 5 entries here (number of eventbuilder servers)
 #LTSM_FSD_SERVERS: lxfsd01 lxfsd02-eth lxfsd03 lxfsd01
 #LTSM_FSD_SERVERS: lxfsd04-eth lxfsd07-eth lxfsd04-eth lxfsd07-eth lxfsd04-eth
-# setup tests september 2021:
-LTSM_FSD_SERVERS: lxfsd01 lxfsd02-eth lxfsd03-eth lxfsd06-eth lxfsd07-eth
+# setup feb2022:
+LTSM_FSD_SERVERS: lxfsd01-eth lxfsd02-eth lxfsd03-eth lxfsd04-eth lxfsd05-eth
 #LTSM_FSD_SERVERS: lxfsd01-eth lxfsd02 lxfsd03-eth lxfsd01-eth lxfsd02
 #LTSM_FSD_SERVERS: lxfsd01-eth lxfsd03-eth lxfsd01-eth lxfsd03-eth lxfsd01-eth
 LTSM_FSD_PORT: 7625 7625 7625 7625 7625

diff --git a/evtbuild/start_eb_gbe.pl b/evtbuild/start_eb_gbe.pl
index 50cd28635d6d2409092a994a97a24cef32f66493..d46c1326c5fc803f30ef12f5f3073f29bd74df3f 120000 (symlink)
--- a/evtbuild/start_eb_gbe.pl
+++ b/evtbuild/start_eb_gbe.pl
@@ -1 +1 @@
-start_eb_gbe_2021-test.pl
\ No newline at end of file
+start_eb_gbe_feb22.pl
\ No newline at end of file

diff --git a/frpc/addresses_frpc.db b/frpc/addresses_frpc.db
index 6892aba30113b685587f0175f7e47912c10cdc3d..82c775760cd70cee2c9faf6d272fba534a4e1fa4 100644 (file)
--- a/frpc/addresses_frpc.db
+++ b/frpc/addresses_frpc.db
@@ -8,10 +8,10 @@
 0x6803     261      3
 
 # frpc2
-0x6810     244      0
-0x6811     244      1
-0x6812     244      2
-0x6813     244      3
+0x6810     238      0
+0x6811     238      1
+0x6812     238      2
+0x6813     238      3
 
 
 

diff --git a/hmon/doc/mdc-temp.htt b/hmon/doc/mdc-temp.htt
index 80042608dfd06e165ab7bb34cf87d1aee0326575..71d5827d59dfe37c289e45d37e3e61e4c8e096a5 100644 (file)
--- a/hmon/doc/mdc-temp.htt
+++ b/hmon/doc/mdc-temp.htt
@@ -1,10 +1,10 @@
 <h3>MDC Temperature</h3>
 <p>
-This button shows the temperatures of the four MDC planes. For more detailed temperature distributions in the single MDC sectors, watch 
+This button shows the temperatures of the four MDC planes. For more detailed temperature distributions in the single MDC sectors, check 
 <a href="/mon/monitor.cgi?10-MDCTemperature">here</a>.
 </p>
 <h4>Error Handling</h4>
-If there is an over-temperature error, check the power consumption of boards (6.8V should not be above 190A). Restart DAQ to see if power-consumption goes down. A power shutdown of MDC may be required.
+If there is an over-temperature error, check the power consumption of boards (6.8V should not be above 190A). Restart DAQ to see if power-consumption goes down. Contact the MDC expert.
 
 
 

diff --git a/hub/addresses_hub_trb3.db b/hub/addresses_hub_trb3.db
index d548b7e1d79ff0c076237afb61653999a1b21b21..68dbf14d842c80a19a9b013e13e6fb67490e183b 100644 (file)
--- a/hub/addresses_hub_trb3.db
+++ b/hub/addresses_hub_trb3.db
@@ -22,7 +22,7 @@
 
 #new TOF
 0x86c0         088     5       0       0
-0x86c1         264     5       0       0
+0x86c1         262     5       0       0
 0x86c2         006     5       0       0
 0x86c3         242     5       0       0
 0x86c4         265     5       0       0
@@ -30,7 +30,7 @@
 
 #fRPC
  0x8c00        261     5       0       0
- 0x8c10        244     5       0       0
+ 0x8c10        238     5       0       0
 
 
 #Wall

diff --git a/hub/register_configgbe_ip.db b/hub/register_configgbe_ip.db
index 57fd7e52aa433c526402f6e04c50924805a8ff35..d5d38797294e749820e5aeb04cded87086405149 120000 (symlink)
--- a/hub/register_configgbe_ip.db
+++ b/hub/register_configgbe_ip.db
@@ -1 +1 @@
-register_configgbe_ip_2021-test-mdconlytwoebs.db
\ No newline at end of file
+register_configgbe_ip_feb22.db
\ No newline at end of file

diff --git a/hub/startup.script b/hub/startup.script
index b88cb21404b1ddc3ccbff9d17d007f01df8425d2..19d41a23c1e0f179dd426043d4234cd240bf5c88 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -44,6 +44,12 @@ trbcmd clearbit 0x8810 0xc1 0x4
 #trbcmd clearbit 0x8014 0xc1 0x40
 #trbcmd clearbit 0x8014 0xc3 0x40
 
+#Veto 3rd FPGA not used
+trbcmd clearbit 0x8890 0xc0 0x4
+trbcmd clearbit 0x8890 0xc1 0x4
+trbcmd clearbit 0x8890 0xc3 0x4
+
+
 
 #Remove both SCS from Trigger Distribution
 trbcmd clearbit 0x8000 0xc0 0x200 #remove pexor from trigger

diff --git a/itof/startup.script b/itof/startup.script
index efaa6481adc240e856a4e039c0b7d243b25e7725..49f3822eebbbb571045e6765ca0e4fb21e04356f 100644 (file)
--- a/itof/startup.script
+++ b/itof/startup.script
@@ -13,3 +13,5 @@ trbcmd w 0xfe74 0x7114 0x00050000 #min number of words per board
   load_register  register_tdc.db
 
   
+# sets all thresholds for itof
+exec_cmd{local} ~/trbsoft/daq/itof/set_threshold_itof.sh

diff --git a/main/main_hades.script b/main/main_hades.script
index a9085eb8d9d0769b42b24ce0464cabef2c845749..46591cdbfeff44e051cc0cb6916004934653c152 100644 (file)
--- a/main/main_hades.script
+++ b/main/main_hades.script
@@ -93,6 +93,9 @@ wait
   exec_cmd{con} echo "Configure Trigger"
   exec_script{local} ../trg/startup.script
 
+  exec_cmd{con} echo "Configure Beam Abort"
+  exec_script{local} ../beamabort/startup.script
+
   
 #Central boards / CTS / SCS
     exec_cmd{con} echo "Configure CTS"

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index d19f9072ff002783b2a019246ff31c2e2f311154..158ecbc9350077aa92bc171b68b40154abcdac8e 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -58,8 +58,10 @@ trbcmd w 0x1031 0xc3 0xfbf
 
 
 #Disable failing boards
-#switchport.pl 0x1104 2 off  #2309 ,  didn't like spike rejection 0x10 (means off), mt 2021.02.14
+###switchport.pl 0x1104 2 off  #2309 ,  didn't like spike rejection 0x10 (means off), mt 2021.02.14
 switchport.pl 0x1101 4 off  #2203, 02.02.22
+switchport.pl 0x1024 7 off  #2027, 04.02.22
+switchport.pl 0x1023 8 off  #2057, 04.02.22
 
 
 
@@ -94,6 +96,8 @@ rm /tmp/EB_prefix.txt
 notifyall.sh "DAQ" "<N> DAQ has been started." "STARTUP" &
 echo "  <Startup> Configuration finished!"
 
+#ssh hadeswrp02 bin/enable_beam_abort.sh
+
 #/home/hadaq/trbsoft/hadesdaq/rich/retransmission.sh 2>/dev/null &
 
 if [ -z $1 ]

diff --git a/oracle/runstatsfromora_testplot.sh b/oracle/runstatsfromora_testplot.sh
index 5f923cf368eeeb80ee8c491f76a54f3a0c880841..87541b61cdd4edda08734c5f7a906fcf4de4ff4e 100755 (executable)
--- a/oracle/runstatsfromora_testplot.sh
+++ b/oracle/runstatsfromora_testplot.sh
@@ -5,11 +5,32 @@
 #  JAM 10-01-2022: TODO for feb22
 
 
-offset=2419200
+start=1643778000
+breakstart=1645509600
+breakend=1646028000
+end=1646802000
+
 cat <<EOF > /tmp/beam_trend.txt
 # timestamp real propaganda
-$(date -d @1612990204 "+%Y-%m-%d %H:%M:%S") 0 0
-$(date -d @$((1612990204+offset)) "+%Y-%m-%d %H:%M:%S") $(($offset*25/3600)) $(($offset*20/3600))
+$(date -d @$(($start)) "+%Y-%m-%d %H:%M:%S") 0 0
+$(date -d @$(($breakstart)) "+%Y-%m-%d %H:%M:%S") $((($breakstart-$start)*1800/86400)) $((($breakstart-$start)*1500/86400))
+$(date -d @$(($breakend)) "+%Y-%m-%d %H:%M:%S") $((($breakstart-$start)*1800/86400)) $((($breakstart-$start)*1500/86400))
+$(date -d @$(($end)) "+%Y-%m-%d %H:%M:%S") $((($end-$start+$breakstart-$breakend)*1800/86400)) $((($end-$start+$breakstart-$breakend)*1500/86400))
+EOF
+#1.5 million per day nominal + 10% due to PT2
+
+cat <<EOF > /tmp/beamtime.txt
+# timestamp real propaganda
+$(date -d @$(($start-1000000)) "+%Y-%m-%d %H:%M:%S") 50000 0
+$(date -d @$(($start-20001)) "+%Y-%m-%d %H:%M:%S") 50000 0
+$(date -d @$(($start-20000)) "+%Y-%m-%d %H:%M:%S") 0 0
+$(date -d @$(($breakstart-1)) "+%Y-%m-%d %H:%M:%S") 0 0
+$(date -d @$(($breakstart)) "+%Y-%m-%d %H:%M:%S") 50000 0
+$(date -d @$(($breakend)) "+%Y-%m-%d %H:%M:%S") 50000 0
+$(date -d @$(($breakend+1)) "+%Y-%m-%d %H:%M:%S") 0 0
+$(date -d @$(($end-1)) "+%Y-%m-%d %H:%M:%S") 0 0
+$(date -d @$(($end)) "+%Y-%m-%d %H:%M:%S") 50000 0
+$(date -d @$(($end+1000000)) "+%Y-%m-%d %H:%M:%S") 50000 0
 EOF
 
 gnuplot -p  <<ENDS
@@ -20,7 +41,7 @@ set out "/tmp/runstats.png"
 
 set key left top
 #set title "HADES Accumulated Statistics 2022"
-set xlabel "February 2022"
+set xlabel "Feb/Mar 2022"
 set ylabel "Million Events"
 #set y2label "Recorded Data [Gbyte]"
 #set y2tics
@@ -28,12 +49,13 @@ set ylabel "Million Events"
 set style line 1 lt rgb "#000000" lw 3 #dd7700
 set style line 2 lt rgb "#008800" lw 2
 set style line 3 lt rgb "#5ce000" lw 2 #ffc155
+set style line 4 lt rgb "#aaaaaa" lw 2 #888888
 set style fill transparent solid 0.4 border lc "#5ce000" #ffc155
-set yrange [0:1500]
+set yrange [0:15000]
 
-#f(x) = 21./3600 * (x-1612990204);
+#f(x) = 65/3600 * (x-1612990204);
 #1551679200);
-f(x) = 24./3600 * (x-11612990204.0);
+# f(x) = 60/3600 * (x-1612990204.0);
 #551679200);
 
 set xdata time
@@ -41,14 +63,15 @@ set timefmt "%Y-%m-%d %H:%M:%S"
 set format x "%d"
 #set timefmt "%H:%M:%S"
 #set format x "%H:%M"
-set xrange ["2022-02-01 00:00":"2022-02-07 09:00"]
+set xrange ["2022-02-01 00:00":"2022-02-11 09:00"]
 #set xtics 3600*24*4
-set xtics 3600*24
+set xtics 7200*24
 
-# plot  '/tmp/beam_trend.txt' using 1.2:3:4  title 'Anticipated Events'ls 3 w filledcu, \
-#       '/home/hadaq/oper/oraruns/runs_feb22.txt' using 2.3:(\$6/1000)  title 'Recorded Events' ls 1 with lines
+ plot  '/tmp/beamtime.txt' using 1.2:3:4 title "Beamtime" ls 4 w filledcu, \
+       '/tmp/beam_trend.txt' using 1.2:3:4  title 'Anticipated Events'ls 3 w filledcu, \
+       '/home/hadaq/oper/oraruns/runs_feb22.txt' using 2.3:(\$6/1000)  title 'Recorded Events' ls 1 with lines
 
-plot  '/home/hadaq/oper/oraruns/runs_feb22.txt' using 2.3:(\$6/1000)  title 'Recorded Events' ls 1 with lines
+#plot  '/home/hadaq/oper/oraruns/runs_feb22.txt' using 2.3:(\$6/1000)  title 'Recorded Events' ls 1 with lines
 
 #      '/home/hadaq/oper/oraruns/runs_feb22.txt'  using 2.3:7  ls 2  with lines  axes x1y2
 

diff --git a/rich/register_tdc_rich.db b/rich/register_tdc_rich.db
index 89dc81265e1ccdf294000e8735af0cf68d44c5a1..a032988145d2deea5e5d582a1764149e70f668ad 100644 (file)
--- a/rich/register_tdc_rich.db
+++ b/rich/register_tdc_rich.db
@@ -11,5 +11,7 @@
 #################################################################################################            
 #0xfe51          0   0x50003000   0x802800c8   0xFFFFFFFF   0x00000000   0x00000010   0x00000000 # dirich TDC
 #0xfe51          0   0x50003000   0x802800c8   0xFFFFFFFF   0x00000000   0x0000000a   0xffffffff # dirich TDC  # Trigger Window active from -1000 to +200
- 0xfe51          0   0x50003000   0x87d800a0   0xFFFFFFFF   0x00000000  0x0000000a   0xffffffff #  dirich TDC  # Trigger Window active from - 800 to -200
+# 0xfe51          0   0x50003000   0x87d800a0   0xFFFFFFFF   0x00000000  0x0000000a   0xffffffff #  dirich TDC  # Trigger Window active from - 800 to -200
+# 0xfe51          0   0x50003000   0x87d800f0   0xFFFFFFFF   0x00000000  0x0000000a   0xffffffff #  dirich TDC  # Trigger Window active from - 1200 to -200
+ 0xfe51          0   0x50003000   0x87d80118   0xFFFFFFFF   0x00000000  0x0000000a   0xffffffff #  dirich TDC  # Trigger Window active from - 1400 to -200
                                                                                                            

diff --git a/start/addresses_trb3sc.db b/start/addresses_trb3sc.db
index 55db1626cf77f1ff18d16885ce50b5f27fea0e58..9922c24d3183a8968d7299db3e874b53e76c7133 100644 (file)
--- a/start/addresses_trb3sc.db
+++ b/start/addresses_trb3sc.db
@@ -10,18 +10,18 @@
 #0x5001        409     1       0       0
 #0x5003        407     1       0       0
 #0x5002        405     1       0       0     
-0x5000 334     1       0       0
+0x5000 441     1       0       0
 0x5001 340      1       0       0
 0x5002 342      1       0       0
 0x5003 344      1       0       0
 0x5004 424     1       0       0
 0x5005 433  1   0       0
 0x5006 434  1   0   0
-0x5007 441     1       0       0
+0x5007 334     1       0       0
 
 0x5d00  338 1  0       0
 0x5d01  341 1  0       0
 0x5d02  337 1  0       0
 0x5d03  410 1  0       0
 0x5d04  339 1  0       0
-0x5d05  408 1  0       0
+0x5d05  346 1  0       0   #was 408, bad TDC 10.1.22

diff --git a/start/register_tdc.db b/start/register_tdc.db
index 197da60f2b3f90d124c9b2835303abbc37aed5b3..08e9413d3cfd0e1a652feca6608c0027af7637b8 100644 (file)
--- a/start/register_tdc.db
+++ b/start/register_tdc.db
@@ -12,7 +12,8 @@
 # TDC    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4    #     C5     #    C6    #            
 ###########################################################################################################            
                                                                                                              
-0xfe76          0   0x50003000   0x800a00c8   0xffffffff   0x0000ffff   0x00000010   0   0
+#0xfe76          0   0x50003000   0x800a00c8   0xffffffff   0x0000ffff   0x00000010   0   0
+0xfe76          0   0x50003000   0x87C40096   0xffffffff   0x0000ffff   0x00000010   0   0
 
-0xfe76          3   0xffffffff   0xffff
+#0xfe76          3   0xffffffff   0xffff
 

diff --git a/start/set_threshold_start.sh b/start/set_threshold_start.sh
index f828506b4dbdf10f3cab50fb8110afd196b097a3..503205d910823e84ef73d56671b6822226a05243 100755 (executable)
--- a/start/set_threshold_start.sh
+++ b/start/set_threshold_start.sh
@@ -1,3 +1,3 @@
 export PERL5LIB="$HOME/trbsoft/daqtools/perllibs"
-cd ~/hadesdaq/start
-~/trbsoft/daqtools/thresholds/write_thresholds.pl current_thresholds  --offset=-100
+cd ~/trbsoft/daq/start
+~/trbsoft/daqtools/thresholds/write_thresholds.pl current_thresholds  --offset=0

diff --git a/start/startup.script b/start/startup.script
index 7969ec501a904b8a120a74dff759a6372d2116ed..fc02c203139487781f3b27bb1b2acf5a763f1be7 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -12,5 +12,10 @@ trbcmd w 0xfe76 0x7114 0x00050000 #min number of words per board
   load_register  register_tdc.db
 
 # sets all thresholds for start
+
+exec_cmd{local} ~/trbsoft/daqtools/tools/padiwa.pl 0xfe76 0 invert 0xffff
+exec_cmd{local} ~/trbsoft/daqtools/tools/padiwa.pl 0xfe76 1 invert 0xffff
+
 exec_cmd{local} ~/hadesdaq/start/set_threshold_start.sh
 
+

diff --git a/sts/startup.script b/sts/startup.script
index bfa9e27d544bd80323f35599460c3b788f195278..837affe064618de9a48e8dd25c21e8953335e3fe 100644 (file)
--- a/sts/startup.script
+++ b/sts/startup.script
@@ -1,4 +1,4 @@
-#Broadcasts affect Veto as well
+#Broadcasts affect Veto/Hodo as well
 
 
 trbcmd s 0x42000005ed6b0428  0x03 0x6445  #workaround for wrong endpoint id
@@ -18,4 +18,12 @@ exec_cmd{local} /home/hadaq/trbsoft/daq/sts/loadregisterdb.pl /home/hadaq/trbsof
 
 
 
-#Configuration for Veto Padiwa
+#Configuration for Veto/Hodo Padiwa
+
+exec_cmd{local} ~/trbsoft/daqtools/tools/padiwa.pl 0x5010 0 invert 0xffff
+exec_cmd{local} ~/trbsoft/daqtools/tools/padiwa.pl 0x5010 1 invert 0xffff
+exec_cmd{local} ~/trbsoft/daqtools/tools/padiwa.pl 0x5011 0 invert 0xffff
+exec_cmd{local} ~/trbsoft/daqtools/tools/padiwa.pl 0x5011 1 invert 0xffff
+
+exec_cmd{local} ~/hadesdaq/hodo/thresholds/set_threshold_hodo.sh
+

diff --git a/tof/addresses_tofnew.db b/tof/addresses_tofnew.db
index 2c296d0e7c3f2b1cc303abf1435f46b3f0d4c346..a5b6310a932e089d7d5e4673a9728e06d3eb8813 100644 (file)
--- a/tof/addresses_tofnew.db
+++ b/tof/addresses_tofnew.db
@@ -6,10 +6,10 @@
 0x5C02        088       2 
 0x5C03        088       3
 
-0x5C10        264       0 
-0x5C11        264       1 
-0x5C12        264       2 
-0x5C13        264       3
+0x5C10        262       0 
+0x5C11        262       1 
+0x5C12        262       2 
+0x5C13        262       3
 
 0x5C20        006       0 
 0x5C21        006       1 

diff --git a/tof/startup.script b/tof/startup.script
index 2fd9ea2a84b636618cc518b1b56ead50d339f9b9..239b87a0daa3af787d59a8819cd3808db502de14 100644 (file)
--- a/tof/startup.script
+++ b/tof/startup.script
@@ -1,6 +1,6 @@
 
 #########
-#This script is for TOF and fRPC
+#This script is for TOF, FWall and fRPC
 #########
 
 trbcmd w 0xfe47 0x7111 500  #max number of words per board
@@ -15,6 +15,8 @@ exec_cmd{local} /home/hadaq/trbsoft/daq/tof/setThreshold.sh
 
 
 #fRPC configuration
+exec_cmd{local} /home/hadaq/trbsoft/daq/frpc/setThreshold.sh
 
 
+#Wall configuration
 

diff --git a/trg/register_trigger_am.db b/trg/register_trigger_am.db
index d438367d0cf11427e8e903e7d981ab33e69d8bce..2ed4455a8a3c5508e1d57839913ed6e228daba47 100644 (file)
--- a/trg/register_trigger_am.db
+++ b/trg/register_trigger_am.db
@@ -127,22 +127,30 @@
  0x8b14       200   0   0   0   0   0xfeff  0   0xfeff   0
  0x8b15       200   0   0   0   0   0x00ff  0   0x00ff   0
 
-#TOF, fRPC TDC: forward to central FPGA in groups of 16 
- 0xfe47       200   0x0000ffff  0        0xffff0000  0   0   0x0000ffff  0xffffffff   0
- 0x6810       100   0xF   0     0x30000     0x400 #mult2 for PMT signals
+#TOF, fRPC, FW TDC: forward to central FPGA in groups of 16
+ 0xfe47       200   0x0000ffff  0           0xffff0000  0   0   0  0xffffffff   0
+ 0xfe47       400   0x55555555  0xaaaaaaaa  0x00000004    #even/odd coincidence for fRPC layer
+#  0x6810       100   0xF   0     0x30000     0x400 #mult2 for PMT signals
  
-#fRPC: 1 and 2  or  3 and 4 
+#fRPC: 1 and 2  or  3 and 4 to output 4
  0x8c00       111   0 0x80000 0
- 0x8c00       300   0x80000703  0x80000F0B  0  0
+ 0x8c00       300   0x80000602  0x80000e0a  0  0
  0x8c10       111   0 0x80000 0
- 0x8c10       300   0x80000703  0x80000F0B  0  0
- 0x8c10       200   0 0     0 0     4 0     0 0  #PMT signal
+ 0x8c10       300   0x80000602  0x80000e0a  0  0
+ 0x8c00       200   0   0   0   0   0  0   0   0
+ 0x8c10       200   0   0   0   0   0  0   0   0
+
 
 #Veto
  0x8890       200   0 0     0 0     0x088 0     0 0
  0x5010       400   0xffff  0xffff0000 0x8   #left/right coincidence for bars
  0x5011       400   0xffff  0xffff0000 0x8
 
+ 0x8890       201   0           0   0   0   0x102
+ 0x5010       201   0xffffffff  0   0   0   0x102
+ 0x5011       201   0xffffffff  0   0   0   0x102
+
+
 #Wall: all to second output
  0x6700       200   0 0        0xffffffff  0
  0x6701       200   0 0        0xffffffff  0
@@ -161,35 +169,17 @@
 
 #Start: or of all channels, in groups of 16 on Pair 1-3, or on Pair 4
 ################################## 
- 0x5000       200   0 0x000000ff    0xfffffc00 0x000000ff     0x0000fc00 0     0xffff0000  0  
- 0x5003       200   0 0x000000ff    0xfffffc00 0x000000ff     0x0000fc00 0     0xffff0000  0  
- 0x5001       200   0 0x0000fc00    0xffff00ff 0x0000fc00     0x000000ff 0     0xffff0000  0  
- 0x5002       200   0 0x0000fc00    0xffff00ff 0x0000fc00     0x000000ff 0     0xffff0000  0  
 
- 
+ 0xfe76       200   0x0003f000 0    0x00fc0000 0    0x0000003f 0    0x00000fc0 0 
+ 0xfe76       201   0xffffffff  0   0   0   0x102
  
 #iTOF: or of all channels, multiplicity in groups of 12/16 on Pair 2,3,4 and or on 1
 ################################## 
-  0x5d00       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
-  0x5d01       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
-  0x5d02       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
-  0x5d03       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
-  0x5d04       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
-  0x5d05       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
-
-  0x5d00       111   0x03030300  0x00000800  0x00000201
-  0x5d01       111   0x03030300  0x00000800  0x00000201
-  0x5d02       111   0x03030300  0x00000800  0x00000201
-  0x5d03       111   0x03030300  0x00000800  0x00000201
-  0x5d04       111   0x03030300  0x00000800  0x00000201
-  0x5d05       111   0x03030300  0x00000800  0x00000201
-
-  0x5d00       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
-  0x5d01       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
-  0x5d02       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
-  0x5d03       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
-  0x5d04       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
-  0x5d05       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
+  0xfe74       110   0x00000fff  0   0x0fff0000  0   0   0x00000fff
+
+  0xfe74       111   0x03030300  0x00000800  0x00000201
+
+  0xfe74       200   0 0  0 0  0x0fff0fff 0x0fff   0 0
 
 #Secondary trigger box
 ##################################
@@ -202,7 +192,7 @@
 #Setup 3: or of all STS boards on output 3
 #Setup 4: from fRPC (PMT mult2 plus both ends of RPC)
  
- 0x0100       200     0 0x00003e3e         0x40000 0         0x0000003f 0x000f0000    0x00000c00 0
+ 0x0100       200     0 0x00003e3e         0x40000 0         0x0000003f 0x000f0000    0x00008800 0
  0x0100       201     0 0x00003e3e         0 0 0 
 
  
@@ -216,27 +206,13 @@
  0xfe61     900     0xffffffff  0xffffffff
  0xfe71     900     0xffffffff  0xffffffff
  0xfe73     900     0xffffffff  0xffffffff
- 0xfe47     902     0xffffffff  
+ 0xfe47     900     0xffffffff  0x0000000f
  0xfe4c     900     0xffffffff  0xffff
  0xfe40     902     0x000fffff  
  0x0100     900     0xffffffff  0xffffffff   #secondary box
 
- 0xfe74     900     0x7fff7fff  0x00007fff
-
- 0x5000     900     0xffffffff  0x0000ffff   #disable unused channels in Start   0xffff0000
- 0x5001     900     0xffffffff  0x0000ffff
- 0x5002     900     0xffffffff  0x0000ffff
- 0x5003     900     0xffffffff  0x0000ffff
- 0x5004     900     0xffffffff  0x0000ffff
- 0x5005     900     0xffffffff  0x0000ffff
- 0x5006     900     0xffffffff  0x0000ffff
- 0x5007     900     0xffffffff  0x0000ffff
-
-# 0x5d00     900     0x7fff7fff  0x7fff
-# 0x5d01     900     0x7fff7fff  0x7fff
-# 0x5d02     900     0x7fff7fff  0x7fff
-# 0x5d03     900     0x7fff7fff  0x7fff
-# 0x5d04     900     0x7fff7fff  0x7fff
-# 0x5d05     900     0x7fff7fff  0x7fff
+ 0xfe74     900     0x7fff7fff  0x000f7fff
+
+ 0xfe76     902     0x0fffffff  
  
  0xfe4c     901     0xffffffff  0xffff       #invert monitor for STS/Veto

diff --git a/trg/triggerbox.trbcmd b/trg/triggerbox.trbcmd
index a8370f5245e130a154cb59f067948a5ef23ed7f7..264f9b1b3da899eb0905cf3c73672bafd1b223f8 120000 (symlink)
--- a/trg/triggerbox.trbcmd
+++ b/trg/triggerbox.trbcmd
@@ -1 +1 @@
-P18_b.txt
\ No newline at end of file
+20220208_P1to8b.trbcmd
\ No newline at end of file