tuning -- mm

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index b7869936b844baf89f78e44a20e367f06809e1cb..c63705a546fb7a94399dda37fa2d90367d25a367 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -10,7 +10,6 @@ set beamTime sep03
 # the name of the event builder
 set evtBuilder hadeb03
 
-# watermark for mdc0 is calculated independently
 set watermark [expr 12 * 1024]
 set bandwidth(0) 27000
 set bandwidth(1) 30000
@@ -99,8 +98,8 @@ if {[lsearch $subSystems mdc0] >= 0} {
        set atmOffset 5
        set vcc [expr $atmBase + $atmOffset]
        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
+       worker create r2-8:memnet -a -p -2 -w $bandwidth($atmOffset) -o ATM:0:$vcc
+       worker create r2-8:readout -s mdc0  -a -p -1 -w $watermark -v notice
        group add acquisition r2-8:memnet
        group add acquisition r2-8:readout
        lappend init r2-8:mdc0:init
@@ -114,8 +113,8 @@ if {[lsearch $subSystems mdc1] >= 0} {
        set atmOffset 6
        set vcc [expr $atmBase + $atmOffset]
        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
+       worker create r2-32:memnet -a -p -2 -w $bandwidth($atmOffset) -o ATM:0:$vcc
+       worker create r2-32:readout -s mdc1  -a -p -1 -w $watermark -v notice
        group add acquisition r2-32:memnet
        group add acquisition r2-32:readout
        lappend init r2-32:mdc1:init
@@ -129,8 +128,8 @@ if {[lsearch $subSystems shw] >= 0} {
        set atmOffset 1
        set vcc [expr $atmBase + $atmOffset]
        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
+       worker create r2-29:memnet -a -p -2 -w $bandwidth($atmOffset) -v notice -o ATM:0:$vcc
+       worker create r2-29:readout -s show -a -p -1 -w $watermark -v notice
        group add acquisition r2-29:memnet
        group add acquisition r2-29:readout
        lappend init r2-29:shw:init