various updates to configuration scripts

diff --git a/.gitignore b/.gitignore
index e78feb7a2632dadc4541d17af2f603bdebc83c21..9bcae400211b9065c8ad886248eb9a26eb648d27 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,7 @@ delme
 *.back
 archive
 tables
+bitfile
+.limbo
+bak
+*.dev

diff --git a/control/gui/expert/Set_RICH_Thr b/control/gui/expert/Set_RICH_Thr
index 274d0275c799485aeb8605c6725614ba1b99f366..a75331e49d1a2020be80f1a9a83dfe51074c8452 100755 (executable)
--- a/control/gui/expert/Set_RICH_Thr
+++ b/control/gui/expert/Set_RICH_Thr
@@ -8,6 +8,7 @@ xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
   echo \"  <RICH_Thr> Connected to lxhadesdaq...\"
   echo \"  <RICH_Thr> Setting Thresholds...\"
   /home/hadaq/trbsoft/hadesdaq/utils/RICH_Thr_Call.sh --loading-file /home/hadaq/hadesdaq/rich/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -t 0 70
+#  /home/hadaq/trbsoft/hadesdaq/utils/RICH_Thr_Call.sh --loading-file /home/hadaq/hadesdaq/rich/trb_dirich_threshold/threshold_files/standard_baselines.thr -l 0 -t 0 50
   echo \"Done\"
   sleep 10
 "

diff --git a/ecal/addresses_ecal.db b/ecal/addresses_ecal.db
index 142b77c1a928a895f09de77aee6f044f7af6f4a0..dde294a195042d3526b31358cf9c8d20e776e255 100644 (file)
--- a/ecal/addresses_ecal.db
+++ b/ecal/addresses_ecal.db
@@ -30,7 +30,7 @@
     0x6033        0         1        0        0
     0x6034        0         1        0        0
     0x6035        0         1        0        0
-    0x6036        0         1        0        0
+    0x6036        1071         1        0        0
 
     0x6040        1161         1        0        0
     0x6041        1151         1        0        0

diff --git a/ecal/ecal_op_guide b/ecal/ecal_op_guide
index 5e3a763c3a6bc2bd7a8c2fba8878eaf6157105a7..9fbd03a9af896e85933b60208e91867c458f8357 100644 (file)
--- a/ecal/ecal_op_guide
+++ b/ecal/ecal_op_guide
@@ -101,10 +101,13 @@ Padiwa low voltage (5 V) power cycle
 Padiwa boards can be power cycled by using the "ECAL LV5 Pwercycle" button in the main DAQ-GUI.\r
 After a power cycle a DAQ restart ist needed and thresholds have to be reloaded.\r
 \r
+\r
+In case of busy ECAL boards in coincidence with DAQ waiting for RICH complain to RICH operator! If he is not around, try to resync the Diriches. If this do not help, perform the RICH LV power cycle.\r
+\r
 ############################\r
 #Contact in case of problems\r
 ############################\r
-In case of some problems call:\r
+In case of some problems do not dare to call if your life is precious to you:\r
 Adrian Rost (PADIWAS and readout electronics): +491771974495\r
 Petr Chudoba (HV, PMTs & laser system): +491781989243\r
 \r

diff --git a/ecal/register_monitoring_trigger_mult3_minusNoise.db b/ecal/register_monitoring_trigger_mult3_minusNoise.db
index 67bf7a98793e2fdb0a34cb62195a732038550341..d476b3ae6aa8238b9e98b0cbc06ca8fde07396e7 100644 (file)
--- a/ecal/register_monitoring_trigger_mult3_minusNoise.db
+++ b/ecal/register_monitoring_trigger_mult3_minusNoise.db
@@ -30,7 +30,7 @@
  0x8a02       1                  0x00000000                0x00015400
  0x8a03       1                  0x00000054                0x00000000
  0x8a04       1                  0x00000015                0x00015400
- 0x8a05       1                  0x00000000                0x00015400
+ 0x8a05       1                  0x00000000                0x00015100
         #left half of crate on output 1, right half on output 2
         
 # 0x0100       0     0x00007e7e   0x00007e7e   0x00000000   0x00000000   0x00000000   0x00007e7e   0x00000000    0x00000000   0x00000000

diff --git a/ecal/register_monitoring_trigger_mult3in1board_or2boards.db b/ecal/register_monitoring_trigger_mult3in1board_or2boards.db
new file mode 100644 (file)
index 0000000..6a063a0
--- /dev/null
+++ b/ecal/register_monitoring_trigger_mult3in1board_or2boards.db
@@ -0,0 +1,43 @@
+# 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   0x00ffffff   0x00000000   0xffffffff   0x0000ffff    0x00000000   0x00000000
+ 0xfe71       2     0x00ffffff   0x00030000   0x00000400
+
+ 0x8a01       2     0x0002a2a2   0x00020000   0x00000200 
+ 
+ 0xfe61       0     0x000fffff   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000   0x00000000    0x00000000   0x00000000
+ 0x8a00       1                  0x00000015                0x00000000   
+ 0x8a01       1                  0x00015151                0x00000000
+ 0x8a02       1                  0x00000000                0x00015400
+ 0x8a03       1                  0x00000054                0x00000000
+ 0x8a04       1                  0x00000015                0x00015400
+ 0x8a05       1                  0x00000000                0x00015100
+        #left half of crate on output 1, right half on output 2
+        
+# 0x0100       0     0x00007e7e   0x00007e7e   0x00000000   0x00000000   0x00000000   0x00007e7e   0x00000000    0x00000000   0x00000000
+ 0x0100       0      0x00007c7c   0x00007c7c   0x00000000   0x00000000   0x00000000   0x00007e7e   0x00000000    0x00000000   0x00000000
+        #1..6: output 1, #9..14 output 2
+        
+ 0x0100       2     0x00007c7c   0x00020000   0x00000200
+        #2 half sectors fire, on second output

diff --git a/ecal/startup.script b/ecal/startup.script
index d7f0aa93033cd814ed98a9697fbaffa1f32be7e0..b52130fdb6fada2a1be713287a9c6fa7cf925d74 100644 (file)
--- a/ecal/startup.script
+++ b/ecal/startup.script
@@ -8,13 +8,18 @@
 
 #ECAL pulser configuration
 
+trbcmd w 0x0120 0xa000 0x0 #switch OFF LASER pulser by default
+
 trbcmd w 0x0120 0xa101 0xa0000  #PulserPeriod=2730688ns
+trbcmd w 0x0120 0xa102 0xa0000  #PulserPeriod=2730688ns
+trbcmd w 0x0120 0xa103 0xa0000  #PulserPeriod=2730688ns
 trbcmd w 0x0120 0xa104 0xa0000  #PulserPeriod=2730688ns
 trbcmd w 0x0120 0xa105 0xa0000  #PulserPeriod=2730688ns
 trbcmd w 0x0120 0xa106 0xa0000  #PulserPeriod=2730688ns
 trbcmd w 0x0120 0xa107 0xa0000  #PulserPeriod=2730688ns
 trbcmd w 0x0120 0xa108 0xa0000  #PulserPeriod=2730688ns
 trbcmd w 0x0120 0xa201 0x2e  #PulserWidth=47ns
+trbcmd w 0x0120 0xa202 0x2e  #PulserWidth=47ns
 trbcmd w 0x0120 0xa203 0x2e  #PulserWidth=47ns
 trbcmd w 0x0120 0xa204 0x2e  #PulserWidth=47ns
 trbcmd w 0x0120 0xa205 0x2e  #PulserWidth=47ns
@@ -231,7 +236,7 @@ trbcmd w 0xfe71 0xc805 0xaaaaaaaa #invert TDCs for SLOW channels
 trbcmd w 0xfe71 0xc806 0xaaaaaaaa #invert TDCs for SLOW channels
 
 #exec_script{pexor} ../ecal/startupQFH.script #not working?
-#exec_cmd{local} ../ecal/startupQFH.sh
+exec_cmd{local} ../ecal/startupQFH.sh
 #trbcmd w 0x6036 0xc802 0x00000000 #deactivate TDCs on QFH board
 
 #wait

diff --git a/ecal/startupQFH.script b/ecal/startupQFH.script
index ffcc9896746b025e296b590b46a47b013590a523..2c4d2cfedebff29e324246f1d64b1e2e4db259d6 100644 (file)
--- a/ecal/startupQFH.script
+++ b/ecal/startupQFH.script
@@ -3,4 +3,4 @@ trbcmd w 0x6036 0xc805 0x0 #do not invert TDCs for SLOW channels for 6036
 trbcmd w 0x6036 0xc806 0x0 #do not invert TDCs for SLOW channels for 6036
 trbcmd w 0x6036 0xc802 0xffff #deactivate unused channels
 trbcmd w 0x6036 0xc803 0x0 #deactivate unused channels
-trbcmd w 0x6036 0xc801 0x83ff00aa #enable trigger window: 965 ns (before), 5115 ns (after)
\ No newline at end of file
+trbcmd w 0x6036 0xc801 0x83ff00aa #enable trigger window: 965 ns (before), 5115 ns (after)

diff --git a/ecal/startupQFH.sh b/ecal/startupQFH.sh
index 5b461d7e5300f47fdacae4648544d95f1b725484..3e54cd9a662e181360357318ee09059045eaaad7 100755 (executable)
--- a/ecal/startupQFH.sh
+++ b/ecal/startupQFH.sh
@@ -2,7 +2,10 @@
 trbcmd w 0x6036 0xc805 0x0 #do not invert TDCs for SLOW channels for 6036
 trbcmd w 0x6036 0xc806 0x0 #do not invert TDCs for SLOW channels for 6036
 trbcmd w 0x6036 0xc802 0xffff #deactivate unused channels
+#trbcmd w 0x6036 0xc802 0x0 #deactivate unused channels
 trbcmd w 0x6036 0xc803 0x0 #deactivate unused channels
 #trbcmd w 0x6036 0xc801 0x83ff00aa #enable trigger window: 965 ns (before), 5115 ns (after)
 #trbcmd w 0x6036 0xc801 0x80640028 #enable trigger window: 200 ns (before), 500 ns (after)
