From a019852fe3d2872d3e21285db976c0141d84e3db Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 20 Jul 2012 09:43:11 +0000
Subject: [PATCH] Task #3250: Replaced path /opt/lofar/share with
/opt/lofar/var/run.
---
CEP/Pipeline/recipes/sip/bin/startPython.sh | 6 +++---
CEP/Pipeline/recipes/sip/pipeline.cfg.in | 2 +-
LCS/ApplCommon/include/ApplCommon/StationInfo.h | 4 ++--
MAC/APL/Appl_Controller/lofarDirs.h | 2 +-
MAC/APL/Appl_Controller/startAP.sh | 2 +-
MAC/APL/Appl_Controller/stopAP.sh | 6 +++---
MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc | 4 ++--
MAC/APL/TestCtlr/src/ControllerMenu.cc | 6 +++---
RTCP/CNProc/test/tCN_Processing_alloc.parset | 2 +-
RTCP/Storage/test/tMeasurementSetFormat.parset-j2000 | 2 +-
RTCP/Storage/test/tMeasurementSetFormat.parset-sun | 2 +-
SAS/Beaminfo/src/failedtilesinfo.cc | 4 ++--
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/CEP/Pipeline/recipes/sip/bin/startPython.sh b/CEP/Pipeline/recipes/sip/bin/startPython.sh
index 718f1dcafc7..11caabd5e7a 100755
--- a/CEP/Pipeline/recipes/sip/bin/startPython.sh
+++ b/CEP/Pipeline/recipes/sip/bin/startPython.sh
@@ -7,7 +7,7 @@
#
# For example:
#
-# startPython.sh ./pythonProgram /opt/lofar/share/Observation6118 \
+# startPython.sh ./pythonProgram /opt/lofar/var/run/Observation6118 \
# MCU001T MCU001T:PythonControl[0]{6118}:listener \
# PythonServer{6118}@MCU001T
#
@@ -23,7 +23,7 @@ shopt -s expand_aliases
debug=on
# Log-file used for logging output of this script
-logFile=/opt/lofar/log/startPython.log
+logFile=/opt/lofar/var/log/startPython.log
usage()
{
@@ -45,7 +45,7 @@ programOptions=" \
-d \
-c ${LOFARROOT}/share/pipeline/pipeline.cfg \
-t ${LOFARROOT}/share/pipeline/tasks.cfg \
- -r ${LOFARROOT}/share/pipeline \
+ -r ${LOFARROOT}/var/run/pipeline \
-w /data/scratch/${USER}"
# Print some debugging information if debugging is enabled.
diff --git a/CEP/Pipeline/recipes/sip/pipeline.cfg.in b/CEP/Pipeline/recipes/sip/pipeline.cfg.in
index 3190c9ca7fc..ceb34610738 100644
--- a/CEP/Pipeline/recipes/sip/pipeline.cfg.in
+++ b/CEP/Pipeline/recipes/sip/pipeline.cfg.in
@@ -5,7 +5,7 @@ pyraproot = @PYRAP_ROOT_DIR@
hdf5root = $ENV{HDF5_ROOT}
wcsroot = @WCSLIB_ROOT_DIR@
pythonpath = @PYTHON_INSTALL_DIR@
-runtime_directory = %(lofarroot)s/share/pipeline
+runtime_directory = %(lofarroot)s/var/run/pipeline
recipe_directories = [%(pythonpath)s/lofarpipe/recipes]
working_directory = /data/scratch/$ENV{USER}
task_files = [%(lofarroot)s/share/pipeline/tasks.cfg]
diff --git a/LCS/ApplCommon/include/ApplCommon/StationInfo.h b/LCS/ApplCommon/include/ApplCommon/StationInfo.h
index d37c7eb9b24..45ac4c2c743 100644
--- a/LCS/ApplCommon/include/ApplCommon/StationInfo.h
+++ b/LCS/ApplCommon/include/ApplCommon/StationInfo.h
@@ -39,8 +39,8 @@ namespace LOFAR {
#define LOFAR_BASE_LOCATION "/opt/lofar"
#define LOFAR_BIN_LOCATION "/opt/lofar/bin"
#define LOFAR_CONFIG_LOCATION "/opt/lofar/etc"
-#define LOFAR_SHARE_LOCATION "/opt/lofar/share"
-#define LOFAR_LOG_LOCATION "/opt/lofar/log"
+#define LOFAR_SHARE_LOCATION "/opt/lofar/var/run"
+#define LOFAR_LOG_LOCATION "/opt/lofar/var/log"
//
// Nameconventions dictate that the hostname has the following syntax:
diff --git a/MAC/APL/Appl_Controller/lofarDirs.h b/MAC/APL/Appl_Controller/lofarDirs.h
index facc48ccb56..9b24e38a61c 100644
--- a/MAC/APL/Appl_Controller/lofarDirs.h
+++ b/MAC/APL/Appl_Controller/lofarDirs.h
@@ -23,6 +23,6 @@
#ifndef ACCBIN_LOFARDIRS_H
#define ACCBIN_LOFARDIRS_H
-#define LOFAR_SHARE_LOCATION "/opt/lofar/share"
+#define LOFAR_SHARE_LOCATION "/opt/lofar/var/run"
#endif
diff --git a/MAC/APL/Appl_Controller/startAP.sh b/MAC/APL/Appl_Controller/startAP.sh
index cd645a5707d..ce8d145a1c5 100755
--- a/MAC/APL/Appl_Controller/startAP.sh
+++ b/MAC/APL/Appl_Controller/startAP.sh
@@ -21,4 +21,4 @@ $3 ACC $4 $2 &
pid=`echo $!`
# construct pid file for stop shell
-echo "$pid" > /opt/lofar/share/$2.pid
+echo "$pid" > /opt/lofar/var/run/$2.pid
diff --git a/MAC/APL/Appl_Controller/stopAP.sh b/MAC/APL/Appl_Controller/stopAP.sh
index 651e2dc6ed1..1984d5a8a53 100755
--- a/MAC/APL/Appl_Controller/stopAP.sh
+++ b/MAC/APL/Appl_Controller/stopAP.sh
@@ -9,6 +9,6 @@
# DISABLED this script: startBGL.sh starts all CEP processes
exit
-echo -n "Killing process "; cat /opt/lofar/share/$2.pid
-kill -9 `cat /opt/lofar/share/$2.pid`
-rm -f /opt/lofar/share/$2.pid /opt/lofar/share/$2.parset
+echo -n "Killing process "; cat /opt/lofar/var/run/$2.pid
+kill -9 `cat /opt/lofar/var/run/$2.pid`
+rm -f /opt/lofar/var/run/$2.pid /opt/lofar/var/run/$2.parset
diff --git a/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc
index 25296ce4a30..cc5906d4776 100644
--- a/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc
+++ b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc
@@ -412,8 +412,8 @@ void CEPlogProcessor::processParset( const std::string &observationID )
return;
}
- // parsets are in /opt/lofar/share
- string filename(formatString("/opt/lofar/share/Observation%s", observationID.c_str()));
+ // parsets are in /opt/lofar/var/run
+ string filename(formatString("/opt/lofar/var/run/Observation%s", observationID.c_str()));
ParameterSet parset(filename);
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.cc b/MAC/APL/TestCtlr/src/ControllerMenu.cc
index 9f115e11fb1..3b5f72df37d 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.cc
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.cc
@@ -547,8 +547,8 @@ void ControllerMenu::_doStartMenu()
{
cout << endl;
cout << "You need an exportFile from OTDB containing an Observation." << endl;
- cout << "Its name has the format /opt/lofar/share/Observation<nr>." << endl;
- string command("ls -1 /opt/lofar/share/Observation[0-9]*");
+ cout << "Its name has the format /opt/lofar/var/run/Observation<nr>." << endl;
+ string command("ls -1 /opt/lofar/var/run/Observation[0-9]*");
system(command.c_str());
int32 obsnr(-1);
@@ -562,7 +562,7 @@ void ControllerMenu::_doStartMenu()
return;
}
ifstream iFile;
- string obsFileName(formatString("/opt/lofar/share/Observation%d", obsnr));
+ string obsFileName(formatString("/opt/lofar/var/run/Observation%d", obsnr));
iFile.open(obsFileName.c_str(), ifstream::in);
if (!iFile) {
cout << endl << "Cannot open file " << obsFileName << endl;
diff --git a/RTCP/CNProc/test/tCN_Processing_alloc.parset b/RTCP/CNProc/test/tCN_Processing_alloc.parset
index 0e5bde80773..bc489a5b1d7 100644
--- a/RTCP/CNProc/test/tCN_Processing_alloc.parset
+++ b/RTCP/CNProc/test/tCN_Processing_alloc.parset
@@ -1,7 +1,7 @@
ApplCtrl.application = CorrAppl
ApplCtrl.procesOrder = []
ApplCtrl.processes = [CorrProc]
-ApplCtrl.resultfile = '/opt/lofar/share/ACC_CCU001:OnlineControl[0]{31821}_CorrAppl_result.param'
+ApplCtrl.resultfile = '/opt/lofar/var/run/ACC_CCU001:OnlineControl[0]{31821}_CorrAppl_result.param'
ApplCtrl.timeout_createsubsets = 30s
ApplCtrl.timeout_define = 30s
ApplCtrl.timeout_info = 30s
diff --git a/RTCP/Storage/test/tMeasurementSetFormat.parset-j2000 b/RTCP/Storage/test/tMeasurementSetFormat.parset-j2000
index bd6e73f0054..4b18640835c 100644
--- a/RTCP/Storage/test/tMeasurementSetFormat.parset-j2000
+++ b/RTCP/Storage/test/tMeasurementSetFormat.parset-j2000
@@ -1,7 +1,7 @@
ApplCtrl.application = CorrAppl
ApplCtrl.procesOrder = []
ApplCtrl.processes = [CNProc]
-ApplCtrl.resultfile = '/opt/lofar/share/ACC_CCU001:OnlineControl[0]{24523}_CorrAppl_result.param'
+ApplCtrl.resultfile = '/opt/lofar/var/run/ACC_CCU001:OnlineControl[0]{24523}_CorrAppl_result.param'
ApplCtrl.timeout_createsubsets = 3m
ApplCtrl.timeout_define = 40
ApplCtrl.timeout_info = 30
diff --git a/RTCP/Storage/test/tMeasurementSetFormat.parset-sun b/RTCP/Storage/test/tMeasurementSetFormat.parset-sun
index f03080e0b67..8e8bd1da6cb 100644
--- a/RTCP/Storage/test/tMeasurementSetFormat.parset-sun
+++ b/RTCP/Storage/test/tMeasurementSetFormat.parset-sun
@@ -1,7 +1,7 @@
ApplCtrl.application = CorrAppl
ApplCtrl.procesOrder = []
ApplCtrl.processes = [CNProc]
-ApplCtrl.resultfile = '/opt/lofar/share/ACC_CCU001:OnlineControl[0]{24523}_CorrAppl_result.param'
+ApplCtrl.resultfile = '/opt/lofar/var/run/ACC_CCU001:OnlineControl[0]{24523}_CorrAppl_result.param'
ApplCtrl.timeout_createsubsets = 3m
ApplCtrl.timeout_define = 40
ApplCtrl.timeout_info = 30
diff --git a/SAS/Beaminfo/src/failedtilesinfo.cc b/SAS/Beaminfo/src/failedtilesinfo.cc
index 880d0dee591..404d3c78498 100644
--- a/SAS/Beaminfo/src/failedtilesinfo.cc
+++ b/SAS/Beaminfo/src/failedtilesinfo.cc
@@ -145,8 +145,8 @@ int main (int argc, char* argv[])
string password = parset.getString("password", "boskabouter");
string port = parset.getString("port", "5432");
// Locations to save SAS hardware strings of broken and failed tiles to
- string brokenfilename = parset.getString("brokenTilesFile", "/opt/lofar/share/brokenTiles.txt");
- string failedfilename = parset.getString("failedTilesFile", "/opt/lofar/share/failedTiles.txt");
+ string brokenfilename = parset.getString("brokenTilesFile", "/opt/lofar/var/run/brokenTiles.txt");
+ string failedfilename = parset.getString("failedTilesFile", "/opt/lofar/var/run/failedTiles.txt");
//---------------------------------------------------------------------
// Handle observation starttime and endtime
--
GitLab