Changeset 2672

Timestamp:

10/18/12 21:06:07 (12 years ago)

Author:

Malte Marquarding

Message:

introduce 'reshape' method; this includes a fix to c++ for the upper boundary assertion

Location:

trunk

Files:

• python/ipysupport.py (modified) (1 diff)
• python/scantable.py (modified) (1 diff)
• src/Scantable.cpp (modified) (1 diff)
• test/test_observatories/test_parkes_mx.py (modified) (1 diff)
• test/test_scantable.py (modified) (1 diff)

trunk/python/ipysupport.py

@@ -97 +97 @@
         resample        - return a scan with resampled channels
         smooth          - return the spectrally smoothed scan
+        reshape         - cut out channel range
         poly_baseline   - fit a polynomial baseline to all Beams/IFs/Pols
         auto_poly_baseline - automatically fit a polynomial baseline

trunk/python/scantable.py

@@ -2192 +2192 @@
 
     @asaplog_post_dec
+    def reshape(self, first, last, insitu=None):
+        """Resize the band by providing first and last channel. 
+        This will cut off all channels outside [first, last].
+        """
+        if insitu is None: 
+            insitu = rcParams['insitu']
+        varlist = vars()
+        if last < 0:
+            last = self.nchan()-1 + last
+        s = None
+        if insitu:
+            s = self
+        else:
+            s = self.copy()
+        s._reshape(first,last)
+        s._add_history("reshape", varlist)
+        if not insitu:
+            return s        
+
+    @asaplog_post_dec
     def resample(self, width=5, method='cubic', insitu=None):
         """\

trunk/src/Scantable.cpp

@@ -1835 +1835 @@
 
   // if nmax exceeds nChan, reset nmax to nChan
-  if ( nmax >= nChan ) {
+  if ( nmax >= nChan-1 ) {
     if ( nmin == 0 ) {
       // nothing to do

trunk/test/test_observatories/test_parkes_mx.py

@@ -27 +27 @@
         rms = avp.stats("rms")
         mx = avp.stats("max_abc")
-        print rms
         assert_almost_equals(rms[0], 0.04148, 5)
         assert_almost_equals(mx[0], 86.67328, 5)

trunk/test/test_scantable.py

@@ -222 +222 @@
         assert_almost_equals(res_rms[0], 0.38346, 5)
         assert_almost_equals(res_rms[1], 0.38780, 5)        
+
+
+    def test_reshape(self):
+        cp = self.st.copy()
+        n = cp.nchan()
+        rs = cp.reshape(10,-10,False)
+        assert_equals(n-20, rs.nchan())
+        assert_equals(cp.nchan(), n)
+        rs = cp.reshape(10,n-11,False)
+        assert_equals(n-20, rs.nchan())
+        cp.reshape(10,-10,True)
+        assert_equals(n-20, cp.nchan())