-trbcmd w 0x6036 0xc801 0x80c80028 #enable trigger window: 200 ns (before), 1000 ns (after)
+#trbcmd w 0x6036 0xc801 0x80c80028 #enable trigger window: 200 ns (before), 1000 ns (after)
+#trbcmd w 0x6036 0xc801 0x83e80028 #enable trigger window: 200 ns (before), 5000 ns (after)
+trbcmd w 0x6036 0xc801 0x83e800c8 #enable trigger window: 1000 ns (before), 5000 ns (after)

diff --git a/evtbuild/eb_bnet_ltsm_newservers.conf b/evtbuild/eb_bnet_ltsm_newservers.conf
index 0d072c39f2fcc77e816a542f8e861f36f2671023..425c8f1c9d916756d14ac100c599caf2573ee12f 100644 (file)
--- a/evtbuild/eb_bnet_ltsm_newservers.conf
+++ b/evtbuild/eb_bnet_ltsm_newservers.conf
@@ -144,7 +144,7 @@ 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/hebe/hades/raw/mar19/default/tsm
+LTSM_PATH:      /lustre/hades/raw/jun19test/default/tsm
 #LTSM_Server:  lxltsm01-tsm-server
 LTSM_Server: lxltsm01
 
@@ -156,7 +156,7 @@ LTSM_Server: lxltsm01
 LTSM_Node:     hades
 LTSM_Passwd:    wDhgcvFF7
 
-LTSM_Filesystem:       /lustre/hebe
+LTSM_Filesystem:       /lustre
 
 
 

diff --git a/evtbuild/start_eb_gbe.sh b/evtbuild/start_eb_gbe.sh
index 5cfa4cf5e00add1b7cfa01db33ee86a4beb4f71b..c45cfe6640e3190373e29052e3aa0fce53cc8b19 100755 (executable)
--- a/evtbuild/start_eb_gbe.sh
+++ b/evtbuild/start_eb_gbe.sh
@@ -1 +1 @@
-./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 8;
+./start_eb_gbe.pl -e restart -n 1-16 -d on -p te -b 1;

diff --git a/evtbuild/start_eb_gbe_newservers.pl b/evtbuild/start_eb_gbe_newservers.pl
index a913f8715e74b252f61da12f705ba36d1c7d2d40..cda07f5bf84b788951edc857005190342dd188be 100755 (executable)
--- a/evtbuild/start_eb_gbe_newservers.pl
+++ b/evtbuild/start_eb_gbe_newservers.pl
@@ -677,7 +677,7 @@ my $ebproc =0; # setup for first EB will define the BNET
 
   # variable master node now:
   my $bnetmaster = "lxhadeb07";
-  #lxhadeb07";
+  #lxhadeb12";
   
 # before we start inidividual bnet processes, need to evaluate list of ports and nodes:
 # BNETSENDERS=[localhost:12501,localhost:12502]
@@ -791,7 +791,7 @@ for ( my $ebserver=0; $ebserver<5; $ebserver=$ebserver+1){
     
     
     
-    print "node ". $gsi_ip . " uses ports ".$hadaqports . ", calibflags " .$calibflags . " hubs: ". $subevents ."\n";
+   # print "node ". $gsi_ip . " uses ports ".$hadaqports . ", calibflags " .$calibflags . " hubs: ". $subevents ."\n";
 }
 $bnetsenders = $bnetsenders . "]";
 $bnetrcvs = $bnetrcvs . "]";
@@ -1890,7 +1890,7 @@ sub readEBports()
             my $addr = $vals[0];
             my $calib = $vals[7]; # jam2018 - add list of trb3 tdc calibration modes
 
-            #print "got: ip: $ip, port: $port, addr: $addr\n";
+          #  print "got: ip: $ip, port: $port, addr: $addr\n";
             #- Accept only sources from active source list
             if( any {hex($_) == hex($addr)} @{$activeSources_href->{'addr_list'}} ){
                 $tmp_href->{$id}->{'IP'} = $ip;
@@ -1907,7 +1907,7 @@ sub readEBports()
 
     $fh->close;
 
-    #print Dumper $tmp_href;
+   # print Dumper $tmp_href;
 
     #- Sort hash according to active data source list
     my $numids= scalar keys %tmp;
@@ -1955,7 +1955,7 @@ sub readEBports()
             }
     }
 
-    #print Dumper $ports_href;
+   # print Dumper $ports_href;
 }
 
 sub readActiveSources()

diff --git a/hub/addresses_hub.db b/hub/addresses_hub.db
index 5d5a270e79da25eb0f706b86e07795e0f93700fd..db1ad8364b6650636b0f7f8fb2e64939457f9821 100644 (file)
--- a/hub/addresses_hub.db
+++ b/hub/addresses_hub.db
@@ -4,10 +4,10 @@
 
 
 #RPC
-0x8401        006         1          2        101
-0x8400        006         2          4        101
-0x8411        014         1          2        102
-0x8410        014         2          4        102
+#0x8401        006         1          2        101
+#0x8400        006         2          4        101
+#0x8411        014         1          2        102
+#0x8410        014         2          4        102
 #0x8421        016         1          2        104
 #0x8420        016         2          4        104
 
@@ -16,16 +16,15 @@
 0x8600        009         2          4        096
 
 #Wall
-0x8701        007         1          2        121  #exchanged 004 on 16.03.11
-0x8700        007         2          4        121  # wall hub
+#0x8701        007         1          2        121  #exchanged 004 on 16.03.11
+#0x8700        007         2          4        121  # wall hub
 
 
 #Pion
 #0x8900        0755        5          0        075
 #0x8910        0815        5          0        081
 
-#StartTRB3
-0x8880        0065        5          0        006
-0x8890        1065        5          0        106
-
 
+#new TOF
+0x86c3        2555        5 0 0
+0x86c6        2505        5 0 0

diff --git a/hub/addresses_hub_trb3.db b/hub/addresses_hub_trb3.db
new file mode 100644 (file)
index 0000000..4db0122
--- /dev/null
+++ b/hub/addresses_hub_trb3.db
@@ -0,0 +1,13 @@
+#Address  #   S/N   #   FPGA  #   Design  #  TRB  #
+###################################################
+#StartTRB3
+0x8880        0065        5          0        006
+0x8890        1065        5          0        106
+
+#new STS2
+ 0x8b10        0715           5         0         071
+ 0x8b11        1555           5         0         155
+ 0x8b12        1225           5         0         122
+ 0x8b13        0315           5         0         031
+ 0x8b14        1575           5         0         157
+ 0x8b15        1545           5         0         154

diff --git a/hub/addresses_hub_trb3sc.db b/hub/addresses_hub_trb3sc.db
index d344f063161a43f85710f7accaac8a048a57a6e8..f518406f9c42c75a93ee73aa6784d4f9afebe005 100644 (file)
--- a/hub/addresses_hub_trb3sc.db
+++ b/hub/addresses_hub_trb3sc.db
@@ -2,16 +2,19 @@
 ###################################################
 #Central
 0x8000        1611         1          0        0
-#0x8010          0         1          0        0 #not used slot
 0x8800        1421         1          0        0
 0x8012        1571         1          0        0
+0x8011        1471         1          0        0
 0x8013        1491         1          0        0
-#0x8014          0         1          0        0 #not used slot
+0x8014        1481         1          0        0
 0x8015        1551         1          0        0
 0x8016        1601         1          0        0
 0x8017        1561         1          0        0
 0x8018        1461         1          0        0
 
+#2nd central crate
+0x8810        3101         1          0        0
+
 #Ecal
 0x8a00        1341         1          0        0
 0x8a01        0091         1          0        0
@@ -35,10 +38,12 @@
  0x83cb        1411        1          0        0
 
 #new RPC
- 0x84c0        3201
- 0x84c1        3151
- 0x84c2        3181
- 0x84c3        3161
- 0x84c4        3191
- 0x84c5        3171
+ 0x84c0        3201    1 0 320
+ 0x84c1        3151    1 0 315
+ 0x84c2        3181    1 0 318
+ 0x84c3        3161    1 0 316
+ 0x84c4        3171    1 0 317
+ 0x84c5        3191    1 0 319
 
+#new TOF sc
+ 0x86c3  3071 1 0 307

diff --git a/hub/configure_ports.script b/hub/configure_ports.script
index 8ba1a562d637bbe1c78bbe46286b4ba7acdbeeac..3fe7082d18dd91ad0e6204fbff1c88614c802fb7 100644 (file)
--- a/hub/configure_ports.script
+++ b/hub/configure_ports.script
@@ -1,32 +1,32 @@
 #Temporary: remove all other hubs in network from CTS hub despite used hub
 
 
-!ifndef RICH
-  trbcmd clearbit 0x8000 0xc0 0x0180
-  trbcmd clearbit 0x8000 0xc1 0x0180
-  trbcmd clearbit 0x8000 0xc3 0x0180
-!endif
+#!ifndef RICH
+#  trbcmd clearbit 0x8000 0xc0 0x0180
+#  trbcmd clearbit 0x8000 0xc1 0x0180
+#  trbcmd clearbit 0x8000 0xc3 0x0180
+#!endif
 
 
-!ifndef TOF
-  trbcmd clearbit 0x8012 0xc0 0x0002
-  trbcmd clearbit 0x8012 0xc1 0x0002
-  trbcmd clearbit 0x8012 0xc3 0x0002
-!endif
+#!ifndef TOF
+#  trbcmd clearbit 0x8012 0xc0 0x0002
+#  trbcmd clearbit 0x8012 0xc1 0x0002
+#  trbcmd clearbit 0x8012 0xc3 0x0002
+#!endif
 
 
-!ifndef RPC
-  trbcmd clearbit 0x8012 0xc0 0x000c
-  trbcmd clearbit 0x8012 0xc1 0x000c
-  trbcmd clearbit 0x8012 0xc3 0x000c
-!endif
+#!ifndef RPC
+#  trbcmd clearbit 0x8012 0xc0 0x000c
+#  trbcmd clearbit 0x8012 0xc1 0x000c
+#  trbcmd clearbit 0x8012 0xc3 0x000c
+#!endif
 
 
-!ifndef WALL
-  trbcmd clearbit 0x8012 0xc0 0x0001
-  trbcmd clearbit 0x8012 0xc1 0x0001
-  trbcmd clearbit 0x8012 0xc3 0x0001
-!endif
+#!ifndef WALL
+#  trbcmd clearbit 0x8012 0xc0 0x0001
+#  trbcmd clearbit 0x8012 0xc1 0x0001
+#  trbcmd clearbit 0x8012 0xc3 0x0001
+#!endif
 
 
  
