Possible to use different base directories (e.g. nov01 ot oct02)

and different event builders.
Did simple tests on hadeb03 with trigconc and one rich crate.
-- mm

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index aa7240f7a3ff593c19d6bb3dbb568cfce6754d2f..cdf944b9263bcb20cb80fd36849462fca21b21e2 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -1,11 +1,26 @@
 #set subSystems { trig rich0 rich1 rich2 mdc0 tof1 tof2 tof3 shw }
-set subSystems { trig  rich0 rich1 rich2 }
+#set subSystems { trig shw rich0 rich1 rich2 }
+#set subSystems { trig shw }
+#set subSystems { trig }
+set subSystems { trig rich0 }
+
+set beamTime nov01
+set evtBuilder hadeb03
+
+if {$evtBuilder == "hadeb01"} {
+       set atmBase 50
+} elseif {$evtBuilder == "hadeb02"} {
+       set atmBase 100
+} elseif {$evtBuilder == "hadeb03"} {
+       set atmBase 150
+}
 
 group create acquisition
 group create run
-
-agent create r2-29 hades /hades/usr/hades/nov01/trig/hadaq
-worker create r2-29:memnet -a -p -1 -w 38000 -o ATM:0:150
+ 
+set vcc [expr $atmBase + 0]
+agent create r2-29 hades /hades/usr/hades/$beamTime/trig/hadaq
+worker create r2-29:memnet -a -p -1 -w 38000 -o ATM:0:$vcc
 worker create r2-29:readout -a -p -2 -w 32768
 group add acquisition r2-29:memnet
 group add acquisition r2-29:readout
@@ -13,14 +28,15 @@ lappend init r2-29:trigconc:init
 lappend reset { }
 lappend start { }
 lappend stop { }
