casa / casa6 / ed483931080

Commits

Takahiro Tsutsumi authored and Ville Suoranta committed ed483931080 Merge 29 Feb 2024

Pull request #781: CAS-13359

Merge in CASA/casa6 from CAS-13359 to master

* commit '5c33a81582dbdaa21dea29ccb23df972dbfae96c':
  Now usescratch's default is True in setjy, modified setjy command in test_model_keys to explicitly set usescatch=False
  Add a test for the exception handling
  Modify to use RuntimeError rather than generic Exception and the boolean comparison to follow PEP8
  Minor edit to retrigger build
  A minor edit in the xml help doc
  Change the default for usescratch to True. Catch to raise an exception when Butler-JPL-Horizons and usescratch = False are set.

casatasks/src/private/task_setjy.py

Modified

-11
+# available
-12
+# Here: defaultRoots is defined differently for CASA6 and CASA5 and
-13
+# that values is used as the default value for the roots parameter in
-14
+# findCalModels.
-15
+# Inside findCalModels there is a new section at the top to use
-16
+# ctsys.resolve to make the initial attempt to find the models.
-17
+# If that fails or is unavailable it falls back to the CASA5 code.
-18
-19
+# get is_python3 and is_CASA6
-20
+from casatasks.private.casa_transition import *
--
+if is_CASA6:
--
+    from .setjy_helper import *
--
+    from .parallel.parallel_data_helper import ParallelDataHelper
--
+    from .parallel.parallel_task_helper import ParallelTaskHelper
--
+    from .mstools import write_history
--
+    from casatools import ctsys, ms, imager, calibrater
--
+    from casatasks import casalog
--
--
+    # used in one type comparison
--
+    strType = str
--
--
+    # default roots argument for findCalModels
--
+    defaultRoots = ['.']
--
+else:
--
+    from setjy_helper import *
--
+    from taskinit import *
--
+    from taskinit import mstool as ms
--
+    from taskinit import imtool as imager
--
+    from taskinit import cbtool as calibrater
--
+    from mstools import write_history
--
+    from parallel.parallel_data_helper import ParallelDataHelper
--
+    from parallel.parallel_task_helper import ParallelTaskHelper
--
--
+    # used in one type comparison
--
+    strType = string
--
--
+    # default roots argument for findCalModels
--
+    defaultRoots = ['.', casa['dirs']['data']]
-+
+from .setjy_helper import *
-+
+from .parallel.parallel_data_helper import ParallelDataHelper
-+
+from .parallel.parallel_task_helper import ParallelTaskHelper
-+
+from .mstools import write_history
-+
+from casatools import ctsys, ms, imager, calibrater
-+
+from casatasks import casalog
-+
-+
+# used in one type comparison
-+
+strType = str
-+
-+
+# default roots argument for findCalModels
-+
+defaultRoots = ['.']
-33
-34
+# Helper class for Multi-MS processing (by SC)
-35
+class SetjyHelper():
-36
+    def __init__(self, msfile=None):
-37
+        self.__msfile = msfile
-38
-39
+    def resetModelCol(self):
-40
+        rstatus = True
-41
+        # Hide the log info
-42
+        casalog.post("Resetting the log filter to WARN", "DEBUG")
-179
+                ssmoddirs=None
-180
+                for d in calmoddirs:
-181
+                    lsmodims(d)
-182
-183
+        # Actual operation, when either the MODEL_DATA column or visibility model header are set
-184
+        else:
-185
+            if not os.path.isdir(vis):
-186
+              #casalog.post(vis + " must be a valid MS unless listmodels is True.",
-187
+              #             "SEVERE")
-188
+                raise Exception("%s is not a valid MS" % vis)
--
-+
+            if 'Butler-JPL-Horizons' in standard and not usescratch:
-+
+                raise RuntimeError(f"usescratch={usescratch} and standard={standard}. "
-+
+                  +"Virtual model can not be used for an ephemeris object calibrator. Use usescratch=True.")
-192
+            myms = ms()
-193
+            myim = imager()
-194
+            if ismms==None: ismms=False
-195
+            if type(vis) == str and os.path.isdir(vis):
-196
+                n_selected_rows = nselrows(vis, field, spw, observation, timerange, scan, intent, usescratch, ismms)
-197
+                # jagonzal: When  usescratch=True, creating the MODEL column only on a sub-set of
-198
+                # Sub-MSs causes problems because ms::open requires all the tables in ConCatTable
-199
+                # to have the same description (MODEL data column must exist in all Sub-MSs)
-200
+                #
-201
+                # This is a bit of an over-doing but it is necessary for the sake of transparency

casa6

Commits

Jira Issues

Add shortcut