@@ -49,11 +49,11 @@
   trbcmd clearbit 0x8000 0xc3 0x0060
 !endif
 
-!ifndef ECAL
-  trbcmd clearbit 0x8000 0xc0 0x0008
-  trbcmd clearbit 0x8000 0xc1 0x0008
-  trbcmd clearbit 0x8000 0xc3 0x0008
-!endif
+#!ifndef ECAL
+#  trbcmd clearbit 0x8000 0xc0 0x0008
+#  trbcmd clearbit 0x8000 0xc1 0x0008
+#  trbcmd clearbit 0x8000 0xc3 0x0008
+#!endif
 
 
 

diff --git a/hub/register_configgbe_2018.db b/hub/register_configgbe_2018.db
index bfa960d0bf2da7c72a44a04ff5466ea9f666f217..23a818b4d09649b902e79b42585661df0a31a95e 100644 (file)
--- a/hub/register_configgbe_2018.db
+++ b/hub/register_configgbe_2018.db
@@ -51,6 +51,7 @@
   0x8600      1       0x8600         1            0
   0x8700      1       0x8700         1            0
   0x8800      1       0x8800         1            0
+  0x8810      1       0x8810         1            0
   0x8880      1       0x8880         1            0
 # 0x8890      1       0x8890         1            0
 # 0x8900      1       0x8900         1            0    
@@ -77,3 +78,4 @@
   0x1150      1       0x1150         1            0
   0x1160      1       0x1160         1            0
 
+  0x84c4      1       0x84c4         1            0

diff --git a/hub/register_configgbe_2019.db b/hub/register_configgbe_2019.db
index facca50955bb7d0a21a91d76605ececbd437305d..51bc7ff118a7b73045af85308768d3a7f4056de5 100644 (file)
--- a/hub/register_configgbe_2019.db
+++ b/hub/register_configgbe_2019.db
@@ -80,6 +80,13 @@
   0x8a04      1       0x8a04         1            1
   0x8a05      1       0x8a05         1            1
 
+  0x8b10      1              0x8b10         1            1     
+  0x8b11      1       0x8b11         1            1
+  0x8b12      1       0x8b12         1            1
+  0x8b13      1       0x8b13         1            1
+  0x8b14      1       0x8b14         1            1
+  0x8b15      1       0x8b15         1            1  
+  
   0x1000      1       0x1000         1            0
   0x1010      1       0x1010         1            0
   0x1020      1       0x1020         1            0
@@ -93,5 +100,3 @@
   0x1140      1       0x1140         1            0
   0x1150      1       0x1150         1            0
   0x1160      1       0x1160         1            0
-
-  0x84c4      1       0x84c4         1            0

diff --git a/hub/register_configgbe_ip_2019.db b/hub/register_configgbe_ip_2019.db
index fbfc36a9726963d0055674285210cc05dc67e5ae..5352c7fd9d51d445a9965b232977319e0b4f6f0a 100644 (file)
--- a/hub/register_configgbe_ip_2019.db
+++ b/hub/register_configgbe_ip_2019.db
@@ -184,16 +184,21 @@
   0x84c2     0        0xc656     0xdead84c2   0xc0a864BB     0xc656     0xc0a8640a 2  # rpc sector 3 lxhadeb10  
   0x84c3     0        0xc657     0xdead84c3   0xc0a864BC     0xc657     0xc0a8690b 2  # rpc sector 4 lxhadeb11  
   0x84c4     0        0xc658     0xdead84c4   0xc0a864BD     0xc658     0xc0a8690b 2  # rpc sector 4 lxhadeb11  
-  0x84c5     0        0xc659     0xdead84c4   0xc0a864BE     0xc659     0xc0a8690b 2  # rpc sector 4 lxhadeb11 
-  
-  0x86c0     0        0xc65A     0xdead86c0   0xc0a864C0     0xc65A     0xc0a86408 2  # tof hub 0 lxhadeb08
-  0x86c1     0        0xc65B     0xdead86c1   0xc0a864C1     0xc65B     0xc0a86409 2  # tof hub 1 lxhadeb09
-  0x86c2     0        0xc65C     0xdead86c2   0xc0a864C2     0xc65C     0xc0a8640A 2  # tof hub 2 lxhadeb10
-  0x86c3     0        0xc65D     0xdead86c3   0xc0a864C3     0xc65D     0xc0a8640B 2  # tof hub 3 lxhadeb11
-  0x86c4     0        0xc65E     0xdead86c4   0xc0a864C4     0xc65E     0xc0a8640B 2  # tof hub 4 lxhadeb11
-  0x86c5     0        0xc65F     0xdead86c5   0xc0a864C5     0xc65F     0xc0a8640C 2  # tof hub 5 lxhadeb12
-  0x86c6     0        0xc660     0xdead86c6   0xc0a864C6     0xc660     0xc0a8640C 2  # tof hub 6 lxhadeb12
+  0x84c5     0        0xc651     0xdead84c4   0xc0a864BE     0xc651     0xc0a8690b 2  # rpc sector 4 lxhadeb11   
+  0x86c0     0        0xc690     0xdead86c0   0xc0a864C0     0xc690     0xc0a86408 2  # tof hub 0 lxhadeb08
+  0x86c1     0        0xc691     0xdead86c1   0xc0a864C1     0xc691     0xc0a86409 2  # tof hub 1 lxhadeb09
+  0x86c2     0        0xc692     0xdead86c2   0xc0a864C2     0xc692     0xc0a8640A 2  # tof hub 2 lxhadeb10
+  0x86c3     0        0xc693     0xdead86c3   0xc0a864C3     0xc693     0xc0a8690B 2  # tof hub 3 lxhadeb11
+  0x86c4     0        0xc694     0xdead86c4   0xc0a864C4     0xc694     0xc0a8690B 2  # tof hub 4 lxhadeb11
+  0x86c5     0        0xc695     0xdead86c5   0xc0a864C5     0xc695     0xc0a8690C 2  # tof hub 5 lxhadeb12
+  0x86c6     0        0xc696     0xdead86c6   0xc0a864C6     0xc696     0xc0a8690C 2  # tof hub 6 lxhadeb12
   
+  0x8b10     0        0xc6B4     0xdead8b10   0xc0a864D9     0xc6B4     0xc0a8640a 1  # STS2 0 lxhadeb10  
+  0x8b11     0        0xc6B5     0xdead8b11   0xc0a864DA     0xc6B5     0xc0a8640a 1  # STS2 1 lxhadeb10  
+  0x8b12     0        0xc6B6     0xdead8b12   0xc0a864DB     0xc6B6     0xc0a8640a 1  # STS2 2 lxhadeb10  
+  0x8b13     0        0xc6B7     0xdead8b13   0xc0a864DC     0xc6B7     0xc0a8690b 1  # STS2 3 lxhadeb11  
+  0x8b14     0        0xc6B8     0xdead8b14   0xc0a864DD     0xc6B8     0xc0a8690b 1  # STS2 4 lxhadeb11  
+  0x8b15     0        0xc6B9     0xdead8b15   0xc0a864DE     0xc6B9     0xc0a8690b 1  # STS2 5 lxhadeb11     
   
   
 #######################################################################################################################
@@ -277,8 +282,7 @@
   0x84c2     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  rpc sector 3 lxhadeb10   
   0x84c3     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  rpc sector 4 lxhadeb11           
   0x84c4     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  rpc sector 5 lxhadeb11      
-  0x84c5     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  rpc sector 6 lxhadeb11      
- 
+  0x84c5     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578 #  rpc sector 6 lxhadeb11       
   0x86c0     100    0xbaf79bb5     0x90e2    0xc0a86408     0x0230        0x0578 #  tof hub 0  lxhadeb08  
   0x86c1     100    0xbaf7cfa1     0x90e2    0xc0a86409     0x0230        0x0578 #  tof hub 1  lxhadeb09  
   0x86c2     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578 #  tof hub 2  lxhadeb10
@@ -287,7 +291,12 @@
   0x86c5     100    0x6b8b601f     0xac1f    0xc0a8690c     0x0230        0x0578 #  tof hub 5 lxhadeb12 
   0x86c6     100    0x6b8b601f     0xac1f    0xc0a8690c     0x0230        0x0578 #  tof hub 6 lxhadeb12
 
-  
+  0x8b10     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578  # STS2 0 lxhadeb10  
+  0x8b11     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578  # STS2 1 lxhadeb10  
+  0x8b12     100    0xbae2c995     0x90e2    0xc0a8640a     0x0230        0x0578  # STS2 2 lxhadeb10  
+  0x8b13     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578  # STS2 3 lxhadeb11  
+  0x8b14     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578  # STS2 4 lxhadeb11  
+  0x8b15     100    0x6b8b62f1     0xac1f    0xc0a8690b     0x0230        0x0578  # STS2 5 lxhadeb11    
   
 #   0xff7f    101     0xbaf7cfa1     0x90e2     0xc0a86409      0x0230       0x0578     #lxhadeb09, EB1 90:e2:ba:f7:cf:a1  192.168.100.9   
 #   0xff7f    102     0xbae2c995     0x90e2     0xc0a8640a      0x0230       0x0578     #lxhadeb10, EB2 90:e2:ba:e2:c9:95  192.168.100.10

diff --git a/hub/serials_trb3.db b/hub/serials_trb3.db
new file mode 120000 (symlink)
index 0000000..e2b6ddd
--- /dev/null
+++ b/hub/serials_trb3.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3.db
\ No newline at end of file

