mdc1 added

r2-29 exchanged for r2-35
some stops removed
ATM bandwidths sum rule
rearrangement of ATM vcc for RICH
changes not by me, just commit by me -- mm

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index f71b5e16c08ff6c54246a03c9eb90bf8c27bca29..ea302de831a72aefd2475e63f0e2e7ea50d1b110 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -1,11 +1,16 @@
 # 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 mdc0 tof1 tof2 tof3 }
+#set subSystems { trig shw rich0 rich1 rich2  tof1 tof2 tof3 mdc0 mdc1 }
+set subSystems { trig shw rich0 rich1 rich2  tof1 tof2 tof3  }
+#set subSystems { trig  shw rich0 rich1 rich2 tof1 tof2 tof3 }
+#set subSystems { trig shw rich0 rich1 rich2 mdc0 tof1 tof2 tof3 }
+#set subSystems { trig shw tof1 tof2 tof3 mdc0 mdc1 }
 #set subSystems { trig shw tof1 tof2 tof3 }
 #set subSystems { trig }
 #set subSystems { trig rich0 }
 #set subSystems { trig tof1 tof2 tof3 rich0 rich1 rich2 }
+#set subSystems { trig rich0 rich1 rich2 }
 #set subSystems { trig tof1 tof2 tof3}
 
 # the component in the HADES_BASE_DIR
@@ -14,7 +19,7 @@ set beamTime oct02
 # the name of the event builder
 set evtBuilder hadeb03
 
-set watermark [expr 56 * 1024]
+set watermark [expr 48 * 1024]
 
 if {$evtBuilder == "hadeb01"} {
        set atmBase 50
@@ -28,73 +33,83 @@ group create acquisition
 group create run
  
 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 -s trigconc -a -p -2 -w $watermark
-group add acquisition r2-29:memnet
-group add acquisition r2-29:readout
-lappend init r2-29:trigconc:init
+agent create r2-35 hades /hades/usr/hades/$beamTime/trig/hadaq
+worker create r2-35:memnet -a -p -1 -w 22000 -o ATM:0:$vcc
+worker create r2-35:readout -s trigconc -a -p -2 -w $watermark
+group add acquisition r2-35:memnet
+group add acquisition r2-35:readout
+lappend init r2-35:trigconc:init
 lappend reset { }
 lappend start { }
 lappend stop { }
-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"
+set trigReset "rsh r2-35 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc reset'\" </dev/null >>&hadaq.log"
+set trigStart "rsh r2-35 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc start'\" </dev/null >>&hadaq.log"
+#set trigStop "rsh r2-35 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./trigconc stop'\" </dev/null >>&hadaq.log"
+set trigStop ""
 lappend inPaths "-i ATM:0:$vcc"
 
 if {[lsearch $subSystems rich0] >= 0} {
-       set vcc [expr $atmBase + 4]
+       set vcc [expr $atmBase + 2]
        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:memnet -a -p -2 -w 16000 -o ATM:0:$vcc
        worker create r2-24:readout -s rich0 -a -p -1 -w $watermark
        group add acquisition r2-24:memnet
        group add acquisition r2-24:readout
        lappend init r2-24:rich0:init
        lappend reset r2-24:rich0:reset
        lappend start r2-24:rich0:start
-       lappend stop r2-24:rich0:stop
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems rich1] >= 0} {
-       set vcc [expr $atmBase + 2]
+       set vcc [expr $atmBase + 3]
        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:memnet -a -p -2 -w 16000 -o ATM:0:$vcc
        worker create r2-28:readout -s rich1 -a -p -1 -w $watermark
        group add acquisition r2-28:memnet
        group add acquisition r2-28:readout
        lappend init r2-28:rich1:init
        lappend reset r2-28:rich1:reset
        lappend start r2-28:rich1:start
-       lappend stop r2-28:rich1:stop
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems rich2] >= 0} {
-       set vcc [expr $atmBase + 3]
+       set vcc [expr $atmBase + 4]
        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:memnet -a -p -2 -w 16000 -o ATM:0:$vcc
        worker create r2-27:readout -s rich2 -a -p -1 -w $watermark
        group add acquisition r2-27:memnet
        group add acquisition r2-27:readout
        lappend init r2-27:rich2:init
        lappend reset r2-27:rich2:reset
        lappend start r2-27:rich2:start
-       lappend stop r2-27:rich2:stop
        lappend inPaths "-i ATM:0:$vcc"
 }
 
 if {[lsearch $subSystems mdc0] >= 0} {
        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:memnet -a -p -1 -w 30000 -o ATM:0:$vcc
        worker create r2-8:readout -s mdc0  -a -p -2 -w $watermark
        group add acquisition r2-8:memnet
        group add acquisition r2-8:readout
        lappend init r2-8:mdc0:init
        lappend reset r2-8:mdc0:reset
        lappend start r2-8:mdc0:start
-       lappend stop r2-8:mdc0:stop
+       lappend inPaths "-i ATM:0:$vcc"
+}
+
+if {[lsearch $subSystems mdc1] >= 0} {
+       set vcc [expr $atmBase + 6]
+       agent create r2-29  hades /hades/usr/hades/$beamTime/mdc/hadaq
+       worker create r2-29:memnet -a -p -1 -w 20000 -o ATM:0:$vcc
+       worker create r2-29:readout -s mdc1  -a -p -2 -w $watermark
+       group add acquisition r2-29:memnet
+       group add acquisition r2-29:readout
+       lappend init r2-29:mdc1:init
+       lappend reset r2-29:mdc1:reset
+       lappend start r2-29:mdc1:start
        lappend inPaths "-i ATM:0:$vcc"
 }
 
