update startup configuration scripts

diff --git a/.gitignore b/.gitignore
index 4c63a29e5031c7ee5505e15e686bf1fec4b41a92..97f82837ef8d638265a4987718e0fc1d0e1eea24 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ old
 sts/tools
 rich_thr*
 conf_sts*
-
+oracle
+rich/trb_dirich_threshold_bck

diff --git a/ecal/ecal_set_thresholds.pl b/ecal/ecal_set_thresholds.pl
new file mode 120000 (symlink)
index 0000000..8960361
--- /dev/null
+++ b/ecal/ecal_set_thresholds.pl
@@ -0,0 +1 @@
+/home/hadaq/trbsoft/daqtools/tools/ecal_set_thresholds.pl
\ No newline at end of file

diff --git a/frpc/addresses_frpc.db b/frpc/addresses_frpc.db
index 471e1ffb6a2bcfd1dbdc44d552d8f8e31b6fdba9..6892aba30113b685587f0175f7e47912c10cdc3d 100644 (file)
--- a/frpc/addresses_frpc.db
+++ b/frpc/addresses_frpc.db
@@ -2,10 +2,10 @@
 ###################################################
 
 # frpc1
-0x6800     237      0
-0x6801     237      1
-0x6802     237      2
-0x6803     237      3
+0x6800     261      0
+0x6801     261      1
+0x6802     261      2
+0x6803     261      3
 
 # frpc2
 0x6810     244      0

diff --git a/hub/addresses_hub_trb3.db b/hub/addresses_hub_trb3.db
index 2f10eb4940f591f479c0a8e1a3aa2fc4f2841fb6..d548b7e1d79ff0c076237afb61653999a1b21b21 100644 (file)
--- a/hub/addresses_hub_trb3.db
+++ b/hub/addresses_hub_trb3.db
@@ -29,7 +29,7 @@
 0x86c5         094     5       0       0
 
 #fRPC
- 0x8c00        237     5       0       0
+ 0x8c00        261     5       0       0
  0x8c10        244     5       0       0
 
 

diff --git a/hub/startup.script b/hub/startup.script
index 03cf269715857b6428bede25029d2062c6671dea..b88cb21404b1ddc3ccbff9d17d007f01df8425d2 100644 (file)
--- a/hub/startup.script
+++ b/hub/startup.script
@@ -38,9 +38,6 @@ trbcmd clearbit 0x8800 0xc0 0xc
 trbcmd clearbit 0x8800 0xc1 0xc
 trbcmd clearbit 0x8810 0xc0 0x4
 trbcmd clearbit 0x8810 0xc1 0x4
-trbcmd clearbit 0x8800 0xc0 0x40 #beam abort
-trbcmd clearbit 0x8800 0xc1 0x40
-#trbcmd clearbit 0x8800 0xc3 0x40
 
 
 #trbcmd clearbit 0x8014 0xc0 0x40

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

diff --git a/itof/startup.script b/itof/startup.script
new file mode 100644 (file)
index 0000000..efaa648
--- /dev/null
+++ b/itof/startup.script
@@ -0,0 +1,15 @@
+
+########
+### Veto TDC settings are in STS!
+### All Trigger settings are in Trg
+########
+
+
+trbcmd w 0xfe74 0x7111 500  #max number of words per board
+trbcmd w 0xfe74 0x7114 0x00050000 #min number of words per board
+
+
+#Load TDC settings
+  load_register  register_tdc.db
+
+  

diff --git a/main/data_sources.db b/main/data_sources.db
index df09801e58bfe8ded20cc6d3af4f4ed8faf70ce8..66b00d0213115faf8626fa3e9d010c2520892f49 100644 (file)
--- a/main/data_sources.db
+++ b/main/data_sources.db
@@ -29,9 +29,9 @@
 0x1130      1         MDC34sec4         mid
 0x1140      1         MDC34sec5         high
 0x1150      1         MDC34sec6         high
-#0x8700      0         FW0               mid
-#0x8701      0         FW1               mid
-#0x8702      0         FW2               mid
+0x8700      1         FW0               mid
+0x8701      1         FW1               mid
+0x8702      1         FW2               mid
 0x8a00      1         ECal0             mid
 0x8a01      1         ECal1             mid
 0x8a02      1         ECal2             mid
@@ -60,6 +60,6 @@
 0x8b13      1         STS2-3             mid
 0x8b14      1         STS2-4             mid
 0x8b15      1         STS2-5             mid
-0x8c00      0        FRPC-0             mid
+0x8c00      1        FRPC-0             mid
 0x8c10      1       FRPC-1             mid
-0x8d00      0       ITOF             mid
+0x8d00      1       ITOF             mid

