Task #3878: Merge from release to trunk of parmexportcal selection from parset...

Task #3878: Merge from release to trunk of parmexportcal selection from parset for the calibrator pipeline

CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py

@@ -289,14 +289,9 @@ class msss_calibrator_pipeline(control):
         #    Swapping outliers in the gains with the median 
         # Export the calibration solutions using gainoutliercorrection and store
         # the results in the files specified in the instrument mapfile.
-        try:
-            export_instrument_model = eval(py_parset.getString(
-                'Calibration.export_instrument_model'))
-        except:
-            export_instrument_model = True
+        export_instrument_model = py_parset.getBool(
+            'Calibration.exportCalibrationParameters', False)
 
-#        export_instrument_model = eval(py_parset.getString(
-#            'Calibration.export_instrument_model'))
         with duration(self, "gainoutliercorrection"):
             self.run_task("gainoutliercorrection",
                       (parmdb_mapfile, instrument_mapfile),

MAC/Deployment/data/OTDB/Calibration.comp

@@ -6,7 +6,8 @@
 #--------------------------------------------------------------------------------------------------------
 node  Calibration  4.0.0  development 'node constraint'  "Calibration pipeline"
 
-#    name                    dir. type   unit   prun. vm   value                constr.  descr.
+#    name                          dir. type   unit   prun. vm   value                constr.  descr.
 #--------------------------------------------------------------------------------------------------------
-par  CalibratorSource        I    text   -	100   0    ''                   -        "Calibrator source for generation of instrument model"
-par  SkyModel                I    text   -      100   0    ''                   -        "User-supplied sky model for generic calibration pipeline"
+par  CalibratorSource              I    text   -      100   0    ''                   -        "Calibrator source for generation of instrument model"
+par  SkyModel                      I    text   -      100   0    ''                   -        "User-supplied sky model for generic calibration pipeline"
+par  exportCalibrationParameters   I    bool   -      100   0    'false'              -        "export the instrument model parameters using parmexportcal"