For tagging nov01 -- mm

diff --git a/hadaq/all_but_mdc_03.tcl b/hadaq/all_but_mdc_03.tcl
index 67e8db3db46013c301819b66277677d9bdb3b2e0..b7d48c25d05de2e84f195daf4590171a9b2aeca5 100644 (file)
--- a/hadaq/all_but_mdc_03.tcl
+++ b/hadaq/all_but_mdc_03.tcl
@@ -5,22 +5,24 @@ agent create r2-27 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-24 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-14 hades /hades/usr/hades/nov01/shw/hadaq
 
+
 # maximum bandwidth: 155Mbit
 worker create hadeb03:evtbuild -a -p -2 -m 5 
-worker create hadeb03:netmem -a -p -1 -m 5 -i ATM:0:150 -i ATM:0:151 -i ATM:0:152 -i ATM:0:153 -i ATM:0:154 
-worker create r2-29:memnet -a -p -1 -w 50000 -o ATM:0:150
-worker create r2-29:readout -a -p -2 -w 32768
-worker create r2-28:memnet -a -p -2 -w 20000 -o ATM:0:151
+worker create hadeb03:netmem -a -p -1 -m 5 -i ATM:0:150 -i ATM:0:151 -i ATM:0:152 -i ATM:0:153 -i ATM:0:154
+worker create r2-29:memnet -a -p -2 -w 30000 -o ATM:0:150
+worker create r2-29:readout -a -p -1 -w 32768
+worker create r2-14:memnet -a -p -2 -w 30000 -o ATM:0:151
+worker create r2-14:readout -a -p -1 -w 32768
+worker create r2-28:memnet -a -p -2 -w 30000 -o ATM:0:152
 worker create r2-28:readout -a -p -1 -w 32768
 # -w 10000 in memnet means: 1000kbytes/s
-worker create r2-27:memnet -a -p -2 -w 20000 -o ATM:0:152
+worker create r2-27:memnet -a -p -2 -w 30000 -o ATM:0:153
 # -w 0 in readout means: every event is sent via ATM
 worker create r2-27:readout -a -p -1 -w 32768
 # priority for rich has changed! readout has higer priority now
-worker create r2-24:memnet -a -p -2 -w 20000 -o ATM:0:153
+worker create r2-24:memnet -a -p -2 -w 30000 -o ATM:0:154
 worker create r2-24:readout -a -p -1 -w 32768
-worker create r2-14:memnet -a -p -1 -w 30000 -o ATM:0:154
-worker create r2-14:readout -a -p -2 -w 32768
+
 group create acquisition
 group create run
 group add acquisition r2-29:memnet
@@ -33,11 +35,12 @@ group add acquisition r2-24:memnet
 group add acquisition r2-24:readout
 group add acquisition r2-14:memnet
 group add acquisition r2-14:readout
