Changeset 1653

Timestamp:

10/22/09 20:47:17 (15 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-1431)

Ready to Release: Yes

Interface Changes: Yes

What Interface Changed: A new parameter 'plot' (boolean) is added to

the method 'smooth'.

Test Programs:

Put in Release Notes: No

Module(s): sdsmooth and sdcal

Description:

A new parameter 'plot' (boolean) is added to the method scantable.smooth.
If plot=True, smoothed and unsmoothed spectra is plotted, for each row
in the input scantable, and you are asked if you accept the displayed
smoothing. If you don't, continues without smoothing the row.

File:

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

branches/alma/python/scantable.py

@@ -1471 +1471 @@
         return s
 
-    def smooth(self, kernel="hanning", width=5.0, insitu=None):
+    #def smooth(self, kernel="hanning", width=5.0, insitu=None):
+    def smooth(self, kernel="hanning", width=5.0, plot=False, insitu=None):
         """
         Smooth the spectrum by the specified kernel (conserving flux).
@@ -1483 +1484 @@
                         Maximum. For 'boxcar' it is the full width.
                         For 'rmedian' it is the half width.
+            plot:       plot the original and the smoothed spectra.
+                        In this each indivual fit has to be approved, by
+                        typing 'y' or 'n'
             insitu:     if False a new scantable is returned.
                         Otherwise, the scaling is done in-situ
@@ -1492 +1496 @@
         self._math._setinsitu(insitu)
         varlist = vars()
+
+        if plot: orgscan = self.copy()
+
         s = scantable(self._math._smooth(self, kernel.lower(), width))
         s._add_history("smooth", varlist)
+
+        if plot:
+            if rcParams['plotter.gui']:
+                from asap.asaplotgui import asaplotgui as asaplot
+            else:
+                from asap.asaplot import asaplot
+            self._p=asaplot()
+            self._p.set_panels()
+            ylab=s._get_ordinate_label()
+            #self._p.palette(0,["#777777","red"])
+            for r in xrange(s.nrow()):
+                xsm=s._getabcissa(r)
+                ysm=s._getspectrum(r)
+                xorg=orgscan._getabcissa(r)
+                yorg=orgscan._getspectrum(r)
+                self._p.clear()
+                self._p.hold()
+                self._p.set_axes('ylabel',ylab)
+                self._p.set_axes('xlabel',s._getabcissalabel(r))
+                self._p.set_axes('title',s._getsourcename(r))
+                self._p.set_line(label='Original',color="#777777")
+                self._p.plot(xorg,yorg)
+                self._p.set_line(label='Smoothed',color="red")
+                self._p.plot(xsm,ysm)
+                ### Ugly part for legend
+                for i in [0,1]:
+                    self._p.subplots[0]['lines'].append([self._p.subplots[0]['axes'].lines[i]])
+                self._p.release()
+                ### Ugly part for legend
+                self._p.subplots[0]['lines']=[]
+                res = raw_input("Accept smoothing ([y]/n): ")
+                if res.upper() == 'N':
+                    s._setspectrum(yorg, r)
+            self._p.unmap()
+            self._p = None
+            del orgscan
+
         print_log()
         if insitu: self._assign(s)
@@ -1555 +1599 @@
                 f.data = None
                 f.fit()
+                fpar = f.get_parameters()
+                if plot:
+                    f.plot(residual=True)
+                    x = raw_input("Accept fit ( [y]/n ): ")
+                    if x.upper() == 'N':
+                        self.blpars.append(None)
+                        continue
                 workscan._setspectrum(f.fitter.getresidual(), r)
-                fpar = f.get_parameters()
                 self.blpars.append(fpar)
-                
+            if plot:
+                f._p.unmap()
+                f._p = None
             #f.set_scan(self, mask)
             #s = f.auto_fit(insitu, plot=plot)