hades.tcl

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index d3b52f7b55dbbdc2a4b9bd53bfda8add50a8fd05..c30506bea3d7069cea0dcf7f7c41502d31274970 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -1,13 +1,13 @@
 # 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 tof1 tof2 tof3 tof4 rich0 rich1 rich2 mdc0  }
+set subSystems { trig shw tof1 tof2 tof3 tof4 rich0 rich1 rich2 mdc0 mdc1  }
 #set subSystems { trig rich0 rich1 rich2 tof1 tof2 tof3 tof4 shw mdc0 mdc1 }
 
 # the component in the HADES_BASE_DIR
 set beamTime sep03
 
-set prot UDP
+set prot ATM
 
 # the name of the event builder
 set evtBuilder hadeb03
@@ -30,7 +30,6 @@ set trigCPU "r2f-14"
 if {$prot == "UDP"} {
        set addr $evtBuilderIp
        set atmBase 2222
-       set watermark 0
 } else {
        set addr 0
        if {$evtBuilder == "hadeb01"} {
@@ -48,7 +47,8 @@ group create run
 set atmOffset 0
 set vcc [expr $atmBase + $atmOffset]
 agent create $trigCPU hades /hades/usr/hades/$beamTime/trig/hwtrig
-worker create $trigCPU:memnet -a -p -1 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+#worker create $trigCPU:memnet -a -p -1 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+worker create $trigCPU:memnet -a -p -2 -w $bandwidth($atmOffset) -o UDP:$evtBuilderIp:2222
 worker create $trigCPU:readout -s trigconc -a -p -2 -w $watermark -v notice
 group add acquisition $trigCPU:memnet
 group add acquisition $trigCPU:readout
@@ -143,7 +143,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 -2 -w $bandwidth($atmOffset) -v notice -o $prot:$addr:$vcc
+#      worker create r2-29:memnet -a -p -2 -w $bandwidth($atmOffset) -v notice -o $prot:$addr:$vcc
+       worker create r2-29:memnet -a -p -2 -w $bandwidth($atmOffset) -o UDP:$evtBuilderIp:2223
        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