+
 group add run hadeb03:evtbuild
 group add run hadeb03:netmem
 
 set duringInit {
-       {run_parallel_nov01 e7_25:tof1:init  e7_21:tof2:init e7_41:tof3:init r2-28:rich1:init r2-27:rich2:init r2-29:trigconc:init r2-24:rich0:init r2-14:shw:init  >>&hadaq.log}
+       {run_parallel_nov01 e7_25:tof1:init  e7_21:tof2:init e7_41:tof3:init r2-28:rich1:init r2-27:rich2:init r2-29:trigconc:init r2-24:rich0:init r2-14:shw:init >>&hadaq.log}
 }
 
 set beforeStartAcq {
@@ -61,3 +64,7 @@ set afterStopAcq {
 
 
 
+
+
+
+

diff --git a/hadaq/all_but_mdc_shw_03.tcl b/hadaq/all_but_mdc_shw_03.tcl
index f0b30f16dc3f51d0ce64fc07789559fd171042a7..3e831bfa77b3bdce2efa57209be46b720b406d13 100644 (file)
--- a/hadaq/all_but_mdc_shw_03.tcl
+++ b/hadaq/all_but_mdc_shw_03.tcl
@@ -1,33 +1,33 @@
 agent create hadeb03 hadaq /home/hadaq/nov01/eb/hadaq_tcl
-agent create r2-29 hades /hades/usr/hades/nov01/trig/hadaq
-agent create r2-27 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-28 hades /hades/usr/hades/nov01/rich/hadaq
+agent create r2-27 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-24 hades /hades/usr/hades/nov01/rich/hadaq
+agent create r2-29 hades /hades/usr/hades/nov01/trig/hadaq
 
 # maximum bandwidth: 155Mbit
 worker create hadeb03:evtbuild -a -p -2 -m 4
 worker create hadeb03:netmem -a -p -1 -m 4 -i ATM:0:150 -i ATM:0:151 -i ATM:0:152 -i ATM:0:153 
-worker create r2-29:memnet -a -p -1 -w 50000 -o ATM:0:150
-worker create r2-29:readout -a -p -2 -w 32768
+worker create r2-29:memnet -a -p -2 -w 50000 -o ATM:0:150
+worker create r2-29:readout -a -p -1 -w 32768
 # -w 10000 in memnet means: 1000kbytes/s
-worker create r2-27:memnet -a -p -2 -w 20000 -o ATM:0:151
+worker create r2-27:memnet -a -p -2 -w 30000 -o ATM:0:151
 # -w 0 in readout means: every event is sent via ATM
 worker create r2-27:readout -a -p -1 -w 32768
 # priority for rich has changed! readout has higer priority now
-worker create r2-28:memnet -a -p -2 -w 20000 -o ATM:0:152
+worker create r2-28:memnet -a -p -2 -w 30000 -o ATM:0:152
 worker create r2-28:readout -a -p -1 -w 32768
-worker create r2-24:memnet -a -p -2 -w 20000 -o ATM:0:153
+worker create r2-24:memnet -a -p -2 -w 30000 -o ATM:0:153
 worker create r2-24:readout -a -p -1 -w 32768
 group create acquisition
 group create run
-group add acquisition r2-29:memnet
-group add acquisition r2-29:readout
 group add acquisition r2-27:memnet
 group add acquisition r2-27:readout
 group add acquisition r2-28:memnet
 group add acquisition r2-28:readout
 group add acquisition r2-24:memnet
 group add acquisition r2-24:readout
+group add acquisition r2-29:memnet
+group add acquisition r2-29:readout
 group add run hadeb03:evtbuild
 group add run hadeb03:netmem
 

diff --git a/hadaq/all_parallel.tcl b/hadaq/all_parallel.tcl
index 33b8575964b54be3e028acf62e8ca4a05a0b4795..5515b672ba3c57c3d91a0271727ecf7cce1577a0 100644 (file)
--- a/hadaq/all_parallel.tcl
+++ b/hadaq/all_parallel.tcl
@@ -28,8 +28,8 @@ worker create r2-29:readout -a -p -2 -w 8192
 worker create r2-14:memnet -a -p -1 -w 20000 -o ATM:0:104
 worker create r2-14:readout -a -p -2 -w 8192
 #MDC
-worker create r2-8:memnet -a -p -1 -w 35000 -o ATM:0:105
-worker create r2-8:readout8 -a -p -2 -w 8192
+worker create r2-8:memnet -a -p -2 -w 35000 -o ATM:0:105
+worker create r2-8:readout8 -a -p -1 -w 8192
 group create acquisition
 group create run
 group add acquisition r2-27:memnet

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index 78fc99982a53f93b0919c0185dbf3eada41740c8..2db1820dcde220f12a4b42c3afae6fe318b7f994 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -2,10 +2,11 @@
 # are: trig rich0 rich1 rich2 mdc0 tof1 tof2 tof3 shw
 
 #set subSystems { trig rich0 rich1 rich2 mdc0 tof1 tof2 tof3 shw }
-#set subSystems { trig shw rich0 rich1 rich2 }
+#set subSystems { trig rich0 rich1 rich2 shw }
 #set subSystems { trig shw }
 #set subSystems { trig }
-set subSystems { trig rich0 }
+#set subSystems { trig rich0 }
+set subSystems { trig rich0 rich1 rich2 tof1 tof2 tof3}
 
 # the component in the HADES_BASE_DIR
 set beamTime nov01