diff --git a/hub/serials_trb3sc.db b/hub/serials_trb3sc.db
deleted file mode 100644 (file)
index 00eac82faacd04513102ccb8de61ec2b62faebd8..0000000000000000000000000000000000000000
--- a/hub/serials_trb3sc.db
+++ /dev/null
@@ -1,81 +0,0 @@
-#List of all serial numbers for TRB3sc. 3-digit serial, append a '1'
-# JAM 23-03-18: comment all serials here that do not belong to hub (for daq2stdout Oracle export)
-#  Serial    #  Unique ID
-########################################
-
-   0011        0x610000050dec4328
-   0021        0x820000050dec0a28
-   0031        0xb00000050d277128
-   0041        0x7a0000050df02428
-   0051        0xff0000050de7e528 
-   0061        0x0000000000000000
-   0071        0xfc000006e90e8828
-   0081        0x67000006ea309a28
-   0091        0xf1000006e919a128
-   0101        0x5d000006e913bc28
-
-#   1051        0x8400000941031228
-#   1061        0xb300000941031328
-#   1071        0xb000000940ce5228
-#   1081        0xcd00000940ce5e28
-#   1091        0x3500000940ce5528
-
-#   1101        0xfc00000940ce6a28
-#   1111        0x3f000009408c2e28
-#   1131        0x4f000009408a9b28
-#   1141        0x2000000940c1e928
-#   1151        0x6f000009409d7428
-#   1161        0xcc000009409d6f28
-   1171        0xf600000940c29928
-#   1191        0x7100000940c28d28
-
-#   1201        0xc100000940c29828
-#   1211        0x4600000940c28c28   
-   1231        0x3b00000940c28028
-#   1241        0x7d00000940880b28
-#   1251        0xb1000009409d6328
-   1261        0x0200000940881428
-#   1271        0x9b00000940876628
-   1281        0x0d00000940876f28
-   1291        0x9a00000940a5da28
-
-   1301        0x1d00000940a5ce28
-   1311        0xf600000940a5cb28
-#   1321        0x6f00000940a61528
-#   1331        0xea00000940a61228
-   1341        0x120000094094a928
-   1361        0xb100000940d69628
-   1371        0x4900000940a60928
-   1381        0x7700000940956828
-   1391        0x6100000940df2928
-
-#   1401        0x6d00000940a60628
-   1411        0xa900000940a5fd28
-   1421        0x2c00000940a5fa28
-   1431        0x1600000940a63f28
-   1441        0x5c00000940a63228
-   1451        0xc300000940955b28
-   1461        0x4d00000940a62f28
-   1471        0x1c00000940a66028
-   1481        0x4600000940955c28
-   1491        0x3b00000940955028
-
-   1501        0x4f0000094093c328
-#   1511        0x4400000940954f28
-   1531        0x3c0000094093b628
-#   1541        0x1a0000094093aa28
-   1551        0x5600000940939228
-   1561        0x0f00000940939128
-   1571        0x430000094093a928
-   1581        0x2b00000940939e28
-#   1591        0x7200000940939d28
-
-   1601        0xcd00000940943b28
-   1611        0xd100000940938628
-   1621        0x4800000940943c28
-   1631        0x840000094117ff28
-   1641        0x250000094117f728
-   1651        0xce0000094117f228
-   1661        0xf300000941240528
-   
-

diff --git a/hub/serials_trb3sc.db b/hub/serials_trb3sc.db
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7651acabd9da5412725bbcb688b0b672219b9de4
--- /dev/null
+++ b/hub/serials_trb3sc.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3sc.db
\ No newline at end of file

diff --git a/hub/startup.script b/hub/startup.script
index 6638abf7568aa962a2500a2454d8b793cc28bff9..6c3e9a0668b03cec8b4958a2e2e509311c15d851 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -1,6 +1,7 @@
 #Assign addresses
 !ifndef RESTART 
-  set_addresses  serials_hub.db  addresses_hub.db     #addresses for hubs
+  set_addresses  serials_hub.db  addresses_hub.db     #addresses for old hubs
+  set_addresses  serials_trb3.db  addresses_hub_trb3.db     #addresses for hubs
   set_addresses  serials_trb3sc.db  addresses_hub_trb3sc.db     #addresses for hubs
   set_addresses  serials_mdcaddon.db  addresses_mdcaddon.db     #addresses for addons  
 !endif
@@ -10,6 +11,18 @@ wait
 exec_script{pexor}  ../hub/configure_ports.script
 
 
+#Switch off Trigger Generation Boards from trigger
+#Trigger off on trigger generation boards
+trbcmd clearbit 0x0100 0x22 0x8000000
+trbcmd clearbit 0x0110 0x22 0x8000000
+trbcmd clearbit 0x0120 0x22 0x8000000
+
+#Remove all the trigger boards 100/110/120/8810 from DAQ
+trbcmd clearbit 0x8800 0xc0 0xc
+trbcmd clearbit 0x8800 0xc1 0xc
+trbcmd clearbit 0x8810 0xc0 0x4
+trbcmd clearbit 0x8810 0xc1 0x4
+
 
 
 wait
@@ -51,7 +64,14 @@ wait
   trbcmd loadbit 0xfe52 0xc5 0xffff0000 0x80080000  #Combiner
 
   trbcmd loadbit 0xfe61 0xc5 0xffff0000 0x00080000  #Ecal bkpl master
- 
+
+  trbcmd loadbit 0x8b10 0xc5 0xffff0000 0x00080000  #STS2
+  trbcmd loadbit 0x8b11 0xc5 0xffff0000 0x00080000  
+  trbcmd loadbit 0x8b12 0xc5 0xffff0000 0x00080000  
+  trbcmd loadbit 0x8b13 0xc5 0xffff0000 0x00080000  
+  trbcmd loadbit 0x8b14 0xc5 0xffff0000 0x00080000  
+  trbcmd loadbit 0x8b15 0xc5 0xffff0000 0x00080000    
+  
   trbcmd loadbit 0xfe11 0xc5 0xffff0000 0x80300000  #with new hub (with auto-switch-off)
   trbcmd loadbit 0xfe15 0xc5 0xffff0000 0x00080000  #MDC hubs
   

diff --git a/hub/trb.db b/hub/trb.db
index 76d66836a68dd6e9550d271c2042576f2c98fd52..045569a361cbc12858e69332abc1d84db8dd13b2 100644 (file)
--- a/hub/trb.db
+++ b/hub/trb.db
@@ -1,5 +1,5 @@
-hub etraxp096  #TOF
-hub etraxp101  #RPC
-hub etraxp102  #RPC
+#hub etraxp096  #TOF
+#hub etraxp101  #RPC
+#hub etraxp102  #RPC
 #hub etraxp104 # jam2017: used in ee lab
-hub etraxp121  #FW
+#hub etraxp121  #FW

diff --git a/hub/trb3sc.db b/hub/trb3sc.db
index 4ed4b18d1248f720b488338aac16f9c98c2f7ca6..015cf5c1402efae46c70917d30a1152b48273a93 100644 (file)
--- a/hub/trb3sc.db
+++ b/hub/trb3sc.db
@@ -1,4 +1,5 @@
 # JAM 2018 this file is used by icinga config only
+# JAM 2020 modified
 # leading subsystems for correct host grouping 
 cts  trb3sc142  #central
 ecal trb3sc134  #ECAL
@@ -18,3 +19,11 @@ rich trb3sc137 #RICH
 rich trb3sc163 #RICH
 rich trb3sc153 #RICH
 rich trb3sc136 #RICH
+rich trb3sc141 #RICH
+rpc  trb3sc320 #RPC
+rpc  trb3sc315 #RPC
+rpc  trb3sc318 #RPC
+rpc  trb3sc316 #RPC
+rpc  trb3sc317 #RPC
+rpc  trb3sc319 #RPC
+tof  trb3sc307 #TOF

diff --git a/main/address_range.db b/main/address_range.db
index 9965010d51e8f004d64e5775cbd0df3d865a8045..73c26af58127161c6e578d995f08852a549bcf13 100644 (file)
--- a/main/address_range.db
+++ b/main/address_range.db
@@ -11,7 +11,10 @@ RPC          0x4800    0x4BFF     TRB
 TOF          0x4C00    0x4FFF     TRB
 StartTrb3    0x5000    0x50FF     TRB3
 SEB          0x5555    0x5555     TRBnet
+RPC          0x5800    0x5900     TRB3
+TOF          0x5c00    0x5cff     TRB3  
 ECal         0x6000    0x60FF     TRB3sc
+STS         0x6400    0x64FF     TRB3
 Rich         0x7000    0x7FFF    DiRich
 Central-Hub  0x8000    0x80FF     TRB3sc
 Rich-Comb    0x8200    0x82ff     DiRichConcentrator
@@ -23,6 +26,7 @@ CTS-Hub      0x8800    0x887F     TRB3sc
 StartTrb3Hub 0x8880    0x88FF     TRB3
 Pion-Hub     0x8900    0x89FF     TRB3
 Ecal-Hub     0x8a00    0x8aff     TRB3sc
+STS-Hub      0x8b00    0x8bff     TRB3
 TestSetup    0xF000    0xFEFF     Test
 Broadcast    0xFF00    0xFFFF     Broadcast
 

diff --git a/main/data_sources.db b/main/data_sources.db
index ac57d055e137b136e0704d063ca8fa2f82b8af11..bec7da5db205640ff33e33153a01d965f3307a71 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -6,19 +6,20 @@
 0x8810      0         CentralAux        low
 0x8400      0         RPC123            mid
 0x8410      0         RPC456            mid
-0x84c0      0         RPCnew1           mid
-0x84c1      0         RPCnew2           mid
-0x84c2      0         RPCnew3           mid
-0x84c3      0         RPCnew4           mid
+0x84c0      1         RPCnew1           mid
+0x84c1      1         RPCnew2           mid
+0x84c2      1         RPCnew3           mid
+0x84c3      1         RPCnew4           mid
 0x84c4      1         RPCnew5           mid
-0x84c5      0         RPCnew6           mid
+0x84c5      1         RPCnew6           mid
 0x8600      0         TOF               low
 0x86c0      0         TOFnew1           mid
 0x86c1      0         TOFnew2           mid
 0x86c2      0         TOFnew3           mid
-0x86c3      0         TOFnew4           mid
+0x86c3      1         TOFnew4           mid
 0x86c4      0         TOFnew5           mid
 0x86c5      0         TOFnew6           mid
+#0x86c6      1         TOFnew7           mid
 0x86c6      0         TOFnew7           mid
 0x8700      0         FW                low
 0x8880      0         StartTRB3         low
@@ -55,3 +56,9 @@
 0x83c9      0         RICH9             mid
 0x83ca      0         RICHa             mid
 0x83cb      0         RICHb             mid
+0x8b10      1         STS2-0             mid
+0x8b11      1         STS2-1             mid
+0x8b12      1         STS2-2             mid
+0x8b13      1         STS2-3             mid
+0x8b14      1         STS2-4             mid
+0x8b15      1         STS2-5             mid

diff --git a/main/main_hades.script b/main/main_hades.script
index 7f162b1585a084a96819b15983a421b5a66d3f29..041380c992ea841764ab2a814b9c8d08071a51c5 100644 (file)
--- a/main/main_hades.script
+++ b/main/main_hades.script
@@ -16,21 +16,21 @@ read_addrange_db ../main/address_range.db
   read_trb_db ../cts/trb.db
 !endif
 
