casa / casa6 / df2ff94bb69

Commits

Federico Montesino Pouzols authored df2ff94bb69 29 Jul 2020

consistent error (except) handling, task spxfit, CAS-13126, CAS-13018

casa5/gcwrap/python/scripts/task_spxfit.py

Modified

-77
+        stokes, axis, mask, minpts, multifit, spxtype, spxest,
-78
+        spxfix, div, spxsol, spxerr,
-79
+        model, residual, wantreturn,
-80
+        stretch, logresults, logfile, append,
-81
+        sigma, outsigma
-82
+):
-83
+    casalog.origin('spxfit')
-84
+    myia = image()
-85
+    retval = None
-86
+    try:
--
+                if type(imagename) == list and len(imagename) > 1:
--
+                        myia = myia.imageconcat(outfile="", infiles=imagename, axis=axis, relax=True)
-+
+        if type(imagename) == list and len(imagename) > 1:
-+
+                myia = myia.imageconcat(outfile="", infiles=imagename, axis=axis, relax=True)
-+
+        else:
-+
+                if type(imagename) == list and len(imagename) == 1:
-+
+                        imagename = imagename[0]
-+
+                if (not myia.open(imagename)):
-+
+                        raise RuntimeError("Cannot create image analysis tool using " + str(imagename))
-+
+        sigmacopy = sigma
-+
+        if type(sigma) == list and type(sigma) == str:
-+
+                if len(sigma) == 1:
-+
+                        sigmacopy = sigma[0]
-98
+                else:
--
+                        if type(imagename) == list and len(imagename) == 1:
--
+                                imagename = imagename[0]
--
+                        if (not myia.open(imagename)):
--
+                                raise Exception("Cannot create image analysis tool using " + str(imagename))
--
+                sigmacopy = sigma
--
+                if type(sigma) == list and type(sigma) == str:
--
+                        if len(sigma) == 1:
--
+                                sigmacopy = sigma[0]
--
+                        else:
--
+                                sigia = myia.imageconcat(outfile="", infiles=sigma, axis=axis, relax=True)
--
+                                sigmacopy = sigia.getchunk()
--
+                retval = myia.fitprofile(
--
+                        box=box, region=region, chans=chans,
--
+                        stokes=stokes, axis=axis, mask=mask,
--
+                        minpts=minpts, ngauss=0, multifit=multifit,
--
+                        spxtype=spxtype, spxest=spxest, spxfix=spxfix,
--
+                        div=div,  model=model, residual=residual,
--
+                        stretch=stretch, logresults=logresults,
--
+                        spxsol=spxsol, spxerr=spxerr, logfile=logfile,
--
+                        append=append,
--
+                        sigma=sigmacopy, outsigma=outsigma
--
+                )
--
+    except Exception as instance:
--
+        casalog.post( str( '*** Error ***') + str(instance), 'SEVERE')
--
+        retval = None
--
+    myia.done()
--
+    if (wantreturn):
--
+        return retval
--
+    else:
--
+        if (retval):
--
+           del retval
--
+        return None
--
--
--
-+
+                        sigia = myia.imageconcat(outfile="", infiles=sigma, axis=axis, relax=True)
-+
+                        sigmacopy = sigia.getchunk()
-+
+        retval = myia.fitprofile(
-+
+            box=box, region=region, chans=chans,
-+
+            stokes=stokes, axis=axis, mask=mask,
-+
+            minpts=minpts, ngauss=0, multifit=multifit,
-+
+            spxtype=spxtype, spxest=spxest, spxfix=spxfix,
-+
+            div=div,  model=model, residual=residual,
-+
+            stretch=stretch, logresults=logresults,
-+
+            spxsol=spxsol, spxerr=spxerr, logfile=logfile,
-+
+            append=append,
-+
+            sigma=sigmacopy, outsigma=outsigma
-+
+        )
-+
+    finally:
-+
+        myia.done()
-+
+        if (wantreturn):
-+
+            return retval
-+
+        else:
-+
+            if (retval):
-+
+                del retval
-+
+            return

casa6

Commits

Jira Issues

Add shortcut