new way of old-runcontrol, mt

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index ac011446b387e9f0d698c26fa95a268a456bb444..3e94b3b29bc9c2b79ae63a2bc3d59a66a6c9e96f 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -1,12 +1,14 @@
 # the list of sub systems according to your needs, possible sub systems
 # are: trig rich0 rich1 rich2 mdc0 tof1 tof2 tof3 shw
 
-#set subSystems { trig shw rich0 rich1 rich2 tof1 tof2 tof3 tof4 mdc0 mdc1 }
+#set subSystems { trig tof1 tof2 tof3  }
+set subSystems { trig shw  tof1 tof2 tof3}
+#set subSystems { trig shw rich0 rich1 rich2 mdc0 mdc1 }
 
-set subSystems { trig tof1 tof2 tof3 tof4  }
+#set subSystems { trig shw rich0 rich1 rich2 tof1 tof2 tof3 tof4 mdc0 mdc1 }
 
 # the component in the HADES_BASE_DIR
-set beamTime oct02
+set beamTime sep03
 
 # the name of the event builder
 set evtBuilder hadeb03
@@ -34,7 +36,7 @@ group create run
  
 set atmOffset 0
 set vcc [expr $atmBase + $atmOffset]
-agent create r2-35 hades /hades/usr/hades/$beamTime/trig/hadaq
+agent create r2-35 hades /hades/usr/hades/$beamTime/trig/hwtrig
 worker create r2-35:memnet -a -p -1 -w $bandwidth($atmOffset) -o ATM:0:$vcc
 worker create r2-35:readout -s trigconc -a -p -2 -w $watermark -v notice
 group add acquisition r2-35:memnet
@@ -43,134 +45,134 @@ lappend init r2-35:trigconc:init
 lappend reset [ list r2-35 ":" ]
 lappend start [ list r2-35 ":" ]
 lappend stop [ list r2-35 ":" ]
