diff --git a/CEP/DP3/DPPP/src/DPRun.cc b/CEP/DP3/DPPP/src/DPRun.cc index 213a0e7c3f2ae0c834e9b5b091db917b14689f4b..04635bd542a2074a61517bce32fed845e0b2d085 100644 --- a/CEP/DP3/DPPP/src/DPRun.cc +++ b/CEP/DP3/DPPP/src/DPRun.cc @@ -54,6 +54,7 @@ #include <casacore/casa/OS/DirectoryIterator.h> #include <casacore/casa/OS/Timer.h> #include <casacore/casa/OS/DynLib.h> +#include <casacore/casa/Utilities/Regex.h> namespace LOFAR { namespace DPPP { @@ -280,8 +281,12 @@ namespace LOFAR { for (vector<string>::const_iterator iter = steps.begin(); iter != steps.end(); ++iter) { string prefix(*iter + '.'); - // The name is the default step type. - string type = toLower(parset.getString (prefix+"type", *iter)); + // The alphabetic part of the name is the default step type. + // This allows names like average1, out3. + int res = casacore::Regex("[a-z]+").match((*iter).c_str(), (*iter).size()); + string defaulttype = (*iter).substr(0,res); + + string type = toLower(parset.getString (prefix+"type", defaulttype)); // Define correct name for AOFlagger synonyms. if (type == "aoflagger" || type == "rficonsole") { type = "aoflag";