From 1d88d39a81a1541c459102710fee76ffb1d13a15 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 12 Mar 2009 10:07:35 +0000
Subject: [PATCH] Bug 1284: Controllers we still trying to find their old name
in the parsetfiles.
---
MAC/APL/APLCommon/src/ControllerDefines.cc | 34 +++++++++----------
.../ObservationControl/ObservationControl.cc | 11 +++---
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/MAC/APL/APLCommon/src/ControllerDefines.cc b/MAC/APL/APLCommon/src/ControllerDefines.cc
index b343fc51615..efa02f729d9 100644
--- a/MAC/APL/APLCommon/src/ControllerDefines.cc
+++ b/MAC/APL/APLCommon/src/ControllerDefines.cc
@@ -46,23 +46,23 @@ typedef struct cntlrDefinition {
} cntlrDefinition_t;
static cntlrDefinition_t controllerTable[] = {
-// executable parsetNode shared
-//----------------------------------------------------------
- { "", "", false },
- { "MACScheduler", "MACScheduler", false },
- { "ObservationControl", "ObsCtrl", false },
- { "OnlineControl", "OnlineCtrl", false },
- { "OfflineControl", "OfflineCtrl", false },
- { "BeamDirectionControl", "BeamDirCtrl", true },
- { "RingControl", "RingCtrl", true },
- { "StationControl", "StationCtrl", true },
- { "ClockControl", "ClockCtrl", true },
- { "BeamControl", "BeamCtrl", false },
- { "CalibrationControl", "CalCtrl", false },
- { "TBBControl", "TBBCtrl", false },
- { "StationInfraControl", "StsInfraCtrl", true },
- { "TestController", "TestCtrl", false },
- { "", "", false }
+// executable parsetNode shared
+//--------------------------------------------------------------------
+ { "", "", false },
+ { "MACScheduler", "MACScheduler", false },
+ { "ObservationControl", "ObservationControl", false },
+ { "OnlineControl", "OnlineControl", false },
+ { "OfflineControl", "OfflineControl", false },
+ { "BeamDirectionControl", "BeamDirControl", true },
+ { "RingControl", "RingControl", true },
+ { "StationControl", "StationControl", true },
+ { "ClockControl", "ClockControl", true },
+ { "BeamControl", "BeamControl", false },
+ { "CalibrationControl", "CalControl", false },
+ { "TBBControl", "TBBControl", false },
+ { "StationInfraControl", "StsInfraControl", true },
+ { "TestController", "TestControl", false },
+ { "", "", false }
};
static char* modeNameTable[] = {
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index d920b5ca424..69033318af5 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -95,10 +95,12 @@ ObservationControl::ObservationControl(const string& cntlrName) :
itsPreparePeriod = globalParameterSet()->getTime ("Observation.preparePeriod");
// My own parameters
- itsTreePrefix = globalParameterSet()->getString("prefix");
- itsTreeID = globalParameterSet()->getUint32("_treeID"); // !!!
- itsHeartBeatItv = globalParameterSet()->getUint32("heartbeatInterval");
- itsObsDPname = globalParameterSet()->getString("_DPname");
+ string moduleName = globalParameterSet()->getString("_moduleName");
+ string modulePrefix = globalParameterSet()->locateModule(moduleName)+moduleName+".";
+ itsTreePrefix = globalParameterSet()->getString("prefix");
+ itsTreeID = globalParameterSet()->getUint32("_treeID"); // !!!
+ itsHeartBeatItv = globalParameterSet()->getUint32(modulePrefix + "heartbeatInterval");
+ itsObsDPname = globalParameterSet()->getString("_DPname");
// The time I have to wait for the forced quit depends on the integration time of OLAP
string OLAPpos = globalParameterSet()->locateModule("OLAP");
@@ -107,7 +109,6 @@ ObservationControl::ObservationControl(const string& cntlrName) :
LOG_DEBUG_STR ("Timer for forcing quit is set to " << itsForcedQuitDelay);
// Inform Logging manager who we are
-// LOG_INFO(formatString("MACProcessScope: LOFAR.ObsSW.Observation%d.ObservationControl", itsTreeID));
LOG_INFO_STR("MACProcessScope: " << createPropertySetName(PSN_OBS_CTRL, getName(), itsObsDPname));
// NOTE: SAS gateway is not yet aware of claimMgr so the data will not be transferred to SAS.
--
GitLab