Changeset 2419

Timestamp:

03/01/12 03:51:53 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2816

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Added function to plot integrated data for specified channel range.

File:

• trunk/python/asapgrid.py (modified) (4 diffs)

trunk/python/asapgrid.py

@@ -287 +287 @@
         else:
             opt = 'pol %s'%(pol)
-        if chan < 0:
+        if type(chan) is list:
+            opt += ', averaged over channel %s-%s'%(chan[0],chan[1])
+        elif chan < 0:
             opt += ', averaged over channel'
         else:
@@ -359 +361 @@
 
     def getData( self, chan=-1, pol=-1 ):
-        if chan == -1:
+        if type(chan) == list:
+            spectra = self.__chanAverage(start=chan[0],end=chan[1])
+        elif chan == -1:
             spectra = self.__chanAverage()
         else:
@@ -370 +374 @@
         return retval
 
-    def __chanAverage( self ):
+    def __chanAverage( self, start=-1, end=-1 ):
         s = scantable( self.outfile, average=False )
         nrow = s.nrow() 
@@ -376 +380 @@
         irow = 0
         sp = [0 for i in xrange(self.nchan)]
+        if start < 0:
+            start = 0
+        if end < 0:
+            end = self.nchan
         for i in xrange(nrow/self.npol):
             for ip in xrange(self.npol):
-                sp = s._getspectrum( irow )
+                sp = s._getspectrum( irow )[start:end]
                 spectra[ip,i] = numpy.mean( sp )
                 irow += 1
+            
         return spectra