-set trigReset {rsh r2-29 -l hades sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc reset'} </dev/null >>&hadaq.log}
-set trigStart {rsh r2-29 -l hades sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc start'} </dev/null >>&hadaq.log}
-set trigStop {rsh r2-29 -l hades sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc stop'} </dev/null >>&hadaq.log}
-lappend inPaths {-i ATM:0:150}
+set trigReset "rsh r2-29 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc reset'\" </dev/null >>&hadaq.log"
+set trigStart "rsh r2-29 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc start'\" </dev/null >>&hadaq.log"
+set trigStop "rsh r2-29 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc stop'\" </dev/null >>&hadaq.log"
+lappend inPaths "-i ATM:0:$vcc"
 
 if {[lsearch $subSystems rich0] >= 0} {
-       agent create r2-24 hades /hades/usr/hades/nov01/rich/hadaq
-       worker create r2-24:memnet -a -p -2 -w 30000 -o ATM:0:154
+       set vcc [expr $atmBase + 4]
+       agent create r2-24 hades /hades/usr/hades/$beamTime/rich/hadaq
+       worker create r2-24:memnet -a -p -2 -w 30000 -o ATM:0:$vcc
        worker create r2-24:readout -a -p -1 -w 32768
        group add acquisition r2-24:memnet
        group add acquisition r2-24:readout
@@ -28,12 +44,13 @@ if {[lsearch $subSystems rich0] >= 0} {
        lappend reset r2-24:rich0:reset
        lappend start r2-24:rich0:start
        lappend stop r2-24:rich0:stop
-       lappend inPaths {-i ATM:0:154}
+       lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems rich1] >= 0} {
-       agent create r2-28 hades /hades/usr/hades/nov01/rich/hadaq
-       worker create r2-28:memnet -a -p -2 -w 30000 -o ATM:0:152
+       set vcc [expr $atmBase + 2]
+       agent create r2-28 hades /hades/usr/hades/$beamTime/rich/hadaq
+       worker create r2-28:memnet -a -p -2 -w 30000 -o ATM:0:$vcc
        worker create r2-28:readout -a -p -1 -w 32768
        group add acquisition r2-28:memnet
        group add acquisition r2-28:readout
@@ -41,12 +58,13 @@ if {[lsearch $subSystems rich1] >= 0} {
        lappend reset r2-28:rich1:reset
        lappend start r2-28:rich1:start
        lappend stop r2-28:rich1:stop
-       lappend inPaths {-i ATM:0:152}
+       lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems rich2] >= 0} {
-       agent create r2-27 hades /hades/usr/hades/nov01/rich/hadaq
-       worker create r2-27:memnet -a -p -2 -w 30000 -o ATM:0:153
+       set vcc [expr $atmBase + 3]
+       agent create r2-27 hades /hades/usr/hades/$beamTime/rich/hadaq
+       worker create r2-27:memnet -a -p -2 -w 30000 -o ATM:0:$vcc
        worker create r2-27:readout -a -p -1 -w 32768
        group add acquisition r2-27:memnet
        group add acquisition r2-27:readout
@@ -54,12 +72,13 @@ if {[lsearch $subSystems rich2] >= 0} {
        lappend reset r2-27:rich2:reset
        lappend start r2-27:rich2:start
        lappend stop r2-27:rich2:stop
-       lappend inPaths {-i ATM:0:153}
+       lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems mdc0] >= 0} {
-       agent create r2-8  hades /hades/usr/hades/nov01/mdc/hadaq
-       worker create r2-8:memnet -a -p -1 -w 35000 -o ATM:0:155
+       set vcc [expr $atmBase + 5]
+       agent create r2-8  hades /hades/usr/hades/$beamTime/mdc/hadaq
+       worker create r2-8:memnet -a -p -1 -w 35000 -o ATM:0:$vcc
        worker create r2-8:readout8 -a -p -2 -w 32768
        group add acquisition r2-8:memnet
        group add acquisition r2-8:readout8
@@ -67,10 +86,11 @@ if {[lsearch $subSystems mdc0] >= 0} {
        lappend reset r2-8:mdc0:reset
        lappend start r2-8:mdc0:start
        lappend stop r2-8:mdc0:stop
-       lappend inPaths {-i ATM:0:155}
+       lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems tof1] >= 0} {
+       set vcc [expr $atmBase + 0]
        lappend init e7_25:tof1:init
        lappend reset e7_25:tof1:reset
        lappend start e7_25:tof1:start
@@ -78,6 +98,7 @@ if {[lsearch $subSystems tof1] >= 0} {
 }
 
 if {[lsearch $subSystems tof2] >= 0} {
+       set vcc [expr $atmBase + 0]
        lappend init e7_21:tof2:init
        lappend reset e7_21:tof2:reset
        lappend start e7_21:tof2:start
@@ -85,6 +106,7 @@ if {[lsearch $subSystems tof2] >= 0} {
 }
 
 if {[lsearch $subSystems tof3] >= 0} {
+       set vcc [expr $atmBase + 0]
        lappend init e7_41:tof3:init
        lappend reset e7_41:tof3:reset
        lappend start e7_41:tof3:start
@@ -92,8 +114,9 @@ if {[lsearch $subSystems tof3] >= 0} {
 }
 
 if {[lsearch $subSystems shw] >= 0} {
-       agent create r2-14 hades /hades/usr/hades/nov01/shw/hadaq
-       worker create r2-14:memnet -a -p -1 -w 35000 -o ATM:0:151
+       set vcc [expr $atmBase + 1]
+       agent create r2-14 hades /hades/usr/hades/$beamTime/shw/hadaq
+       worker create r2-14:memnet -a -p -1 -w 35000 -o ATM:0:$vcc
        worker create r2-14:readout -a -p -2 -w 32768
        group add acquisition r2-14:memnet
        group add acquisition r2-14:readout
@@ -101,24 +124,20 @@ if {[lsearch $subSystems shw] >= 0} {
        lappend reset r2-14:shw:reset
        lappend start r2-14:shw:start
        lappend stop r2-14:shw:stop
-       lappend inPaths {-i ATM:0:151}
+       lappend inPaths "-i ATM:0:$vcc"
 }
 
-agent create hadeb03 hadaq /home/hadaq/nov01/eb/hadaq_tcl
+agent create hadeb03 hadaq /home/hadaq/$beamTime/eb/hadaq_tcl
 eval worker create hadeb03:evtbuild -a -p -2 -m [llength $inPaths] 
 eval worker create hadeb03:netmem -a -p -1 -m [llength $inPaths] [join $inPaths { }]
 group add run hadeb03:evtbuild
 group add run hadeb03:netmem
 
-set duringInit [list "run_parallel_nov01 [join $init { }]"]
-set beforeStartAcq [list $trigReset "run_parallel_nov01 [join $reset { }]" $trigReset "run_parallel_nov01 [join $start { }]" $trigStart]
+set duringInit [list "run_parallel_$beamTime [join $init { }]"]
+set beforeStartAcq [list $trigReset "run_parallel_$beamTime [join $reset { }]" $trigReset "run_parallel_$beamTime [join $start { }]" $trigStart]
 
-set afterStartAcq {
-       {rsh r2-29 -l hades sh -c {'. bin/daqenv nov01; cd nov01/slow; ./ctustart'} </dev/null >>&hadaq.log}
-}
+set afterStartAcq [list "rsh r2-29 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./ctustart'\" </dev/null >>&hadaq.log"]
 
-set beforeStopAcq {
-       {rsh r2-29 -l hades sh -c {'. bin/daqenv nov01; cd nov01/slow; ./ctustop'} </dev/null >>&hadaq.log}
-}
+set beforeStopAcq [list "rsh r2-29 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./ctustop'\" </dev/null >>&hadaq.log"]
 
-set afterStopAcq [list "run_parallel_nov01 [join $stop { }]"]
+set afterStopAcq [list $trigStop "run_parallel_$beamTime [join $stop { }]"]