Task #2862: ApplController now generates a parset filename using the obsid,...

Task #2862: ApplController now generates a parset filename using the obsid, and removed the depricated search for CNProc.parset

MAC/APL/Appl_Controller/ApplController.cc

@@ -298,8 +298,6 @@ void ApplController::createParSubsets()
 		// The startstopType determines what information is put in the parsetfiles
 		// for the processes.
 		string startstopType = itsObsParamSet->getString(procPrefix+"._startstopType");
-		string fileName 	 = string(LOFAR_SHARE_LOCATION) + "/" + procName + ".parset";
-
 		LOG_DEBUG_STR("Creating parameterfile for process " << procName);
 
 		// [A] Get the default parameters ( procName[0].* ) when procname changes
@@ -318,6 +316,8 @@ void ApplController::createParSubsets()
 			prevProcName = procName;
 		}
 
+		string fileName 	 = formatString("%s/%s-%s.parset", LOFAR_SHARE_LOCATION, procName.c_str(), basePS.getString("Observation.ObsID").c_str());
+
 		// --- cmdline ---
 		if (startstopType == "cmdline") {
 			if (nrProcs == 0) {
@@ -355,7 +355,7 @@ void ApplController::createParSubsets()
 					// copy the default PS and give it a new prefix
 //					myPS.adoptCollection(itsObsParamSet->makeSubset(procPrefix+".",
 //																	procPrefix+"."));
-					fileName  = string(LOFAR_SHARE_LOCATION) + "/" + pName + ".parset";
+					fileName  = formatString("%s/%s-%s.parset", LOFAR_SHARE_LOCATION, pName.c_str(), basePS.getString("Observation.ObsID").c_str());
 					writeParSubset(myPS, pName, fileName);
 
 					// note: nodes[] may be smaller than nrProcs. by taking the remainder

MAC/APL/Appl_Controller/startBGL.sh

@@ -3,8 +3,8 @@
 # jobName
 # executable      executable file (should be in a place that is readable from BG/L)
 # workingDir      directory for output files (should be readable by BG/L)
-# observationID   observation number
 # parameterfile   jobName.ps
+# observationID   observation number
 # noNodes         number of nodes of the partition to use
 #
 # start the job and stores the jobID in jobName.jobID
@@ -12,22 +12,11 @@
 # all ACC processes expect to be started with "ACC" as first parameter
 
 JOBNAME=$1
+PARSET=$4
+OBSID=$5
 
 . /opt/lofar/etc/BlueGeneControl.conf
 
-# Select the newest parset in the list. Multiple file names are supported
-# to allow cooperation with different versions of ApplController/ACDaemon
-
-PARSETS="/opt/lofar/share/CorrProc.parset /opt/lofar/share/CNProc.parset"
-PARSET=""
-for p in $PARSETS
-do
-  if [ "$PARSET" = "" ] || [ $PARSET -ot $p ]
-  then
-    PARSET=$p
-  fi
-done
-
 # Remove values which runParset should derive
 sed -i 's/.*OLAP.CNProc.integrationSteps.*//' $PARSET
 sed -i 's/.*OLAP.IONProc.integrationSteps.*//' $PARSET