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

Timestamp:

06/09/10 19:03:06 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: Yes (CAS-2211)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: ASAP 3.0.0 interface changes

Test Programs:

Put in Release Notes: Yes

Module(s): all the CASA sd tools and tasks are affected.

Description: Merged ATNF-ASAP 3.0.0 developments to CASA (alma) branch.

Note you also need to update casa/code/atnf.

Location:

branches/alma

Files:

• . (modified) (2 props)
• python/asapfitter.py (modified) (15 diffs)

branches/alma/python/asapfitter.py

@@ -1 +1 @@
 import _asap
 from asap import rcParams
-from asap import print_log
+from asap import print_log, print_log_dec
 from asap import _n_bools
 from asap import mask_and
@@ -79 +79 @@
         Set the function to be fit.
         Parameters:
-            poly:    use a polynomial of the order given with nonlinear least squares fit 
+            poly:    use a polynomial of the order given with nonlinear least squares fit
             lpoly:   use polynomial of the order given with linear least squares fit
             gauss:   fit the number of gaussian specified
@@ -95 +95 @@
             n = kwargs.get('poly')
             self.components = [n]
-            self.uselinear = False 
+            self.uselinear = False
         elif kwargs.has_key('lpoly'):
             self.fitfunc = 'poly'
@@ -106 +106 @@
             self.fitfuncs = [ 'gauss' for i in range(n) ]
             self.components = [ 3 for i in range(n) ]
-            self.uselinear = False 
+            self.uselinear = False
         elif kwargs.has_key('lorentz'):
             n = kwargs.get('lorentz')
@@ -112 +112 @@
             self.fitfuncs = [ 'lorentz' for i in range(n) ]
             self.components = [ 3 for i in range(n) ]
-            self.uselinear = False 
+            self.uselinear = False
         else:
             msg = "Invalid function type."
@@ -127 +127 @@
         return
 
+    #@print_log_dec
     def fit(self, row=0, estimate=False):
         """
@@ -164 +165 @@
                                                                       self.data.getbeam(i),
                                                                       self.data.getif(i),
-                                                                      self.data.getpol(i), 
+                                                                      self.data.getpol(i),
                                                                       self.data.getcycle(i))
                 asaplog.push(out,False)
@@ -221 +222 @@
                 self.data._addfit(fit,self._fittedrow)
 
-    #def set_parameters(self, params, fixed=None, component=None):
+    #@print_log_dec
     def set_parameters(self,*args,**kwargs):
         """
@@ -543 +544 @@
         return self.fitter.getfit()
 
+    #@print_log_dec
     def commit(self):
         """
@@ -571 +573 @@
         return scan
 
-    def plot(self, residual=False, components=None, plotparms=False, filename=None):
+    #@print_log_dec
+    def plot(self, residual=False, components=None, plotparms=False,
+             filename=None):
         """
         Plot the last fit.
@@ -598 +602 @@
         xlab = 'Abcissa'
         ylab = 'Ordinate'
-        from matplotlib.numerix import ma,logical_not,logical_and,array
+        from numpy import ma,logical_not,logical_and,array
         m = self.mask
         if self.data:
@@ -606 +610 @@
                              array(self.data._getmask(self._fittedrow),
                                    copy=False))
-                             
+
             ylab = self.data._get_ordinate_label()
 
@@ -670 +674 @@
         print_log()
 
+    #@print_log_dec
     def auto_fit(self, insitu=None, plot=False):
         """
@@ -700 +705 @@
                                                                    scan.getbeam(r),
                                                                    scan.getif(r),
-                                                                   scan.getpol(r), 
+                                                                   scan.getpol(r),
                                                                    scan.getcycle(r))
             asaplog.push(out, False)
@@ -723 +728 @@
         print_log()
         return scan
-