-!ifndef NORPC
-  read_trb_db ../rpc/trb.db
-!endif
+#!ifndef NORPC
+#  read_trb_db ../rpc/trb.db
+#!endif
 
-!ifndef NOTOF
-  read_trb_db ../tof/trb.db
-!endif
+#!ifndef NOTOF
+#  read_trb_db ../tof/trb.db
+#!endif
 
 !ifndef NOHUB
   read_trb_db ../hub/trb.db
 !endif
 
-!ifndef NOWALL
-  read_trb_db ../wall/trb.db
-!endif
+#!ifndef NOWALL
+#  read_trb_db ../wall/trb.db
+#!endif
 
 !ifndef NOSTARTCTS   #Contains both Start and Veto TRBs!
 #  read_trb_db ../start/trb.db
@@ -44,17 +44,17 @@ read_addrange_db ../main/address_range.db
 
 !ifndef CONFIGONLY
 #   Program CTS,SCS,TOF FPGA 
-  exec_cmd{local} echo "Programming TRB-FPGA"
-  exec_cmd{wall}  jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
-  exec_cmd{rpc}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/rpc/fpga/20120323_rpc_a.stapl
-  exec_cmd{tof}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
-  #exec_cmd{start} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
-  #exec_cmd{veto}  jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
-  wait
+#  exec_cmd{local} echo "Programming TRB-FPGA"
+#  exec_cmd{wall}  jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
+#  exec_cmd{rpc}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/rpc/fpga/20120323_rpc_a.stapl
+#  exec_cmd{tof}   jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
+#  #exec_cmd{start} jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
+#  #exec_cmd{veto}  jam_trbv2 --trb -aRUN_XILINX_PROC /home/hadaq/tof/fpga/20120305_tof.stapl
+#  wait
 
   # Program 1st AddOn FPGA
   exec_cmd{local} echo "Programming FPGA1"
-  exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga1_single_20140818.stp
+#  exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga1_single_20140818.stp
   #exec_cmd{hubcts} jam_trbv2 --addon     -aFP /home/hadaq/hub/hub2_fpga1_full_20110517.stp
   exec_cmd{cts}    jam_trbv2 --addononly  -aFP  /home/hadaq/cts/20140422_cts_fpga1_only_etrax_a.stp
   wait
@@ -62,9 +62,9 @@ read_addrange_db ../main/address_range.db
   # Program 2nd AddOn FPGA
   exec_cmd{local} echo "Programming FPGA2"
 
-  exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20120221.stp # multievent test
-  #exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20111121.stp # proper one
-  #exec_cmd{hubcts}    jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20111121.stp #experimental
+#  exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20120221.stp # multievent test
+#  #exec_cmd{hub}    jam_trbv2 --addononly -aFP /home/hadaq/hub/hub2_fpga2_single_20111121.stp # proper one
+#  #exec_cmd{hubcts}    jam_trbv2 --addon -aFP /home/hadaq/hub/hub2_fpga2_full_20111121.stp #experimental
   exec_cmd{cts}    jam_trbv2 --addononly -aFP  /home/hadaq/cts/20140422_cts_fpga2_only_etrax_a.stp
   wait
  
@@ -146,7 +146,13 @@ wait
     exec_cmd{con} echo "Configure ECAL"
     exec_script{local}  ../ecal/startup.script
   !endif
-
+  
+#STS
+  !ifndef NOSTS
+    exec_cmd{con} echo "Configure STS"
+    exec_script{local}  ../sts/startup.script
+  !endif
+  
 #Wall
   !ifndef NOWALL
     exec_cmd{con} echo "Configure Wall"

diff --git a/main/startup_briccolage.sh b/main/startup_briccolage.sh
index cc05e46571f9f0484b156e0c5a27e4140677a52b..f60e601e712344a545637eded00a358bf30b4f25 100755 (executable)
--- a/main/startup_briccolage.sh
+++ b/main/startup_briccolage.sh
@@ -81,11 +81,17 @@ switchport.pl 0x1024 7 off  #2057, 19/03/12
 
 #Main Start-up
   echo "  <Startup>  Running Startup script"
-  time ./startup.pl -f main_hades.script -eb off -o file \
-      -m TOF -m RPC -m WALL -m RICH  -m NOPION -m ECAL \
+#  time ./startup.pl -f main_hades.script -eb off -o file \
+#      -m TOF -m RPC -m WALL -m RICH  -m NOPION -m ECAL \
+#      -m STARTCTS -m NORESET -m CONFIGONLY  -m MON_CTS \
+#      -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv
+
+ time ./startup.pl -f main_hades.script -eb off -o file \
+      -m TOF -m RPC -m NOWALL -m RICH  -m NOPION -m ECAL \
       -m STARTCTS -m NORESET -m CONFIGONLY  -m MON_CTS \
       -m MDC -m MDCreg0current -m MDCnomasks -m MDCDATASET -m MDCindiv
 
+
   echo "startup.pl finished"
 
 #   /home/hadaq/trbsoft/daq/nettools/revivedirich.pl

diff --git a/main/subevtids.db b/main/subevtids.db
index 2aafb641b6a6a8ca592c84141d249ac3f42c224c..f15be384fb4abc84e8afc7b1a249577c45e91495 100644 (file)
--- a/main/subevtids.db
+++ b/main/subevtids.db
@@ -15,14 +15,14 @@
 0x8000          #Hub2
 0x8100          #Hub2
 0x8110          #Hub2
-0x8400          #Hub2
-0x8410          #Hub2
-0x8600          #Hub2
-0x8700          #Hub2
+#0x8400          #Hub2
+#0x8410          #Hub2
+#0x8600          #Hub2
+#0x8700          #Hub2
 0x8800          #Hub2
 0x8880          #StartTRB3
 0x8890          #VetoTRB3
-0x8900         #Pion1
+0x8900              #Pion1
 0x8910          #Pion2
 0x83c0          #Rich0
 0x83c1          #Rich1
@@ -40,4 +40,23 @@
 0x8a02          #Ecal2
 0x8a03          #Ecal3
 0x8a04          #Ecal4
-0x8a05          #Ecal5
\ No newline at end of file
+0x8a05          #Ecal5
+0x84c0            #RPCnew1           
+0x84c1            #RPCnew2           
+0x84c2            #RPCnew3           
+0x84c3            #RPCnew4           
+0x84c4            #RPCnew5           
+0x84c5            #RPCnew6           
+0x86c0            #TOFnew1           
+0x86c1            #TOFnew2           
+0x86c2            #TOFnew3           
+0x86c3            #TOFnew4           
+0x86c4            #TOFnew5           
+0x86c5            #TOFnew6           
+0x86c6            #TOFnew7                      
+0x8b10          #STS2-0             
+0x8b11          #STS2-1         
+0x8b12          #STS2-2         
+0x8b13          #STS2-3         
+0x8b14          #STS2-4         
+0x8b15          #STS2-5         

diff --git a/nettools/Perl2Epics.pm b/nettools/Perl2Epics.pm
index 114a3c67e71379c73db7c7678bbde7ba1f2676c2..f52a3d9c5fe5d7b59ed240445a04fd243ea69203 100644 (file)
--- a/nettools/Perl2Epics.pm
+++ b/nettools/Perl2Epics.pm
@@ -5,6 +5,7 @@ use Data::Dumper;
 # use Hmon;
 
 use lib '/home/scs/EPICS/EPICS-3.14.12.4/base/' . '/lib/perl';
+use lib '/home/hadaq/EPICS/EPICS-3.15.6/base' . '/lib/perl';
 use lib '/home/hadaq/soft/EPICS/EPICS-3.16.1/base/' . '/lib/perl';
 use lib '/home/epics/EPICS/EPICS-3.16.1/base/' . '/lib/perl';
 use CA;

diff --git a/nettools/tryreset.pl b/nettools/tryreset.pl
index a12814e029f90de350d2b69d627f8f9cf5b9c2db..b754ead002ebb8b5528db36fac04f77865ae8260 100755 (executable)
--- a/nettools/tryreset.pl
+++ b/nettools/tryreset.pl
@@ -18,7 +18,8 @@ while(1) {
     }
 
 # uncomment the following line if in beam the check leads to frequent loops.
-# exit; 
+ exit; 
+ # JAM 15-Oct-2019 deactivated following check to get partially running daq
 
     $cmd = "trbcmdlocal i 0xffff | wc";
     my $o = qx($cmd);

diff --git a/oracle/daq2stdout.pl b/oracle/daq2stdout.pl
index 22d843b1d7015b2203cfb2dbf04d4c9a75267029..b63a4d2ca6d98c1e4315ef75579bc05baad9c5ab 100755 (executable)
--- a/oracle/daq2stdout.pl
+++ b/oracle/daq2stdout.pl
@@ -109,10 +109,14 @@ sub readDB()
 #&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Hub-AllTrb3");
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Ecal-Hub",0);
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Rich-Hub",0);
+&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "RPC-Hub",0);
+&readSerialsDB("../../daqtools/base/serials_trb3sc.db", "TOF-Hub",0);
+
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "Central-Hub",0);
+&readSerialsDB("../../daqtools/base/serials_trb3.db", "STS-Hub",0);
 &readSerialsDB("../../daqtools/base/serials_trb3sc.db", "CTS-Hub",0);
-&readSerialsDB("../hub/serials_hub.db", "RPC-Hub",0);
-&readSerialsDB("../hub/serials_hub.db", "TOF-Hub",0);
+#&readSerialsDB("../hub/serials_hub.db", "RPC-Hub",0);
+#&readSerialsDB("../hub/serials_hub.db", "TOF-Hub",0);
 &readSerialsDB("../hub/serials_hub.db", "Wall-Hub",0);
 &readSerialsDB("../hub/serials_hub.db", "Pion-Hub",0);
 &readSerialsDB("../hub/serials_hub.db", "StartTrb3Hub",0);
@@ -125,10 +129,14 @@ sub readDB()
     #&readSerialsDB("../pion/serials_pion.db", "Pion");
 &readSerialsDB("../rich/serials_dirich.db", "Rich",2);
 &readSerialsDB("../rich/serials_dirich_concentrator.db", "Rich-Comb",1);
