Changeset 1603 for branches/alma/python/asapfitter.py

Timestamp:

07/18/09 06:35:47 (15 years ago)

Author:

TakTsutsumi

Message:

New Development: No, merge with asap2.3.1

JIRA Issue: Yes CAS-1450

Ready to Release: Yes/No?

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes

Module(s): single dish

Description: Upgrade of alma branch based on ASAP2.2.0

(rev.1562) to ASAP2.3.1 (rev.1561)

File:

• branches/alma/python/asapfitter.py (modified) (7 diffs)

branches/alma/python/asapfitter.py

@@ -3 +3 @@
 from asap import print_log
 from asap import _n_bools
+from asap import mask_and
 
 class fitter:
@@ -53 +54 @@
         Parameters:
             thescan:     a scantable
-            mask:        a msk retireved from the scantable
+            mask:        a msk retrieved from the scantable
         """
         if not thescan:
@@ -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)
@@ -245 +251 @@
 
     def set_gauss_parameters(self, peak, centre, fwhm,
-                             peakfixed=0, centerfixed=0,
+                             peakfixed=0, centrefixed=0,
                              fwhmfixed=0,
                              component=0):
@@ -253 +259 @@
             peak, centre, fwhm:  The gaussian parameters
             peakfixed,
-            centerfixed,
+            centrefixed,
             fwhmfixed:           Optional parameters to indicate if
                                  the paramters should be held fixed during
@@ -270 +276 @@
         if 0 <= component < len(self.components):
             d = {'params':[peak, centre, fwhm],
-                 'fixed':[peakfixed, centerfixed, fwhmfixed]}
+                 'fixed':[peakfixed, centrefixed, fwhmfixed]}
             self.set_parameters(d, component)
         else:
@@ -604 +610 @@
         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()
+            x = self.get_parameters()
             fpar = self.get_parameters()
             if plot: