From 8d80a03a8878db8d25ee43de15213556a08d9ec7 Mon Sep 17 00:00:00 2001
From: Adriaan Renting <renting@astron.nl>
Date: Thu, 29 Mar 2018 14:36:18 +0000
Subject: [PATCH] SW-227: Cleaner code for generating the feedback version
number.
---
RTCP/Cobalt/CoInterface/src/LTAFeedback.h | 10 +++++-----
SAS/XSD/SAS/LofarBase.xsd | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/RTCP/Cobalt/CoInterface/src/LTAFeedback.h b/RTCP/Cobalt/CoInterface/src/LTAFeedback.h
index 6a2608e8f29..6e7d560d9cd 100644
--- a/RTCP/Cobalt/CoInterface/src/LTAFeedback.h
+++ b/RTCP/Cobalt/CoInterface/src/LTAFeedback.h
@@ -60,11 +60,11 @@ namespace LOFAR
// Package (sip) for the LTA.
// \see http://proposal.astron.nl/schemas/LTA-SIP.xsd
ParameterSet allFeedback() const;
- const int major_version = 3;
- const int minor_version = 1;
- const int patch_number = 0;
- const std::string feedback_version = std::str(boost::format("%02d.%02d.%02d") %
- major_version % minor_version % patch_number);
+ static const int major_version = 3;
+ static const int minor_version = 1;
+ static const int patch_number = 0;
+ static const std::string feedback_version = boost::str(boost::format("%02d.%02d.%02d")
+ % major_version % minor_version % patch_number);
private:
const ObservationSettings settings;
diff --git a/SAS/XSD/SAS/LofarBase.xsd b/SAS/XSD/SAS/LofarBase.xsd
index 84e9656811d..20fa87e6043 100644
--- a/SAS/XSD/SAS/LofarBase.xsd
+++ b/SAS/XSD/SAS/LofarBase.xsd
@@ -405,6 +405,9 @@
</xsd:sequence>
</xsd:complexType>
<!-- Calibration Pipeline related declarations -->
+<!-- FIXME: The Calibration Pipeline should have BbsParameters while the Averaging Pipeline does not, but for backward
+compatibility with MoM it is currently not defined that way, making them identical. When support for MoM 3 can be dropped
+this should be fixed. -->
<xsd:complexType name="CalibrationPipeline">
<xsd:complexContent>
<xsd:extension base="AveragingPipeline"><!-- Untested if this works properly -->
--
GitLab