Changeset 1204

Timestamp:

08/29/06 14:15:56 (18 years ago)

Author:

mar637

Message:

Changes from trunk, whcih accidentally got added there instead of here.

Location:

tags/Release2.1.0b

Files:

• python/scantable.py (modified) (4 diffs)
• src/STMath.cpp (modified) (2 diffs)

tags/Release2.1.0b/python/scantable.py

@@ -640 +640 @@
         self._add_history("flag", varlist)
 
-    def lag_flag(self, frequency, unit="GHz", width=0.0, insitu=None):
+    def lag_flag(self, frequency, width=0.0, unit="GHz", insitu=None):
         """
         Flag the data in 'lag' space by providing a frequency to remove.
@@ -646 +646 @@
         No taper is applied.
         Parameters:
-            frequency:    the frequency to remove
-            unit:         the frequency unit ()default "GHz")
-            width:        the width of the frequency to remove
+            frequency:    the frequency (really a period within the bandwidth) to remove
+            width:        the width of the frequency to remove, to remove a range
+                          of frequencies aroung the centre.
+            unit:         the frequency unit (default "GHz")
+        Notes:
+            It is recommended to flag edges of the band or strong signals beforehand.
         """
         if insitu is None: insitu = rcParams['insitu']
@@ -1430 +1433 @@
                             preserve: Output = Toff * (on/off) - Toff
                             remove:   Output = Toff * (on/off) - Ton
-        """
+    """
         if mask is None: mask = ()
         varlist = vars()
@@ -1436 +1439 @@
         preoff = scantable(self._math._mx_extract(self, 'off'))
         off = preoff.average_time(mask=mask, weight=weight, scanav=False)
-        from asapmath  import quotient
+    from asapmath  import quotient
         q = quotient(on, off, preserve)
         q._add_history("mx_quotient", varlist)
         print_log()
-        return q
+    return q
 
     def freq_switch(self, insitu=None):

tags/Release2.1.0b/src/STMath.cpp

@@ -1407 +1407 @@
       }
       Vector<Complex> lags;
-      ffts.fft(lags, spec);
+      ffts.fft0(lags, spec);
       Int start =  max(0, lag0);
       Int end =  min(Int(lags.nelements()-1), lag1);
@@ -1417 +1417 @@
         }
       }
-      ffts.fft(spec, lags);
+      ffts.fft0(spec, lags);
       specCol.put(i, spec);
     }