diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategyreader.h b/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategyreader.h index dab74776c71644920345baa414c381aade47b3d6..f0944b12bf9ef3a952b485477890b35ad6eddf1a 100644 --- a/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategyreader.h +++ b/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategyreader.h @@ -79,6 +79,7 @@ class StrategyReader { class Action *parseIterationBlock(xmlNode *node); class Action *parsePlotAction(xmlNode *node); class Action *parseQuickCalibrateAction(xmlNode *node); + class Action *parseRawAppenderAction(xmlNode *node); class Action *parseSetFlaggingAction(xmlNode *node); class Action *parseSetImageAction(xmlNode *node); class Action *parseSlidingWindowFitAction(xmlNode *node); diff --git a/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategywriter.h b/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategywriter.h index 3d79bc5ac877bea77cb9fdd9c52b26d6a1d4098c..2c09c84dbf86560eab72053603dc54f3d7df75c0 100644 --- a/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategywriter.h +++ b/CEP/DP3/AOFlagger/include/AOFlagger/strategy/control/strategywriter.h @@ -94,6 +94,7 @@ namespace rfiStrategy { void writeIterationBlock(const class IterationBlock &action); void writePlotAction(const class PlotAction &action); void writeQuickCalibrateAction(const class QuickCalibrateAction &action); + void writeRawAppenderAction(const class RawAppenderAction &action); void writeSetFlaggingAction(const class SetFlaggingAction &action); void writeSetImageAction(const class SetImageAction &action); void writeSlidingWindowFitAction(const class SlidingWindowFitAction &action); diff --git a/CEP/DP3/AOFlagger/src/strategy/control/strategyreader.cpp b/CEP/DP3/AOFlagger/src/strategy/control/strategyreader.cpp index 93b72dc71bec5fdada575f867c8ee7cfbfaff454..50014cbd449f86c28fbd4510e5cf34b1e4e484b1 100644 --- a/CEP/DP3/AOFlagger/src/strategy/control/strategyreader.cpp +++ b/CEP/DP3/AOFlagger/src/strategy/control/strategyreader.cpp @@ -43,6 +43,7 @@ #include <AOFlagger/strategy/actions/iterationaction.h> #include <AOFlagger/strategy/actions/plotaction.h> #include <AOFlagger/strategy/actions/quickcalibrateaction.h> +#include <AOFlagger/strategy/actions/rawappenderaction.h> #include <AOFlagger/strategy/actions/setflaggingaction.h> #include <AOFlagger/strategy/actions/setimageaction.h> #include <AOFlagger/strategy/actions/slidingwindowfitaction.h> @@ -276,7 +277,9 @@ Action *StrategyReader::parseAction(xmlNode *node) else if(typeStr == "PlotAction") newAction = parsePlotAction(node); else if(typeStr == "QuickCalibrateAction") - newAction = parseQuickCalibrateAction(node); + newAction = parseQuickCalibrateAction(node); + else if(typeStr == "RawAppenderAction") + newAction = parseRawAppenderAction(node); else if(typeStr == "SetFlaggingAction") newAction = parseSetFlaggingAction(node); else if(typeStr == "SetImageAction") @@ -586,6 +589,12 @@ Action *StrategyReader::parseQuickCalibrateAction(xmlNode *) return newAction; } +Action *StrategyReader::parseRawAppenderAction(xmlNode *) +{ + RawAppenderAction *newAction = new RawAppenderAction(); + return newAction; +} + class Action *StrategyReader::parseSetImageAction(xmlNode *node) { SetImageAction *newAction = new SetImageAction(); diff --git a/CEP/DP3/AOFlagger/src/strategy/control/strategywriter.cpp b/CEP/DP3/AOFlagger/src/strategy/control/strategywriter.cpp index bc786e7a7610f23cc027d0deb30dbdc59edd811d..91db62daf33fcfd2239269da3f1c14d69342716d 100644 --- a/CEP/DP3/AOFlagger/src/strategy/control/strategywriter.cpp +++ b/CEP/DP3/AOFlagger/src/strategy/control/strategywriter.cpp @@ -42,6 +42,7 @@ #include <AOFlagger/strategy/actions/iterationaction.h> #include <AOFlagger/strategy/actions/plotaction.h> #include <AOFlagger/strategy/actions/quickcalibrateaction.h> +#include <AOFlagger/strategy/actions/rawappenderaction.h> #include <AOFlagger/strategy/actions/setflaggingaction.h> #include <AOFlagger/strategy/actions/setimageaction.h> #include <AOFlagger/strategy/actions/slidingwindowfitaction.h> @@ -127,9 +128,9 @@ namespace rfiStrategy { case DirectionProfileActionType: writeDirectionProfileAction(static_cast<const DirectionProfileAction&>(action)); break; - case EigenValueVerticalActionType: - writeEigenValueVerticalAction(static_cast<const EigenValueVerticalAction&>(action)); - break; + case EigenValueVerticalActionType: + writeEigenValueVerticalAction(static_cast<const EigenValueVerticalAction&>(action)); + break; case ForEachBaselineActionType: writeForEachBaselineAction(static_cast<const ForEachBaselineAction&>(action)); break; @@ -166,6 +167,9 @@ namespace rfiStrategy { case QuickCalibrateActionType: writeQuickCalibrateAction(static_cast<const QuickCalibrateAction&>(action)); break; + case RawAppenderActionType: + writeRawAppenderAction(static_cast<const RawAppenderAction&>(action)); + break; case SetFlaggingActionType: writeSetFlaggingAction(static_cast<const SetFlaggingAction&>(action)); break; @@ -407,6 +411,11 @@ namespace rfiStrategy { Attribute("type", "QuickCalibrateAction"); } + void StrategyWriter::writeRawAppenderAction(const RawAppenderAction &) + { + Attribute("type", "RawAppenderAction"); + } + void StrategyWriter::writeSetFlaggingAction(const SetFlaggingAction &action) { Attribute("type", "SetFlaggingAction");