Changeset 1461 for branches/alma

Timestamp:

12/22/08 12:56:22 (16 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1085

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: execute sdbaseline with verify=True

Put in Release Notes: No

Description: Previously asapfitter only plots selected

region to verify baseline fit. I have
modified to plot whole spectral regions to
verify fit.

File:

• branches/alma/python/asapfitter.py (modified) (1 diff)

branches/alma/python/asapfitter.py

@@ -518 +518 @@
 
         colours = ["#777777","#dddddd","red","orange","purple","green","magenta", "cyan"]
+        nomask=True
+        for i in range(len(m)):
+            nomask = nomask and m[i]
+        label0='Masked Region'
+        label1='Spectrum'
+        if ( nomask ):
+            label0=label1
+        else:
+            y = ma.masked_array( self.y, mask = m )
+            self._p.palette(1,colours)
+            self._p.set_line( label = label1 )
+            self._p.plot( self.x, y )
         self._p.palette(0,colours)
-        self._p.set_line(label='Spectrum')
+        self._p.set_line(label=label0)
         y = ma.masked_array(self.y,mask=logical_not(m))
         self._p.plot(self.x, y)
         if residual:
-            self._p.palette(1)
+            self._p.palette(7)
             self._p.set_line(label='Residual')
             y = ma.masked_array(self.get_residual(),