@@ -103,7 +118,6 @@ if {[lsearch $subSystems tof1] >= 0} {
        lappend init e7_25:tof1:init
        lappend reset e7_25:tof1:reset
        lappend start e7_25:tof1:start
-       lappend stop e7_25:tof1:stop
 }
 
 if {[lsearch $subSystems tof2] >= 0} {
@@ -111,7 +125,6 @@ if {[lsearch $subSystems tof2] >= 0} {
        lappend init e7_21:tof2:init
        lappend reset e7_21:tof2:reset
        lappend start e7_21:tof2:start
-       lappend stop e7_21:tof2:stop
 }
 
 if {[lsearch $subSystems tof3] >= 0} {
@@ -119,20 +132,19 @@ if {[lsearch $subSystems tof3] >= 0} {
        lappend init e7_41:tof3:init
        lappend reset e7_41:tof3:reset
        lappend start e7_41:tof3:start
-       lappend stop e7_41:tof3:stop
 }
 
 if {[lsearch $subSystems shw] >= 0} {
        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 68000 -o ATM:0:$vcc
+       worker create r2-14:memnet -a -p -1 -w 30000 -o ATM:0:$vcc
        worker create r2-14:readout -s show -a -p -2 -w $watermark
        group add acquisition r2-14:memnet
        group add acquisition r2-14:readout
        lappend init r2-14:shw:init
        lappend reset r2-14:shw:reset
        lappend start r2-14:shw:start
-       lappend stop r2-14:shw:stop
+       lappend stop  r2-14:shw:stop
        lappend inPaths "-i ATM:0:$vcc"
 }
 
@@ -145,8 +157,8 @@ group add run $evtBuilder:netmem
 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 [list "rsh r2-29 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./ctustart'\" </dev/null >>&hadaq.log"]
+set afterStartAcq [list "rsh r2-35 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./ctustart'\" </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 beforeStopAcq [list "rsh r2-35 -l hades sh -c \"'. bin/daqenv $beamTime; cd $beamTime/slow; ./ctustop'\" </dev/null >>&hadaq.log"]
 
 set afterStopAcq [list $trigStop "run_parallel_$beamTime [join $stop { }]"]