-    &readSerialsDB("../rpc/serials_rpc.db", "RPC",0);
+   # &readSerialsDB("../rpc/serials_rpc.db", "RPC",0);
+     &readSerialsDB("../rpc/serials_trb3sc.db", "RPC",0);
     #&readSerialsDB("../shower/serials_shower.db", "Shw-AddOn");
-    &readSerialsDB("../tof/serials_tof.db", "TOF",0);
+    #&readSerialsDB("../tof/serials_tof.db", "TOF",0);
+    &readSerialsDB("../tof/serials_trb3sc.db", "TOF",0);
+    
     &readSerialsDB("../wall/serials_wall.db", "Wall",0);
+    &readSerialsDB("../sts/serials_trb3.db", "STS",0);
  
     #- Read addresses_db
     #&readAddressesDB("../start/addresses_start.db", "StartVeto");
@@ -138,10 +146,15 @@ sub readDB()
     #&readAddressesDB("../hub/addresses_hub_trb3sc.db","Hub-AllTrb3");
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","Ecal-Hub");
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","Rich-Hub");
+     &readAddressesDB("../hub/addresses_hub_trb3sc.db","RPC-Hub");
+     &readAddressesDB("../hub/addresses_hub_trb3sc.db","TOF-Hub");
+      
+    &readAddressesDB("../hub/addresses_hub_trb3.db","STS-Hub");
+     
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","Central-Hub");
      &readAddressesDB("../hub/addresses_hub_trb3sc.db","CTS-Hub");
-     &readAddressesDB("../hub/addresses_hub.db","RPC-Hub");
-     &readAddressesDB("../hub/addresses_hub.db","TOF-Hub");
+     #&readAddressesDB("../hub/addresses_hub.db","RPC-Hub");
+     #&readAddressesDB("../hub/addresses_hub.db","TOF-Hub");
      &readAddressesDB("../hub/addresses_hub.db","Wall-Hub");
      &readAddressesDB("../hub/addresses_hub.db","Pion-Hub");
      &readAddressesDB("../hub/addresses_hub.db","StartTrb3Hub");
@@ -156,10 +169,13 @@ sub readDB()
    &readAddressesDB("../rich/addresses_dirich_concentrator.db", "Rich-Comb"); 
     
     
-    &readAddressesDB("../rpc/addresses_rpc.db", "RPC");
+    #&readAddressesDB("../rpc/addresses_rpc.db", "RPC");
+     &readAddressesDB("../rpc/addresses_rpc_trb3sc.db", "RPC");
    # &readAddressesDB("../shower/addresses_shower.db", "Shw-AddOn");
-    &readAddressesDB("../tof/addresses_tof.db", "TOF");
+   # &readAddressesDB("../tof/addresses_tof.db", "TOF");
+     &readAddressesDB("../tof/addresses_tofnew.db", "TOF");
     &readAddressesDB("../wall/addresses_wall.db", "Wall");
+     &readAddressesDB("../sts/addresses_sts.db", "STS");
 }
 
 sub readSubEvtIdsDB()
