Changeset 1701 for branches/alma

Timestamp:

02/16/10 16:29:35 (14 years ago)

Author:

WataruKawasaki

Message:

New Development: Yes

JIRA Issue: Yes (CAS-1800 + CAS-1807)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: added new methods to scantable and fitter.

Test Programs:

Put in Release Notes: No

Module(s): sdfit, sdflag

Description: added new methods 'scantable.clip' and 'fitter.set_lorentz_parameters'.

Location:

branches/alma/python

Files:

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

branches/alma/python/asapfitter.py

@@ -82 +82 @@
             lpoly:   use polynomial of the order given with linear least squares fit
             gauss:   fit the number of gaussian specified
+            lorentz: fit the number of lorentzian specified
         Example:
-            fitter.set_function(gauss=2) # will fit two gaussians
             fitter.set_function(poly=3)  # will fit a 3rd order polynomial via nonlinear method
             fitter.set_function(lpoly=3)  # will fit a 3rd order polynomial via linear method
+            fitter.set_function(gauss=2) # will fit two gaussians
+            fitter.set_function(lorentz=2) # will fit two lorentzians
         """
         #default poly order 0
@@ -105 +107 @@
             self.components = [ 3 for i in range(n) ]
             self.uselinear = False 
+        elif kwargs.has_key('lorentz'):
+            n = kwargs.get('lorentz')
+            self.fitfunc = 'lorentz'
+            self.fitfuncs = [ 'lorentz' for i in range(n) ]
+            self.components = [ 3 for i in range(n) ]
+            self.uselinear = False 
         else:
             msg = "Invalid function type."
@@ -160 +168 @@
                 asaplog.push(out,False)
         self.fitter.setdata(self.x, self.y, self.mask)
-        if self.fitfunc == 'gauss':
+        if self.fitfunc == 'gauss' or self.fitfunc == 'lorentz':
             ps = self.fitter.getparameters()
             if len(ps) == 0 or estimate:
@@ -243 +251 @@
             else:
                 raise RuntimeError(msg)
-        if self.fitfunc == "gauss" and component is not None:
+        if (self.fitfunc == "gauss" or self.fitfunc == 'lorentz') and component is not None:
             if not self.fitted and sum(self.fitter.getparameters()) == 0:
                 pars = _n_bools(len(self.components)*3, False)
@@ -301 +309 @@
                 raise ValueError(msg)
 
+    def set_lorentz_parameters(self, peak, centre, fwhm,
+                             peakfixed=0, centrefixed=0,
+                             fwhmfixed=0,
+                             component=0):
+        """
+        Set the Parameters of a 'Lorentzian' component, set with set_function.
+        Parameters:
+            peak, centre, fwhm:  The gaussian parameters
+            peakfixed,
+            centrefixed,
+            fwhmfixed:           Optional parameters to indicate if
+                                 the paramters should be held fixed during
+                                 the fitting process. The default is to keep
+                                 all parameters flexible.
+            component:           The number of the component (Default is the
+                                 component 0)
+        """
+        if self.fitfunc != "lorentz":
+            msg = "Function only operates on Lorentzian components."
+            if rcParams['verbose']:
+                #print msg
+                asaplog.push(msg)
+                print_log('ERROR')
+                return
+            else:
+                raise ValueError(msg)
+        if 0 <= component < len(self.components):
+            d = {'params':[peak, centre, fwhm],
+                 'fixed':[peakfixed, centrefixed, fwhmfixed]}
+            self.set_parameters(d, component)
+        else:
+            msg = "Please select a valid  component."
+            if rcParams['verbose']:
+                #print msg
+                asaplog.push(msg)
+                print_log('ERROR')
+                return
+            else:
+                raise ValueError(msg)
+
     def get_area(self, component=None):
         """
-        Return the area under the fitted gaussian component.
-        Parameters:
-              component:   the gaussian component selection,
+        Return the area under the fitted gaussian/lorentzian component.
+        Parameters:
+              component:   the gaussian/lorentzian component selection,
                            default (None) is the sum of all components
         Note:
-              This will only work for gaussian fits.
+              This will only work for gaussian/lorentzian fits.
         """
         if not self.fitted: return
-        if self.fitfunc == "gauss":
+        if self.fitfunc == "gauss" or self.fitfunc == "lorentz":
             pars = list(self.fitter.getparameters())
             from math import log,pi,sqrt
-            fac = sqrt(pi/log(16.0))
+            if self.fitfunc == "gauss":
+                fac = sqrt(pi/log(16.0))
+            elif self.fitfunc == "lorentz":
+                fac = pi/2.0
             areas = []
             for i in range(len(self.components)):
@@ -346 +397 @@
         cerrs = errs
         if component is not None:
-            if self.fitfunc == "gauss":
+            if self.fitfunc == "gauss" or self.fitfunc == "lorentz":
                 i = 3*component
                 if i < len(errs):
@@ -373 +424 @@
         area = []
         if component is not None:
-            if self.fitfunc == "gauss":
+            if self.fitfunc == "gauss" or self.fitfunc == "lorentz":
                 i = 3*component
                 cpars = pars[i:i+3]
@@ -388 +439 @@
             cfixed = fixed
             cerrs = errs
-            if self.fitfunc == "gauss":
+            if self.fitfunc == "gauss" or self.fitfunc == "lorentz":
                 for c in range(len(self.components)):
                   a = self.get_area(c)
@@ -413 +464 @@
                 c+=1
             out = out[:-1]  # remove trailing ','
-        elif self.fitfunc == 'gauss':
+        elif self.fitfunc == 'gauss' or self.fitfunc == 'lorentz':
             i = 0
             c = 0

branches/alma/python/scantable.py

@@ -862 +862 @@
         self._add_history("flag_row", varlist)
         
+    def clip(self, uthres=None, dthres=None, clipoutside=True, unflag=False):
+        """
+        Flag the selected data outside a specified range (in channel-base)
+        Parameters:
+            uthres:      upper threshold.
+            dthres:      lower threshold
+            clipoutside: True for flagging data outside the range [dthres:uthres].
+                         False for glagging data inside the range.
+            unflag     : if True, unflag the data.
+        """
+        varlist = vars()
+        try:
+            self._clip(uthres, dthres, clipoutside, unflag)
+        except RuntimeError, msg:
+            if rcParams['verbose']:
+                print_log()
+                asaplog.push(str(msg))
+                print_log('ERROR')
+                return
+            else: raise
+        self._add_history("clip", varlist)
         
     def lag_flag(self, frequency, width=0.0, unit="GHz", insitu=None):