mostly change r2 to r2f

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index abee48e978fa4cc44b5c51dbbddfe6335a0fd5f4..953c5a3fcf5b132f0c82e45dc6a62ef514e585e6 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -1,7 +1,7 @@
 # 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 mdc1  }
+set subSystems { trig shw  rich0 rich1 rich2  mdc0 mdc1 tof1 tof2 tof3 tof4 }
 #set subSystems { trig rich0 rich1 rich2 tof1 tof2 tof3 tof4 shw mdc0 mdc1 }
 
 # the component in the HADES_BASE_DIR
@@ -16,15 +16,15 @@ set evtBuilderIp 140.181.97.116
 set watermark [expr 32 * 1024]
 set watermark_mdc [expr 16 * 1024]
 
-set bandwidth(0) 27000
-set bandwidth(1) 30000
-set bandwidth(2) 16000
-set bandwidth(3) 16000
-set bandwidth(4) 16000
-set bandwidth(5) 30000
-set bandwidth(6) 20000
+set bandwidth(0) 00000
+set bandwidth(1) 00000
+set bandwidth(2) 25000
+set bandwidth(3) 25000
+set bandwidth(4) 25000
+set bandwidth(5) 40000
+set bandwidth(6) 40000
 
-set trigCPU "r2f-14"
+set trigCPU "r2f-35"
 
 
 if {$prot == "UDP"} {
@@ -67,75 +67,75 @@ lappend inPaths "-i $prot: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/hwrich
-       worker create r2-24:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$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 ". \$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" ]
+       agent create r2f-24 hades /hades/usr/hades/$beamTime/rich/hwrich
+       worker create r2f-24:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+       worker create r2f-24:readout -s rich0 -a -p -1 -w $watermark -v notice
+       group add acquisition r2f-24:memnet
+       group add acquisition r2f-24:readout
+       lappend init r2f-24:rich0:init
+       lappend reset [ list r2f-24 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich0 reset" ]
+       lappend start [ list r2f-24 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich0 start" ]
+       lappend stop [ list r2f-24 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich0 stop" ]
        lappend inPaths "-i $prot: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/hwrich
-       worker create r2-28:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$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 ". \$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" ]
+       agent create r2f-28 hades /hades/usr/hades/$beamTime/rich/hwrich
+       worker create r2f-28:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+       worker create r2f-28:readout -s rich1 -a -p -1 -w $watermark -v notice
+       group add acquisition r2f-28:memnet
+       group add acquisition r2f-28:readout
+       lappend init r2f-28:rich1:init
+       lappend reset [ list r2f-28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich1 reset" ]
+       lappend start [ list r2f-28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich1 start" ]
+       lappend stop [ list r2f-28 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich1 stop" ]
        lappend inPaths "-i $prot: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/hwrich
-       worker create r2-27:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$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 ". \$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" ]
+       agent create r2f-27 hades /hades/usr/hades/$beamTime/rich/hwrich
+       worker create r2f-27:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+       worker create r2f-27:readout -s rich2 -a -p -1 -w $watermark -v notice
+       group add acquisition r2f-27:memnet
+       group add acquisition r2f-27:readout
+       lappend init r2f-27:rich2:init
+       lappend reset [ list r2f-27 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich2 reset" ]
+       lappend start [ list r2f-27 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich2 start" ]
+       lappend stop [ list r2f-27 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./rich2 stop" ]
        lappend inPaths "-i $prot: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/hwmdc
-       worker create r2-8:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
-       worker create r2-8:readout -s mdc0  -a -p -1 -w $watermark_mdc -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 ". \$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" ]
+       agent create r2f-8  hades /hades/usr/hades/$beamTime/mdc/hwmdc
+       worker create r2f-8:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+       worker create r2f-8:readout -s mdc0  -a -p -1 -w $watermark_mdc -v notice
+       group add acquisition r2f-8:memnet
+       group add acquisition r2f-8:readout
+       lappend init r2f-8:mdc0:init
+       lappend reset [ list r2f-8 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc0 reset" ]
+       lappend start [ list r2f-8 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc0 start" ]
+       lappend stop [ list r2f-8 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc0 stop" ]
        lappend inPaths "-i $prot: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/hwmdc
-       worker create r2-32:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
-       worker create r2-32:readout -s mdc1  -a -p -1 -w $watermark_mdc -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 ". \$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" ]
+       agent create r2f-32  hades /hades/usr/hades/$beamTime/mdc/hwmdc
+       worker create r2f-32:memnet -a -p -2 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
+       worker create r2f-32:readout -s mdc1  -a -p -1 -w $watermark_mdc -v notice
+       group add acquisition r2f-32:memnet
+       group add acquisition r2f-32:readout
+       lappend init r2f-32:mdc1:init
+       lappend reset [ list r2f-32 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc1 reset" ]
+       lappend start [ list r2f-32 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc1 start" ]
+       lappend stop [ list r2f-32 ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./mdc1 stop" ]
        lappend inPaths "-i $prot:0:$vcc"
 }