status save

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index 4d850cb93a70499212ea745339c95c4372d13854..acd05d10a9a4fd5ea836510b922ed056d7dcb3ff 100644 (file)
--- a/hadaq/hades.tcl
+++ b/hadaq/hades.tcl
@@ -1,14 +1,15 @@
 # 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 rich0 rich1 rich2 tof1 tof2 tof3 tof4 mdc0 mdc1 }
+set subSystems { trig shw tof1 tof2 tof3 tof4 rich0 rich1 rich2 mdc0  }
+#set subSystems { trig rich0 rich1 rich2 tof1 tof2 tof3 tof4 shw mdc0 mdc1 }
 
 # the component in the HADES_BASE_DIR
 set beamTime sep03
 
 # the name of the event builder
 set evtBuilder hadeb03
+set evtBuilderIP 140.181.97.118
 
 set watermark [expr 32 * 1024]
 set watermark_mdc [expr 16 * 1024]
@@ -21,6 +22,8 @@ set bandwidth(4) 16000
 set bandwidth(5) 30000
 set bandwidth(6) 20000
 
+set trigCPU "r2f-14"
+
 
 if {$evtBuilder == "hadeb01"} {
        set atmBase 50
@@ -35,20 +38,22 @@ group create run
  
 set atmOffset 0
 set vcc [expr $atmBase + $atmOffset]
-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
-group add acquisition r2-35:readout
-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 ". \$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"
+agent create $trigCPU hades /hades/usr/hades/$beamTime/trig/hwtrig
+worker create $trigCPU:memnet -a -p -1 -w $bandwidth($atmOffset) -o ATM:0:$vcc
+#worker create $trigCPU:memnet -a -p -1 -w $bandwidth($atmOffset) -o UDP:$evtBuilderIP:2222
+worker create $trigCPU:readout -s trigconc -a -p -2 -w $watermark -v notice
+#worker create $trigCPU:readout -s trigconc -a -p -2 -w 0 -v notice
+group add acquisition $trigCPU:memnet
+group add acquisition $trigCPU:readout
+lappend init $trigCPU:trigconc:init
+lappend reset [ list $trigCPU ":" ]
+lappend start [ list $trigCPU ":" ]
+lappend stop [ list $trigCPU ":" ]
+lappend trigReset $trigCPU ". \$HOME/.bash_profile;  echo \"DAQ_SETUP is:\"; echo \$DAQ_SETUP; cd \$HOME/$beamTime/slow; ./trigconc reset"
+lappend trigStart $trigCPU ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./trigconc start"
+lappend trigStop $trigCPU ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./trigconc stop"
+lappend ctustart $trigCPU ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./ctustart"
+lappend ctustop $trigCPU ". \$HOME/.bash_profile;  cd \$HOME/$beamTime/slow; ./ctustop"
 
 lappend inPaths "-i ATM:0:$vcc"
 
@@ -206,13 +211,13 @@ lappend afterStopAcq {join ""}
 foreach i "$stop" { lappend afterStopAcq $i }
 lappend afterStopAcq {join ""}
 } else {
-lappend beforeStartAcq {r2-35 date}
+lappend beforeStartAcq {$trigCPU date}
 lappend beforeStartAcq {join ""}
-lappend afterStartAcq {r2-35 date}
+lappend afterStartAcq {$trigCPU date}
 lappend afterStartAcq {join ""}
-lappend beforeStopAcq {r2-35 date}
+lappend beforeStopAcq {$trigCPU date}
 lappend beforeStopAcq {join ""}
-lappend afterStopAcq {r2-35 date}
+lappend afterStopAcq {$trigCPU date}
 lappend afterStopAcq {join ""}
 }
 

diff --git a/hadaq/start_agents_parallel_sep03 b/hadaq/start_agents_parallel_sep03
index df20863b791b34044e899568e60936c040923ac0..ec3ad2bf1947cbdda957ff82fb4d27baab97a1a3 100644 (file)
--- a/hadaq/start_agents_parallel_sep03
+++ b/hadaq/start_agents_parallel_sep03
@@ -7,7 +7,7 @@ use FileHandle;
 my $beamTime="sep03";
 
 my %system_cpu_map = ( 'rich0' => 'r2-24', 'rich1' => 'r2-28', 'rich2' => 'r2-27'  , 
-                      'trig'  => 'r2-35', 'shw'   => 'r2-29' , 'mdc0' => 'r2-8'   , 
+                      'trig'  => 'r2f-14', 'shw'   => 'r2-29' , 'mdc0' => 'r2-8'   , 
                       'mdc1'  => 'r2-32', 'tof1'  => 'E7_25' , 'tof2' =>  'E7_21'  ,
                       'tof3'  => 'E7_41', 'tof4'  => 'E7_28', 'eb'    => 'hadeb03' );