100MBit names differ from 10MBit names

diff --git a/hadaq/hades.tcl b/hadaq/hades.tcl
index 953c5a3fcf5b132f0c82e45dc6a62ef514e585e6..f5bb37adc647c506c0f0d87b80292cdadc176f42 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  rich0 rich1 rich2  mdc0 mdc1 tof1 tof2 tof3 tof4 }
+set subSystems { trig 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
 set beamTime sep03
 
-set prot ATM
+set prot UDP
 
 # the name of the event builder
 set evtBuilder hadeb02
@@ -47,8 +47,7 @@ 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 -2 -w $bandwidth($atmOffset) -o UDP:$evtBuilderIp:2222
+worker create $trigCPU:memnet -a -p -1 -w $bandwidth($atmOffset) -o $prot:$addr:$vcc
 worker create $trigCPU:readout -s trigconc -a -p -2 -w $watermark -v notice
 group add acquisition $trigCPU:memnet
 group add acquisition $trigCPU:readout
@@ -143,8 +142,7 @@ 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) -o UDP:$evtBuilderIp:2223
+       worker create r2-29:memnet -a -p -2 -w $bandwidth($atmOffset) -v notice -o $prot:$addr:$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

diff --git a/hadaq/start_agents_parallel_sep03 b/hadaq/start_agents_parallel_sep03
index ec3ad2bf1947cbdda957ff82fb4d27baab97a1a3..9dc9972177f10c877a7b32d1f3604bed994fba27 100644 (file)
--- a/hadaq/start_agents_parallel_sep03
+++ b/hadaq/start_agents_parallel_sep03
@@ -6,10 +6,10 @@ use FileHandle;
 
 my $beamTime="sep03";
 
-my %system_cpu_map = ( 'rich0' => 'r2-24', 'rich1' => 'r2-28', 'rich2' => 'r2-27'  , 
-                      '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' );
+my %system_cpu_map = ( 'rich0' => 'r2f-24', 'rich1' => 'r2f-28', 'rich2' => 'r2f-27'  , 
+                      'trig'  => 'r2f-35', 'shw'   => 'r2-29' , 'mdc0' => 'r2f-8'   , 
+                      'mdc1'  => 'r2f-32', 'tof1'  => 'E7_25' , 'tof2' =>  'E7_21'  ,
+                      'tof3'  => 'E7_41', 'tof4'  => 'E7_28', 'eb'    => 'hadeb02' );
 
 my %system_hwdir_map = ( 
                         'trig'  => "hwtrig", 'tof'  => "" ,
@@ -89,7 +89,7 @@ foreach $cur_system (@subSys) {
        $agent_path = "/home/hadaq/" . $beamTime . "/eb/hadaq_tcl";
     }
 
-    my($exec_command) = "rsh $cpu -l $user_name \"sh -c 'cd; . .bash_profile; kill_all_daq_procs; cd $agent_path; echo \"DAQSETUP: \\\$DAQ_SETUP\"; type daq_agent; echo \"PWD:\"; pwd; ./daq_agent'\"";
+    my($exec_command) = "rsh $cpu -l $user_name \"sh -c 'cd; . .bash_profile; kill_all_daq_procs; cd $agent_path; echo \"DAQSETUP: \\\$DAQ_SETUP\"; type daq_agent; echo \"PWD:\"; pwd; daq_agent'\"";
     print "exec: $exec_command\n";
     system($exec_command);
     print "finished pid:  $PID , cpu: $cpu, subsystem:  $cur_system, command: $exec_command\n";