current status, mt

diff --git a/hadaq/all_parallel.tcl b/hadaq/all_parallel.tcl
index 1eb017383efe1fca86961ed8de29730b608b2e9d..33b8575964b54be3e028acf62e8ca4a05a0b4795 100644 (file)
--- a/hadaq/all_parallel.tcl
+++ b/hadaq/all_parallel.tcl
@@ -1,37 +1,35 @@
-agent create hadeb01 hades /home/hades/nov01/eb/hadaq
+agent create hadeb02 hades /home/hades/nov01/eb/hadaq
 agent create r2-28 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-27 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-24 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-29 hades /hades/usr/hades/nov01/trig/hadaq
 agent create r2-14 hades /hades/usr/hades/nov01/shw/hadaq
 agent create r2-8  hades /hades/usr/hades/nov01/mdc/hadaq
-agent create r2-7  hades /hades/usr/hades/nov01/mdc/hadaq
+#agent create r2-7  hades /hades/usr/hades/nov01/mdc/hadaq
 
 
 # maximum bandwidth: 155Mbit
-worker create hadeb01:evtbuild -a -p -2 -m 7
-worker create hadeb01:netmem -a -p -1 -m 7 -i ATM:0:50 -i ATM:0:51 -i ATM:0:52 -i ATM:0:53 -i ATM:0:54 -i ATM:0:55 -i ATM:0:56
+worker create hadeb02:evtbuild -a -p -2 -m 6
+worker create hadeb02:netmem -a -p -1 -m 6 -i ATM:0:100 -i ATM:0:101 -i ATM:0:102 -i ATM:0:103 -i ATM:0:104 -i ATM:0:105 
 # -w 10000 in memnet means: 1000kbytes/s
 #RICH
-worker create r2-27:memnet -a -p -2 -w 15000 -o ATM:0:50
+worker create r2-27:memnet -a -p -2 -w 15000 -o ATM:0:100
 # -w 0 in readout means: every event is sent via ATM
 worker create r2-27:readout -a -p -1 -w 8192
 # priority for rich has changed! readout has higer priority now
-worker create r2-28:memnet -a -p -2 -w 15000 -o ATM:0:51
+worker create r2-28:memnet -a -p -2 -w 15000 -o ATM:0:101
 worker create r2-28:readout -a -p -1 -w 8192
-worker create r2-24:memnet -a -p -2 -w 15000 -o ATM:0:52
+worker create r2-24:memnet -a -p -2 -w 15000 -o ATM:0:102
 worker create r2-24:readout -a -p -1 -w 8192
 #TRIG
-worker create r2-29:memnet -a -p -1 -w 20000 -o ATM:0:53
+worker create r2-29:memnet -a -p -1 -w 20000 -o ATM:0:103
 worker create r2-29:readout -a -p -2 -w 8192
 #SHW
-worker create r2-14:memnet -a -p -1 -w 20000 -o ATM:0:54
+worker create r2-14:memnet -a -p -1 -w 20000 -o ATM:0:104
 worker create r2-14:readout -a -p -2 -w 8192
 #MDC
-worker create r2-8:memnet -a -p -1 -w 35000 -o ATM:0:55
+worker create r2-8:memnet -a -p -1 -w 35000 -o ATM:0:105
 worker create r2-8:readout8 -a -p -2 -w 8192
-worker create r2-7:memnet -a -p -1 -w 35000 -o ATM:0:56
-worker create r2-7:readout7 -a -p -2 -w 8192
 group create acquisition
 group create run
 group add acquisition r2-27:memnet
@@ -45,21 +43,19 @@ group add acquisition r2-29:readout
 group add acquisition r2-14:memnet
 group add acquisition r2-14:readout
 group add acquisition r2-8:memnet