diff --git a/main/main_hades.script b/main/main_hades.script
index aee0f600426fa587827e18a092ede31b2e083fb9..a9085eb8d9d0769b42b24ce0464cabef2c845749 100644 (file)
--- a/main/main_hades.script
+++ b/main/main_hades.script
@@ -84,9 +84,11 @@ wait
   exec_cmd{con} echo "Configure ECAL"
   exec_script{local}  ../ecal/startup.script
 
-  exec_cmd{con} echo "Configure Start / iTOF"
+  exec_cmd{con} echo "Configure Start"
   exec_script{local}  ../start/startup.script
   
+  exec_cmd{con} echo "Configure iTOF"
+  exec_script{local}  ../itof/startup.script
   
   exec_cmd{con} echo "Configure Trigger"
   exec_script{local} ../trg/startup.script

diff --git a/rich/startup.script b/rich/startup.script
index 004fef590240b4e8d3d596759a98e96dfa050032..664c90a40335462fe3f55e7c11c3b199c95c55de 100644 (file)
--- a/rich/startup.script
+++ b/rich/startup.script
@@ -9,6 +9,7 @@ trbcmd loadbit 0xfe51 0x7114 0x00ff0000 0x00050000   #minimum event size
 
 load_register register_tdc_rich.db
 
-trbcmd w 0x0110 0xe120 0x250 # set to 37°
+#trbcmd w 0x0110 0xe120 0x250 # set to 37°
+trbcmd w 0x0110 0xe120 0x280 # set to 40°
 
 #trbcmd w 0x0110 0xe120 0x600

diff --git a/start/addresses_trb3sc.db b/start/addresses_trb3sc.db
index 4d4c155b3fa56f15ce8163bef5f332f04a14ded4..55db1626cf77f1ff18d16885ce50b5f27fea0e58 100644 (file)
--- a/start/addresses_trb3sc.db
+++ b/start/addresses_trb3sc.db
@@ -6,16 +6,22 @@
 0x0120       007        1            0       0   #ECal Laser Controller
 0x0130       200        1            0       0   #beam abort
 
+#0x5000        439     1       0       0
+#0x5001        409     1       0       0
+#0x5003        407     1       0       0
+#0x5002        405     1       0       0     
+0x5000 334     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
 
-0x5000 439     1       0       0
-0x5001 409     1       0       0
-0x5003 407     1       0       0
-0x5002 405     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
+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

diff --git a/start/register_tdc.db b/start/register_tdc.db
index 8f1bf40af9fffb67dacce2fc16b18d00a7d90fc0..197da60f2b3f90d124c9b2835303abbc37aed5b3 100644 (file)
--- a/start/register_tdc.db
+++ b/start/register_tdc.db
@@ -12,20 +12,7 @@
 # TDC    #  Type  #     C0     #     C1     #     C2     #     C3     #     C4    #     C5     #    C6    #            
 ###########################################################################################################            
                                                                                                              
-0xfe74          0   0x50003000   0x800a00c8   0xffffffff   0x0000ffff   0x00000010   0   0
+0xfe76          0   0x50003000   0x800a00c8   0xffffffff   0x0000ffff   0x00000010   0   0
 
-0x5000          3   0xfffffc00   0x000000ff
-0x5003          3   0xfffffc00   0x000000ff
-0x5001          3   0xffff00ff   0x0000fc00
-0x5002          3   0xffff00ff   0x0000fc00
+0xfe76          3   0xffffffff   0xffff
 
-#0x5d00          3   0   0
-0x5d01          3   0x7fff7fff   0x7fff
-#0x5d02          3   0   0
-#0x5d03          3   0   0
-0x5d04          3   0x7fff7fff   0x7fff
-#0x5d05          3   0   0
-0x5d00          3   0x7fff7fff   0x7fff
-0x5d02          3   0x7fff7fff   0x7fff
-0x5d03          3   0x7fff7fff   0x7fff
-0x5d05          3   0x7fff7fff   0x7fff

diff --git a/start/startup.script b/start/startup.script
index 37aa70232edfd7abcbfeb41a38074dfccea62b7a..942bf5c1a4c0f0722cfd081f3354deb7568220b4 100644 (file)
--- a/start/startup.script
+++ b/start/startup.script
@@ -2,12 +2,11 @@
 ########
 ### Veto TDC settings are in STS!
 ### All Trigger settings are in Trg
-### This combines iTOF and Start
 ########
 
 
-trbcmd w 0xfe74 0x7111 500  #max number of words per board
-trbcmd w 0xfe74 0x7114 0x00050000 #min number of words per board
+trbcmd w 0xfe76 0x7111 500  #max number of words per board
+trbcmd w 0xfe76 0x7114 0x00050000 #min number of words per board
 
 #Load TDC settings
   load_register  register_tdc.db