-lappend trigReset r2-35 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc reset"
-lappend trigStart r2-35 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc start"
-lappend trigStop r2-35 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc stop"
-lappend ctustart r2-35 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./ctustart"
-lappend ctustop r2-35 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./ctustop"
+lappend trigReset r2-35 ". \$HOME/.bash_profile;  echo \"DAQ_SETUP is:\"; echo \$DAQ_SETUP; cd \$HOME/$beamTime/slow; ./trigconc reset"
+lappend trigStart r2-35 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./trigconc start"
+lappend trigStop r2-35 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./trigconc stop"
+lappend ctustart r2-35 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./ctustart"
+lappend ctustop r2-35 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./ctustop"
 
 lappend inPaths "-i ATM:0:$vcc"
 
 if {[lsearch $subSystems rich0] >= 0} {
        set atmOffset 2
        set vcc [expr $atmBase + $atmOffset]
-       agent create r2-24 hades /hades/usr/hades/$beamTime/rich/hadaq
+       agent create r2-24 hades /hades/usr/hades/$beamTime/rich/hwrich
        worker create r2-24:memnet -a -p -2 -w $bandwidth($atmOffset) -o ATM:0:$vcc
        worker create r2-24:readout -s rich0 -a -p -1 -w $watermark -v notice
        group add acquisition r2-24:memnet
        group add acquisition r2-24:readout
        lappend init r2-24:rich0:init
-       lappend reset [ list r2-24 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich0 reset" ]
-       lappend start [ list r2-24 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich0 start" ]
-       lappend stop [ list r2-24 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich0 stop" ]
+       lappend reset [ list r2-24 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich0 reset" ]
+       lappend start [ list r2-24 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich0 start" ]
+       lappend stop [ list r2-24 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich0 stop" ]
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems rich1] >= 0} {
        set atmOffset 3
        set vcc [expr $atmBase + $atmOffset]
-       agent create r2-28 hades /hades/usr/hades/$beamTime/rich/hadaq
+       agent create r2-28 hades /hades/usr/hades/$beamTime/rich/hwrich
        worker create r2-28:memnet -a -p -2 -w $bandwidth($atmOffset) -o ATM:0:$vcc
        worker create r2-28:readout -s rich1 -a -p -1 -w $watermark -v notice
        group add acquisition r2-28:memnet
        group add acquisition r2-28:readout
        lappend init r2-28:rich1:init
-       lappend reset [ list r2-28 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich1 reset" ]
-       lappend start [ list r2-28 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich1 start" ]
-       lappend stop [ list r2-28 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich1 stop" ]
+       lappend reset [ list r2-28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich1 reset" ]
+       lappend start [ list r2-28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich1 start" ]
+       lappend stop [ list r2-28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich1 stop" ]
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems rich2] >= 0} {
        set atmOffset 4
        set vcc [expr $atmBase + $atmOffset]
-       agent create r2-27 hades /hades/usr/hades/$beamTime/rich/hadaq
+       agent create r2-27 hades /hades/usr/hades/$beamTime/rich/hwrich
        worker create r2-27:memnet -a -p -2 -w $bandwidth($atmOffset) -o ATM:0:$vcc
        worker create r2-27:readout -s rich2 -a -p -1 -w $watermark -v notice
        group add acquisition r2-27:memnet
        group add acquisition r2-27:readout
        lappend init r2-27:rich2:init
-       lappend reset [ list r2-27 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich2 reset" ]
-       lappend start [ list r2-27 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich2 start" ]
-       lappend stop [ list r2-27 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./rich2 stop" ]
+       lappend reset [ list r2-27 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich2 reset" ]
+       lappend start [ list r2-27 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich2 start" ]
+       lappend stop [ list r2-27 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich2 stop" ]
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems mdc0] >= 0} {
        set atmOffset 5
        set vcc [expr $atmBase + $atmOffset]
-       agent create r2-8  hades /hades/usr/hades/$beamTime/mdc/hadaq
+       agent create r2-8  hades /hades/usr/hades/$beamTime/mdc/hwmdc
        worker create r2-8:memnet -a -p -1 -w $bandwidth($atmOffset) -o ATM:0:$vcc
        worker create r2-8:readout -s mdc0  -a -p -2 -w 24576 -v notice
        group add acquisition r2-8:memnet
        group add acquisition r2-8:readout
        lappend init r2-8:mdc0:init
-       lappend reset [ list r2-8 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./mdc0 reset" ]
-       lappend start [ list r2-8 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./mdc0 start" ]
-       lappend stop [ list r2-8 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./mdc0 stop" ]
+       lappend reset [ list r2-8 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc0 reset" ]
+       lappend start [ list r2-8 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc0 start" ]
+       lappend stop [ list r2-8 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc0 stop" ]
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems mdc1] >= 0} {
        set atmOffset 6
        set vcc [expr $atmBase + $atmOffset]
-       agent create r2-32  hades /hades/usr/hades/$beamTime/mdc/hadaq
+       agent create r2-32  hades /hades/usr/hades/$beamTime/mdc/hwmdc
        worker create r2-32:memnet -a -p -1 -w $bandwidth($atmOffset) -o ATM:0:$vcc
        worker create r2-32:readout -s mdc1  -a -p -2 -w $watermark -v notice
        group add acquisition r2-32:memnet
        group add acquisition r2-32:readout
        lappend init r2-32:mdc1:init
-       lappend reset [ list r2-32 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./mdc1 reset" ]
-       lappend start [ list r2-32 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./mdc1 start" ]
-       lappend stop [ list r2-32 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./mdc1 stop" ]
+       lappend reset [ list r2-32 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc1 reset" ]
+       lappend start [ list r2-32 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc1 start" ]
+       lappend stop [ list r2-32 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc1 stop" ]
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems shw] >= 0} {
        set atmOffset 1
        set vcc [expr $atmBase + $atmOffset]
-       agent create r2-29 hades /hades/usr/hades/$beamTime/shw/hadaq
-       worker create r2-29:memnet -a -p -1 -w $bandwidth($atmOffset) -o ATM:0:$vcc
+       agent create r2-29 hades /hades/usr/hades/$beamTime/shw/hwshw
+       worker create r2-29:memnet -a -p -1 -w $bandwidth($atmOffset) -v notice -o ATM:0:$vcc
        worker create r2-29:readout -s show -a -p -2 -w $watermark -v notice
        group add acquisition r2-29:memnet
        group add acquisition r2-29:readout
        lappend init r2-29:shw:init
-       lappend reset [ list r2-29 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./shw reset" ]
-       lappend start [ list r2-29 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./shw start" ]
-       lappend stop [ list r2-29 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./shw stop" ]
+       lappend reset [ list r2-29 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./shw reset" ]
+       lappend start [ list r2-29 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./shw start" ]
+       lappend stop [ list r2-29 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./shw stop" ]
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems tof1] >= 0} {
-       agent create e7_25 hades /hades/usr/hades/$beamTime/tof/hadaq
+       agent create e7_25 hades /hades/usr/hades/$beamTime/tof/hwtrig
        lappend init e7_25:tof1:init
-       lappend reset [ list e7_25 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof1 reset" ]
-       lappend start [ list e7_25 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof1 start" ]
-       lappend stop [ list e7_25 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof1 stop" ]
+       lappend reset [ list e7_25 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof1 reset" ]
+       lappend start [ list e7_25 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof1 start" ]
+       lappend stop [ list e7_25 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof1 stop" ]
 }
 
 if {[lsearch $subSystems tof2] >= 0} {
-       agent create e7_21 hades /hades/usr/hades/$beamTime/tof/hadaq
+       agent create e7_21 hades /hades/usr/hades/$beamTime/tof/hwtrig
        lappend init e7_21:tof2:init
-       lappend reset [ list e7_21 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof2 reset" ]
-       lappend start [ list e7_21 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof2 start" ]
-       lappend stop [ list e7_21 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof2 stop" ]
+       lappend reset [ list e7_21 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof2 reset" ]
+       lappend start [ list e7_21 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof2 start" ]
+       lappend stop [ list e7_21 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof2 stop" ]
 }
 
 if {[lsearch $subSystems tof3] >= 0} {
-       agent create e7_41 hades /hades/usr/hades/$beamTime/tof/hadaq
+       agent create e7_41 hades /hades/usr/hades/$beamTime/tof/hwtrig
        lappend init e7_41:tof3:init
-       lappend reset [ list e7_41 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof3 reset" ]
-       lappend start [ list e7_41 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof3 start" ]
-       lappend stop [ list e7_41 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof3 stop" ]
+       lappend reset [ list e7_41 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof3 reset" ]
+       lappend start [ list e7_41 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof3 start" ]
+       lappend stop [ list e7_41 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof3 stop" ]
 }
 
 if {[lsearch $subSystems tof4] >= 0} {
-       agent create e7_28 hades /hades/usr/hades/$beamTime/tof/hadaq
+       agent create e7_28 hades /hades/usr/hades/$beamTime/tof/hwtrig
        lappend init e7_28:tof4:init
-       lappend reset [ list e7_28  "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof4 reset" ]
-       lappend start [ list e7_28 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof4 start" ]
-       lappend stop [ list e7_28 "cd; . bin/daqenv $beamTime; cd $beamTime/slow; ./tof4 stop" ]
+       lappend reset [ list e7_28  ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof4 reset" ]
+       lappend start [ list e7_28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof4 start" ]
+       lappend stop [ list e7_28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./tof4 stop" ]
 }