From c6ff24e425fc33ce5c70a0584e2c9d0bf1c791af Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Tue, 21 Feb 2012 13:02:28 +0000
Subject: [PATCH] Task #3048: Merging all changes in release branch
LOFAR-Release-0.91 to trunk
---
CMake/variants/variants.kis001 | 1 +
LCS/ApplCommon/src/Observation.cc | 3 +--
MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.conf | 2 +-
MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in | 2 +-
MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMake/variants/variants.kis001 b/CMake/variants/variants.kis001
index 3ff8ef847f7..7b56af9f88e 100644
--- a/CMake/variants/variants.kis001
+++ b/CMake/variants/variants.kis001
@@ -1,6 +1,7 @@
set(ENV{JAVA_HOME} /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0)
set(PVSS_ROOT_DIR /opt/pvss/pvss2_v3.7)
set(PVSS_DEFINITIONS "-Wno-deprecated")
+set(LOG4CPLUS_ROOT_DIR "/usr/local/log4cplus")
set(CTEST_CUSTOM_WARNING_EXCEPTION
"/boost/date_time/time_facet.hpp:[0-9]+: warning: unused parameter"
diff --git a/LCS/ApplCommon/src/Observation.cc b/LCS/ApplCommon/src/Observation.cc
index 527ca564944..99ae3fcff75 100644
--- a/LCS/ApplCommon/src/Observation.cc
+++ b/LCS/ApplCommon/src/Observation.cc
@@ -144,8 +144,7 @@ Observation::Observation(const ParameterSet* aParSet,
}
// determine if DataslotLists are available in this parset
- LOG_DEBUG_STR(str(format("Dataslots.%s%s.DataslotList") % stations[0] % getAntennaFieldName(itsStnHasDualHBA)));
- itsHasDataslots = aParSet->isDefined(prefix+str(format("Dataslots.%s%s.DataslotList") % stations[0] % getAntennaFieldName(itsStnHasDualHBA)));
+ itsHasDataslots = !stations.empty() && aParSet->isDefined(prefix+str(format("Dataslots.%s%s.DataslotList") % stations[0] % getAntennaFieldName(itsStnHasDualHBA)));
if (itsHasDataslots) {
itsDataslotParset = aParSet->makeSubset(prefix+"Dataslots."); // save subset for later
}
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.conf b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.conf
index c22934caf86..82f960eb7b1 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.conf
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.conf
@@ -1,6 +1,6 @@
#
#
#
-SASGateway.OTDBdatabase = LOFAR_3
+SASGateway.OTDBdatabase = LOFAR_4
SASGateway.OTDBhostname = sas001
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in
index 09f8999008e..5d9e0988dbb 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in
@@ -1,7 +1,7 @@
# Startup parameters for the MACScheduler.
# OTDB connection info
-OTDBdatabasename = LOFAR_3
+OTDBdatabasename = LOFAR_4
OTDBhostname = sas001
OTDBusername = paulus
OTDBpassword = boskabouter
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
index 25a8d2cbccf..c3570a9f3c8 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
@@ -292,9 +292,9 @@ GCFEvent::TResult ObsClaimer::preparePVSS_state (GCFEvent& event, GCFPortInterfa
for (uint32 b(0); b < theObs.beams.size(); b++) {
for (uint32 t(0); t < theObs.beams[b].TABs.size(); t++) {
beamIndexArr.push_back (new GCFPVInteger(b));
- angle1Arr.push_back (new GCFPVDouble(theObs.beams[b].TABs[t].angle1));
- angle2Arr.push_back (new GCFPVDouble(theObs.beams[b].TABs[t].angle2));
- dirTypesArr.push_back (new GCFPVString(theObs.beams[b].TABs[t].directionType));
+ TABangle1Arr.push_back (new GCFPVDouble(theObs.beams[b].TABs[t].angle1));
+ TABangle2Arr.push_back (new GCFPVDouble(theObs.beams[b].TABs[t].angle2));
+ TABdirTypesArr.push_back (new GCFPVString(theObs.beams[b].TABs[t].directionType));
dispersionArr.push_back (new GCFPVDouble(theObs.beams[b].TABs[t].dispersionMeasure));
coherentArr.push_back (new GCFPVBool(theObs.beams[b].TABs[t].coherent));
}
@@ -305,7 +305,7 @@ GCFEvent::TResult ObsClaimer::preparePVSS_state (GCFEvent& event, GCFPortInterfa
theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_ANGLE1, GCFPVDynArr(LPT_DYNDOUBLE, TABangle1Arr), 0.0, false);
theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_ANGLE2, GCFPVDynArr(LPT_DYNDOUBLE, TABangle2Arr), 0.0, false);
theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_DIRECTION_TYPE, GCFPVDynArr(LPT_DYNSTRING, TABdirTypesArr), 0.0, false);
- theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_DISPERSION, GCFPVDynArr(LPT_DYNSTRING, dispersionArr), 0.0, false);
+ theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_DISPERSION, GCFPVDynArr(LPT_DYNDOUBLE, dispersionArr), 0.0, false);
theObsPS->setValue(PN_OBS_TIED_ARRAY_BEAMS_COHERENT, GCFPVDynArr(LPT_DYNBOOL, coherentArr), 0.0, false);
theObsPS->flush();
--
GitLab