diff --git a/MAC/APL/Appl_Controller/startBGL.sh b/MAC/APL/Appl_Controller/startBGL.sh index 1f694b0a535c18c7443ddafae4b9b0aea9cbd89c..0a9a2e50e6819afa4bd568026aeec85b1e2de097 100755 --- a/MAC/APL/Appl_Controller/startBGL.sh +++ b/MAC/APL/Appl_Controller/startBGL.sh @@ -12,16 +12,12 @@ # # all ACC processes expect to be started with "ACC" as first parameter +. /opt/lofar/etc/BlueGeneControl.conf # startBGL starts specific CEP run scripts directly PARSET=/opt/lofar/share/CNProc.parset -PARTITION=$2 sed -i 's/.*OLAP.CNProc.integrationSteps.*//' $PARSET sed -i 's/.*OLAP.IONProc.integrationSteps.*//' $PARSET -/opt/lofar/bin/runParset.py -P $PARTITION parset=$PARSET >>/opt/lofar/log/run.runParset.py.log 2>&1 & - -#echo "executing /usr/local/bin/submitjob $2 $3 $4 virtual_node_mode BGLMPI_SIZE=$6 ACC $5" > startBGL.output -#/usr/local/bin/submitjob $2 $3 $4 virtual_node_mode BGLMPI_SIZE=$6 ACC $5 2>&1 | awk '{split($1, a, "="); print a[2];}' > $1.jobID - +$BINPATH/runParset.py -P $PARTITION parset=$PARSET >>/opt/lofar/log/run.runParset.py.log 2>&1 & diff --git a/RTCP/Run/src/BlueGeneControl.conf b/RTCP/Run/src/BlueGeneControl.conf index 5ff14d23a056268bf01c123e36fb049531aed15f..c2600a8dac861ebdd9c86c7759c0a71e25f80eb7 100644 --- a/RTCP/Run/src/BlueGeneControl.conf +++ b/RTCP/Run/src/BlueGeneControl.conf @@ -1,5 +1,5 @@ # BG/P Partition to use for the correlator -PARTITION=R01 +PARTITION=R00 # Root directory for the binaries BINPATH=/opt/lofar/bin @@ -8,5 +8,6 @@ BINPATH=/opt/lofar/bin PIDFILE=/tmp/BlueGeneControl-$PARTITION.pid # Location of log file -LOGFILE=/opt/lofar/log/BlueGeneControl.log +LOGDIR=/opt/lofar/log +LOGFILE=$LOGFILE/BlueGeneControl.log diff --git a/RTCP/Run/src/LOFAR/Locations.py b/RTCP/Run/src/LOFAR/Locations.py index 47dbca05fe57eb2606aae82e91894d3f4f13aade..e434fe192fdd81dd12e915b1ce6bbda6bbe4c702 100644 --- a/RTCP/Run/src/LOFAR/Locations.py +++ b/RTCP/Run/src/LOFAR/Locations.py @@ -125,18 +125,18 @@ class Locations: # where to start the executables. rundir needs to be reachable # for all sections. - "rundir": "${BASEDIR}/bgfen/log/L${TIMESTAMP}", + "rundir": "${HOME}/log/L${TIMESTAMP}", # where to store logs - "logdir": "${BASEDIR}/bgfen/log/L${TIMESTAMP}", + "logdir": "${HOME}/log/L${TIMESTAMP}", # where configuration files are kept "configdir": "${BASEDIR}/bgfen/etc", # symlink for each observation to relevant log dir - "obssymlink": "${BASEDIR}/bgfen/log/L${MSNUMBER}", + "obssymlink": "${HOME}/log/L${MSNUMBER}", - "logsymlink": "${BASEDIR}/bgfen/log/latest", + "logsymlink": "${HOME}/log/latest", # location of valgrind suppressions file "ionsuppfile": "",