@@ -263,7 +279,7 @@ sub readAddressesDB()
     while(<$fh>){
        
        #- Remove all comments
-       $_ =~ s{                # Substitue...
+       $_ =~ s{                # Substitue...                  #
                 \#             # ...a literal octothorpe
                 [^\n]*         # ...followed by any number of non-newlines
               }
@@ -275,22 +291,24 @@ sub readAddressesDB()
        #- Extract command and parameters
        my ($addr, $serial, $fpga, $design, $trb);
 
-       if( $_ =~ /0x(\w+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/){
+       #if( $_ =~ /0x(\w+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/){
+       if( $_ =~ /0x(\w+)\s+(\d+)\s+(\d+)/){
            $addr   = lc($1); 
            $serial = $2;
            $fpga   = $3;
-           $design = lc($4);
-           $trb    = lc($5);
+          # $design = lc($4);
+          # $trb    = lc($5);
        }
 
-       unless( defined $addr || defined $serial || defined $fpga ||
-               defined $design || defined $trb){
+       unless( defined $addr || defined $serial || defined $fpga )
+        # || defined $design || defined $trb)
+               {
+                       #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n";
            print "Not all parameters are defined in $file2read! Exit\n";
            $fh->close;
            exit(1);
        }
-
-       #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n";
+    #print " address:$addr, serial:$serial, fpga:$fpga, design:$design trb:$trb \n";
        
        
        #- Add to a main configuration hash
@@ -299,15 +317,15 @@ sub readAddressesDB()
            {
                $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}   = $addr;
                $conf_db_href->{'addresses'}->{$type}->{$serial}->{'fpga'}   = $fpga;
-               $conf_db_href->{'addresses'}->{$type}->{$serial}->{'design'} = $design;
-               $conf_db_href->{'addresses'}->{$type}->{$serial}->{'trb'}    = $trb;
+       #       $conf_db_href->{'addresses'}->{$type}->{$serial}->{'design'} = $design;
+       #       $conf_db_href->{'addresses'}->{$type}->{$serial}->{'trb'}    = $trb;
            }
        }
        else{
            $conf_db_href->{'addresses'}->{$type}->{$serial}->{'addr'}   = $addr;
            $conf_db_href->{'addresses'}->{$type}->{$serial}->{'fpga'}   = $fpga;
-           $conf_db_href->{'addresses'}->{$type}->{$serial}->{'design'} = $design;
-           $conf_db_href->{'addresses'}->{$type}->{$serial}->{'trb'}    = $trb;
+       #    $conf_db_href->{'addresses'}->{$type}->{$serial}->{'design'} = $design;
+       #    $conf_db_href->{'addresses'}->{$type}->{$serial}->{'trb'}    = $trb;
        }
     }
 

diff --git a/oracle/runinfo2ora.pl b/oracle/runinfo2ora.pl
index 378d2b1570e6ac04bcc84b9156611ecd2486dd37..0619c9fa069bbbcd6aaa3ca23c66a187b2bc9a32 100755 (executable)
--- a/oracle/runinfo2ora.pl
+++ b/oracle/runinfo2ora.pl
@@ -239,7 +239,9 @@ sub checkPrefix()
 
     #no prefixes are excluded from @prefixList
        # my @prefixList = qw/be co ri ru sh tr ve st to md rp te pu fw/;
-    my @prefixList = qw/be co ri ru sh tr ve st to md rp fw pt tc ec/;
+    #my @prefixList = qw/be co ri ru sh tr ve st to md rp fw pt tc ec/;
+    
+    my @prefixList = qw/be co ri ru sh tr ve st to md rp fw pt tc ec fd/;
     my $pref;
 
     foreach $pref (@prefixList) {

diff --git a/oracle/runstatsfromora_testplot.sh b/oracle/runstatsfromora_testplot.sh
index bee4aca732f8128e2059ae863e30adf2e82a2e42..08d4414c95a1fa45057f459e89180ef8367ffe32 100755 (executable)
--- a/oracle/runstatsfromora_testplot.sh
+++ b/oracle/runstatsfromora_testplot.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-offset=2340000
+offset=2419200
 cat <<EOF > /tmp/beam_trend.txt
 # timestamp real propaganda
 $(date -d @1551679200 "+%Y-%m-%d %H:%M:%S") 0 0
@@ -34,7 +34,7 @@ set timefmt "%Y-%m-%d %H:%M:%S"
 set format x "%d"
 #set timefmt "%H:%M:%S"
 #set format x "%H:%M"
-set xrange ["2019-03-03":"2019-04-01"]
+set xrange ["2019-03-03":"2019-04-01 09:00"]
 set xtics 3600*24*4
 
 plot  '/tmp/beam_trend.txt' using 1.2:3:4  title 'Anticipated Events'ls 3 w filledcu, \

diff --git a/rpc/addresses_rpc_trb3sc.db b/rpc/addresses_rpc_trb3sc.db
index 4f849dc0ecb95110fafd07bdb7edc997c9231142..0aa7445f8382d52b596c4d53a37e248652616a74 100644 (file)
--- a/rpc/addresses_rpc_trb3sc.db
+++ b/rpc/addresses_rpc_trb3sc.db
@@ -1,63 +1,73 @@
 #Address  #   S/N   #   FPGA  #   Design  #  TRB  #
 ###################################################
 
-0x5800       2321
-0x5801       2541
-0x5802       2171
-0x5803       2571
-0x5804       2471
-0x5805       2561
-0x5806       2501
-0x5807       2491
-0x5808       2141
-
-0x5810       2121
-0x5811       2241
-0x5812       2221
-0x5813       2011
-0x5814       2341
-0x5815       2451
-0x5816       2521
-0x5817       2231
-0x5818       2481
-
-0x5820       2161
-0x5821       2281
-0x5822       2201
-0x5823       2261
-0x5824       2111
-0x5825       2401
-0x5826       2551
-0x5827       2051
-0x5828       2361
-
-0x5830       2381
-0x5831       2531
-0x5832       2021
-0x5833       2071
-0x5834       2371
-0x5835       2441
-0x5836       2581
-0x5837       2061
-0x5838       2431
-
-0x5840       2601
-0x5841       2351
-0x5842       2081
-0x5843       2131
-0x5844       2461
-0x5845       2421
-0x5846       2591
-0x5847       2041
-0x5848       2311
-
-
-0x5850       2271
-0x5851       2191
-0x5852       2031
-0x5853       2181
-0x5854       2511
-0x5855       2251
-0x5856       2091
-0x5857       2291
-0x5858       2411
+0x5800       2381       1 
+0x5801       2541      1
+0x5802       2161      1
+0x5803       2571      1
+0x5804       2501      1
+0x5805       2561      1
+0x5806       2551      1
+0x5807       2491      1
+0x5808       2431      1
+
+0x5810       2121      1
+0x5811       2241      1
+0x5812       2221      1
+0x5813       2011      1
+0x5814       2341      1
+0x5815       2451      1
+0x5816       2521      1
+0x5817       2231      1
+0x5818       2021      1
+
+0x5820       2361      1
+0x5821       2391      1
+0x5822       2111      1
+0x5823       2261      1
+0x5824       2281      1
+0x5825       2401      1
+0x5826       2031      1
+0x5827       2051      1
+0x5828       2311      1
+
+0x5830       2371      1
+0x5831       2531      1
+0x5832       2271      1
+0x5833       2071      1
+0x5834       2591      1
+0x5835       2441      1
+0x5836       2471      1
+0x5837       2061      1
+0x5838       2141      1
+
+
+0x5840       2201       1
+0x5841       2351       1
+0x5842       2581       1
+0x5843       2131       1
+0x5844       2171       1
+0x5845       2421       1
+0x5846       2321       1
+0x5847       2041       1
+0x5848       2481       1
+
+0x5850       2601      1
+0x5851       2191      1
+0x5852       2461      1
+0x5853       2181      1
+0x5854       2091      1
+0x5855       2251      1
+0x5856       2511      1
+0x5857       2291      1
+0x5858       2411      1
+
+#0x5850       2271     1       
+#0x5851       2191     1
+#0x5852       2031     1
+#0x5853       2181     1
+#0x5854       2511     1
+#0x5855       2251     1
+#0x5856       2091     1
+#0x5857       2291     1
+#0x5858       2411     1

diff --git a/rpc/serials_trb3sc.db b/rpc/serials_trb3sc.db
new file mode 120000 (symlink)
index 0000000..7651aca
--- /dev/null
+++ b/rpc/serials_trb3sc.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3sc.db
\ No newline at end of file

diff --git a/rpc/startup.script b/rpc/startup.script
index 901c152f38b0d1a5e7d11c85363757cb8057f2d6..0a5f2a3bc2b49d63e14f5a37a559dabb7d9dcbdf 100644 (file)
--- a/rpc/startup.script
+++ b/rpc/startup.script
@@ -1,16 +1,26 @@
 
 #Assign addresses
 !ifndef RESTART
-  set_addresses  serials_rpc.db  addresses_rpc.db     #addresses for RPC TRB
+#  set_addresses  serials_rpc.db  addresses_rpc.db     #addresses for RPC TRB
+  set_addresses  serials_trb3sc.db  addresses_rpc_trb3sc.db     #addresses for RPC TRB
 !endif
 
 
-exec_cmd{rpc_blr} spi_trbv2_5 /home/hadaq/rpc/triggerBoards/triggerBoard_${TRBNUM}
-wait
+#exec_cmd{rpc_blr} spi_trbv2_5 /home/hadaq/rpc/triggerBoards/triggerBoard_${TRBNUM}
+#wait
 
-trbcmd setbit 0x4800 0xA0C0 0x00000001
-trbcmd setbit 0x4810 0xA0C0 0x00000001
-trbcmd setbit 0x4820 0xA0C0 0x00000001
-trbcmd setbit 0x4830 0xA0C0 0x00000001
-trbcmd setbit 0x4840 0xA0C0 0x00000001
-trbcmd setbit 0x4850 0xA0C0 0x00000001
+#trbcmd setbit 0x4800 0xA0C0 0x00000001
+#trbcmd setbit 0x4810 0xA0C0 0x00000001
+#trbcmd setbit 0x4820 0xA0C0 0x00000001
+#trbcmd setbit 0x4830 0xA0C0 0x00000001
+#trbcmd setbit 0x4840 0xA0C0 0x00000001
+#trbcmd setbit 0x4850 0xA0C0 0x00000001
+
+
+
+
+trbcmd w 0xfe73 0x7111 500  #max number of words per board
+trbcmd w 0xfe73 0x7114 0x00050000 #min number of words per board
+
+#Load TDC settings
+load_register  register_tdc_rpc.db

diff --git a/rpc/trb.db b/rpc/trb.db
index caa6eb30bca2c023b9c3adeb1998a200c20a89d1..1520b8846850d88eecf4420654130b536b7612a1 100644 (file)
--- a/rpc/trb.db
+++ b/rpc/trb.db
@@ -1,31 +1,31 @@
-rpc etraxp059
-rpc etraxp067
-rpc etraxp052
-rpc etraxp124
-rpc etraxp055
-rpc etraxp085
-rpc etraxp065
-rpc etraxp063
-rpc etraxp089
-rpc etraxp031
-rpc etraxp040
-rpc etraxp074
-rpc etraxp092
-rpc etraxp083
-rpc etraxp075
-rpc etraxp061
-rpc etraxp054
-rpc etraxp053
-rpc etraxp110
-rpc etraxp051
-rpc etraxp091
-rpc etraxp080
-rpc etraxp078
-rpc etraxp050
-
-rpc_blr etraxp059
-rpc_blr etraxp055
-rpc_blr etraxp089
-rpc_blr etraxp092
-rpc_blr etraxp054
-rpc_blr etraxp091
+#rpc etraxp059
+#rpc etraxp067
+#rpc etraxp052
+#rpc etraxp124
+#rpc etraxp055
+#rpc etraxp085
+#rpc etraxp065
+#rpc etraxp063
+#rpc etraxp089
+#rpc etraxp031
+#rpc etraxp040
+#rpc etraxp074
+#rpc etraxp092
+#rpc etraxp083
+#rpc etraxp075
+#rpc etraxp061
+##rpc etraxp054
+##rpc etraxp053
+##rpc etraxp110
+##rpc etraxp051
+#rpc etraxp091
+#rpc etraxp080
+#rpc etraxp078
+#rpc etraxp050
+#
+#rpc_blr etraxp059
+#rpc_blr etraxp055
+#rpc_blr etraxp089
+#rpc_blr etraxp092
+##rpc_blr etraxp054
+#rpc_blr etraxp091

diff --git a/start/ThreshNinoStart.db b/start/ThreshNinoStart.db
index 4bbf621b456e795013c97baf7874e8076bf5d58c..2b8925701177fb12f0e887607a88a32d3d186557 100644 (file)
--- a/start/ThreshNinoStart.db
+++ b/start/ThreshNinoStart.db
@@ -30,7 +30,7 @@
   5000    2       2         1     1         3         0x7000 ### ch. 3  
   5000    2       2         1     2         3         0x7000 ### ch. 2  
   5000    2       2         1     3         3         0x7000 ### ch. 1  
-  5000    2       2         1     4         3         0x1000 ### ch. 5  
+  5000    2       2         1     4         3         0x7000 ### ch. 5  
   5000    2       2         1     5         3         0x7000 ### ch. 6  
   5000    2       2         1     6         3         0x7000 ### ch. 7  
   5000    2       2         1     7         3         0x7000 ### ch. 8    
@@ -39,7 +39,7 @@
 #######
 # 3.NINO (Start Y)
 # Board   Chain   ChainLen  DAC   Channel   Command   Value
-  5001    1       2         0     0         3         0x4500 # ---Glob. Thres #3                  
+  5001    1       2         0     0         3         0x2500 # ---Glob. Thres #3                  
   5001    1       2         0     1         3         0x7000 #                                
   5001    1       2         0     2         3         0x7000 # --- Str. 9-20ns, 7-30ns, 5-80ns
   5001    1       2         0     3         3         0x7000 #                                
@@ -47,10 +47,10 @@
   5001    1       2         0     5         3         0x7000                                  
   5001    1       2         0     6         3         0x7000                                  
   5001    1       2         0     7         3         0x7000 
-  5001    1       2         1     0         3         0x7000 ### ch. 4
-  5001    1       2         1     1         3         0x7000 ### ch. 3
-  5001    1       2         1     2         3         0x7000 ### ch. 2
-  5001    1       2         1     3         3         0x7000 ### ch. 1
+  5001    1       2         1     0         3         0x3000 ### ch. 4
+  5001    1       2         1     1         3         0x3000 ### ch. 3
+  5001    1       2         1     2         3         0x3000 ### ch. 2
+  5001    1       2         1     3         3         0x3000 ### ch. 1
   5001    1       2         1     4         3         0x7000 ### ch. 5
   5001    1       2         1     5         3         0x7000 ### ch. 6
   5001    1       2         1     6         3         0x7000 ### ch. 7
@@ -68,7 +68,7 @@
   5001    2       2         1     0         3         0x7000 ### ch. 4  
   5001    2       2         1     1         3         0x7000 ### ch. 3  
   5001    2       2         1     2         3         0x7000 ### ch. 2  
-  5001    2       2         1     3         3         0x7000 ### ch. 1  
+  5001    2       2         1     3         3         0xf000 ### ch. 1  
   5001    2       2         1     4         3         0x7000 ### ch. 5  
   5001    2       2         1     5         3         0x7000 ### ch. 6  
   5001    2       2         1     6         3         0x7000 ### ch. 7  
@@ -78,7 +78,7 @@
 #######
 # 5. NINO (Veto)
 # Board   Chain   ChainLen  DAC   Channel   Command   Value
-  5002    1       2         0     0         3         0x1200 # ---Glob. Thres  #5                 
+  5002    1       2         0     0         3         0x1500 # ---Glob. Thres  #5                 
   5002    1       2         0     1         3         0x5000 #                                
   5002    1       2         0     2         3         0x9000 # --- Str. 9-10ns, 7-20ns, 6 - 30ns, 5-70ns
   5002    1       2         0     3         3         0x6000 #                                

diff --git a/start/startup.script b/start/startup.script
index b0268fc14c2cd27f815f1d731da8614b46706dcb..3ec74e93592e553354ad21640f8d51382b165f89 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -9,20 +9,6 @@
 !endif
 
 
-#Switch off Trigger Generation Boards from trigger
-trbcmd clearbit 0x8000 0xc0 1  #0x0100
-trbcmd clearbit 0x8000 0xc1 1
-trbcmd clearbit 0x8017 0xc0 0x40  #0x0110
-trbcmd clearbit 0x8017 0xc1 0x40
-trbcmd clearbit 0x8800 0xc0 0x04  #0x0120
-trbcmd clearbit 0x8800 0xc1 0x04
-#Trigger off on trigger generation boards
-trbcmd clearbit 0x0100 0x22 0x8000000
-trbcmd clearbit 0x0110 0x22 0x8000000
-trbcmd clearbit 0x0120 0x22 0x8000000
-
-
-
 #TRB3 settings
 
 #Triggerless mode, calib downscaling
@@ -47,26 +33,26 @@ trbcmd w 0xfe48 0x7111 1024        #1024 words per FPGA
 #trbcmd w 0x5000 0xc802 0xfffcfcfc # channel 0-31
 #trbcmd w 0x5000 0xc803 0x00000000 # channel 32-63
 
-trbcmd w 0x5000 0xc802 0xffff # enable 16 channels in 0x5000
+trbcmd w 0x5000 0xc802 0xfeff # enable 16 channels in 0x5000  #channel 9 (strip 15) off because of noise 2019-03-26
 trbcmd w 0x5001 0xc802 0xffff # enable 16 channels in 0x5001
 trbcmd w 0x5002 0xc802 0x0fff # enable 8 (Veto) and 4 (HALO) channels in 0x5002
 trbcmd w 0x5003 0xc802 0x0000 # enable 0 channels in 0x5003
 
 
 #Trigger Generator Settings
-trbcmd w 0x5000 0xcf00 0xfeee
-trbcmd w 0x5001 0xcf00 0x0000
-trbcmd w 0x5002 0xcf00 0xfeee
-#trbcmd w 0x5003 0xcf00 0x7e1c   #second input channel in 5003 shows permanent high
+trbcmd w 0x5000 0xdf00 0xfeee
+trbcmd w 0x5001 0xdf00 0x0000
+trbcmd w 0x5002 0xdf00 0xfeee
+#trbcmd w 0x5003 0xdf00 0x7e1c   #second input channel in 5003 shows permanent high
 
-trbcmd w 0x5003 0xcf00 0x7e1e   
+trbcmd w 0x5003 0xdf00 0x7e1e   
 trbcmd w 0x8880 0xcf00 0x1101   #Forward to CTS via central FPGA
 
 #Connected to second Start input on CTS
 
-trbcmd w 0x8890 0xcf00 0x0000   #Forward to CTS via central FPGA
-trbcmd w 0x8890 0xcf25 0x1111
-trbcmd w 0x8890 0xcf26 0x2222
+#trbcmd w 0x8890 0xcf00 0x0000   #Forward to CTS via central FPGA
+#trbcmd w 0x8890 0xcf25 0x1111
+#trbcmd w 0x8890 0xcf26 0x2222
 
 
 #Input Monitor Settings

diff --git a/sts/addresses_sts.db b/sts/addresses_sts.db
new file mode 100644 (file)
index 0000000..f1887af
--- /dev/null
+++ b/sts/addresses_sts.db
@@ -0,0 +1,39 @@
+#Address  #   S/N   #   FPGA  #   Design  #  TRB  #
+###################################################
+
+# STS2-4
+0x6460     0310      0
+0x6461     0311      1
+0x6462     0312      2
+0x6463     0313      3
+
+# STS2-1
+0x6440     0710      0
+0x6441     0711      1
+0x6442     0712      2
+0x6443     0713      3
+
+# STS2-3
+0x6444     1220      0
+0x6445     1221      1  -- has endpoint id 3?
+0x6454     1222      2
+0x6455     1223      3
+
+# STS2-6
+0x6464     1540      0
+0x6465     1541      1
+0x6474     1542      2
+0x6475     1543      3
+
+# STS2-2
+0x6450     1550      0
+0x6451     1551      1
+0x6452     1552      2
+0x6453     1553      3
+
+# STS2-5
+0x6470     1570      0
+0x6471     1571      1
+0x6472     1572      2
+0x6473     1573      3
+

diff --git a/sts/register_tdc_sts.db b/sts/register_tdc_sts.db
new file mode 100644 (file)
index 0000000..5c8c48a
--- /dev/null
+++ b/sts/register_tdc_sts.db
@@ -0,0 +1,13 @@
+# TDC config registers                                                                                       
+                                                                                                             
+!Register table                                                                                              
+#  Type  #   C0   #   C1   #   C2   #   C3   #   C4   #   C5   #   C6                                          
+################################################################                                             
+     0     0xc800   0xc801   0xc802   0xc803   0xc804   0xc805    0xc806                                            
+                                                                                                             
+!Value table                                                                                                 
+#                    Gnl Conf    Trg Window   Ch En 1-32   Ch En 33-64 RingBufSize   Invert 1-32  Invert 33-64                
+# TDC    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4    #     C5     #             
+#################################################################################################            
+                                                                                                           
+0xfe4c          0   0x50003000   0x800a00c8   0xffffffff   0x0000ffff   0x00000010   0xffffffff   0x0000ffff

diff --git a/sts/serials_trb3.db b/sts/serials_trb3.db
new file mode 120000 (symlink)
index 0000000..e2b6ddd
--- /dev/null
+++ b/sts/serials_trb3.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3.db
\ No newline at end of file

diff --git a/sts/startup.script b/sts/startup.script
new file mode 100644 (file)
index 0000000..a65dcfd
--- /dev/null
+++ b/sts/startup.script
@@ -0,0 +1,17 @@
+#Assign addresses
+!ifndef RESTART
+  set_addresses  serials_trb3.db  addresses_sts.db
+!endif
+
+trbcmd s 0x42000005ed6b0428  0x03 0x6445  #workaround for wrong endpoint id
+
+trbcmd w 0xfe4c 0x7111 300  #max number of words per board
+trbcmd w 0xfe4c 0x7114 0x00050000 #min number of words per board
+  
+#Load TDC settings
+
+  load_register  register_tdc_sts.db
+    
+
+
+#wait

diff --git a/sts/tools/.gitignore b/sts/tools/.gitignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sts/trb3sc.db b/sts/trb3sc.db
new file mode 100644 (file)
index 0000000..8ca894b
--- /dev/null
+++ b/sts/trb3sc.db
@@ -0,0 +1,9 @@
+# JAM 2020 this file is used by icinga config only
+# leading subsystems for correct host grouping 
+sts trbp071 #STS
+sts trbp155 #STS
+sts trbp122 #STS
+sts trbp031 #STS
+sts trbp157 #STS
+sts trbp154 #STS
+

diff --git a/tof/addresses_tofnew.db b/tof/addresses_tofnew.db
new file mode 100644 (file)
index 0000000..89d33f2
--- /dev/null
+++ b/tof/addresses_tofnew.db
@@ -0,0 +1,17 @@
+#Address  #   S/N   #   FPGA  #   Design  #  TRB  #
+###################################################
+0x5C30        2550       0 
+0x5C31        2551       1 
+0x5C32        2552       2 
+0x5C33        2553       3
+
+#0x5C60        2500       0 
+#0x5C61        2501       1 
+#0x5C62        2502       2 
+#0x5C63        2503       3
+
+ 
+0x5C30        3041       1
+0x5C31        3081       1 
+0x5C32        3091       1 
+0x5C33        3141       1

diff --git a/tof/register_tdc_tof.db b/tof/register_tdc_tof.db
new file mode 100644 (file)
index 0000000..1910347
--- /dev/null
+++ b/tof/register_tdc_tof.db
@@ -0,0 +1,13 @@
+# TDC config registers                                                                                       
+                                                                                                             
+!Register table                                                                                              
+#  Type  #   C0   #   C1   #   C2   #   C3   #   C4   #   C5   #                                             
+################################################################                                             
+     0     0xc800   0xc801   0xc802   0xc803   0xc804   0xc805                                               
+                                                                                                             
+!Value table                                                                                                 
+#                    Gnl Conf    Trg Window   Ch En 1-32   Ch En 33-64 RingBufSize    Invert                 
+# TDC    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4    #     C5     #             
+#################################################################################################            
+                                                                                                           
+0xfe47          0   0x50003000   0x800a00c8   0xffffffff   0x00000000   0x00000010   0x00000000 # trb3 TDC

diff --git a/tof/registers_tof.db b/tof/registers_tof.db
deleted file mode 100644 (file)
index 193217c..0000000
--- a/tof/registers_tof.db
+++ /dev/null
@@ -1,21 +0,0 @@
-# I'm using the 0x prefix to make replacing settings automatically easier
-
-
-!Register table
-#  Type  #   C0   #   C1   #   C2   #   C3   #   C4   #   C5   #   C6   #   C7  #
-#################################################################################
-     1     0xA0C0   0xA0C1   0xA0C2   0xA0C3   0xA0C4   0xA0C5   0xA0C6   0xA0C7  
-
-
-!Value table
-#Plane 1
-#OEP    #  Type  #   C0   #   C1   #   C2   #   C3   #   C4   #   C5   #   C6   #   C7   # 
-##########################################################################################
-#0x4C00       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C10       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C20       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C30       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C40       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C50       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C01       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
-#0x4C02       1      0x00     0x00  0x500000   0x100     0x00     0x400     0x00     0x00
\ No newline at end of file

diff --git a/tof/serials_trb3.db b/tof/serials_trb3.db
new file mode 120000 (symlink)
index 0000000..e2b6ddd
--- /dev/null
+++ b/tof/serials_trb3.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3.db
\ No newline at end of file

diff --git a/tof/serials_trb3sc.db b/tof/serials_trb3sc.db
new file mode 120000 (symlink)
index 0000000..7651aca
--- /dev/null
+++ b/tof/serials_trb3sc.db
@@ -0,0 +1 @@
+../../daqtools/base/serials_trb3sc.db
\ No newline at end of file

diff --git a/tof/startup.script b/tof/startup.script
index 90fac5cd004b6974afd7860af4c5757beb4daf66..b20ec1768dcdb2be6a68e98e4de8c759762cdfa0 100644 (file)
--- a/tof/startup.script
+++ b/tof/startup.script
@@ -2,6 +2,19 @@
 #Set all addresses
 !ifndef RESTART
   set_addresses  serials_tof.db  addresses_tof.db     #addresses for TOF TRB
+  set_addresses  serials_trb3.db  addresses_tofnew.db     #addresses for TOF TRB
+  set_addresses  serials_trb3sc.db  addresses_tofnew.db     #addresses for TOF TRB
 !endif
 
 
+trbcmd w 0xfe47 0x7111 500  #max number of words per board
+trbcmd w 0xfe47 0x7114 0x00050000 #min number of words per board
+
+#Load TDC settings
+load_register  register_tdc_tof.db
+
+
+
+
+
+

diff --git a/tof/trb.db b/tof/trb.db
index d9e8c6a5e9f700a7ced95b4155643ec2ba627578..0c9f577be66ef8b66ef8fb900fdcf3d96f822146 100644 (file)
--- a/tof/trb.db
+++ b/tof/trb.db
@@ -1,7 +1,7 @@
-tof    etraxp079 
-tof    etraxp064 
-tof    etraxp086 
-tof    etraxp062 
-tof    etraxp081 
-tof    etraxp084 
-tof    etraxp072 
\ No newline at end of file
+#tof    etraxp079 
+#tof    etraxp064 
+#tof    etraxp086 
+#tof    etraxp062 
+#tof    etraxp081 
+#tof    etraxp084 
+#tof    etraxp072