Changeset 1536

Timestamp:

03/25/09 15:09:10 (16 years ago)

Author:

Malte Marquarding

Message:

Fix for ticket #154: flagged data wasnrt honoured in any fitting process, e.g. poly_baseline

Location:

trunk/python

Files:

• asapfitter.py (modified) (3 diffs)
• scantable.py (modified) (1 diff)

trunk/python/asapfitter.py

@@ -3 +3 @@
 from asap import print_log
 from asap import _n_bools
+from asap import mask_and
 
 class fitter:
@@ -142 +143 @@
                 self.x = self.data._getabcissa(row)
                 self.y = self.data._getspectrum(row)
+                self.mask = mask_and(self.mask, self.data._getmask(row))
                 from asap import asaplog
                 asaplog.push("Fitting:")
                 i = row
-                out = "Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" % (self.data.getscan(i),self.data.getbeam(i),self.data.getif(i),self.data.getpol(i), self.data.getcycle(i))
+                out = "Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" % (self.data.getscan(i),
+                                                                      self.data.getbeam(i),
+                                                                      self.data.getif(i),
+                                                                      self.data.getpol(i), 
+                                                                      self.data.getcycle(i))
                 asaplog.push(out,False)
         self.fitter.setdata(self.x, self.y, self.mask)
@@ -589 +595 @@
         asaplog.push("Fitting:")
         for r in rows:
-            out = " Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" % (scan.getscan(r),scan.getbeam(r),scan.getif(r),scan.getpol(r), scan.getcycle(r))
+            out = " Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" % (scan.getscan(r),
+                                                                   scan.getbeam(r),
+                                                                   scan.getif(r),
+                                                                   scan.getpol(r), 
+                                                                   scan.getcycle(r))
             asaplog.push(out, False)
             self.x = scan._getabcissa(r)
             self.y = scan._getspectrum(r)
+            self.mask = mask_and(self.mask, scan._getmask(r))
             self.data = None
             self.fit()

trunk/python/scantable.py

@@ -1398 +1398 @@
             # setup line finder
             fl.find_lines(r, mask, curedge)
-            f.set_scan(workscan, fl.get_mask())
-            f.x = workscan._getabcissa(r)
-            f.y = workscan._getspectrum(r)
-            f.data = None
+            f.set_data(workscan._getabcissa(r),  workscan._getspectrum(r),
+                        mask_and(workscan._getmask(r), fl.get_mask()))
             f.fit()
             x = f.get_parameters()