Changeset 516 for trunk/python

Timestamp:

02/28/05 16:56:53 (20 years ago)

Author:

vor010

Message:

LineFinder/automatic baseline fitter: a bug related to multiple-row scantable handling has been corrected.
Help is changed to describe a new interface. Parameter checking + vector to tuple conversion for the edge parameter have been added

Location:

trunk/python

Files:

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

trunk/python/asaplinefind.py

@@ -15 +15 @@
        else:
           print "No lines found!"
-       sc2=poly_baseline(sc,fl.get_mask(),7)
+       sc2=sc.poly_baseline(fl.get_mask(),7)
     
     The algorithm involves a simple threshold criterion. The line is
@@ -79 +79 @@
         if not scan:
            raise RuntimeError, 'Please give a correct scan'
+        from asap import _is_sequence_or_number as _is_valid
+
+        if not _is_valid(edge, int):
+           raise RuntimeError, "Parameter 'edge' as to be an integer or \
+           a pair of integers"
+
         if len(edge)>2:
            raise RuntimeError, "The edge parameter should have two \
@@ -84 +90 @@
         if mask is None:
             from numarray import ones
-            self.finder.setscan(scan,ones(scan.nchan()),edge)
+            self.finder.setscan(scan,ones(scan.nchan()),tuple(edge))
         else:    
-            self.finder.setscan(scan,mask,edge)
+            self.finder.setscan(scan,mask,tuple(edge))
         return 
     def find_lines(self,nRow=0):
@@ -121 +127 @@
         else:
             return self.finder.getlinerangesinchannels()
-

trunk/python/scantable.py

@@ -1103 +1103 @@
 
         Example:
-            sc2=auto_poly_baseline(order=7)
+            scan2=scan.auto_poly_baseline(order=7)
         """
         if insitu is None: insitu = rcParams['insitu']
@@ -1112 +1112 @@
         
         if not _is_valid(edge, int):
-            print "Parameter 'edge' as to be an integer or a pair of integers"
-            return
+            raise RuntimeError, "Parameter 'edge' has to be an integer or a \
+            pair of integers specified as a tuple"
         
         # setup fitter