Changeset 907 for trunk/python

Timestamp:

03/20/06 15:17:06 (19 years ago)

Author:

vor010

Message:

LineFinder & auto_poly_baseline: a support of
new scantable format has been added. Now findLines accept a mask and edge
parameters, which can therefore be different for different rows. Constructor
need now just a scan table. Boost types removed from STLineFinder. auto_poly_baseline can accept a nested tuple of edges, which would be interpreted as
different edge parameters for different IFs

Location:

trunk/python

Files:

• asaplinefind.py (modified) (3 diffs)
• scantable.py (modified) (4 diffs)

trunk/python/asaplinefind.py

@@ -7 +7 @@
     Example:
        fl=linefinder()
-       fl.set_scan(sc,edge=(50,))
+       fl.set_scan(sc)
        fl.set_options(threshold=3)
-       nlines=fl.find_lines()
+       nlines=fl.find_lines(edge=(50,0))
        if nlines!=0:
           print "Found ",nlines," spectral lines"
@@ -65 +65 @@
         return
 
-    def set_scan(self, scan, mask=None, edge=(0,0)):
+    def set_scan(self, scan):
         """
         Set the 'data' (scantable) to work with.
         Parameters:
              scan:    a scantable
-             mask:       an optional mask retreived from scantable
-             edge:       an optional number of channel to drop at
-                         the edge of spectrum. If only one value is
+        """
+        if not scan:
+           raise RuntimeError, 'Please give a correct scan'
+        return
+    def find_lines(self,nRow=0,mask=None,edge=(0,0)):
+        """
+        Search for spectral lines in the scan assigned in set_scan.
+        Parameters:
+             nRow:       a row in the scantable to work with
+             mask:       an optional mask (e.g. retreived from scantable)
+             edge:       an optional number of channels to drop at
+                         the edge of the spectrum. If only one value is
                          specified, the same number will be dropped from
                          both sides of the spectrum. Default is to keep
                          all channels
+        A number of lines found will be returned
         """
-        if not scan:
-           raise RuntimeError, 'Please give a correct scan'
-        if not scan._check_ifs():
-           raise RuntimeError, 'IFs with different numbers of channels are not yet supported'
-
         if isinstance(edge,int):
            edge=(edge,)
@@ -96 +101 @@
         if mask is None:
             from numarray import ones
-            self.finder.setscan(scan,ones(scan.nchan(-1)),tuple(edge))
+            return self.finder.findlines(ones(scan.nchan(nRow)),list(edge),nRow)
         else:
-            self.finder.setscan(scan,mask,tuple(edge))
-        return
-    def find_lines(self,nRow=0):
-        """
-        Search for spectral lines in the scan assigned in set_scan.
-        Current Beam/IF/Pol is used, Row is specified by parameter
-        A number of lines found will be returned
-        """
-        return self.finder.findlines(nRow)
+            return self.finder.setscan(mask,list(edge),nRow)
     def get_mask(self,invert=False):
         """

trunk/python/scantable.py

@@ -1033 +1033 @@
                         specified, the same number will be dropped from
                         both sides of the spectrum. Default is to keep
-                        all channels
+                        all channels. Nested tuples represent individual
+                        edge selection for different IFs (a number of spectral
+                        channels can be different)
             order:      the order of the polynomial (default is 0)
             threshold:  the threshold used by line finder. It is better to
@@ -1051 +1053 @@
         from asap import _is_sequence_or_number as _is_valid
 
-        if not _is_valid(edge, int):
+        # check whether edge is set up for each IF individually
+        individualEdge = False;
+        if len(edge)>1:
+           if isinstance(edge[0],list) or isinstance(edge[0],tuple):
+           individualEdge = True;
+
+        if not _is_valid(edge, int) and not individualEdge:
             raise RuntimeError, "Parameter 'edge' has to be an integer or a \
-            pair of integers specified as a tuple"
+            pair of integers specified as a tuple. Nested tuples are allowed \
+            to make individual selection for different IFs."
+        
+        curedge = (0,0)
+        if individualEdge:
+           for edge_par in edge:
+               if not _is_valid(edge,int):
+                  raise RuntimeError, "Each element of the 'edge' tuple has \
+                  to be a pair of integers or an integer."
+        else:
+           curedge = edge;
 
         # setup fitter
@@ -1067 +1085 @@
         else:
             workscan=self
+
+        fl.set_scan(workscan)
 
         rows=range(workscan.nrow())
@@ -1074 +1094 @@
             msg = " Scan[%d] Beam[%d] IF[%d] Pol[%d] Cycle[%d]" %        (workscan.getscan(r),workscan.getbeam(r),workscan.getif(r),workscan.getpol(r), workscan.getcycle(r))
             asaplog.push(msg, False)
-            fl.set_scan(workscan, mask, edge)
-            fl.find_lines(r)
+
+            # figure out edge parameter
+            if individualEdge:
+               if len(edge)>=workscan.getif(r):
+                  raise RuntimeError, "Number of edge elements appear to be less than the number of IFs"
+                  curedge = edge[workscan.getif(r)]
+            
+            # setup line finder
+            fl.find_lines(r,mask,curedge)
             f.set_scan(workscan, fl.get_mask())
             f.x = workscan._getabcissa(r)