Changeset 1637 for branches/alma

Timestamp:

09/25/09 19:04:34 (15 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes (CAS-1434)

Ready to Release: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s):

Description: modified poly_baseline() and auto_poly_baseline()

so that FLAGTRA info is properly used in baseline fitting.

File:

• branches/alma/python/scantable.py (modified) (2 diffs)

branches/alma/python/scantable.py

@@ -1521 +1521 @@
         if mask is None:
             mask = [True for i in xrange(self.nchan(-1))]
+        
         from asap.asapfitter import fitter
         try:
             f = fitter()
-            f.set_scan(self, mask)
             if uselin:
                 f.set_function(lpoly=order)
             else:
                 f.set_function(poly=order)
-            s = f.auto_fit(insitu, plot=plot)
-            # Save parameters of baseline fits as a class attribute.
-            # NOTICE: It does not reflect changes in scantable!
-            self.blpars = f.blpars
+
+            rows = range(self.nrow())
+            if len(rows) > 0:
+                self.blpars = []
+            
+            for r in rows:
+                # take into account flagtra info (CAS-1434)
+                flagtra = self._getmask(r)
+                actualmask = mask[:]
+                if len(actualmask) == 0:
+                    actualmask = list(flagtra[:])
+                else:
+                    if len(actualmask) != len(flagtra):
+                        raise RuntimeError, "Mask and flagtra have different length"
+                    else:
+                        for i in range(0, len(actualmask)):
+                            actualmask[i] = actualmask[i] and flagtra[i]
+                f.set_scan(self, actualmask)
+                f.x = self._getabcissa(r)
+                f.y = self._getspectrum(r)
+                f.data = None
+                f.fit()
+                fpar = f.get_parameters()
+                self.blpars.append(fpar)
+                
+            #f.set_scan(self, mask)
+            #s = f.auto_fit(insitu, plot=plot)
+            ## Save parameters of baseline fits as a class attribute.
+            ## NOTICE: It does not reflect changes in scantable!
+            #self.blpars = f.blpars
             s._add_history("poly_baseline", varlist)
             print_log()
@@ -1650 +1676 @@
                     curedge = edge[workscan.getif(r)]
 
+            # take into account flagtra info (CAS-1434)
+            flagtra = workscan._getmask(r)
+            actualmask = mask[:]
+            if len(actualmask) == 0:
+                actualmask = list(flagtra[:])
+            else:
+                if len(actualmask) != len(flagtra):
+                    raise RuntimeError, "Mask and flagtra have different length"
+                else:
+                    for i in range(0, len(actualmask)):
+                        actualmask[i] = actualmask[i] and flagtra[i]
+
             # setup line finder
-            fl.find_lines(r, mask, curedge)
+            fl.find_lines(r, actualmask, curedge)
             outmask=fl.get_mask()
             f.set_scan(workscan, fl.get_mask())