-group add acquisition r2-8:readout8
-group add acquisition r2-7:memnet
-group add acquisition r2-7:readout7
-group add run hadeb01:evtbuild
-group add run hadeb01:netmem
+group add acquisition r2-8:readout
+group add run hadeb02:evtbuild
+group add run hadeb02:netmem
 
 set duringInit {
-       {run_parallel e7_25:tof1:init  e7_21:tof2:init e7_41:tof3:init r2-28:rich1:init r2-27:rich2:init r2-29:trigconc:init r2-24:rich0:init r2-14:shw:init r2-8:mdc0:init r2-7:mdc1:init >>&hadaq.log}
+       {run_parallel_nov01 e7_25:tof1:init  e7_21:tof2:init e7_41:tof3:init r2-28:rich1:init r2-27:rich2:init r2-29:trigconc:init r2-24:rich0:init r2-14:shw:init r2-8:mdc:init >>&hadaq.log}
 }
 
 set beforeStartAcq {
        {rsh r2-29 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc reset'} </dev/null >>&hadaq.log}
-       {run_parallel e7_25:tof1:reset  e7_21:tof2:reset e7_41:tof3:reset r2-28:rich1:reset r2-27:rich2:reset r2-24:rich0:reset r2-14:shw:reset r2-8:mdc0:reset r2-7:mdc1:reset >>&hadaq.log}
+       {run_parallel_nov01 e7_25:tof1:reset  e7_21:tof2:reset e7_41:tof3:reset r2-28:rich1:reset r2-27:rich2:reset r2-24:rich0:reset r2-14:shw:reset r2-8:mdc:reset  >>&hadaq.log}
        {rsh r2-29 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc reset'} </dev/null >>&hadaq.log}
-       {run_parallel e7_25:tof1:start  e7_21:tof2:start e7_41:tof3:start r2-28:rich1:start r2-27:rich2:start r2-24:rich0:start r2-14:shw:start r2-8:mdc0:start r2-7:mdc1:start >>&hadaq.log}
+       {run_parallel_nov01 e7_25:tof1:start  e7_21:tof2:start e7_41:tof3:start r2-28:rich1:start r2-27:rich2:start r2-24:rich0:start r2-14:shw:start r2-8:mdc:start  >>&hadaq.log}
        {rsh r2-29 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc start'} </dev/null >>&hadaq.log}
 }
 
@@ -73,3 +69,5 @@ set beforeStopAcq {
 
 set afterStopAcq {
 }
+
+

diff --git a/hadaq/mdc.tcl b/hadaq/mdc.tcl
index b8c04feac68f983bf6b0f0d372781a7c2b816365..790d842b8adb3e2b8d7ebb8572d68df6d9ff5d83 100644 (file)
--- a/hadaq/mdc.tcl
+++ b/hadaq/mdc.tcl
@@ -1,42 +1,42 @@
-agent create hadeb02 hadaq /home/hadaq/nov01/eb/hadaq_tcl
+agent create hadeb02 root /home/hadaq/nov01/eb/hadaq_tcl
 agent create r2-7 hades /hades/usr/hades/nov01/mdc/hadaq
 agent create r2-8 hades /hades/usr/hades/nov01/mdc/hadaq
 worker create hadeb02:evtbuild -a -p -2 -m 2
 worker create hadeb02:netmem -a -p -1 -m 2 -i ATM:0:100 -i ATM:0:101
 worker create r2-7:memnet -a -p -1 -w 50000 -o ATM:0:100
-worker create r2-7:readout -a -p -2
+worker create r2-7:readout7 -a -p -2
 worker create r2-8:memnet -a -p -1 -w 50000 -o ATM:0:101
-worker create r2-8:readout -a -p -2
+worker create r2-8:readout8 -a -p -2
 group create acquisition
 group create run
 group add acquisition r2-7:memnet
-group add acquisition r2-7:readout
+group add acquisition r2-7:readout7
 group add acquisition r2-8:memnet
-group add acquisition r2-8:readout
+group add acquisition r2-8:readout8
 group add run hadeb02:evtbuild
 group add run hadeb02:netmem
 
 set duringInit {
-       {rsh -l hades r2-7 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc1_init_sigbus'} </dev/null }
-       {rsh -l hades r2-8 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc0_init_sigbus'} </dev/null }
+       {rsh -l hades r2-7 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc1 init'} </dev/null >>&hadaq.log}
+       {rsh -l hades r2-8 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc0 init'} </dev/null >>&hadaq.log}
 }
 
 set beforeStartAcq {
-       {rsh -l hades r2-7 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc1_reset_sigbus'} </dev/null }
-       {rsh -l hades r2-8 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc0_reset_sigbus'} </dev/null }
-       {rsh -l hades r2-7 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc1 start'} </dev/null }
-       {rsh -l hades r2-8 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc0 start'} </dev/null }
+       {rsh -l hades r2-7 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc1 reset'} </dev/null >>&hadaq.log}
+       {rsh -l hades r2-8 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc0 reset'} </dev/null >>&hadaq.log}
+       {rsh -l hades r2-7 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc1 start'} </dev/null >>&hadaq.log}
+       {rsh -l hades r2-8 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc0 start'} </dev/null >>&hadaq.log}
 }
 
 set afterStartAcq {
-       {rsh -l hades r2-8 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./ctustart'} </dev/null }
+       {rsh -l hades r2-8 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./ctustart'} </dev/null >>&hadaq.log}
 }
 
 set beforeStopAcq {
-       {rsh -l hades r2-8 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./ctustop'} </dev/null }
+       {rsh -l hades r2-8 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./ctustop'} </dev/null >>&hadaq.log}
 }
 
 set afterStopAcq {
-       {rsh -l hades r2-7 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc1 stop'} </dev/null }
-       {rsh -l hades r2-8 sh -c {'bin/daqenv nov01; cd $HADES_BASE_DIR/slow; ./mdc0 stop'} </dev/null }
+       {rsh -l hades r2-7 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc1 stop'} </dev/null >>&hadaq.log}
+       {rsh -l hades r2-8 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./mdc0 stop'} </dev/null >>&hadaq.log}
 }

diff --git a/hadaq/trig_all_rich_all_tof_all_shw_parallel.tcl b/hadaq/trig_all_rich_all_tof_all_shw_parallel.tcl
index b7c26a548bc76478908645573ae5ad3fc5bd8df2..93ff8a79f6cce80e56d70e40430fa409d229a4f7 100644 (file)
--- a/hadaq/trig_all_rich_all_tof_all_shw_parallel.tcl
+++ b/hadaq/trig_all_rich_all_tof_all_shw_parallel.tcl
@@ -1,20 +1,20 @@
-agent create hadeb01 hades /home/hades/nov01/eb/hadaq
+agent create hadeb02 hadaq /home/hades/nov01/eb/hadaq
 agent create r2-28 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-27 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-24 hades /hades/usr/hades/nov01/rich/hadaq
 agent create r2-29 hades /hades/usr/hades/nov01/trig/hadaq
 agent create r2-14 hades /hades/usr/hades/nov01/shw/hadaq
-worker create hadeb01:evtbuild -a -p -2 -m 5
-worker create hadeb01:netmem -a -p -1 -m 5 -i ATM:0:50 -i ATM:0:51 -i ATM:0:52 -i ATM:0:53 -i ATM:0:54
-worker create r2-27:memnet -a -p -1  -w 20000 -o ATM:0:50
+worker create hadeb02:evtbuild -a -p -2 -m 5
+worker create hadeb02:netmem -a -p -1 -m 5 -i ATM:0:100 -i ATM:0:101 -i ATM:0:102 -i ATM:0:103 -i ATM:0:104
+worker create r2-29:memnet -a -p -2   -w 10000 -o ATM:0:100
+worker create r2-29:readout -a -p -1  -w 32768
+worker create r2-27:memnet -a -p -1  -w 20000 -o ATM:0:101
 worker create r2-27:readout -a -p -2  -w 32768
-worker create r2-28:memnet -a -p -1  -w 20000 -o ATM:0:51
+worker create r2-28:memnet -a -p -1  -w 20000 -o ATM:0:102
 worker create r2-28:readout -a -p -2  -w 32768
-worker create r2-29:memnet -a -p -2   -w 10000 -o ATM:0:52
-worker create r2-29:readout -a -p -1  -w 32768
-worker create r2-24:memnet -a -p -1  -w 20000 -o ATM:0:53
+worker create r2-24:memnet -a -p -1  -w 20000 -o ATM:0:103
 worker create r2-24:readout -a -p -2  -w 32768
-worker create r2-14:memnet -a -p -1  -w 20000 -o ATM:0:54
+worker create r2-14:memnet -a -p -1  -w 20000 -o ATM:0:104
 worker create r2-14:readout -a -p -2  -w 32768
 group create acquisition
 group create run
@@ -28,8 +28,8 @@ group add acquisition r2-29:memnet
 group add acquisition r2-29:readout
 group add acquisition r2-14:memnet
 group add acquisition r2-14:readout
-group add run hadeb01:evtbuild
-group add run hadeb01:netmem
+group add run hadeb02:evtbuild
+group add run hadeb02:netmem
 
 set duringInit {
        {run_parallel_nov01 e7_25:tof1:init  e7_21:tof2:init e7_41:tof3:init r2-28:rich1:init r2-27:rich2:init r2-29:trigconc:init r2-24:rich0:init  r2-14:shw:init >>&hadaq.log}
@@ -39,7 +39,7 @@ set beforeStartAcq {
        {rsh -l hades r2-29 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc reset'} </dev/null >>&hadaq.log}
        {run_parallel_nov01 e7_25:tof1:reset  e7_21:tof2:reset e7_41:tof3:reset r2-28:rich1:reset r2-27:rich2:reset r2-24:rich0:reset r2-14:shw:reset >>&hadaq.log}
        {rsh -l hades r2-29 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc reset'} </dev/null >>&hadaq.log}
-       {run_parallel_nov01 e7_25:tof1:start  e7_21:tof2:start e7_41:tof3:start r2-28:rich1:start r2-27:rich2:start r2-29:trigconc:start r2-24:rich0:start  r2-14:shw:start >>&hadaq.log}
+       {run_parallel_nov01 e7_25:tof1:start  e7_21:tof2:start e7_41:tof3:start r2-28:rich1:start r2-27:rich2:start r2-24:rich0:start r2-14:shw:start >>&hadaq.log}
        {rsh -l hades r2-29 sh -c {'. bin/daqenv nov01; cd nov01/slow; ./trigconc start'} </dev/null >>&hadaq.log}
 }
 

diff --git a/hadaq/trig_rich_tof_shw_1mdc_nov01.tcl b/hadaq/trig_rich_tof_shw_1mdc_nov01.tcl
index f011dff3210f88c1ec90ab83db1efd06cd822b12..fbfcd22aa9a03b98ab02a6c8f0cafa6deb07e07e 100644 (file)
--- a/hadaq/trig_rich_tof_shw_1mdc_nov01.tcl
+++ b/hadaq/trig_rich_tof_shw_1mdc_nov01.tcl
@@ -8,17 +8,17 @@ agent create r2-8  hades /hades/usr/hades/nov01/mdc/hadaq
 
 worker create hadeb02:evtbuild -a -p -2 -m 6
 worker create hadeb02:netmem -a -p -1 -m 6 -i ATM:0:100 -i ATM:0:101 -i ATM:0:102 -i ATM:0:103 -i ATM:0:104 -i ATM:0:105
-worker create r2-29:memnet -a -p -2 -w 28481 -o ATM:0:100
+worker create r2-29:memnet -a -p -2 -w 32568 -o ATM:0:100
 worker create r2-29:readout -a -p -1 -w 8192
-worker create r2-14:memnet -a -p -2 -w 14768 -o ATM:0:101
-worker create r2-14:readout -a -p -1 -w 8192
-worker create r2-8:memnet -a -p -1 -w 30101 -o ATM:0:102
+worker create r2-8:memnet -a -p -1 -w 85333 -o ATM:0:101
 worker create r2-8:readout8 -a -p -2 -w 8192
-worker create r2-27:memnet -a -p -2 -w 6110 -o ATM:0:103
+worker create r2-14:memnet -a -p -2 -w 17200 -o ATM:0:102
+worker create r2-14:readout -a -p -1 -w 8192
+worker create r2-27:memnet -a -p -2 -w 6148 -o ATM:0:103
 worker create r2-27:readout -a -p -1 -w 8192
-worker create r2-28:memnet -a -p -2 -w 6146 -o ATM:0:104
+worker create r2-28:memnet -a -p -2 -w 6124 -o ATM:0:104
 worker create r2-28:readout -a -p -1 -w 8192
-worker create r2-24:memnet -a -p -2 -w 6186 -o ATM:0:105
+worker create r2-24:memnet -a -p -2 -w 7627 -o ATM:0:105
 worker create r2-24:readout -a -p -1 -w 8192
 
 group create acquisition