Changeset 1200 for trunk

Timestamp:

08/29/06 11:03:45 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

Location:

trunk

Files:

• python/scantable.py (modified) (3 diffs)
• src/STMath.cpp (modified) (3 diffs)
• src/STMath.h (modified) (1 diff)
• src/STMathWrapper.h (modified) (1 diff)

trunk/python/scantable.py

@@ -640 +640 @@
         self._add_history("flag", varlist)
 
-    def lag_flag(self, frequency, unit="GHz", width=0, insitu=None):
+    def lag_flag(self, frequency, unit="GHz", width=0.0, insitu=None):
         """
         Flag the data in 'lag' space by providing a frequency to remove.
@@ -648 +648 @@
             frequency:    the frequency to remove
             unit:         the frequency unit ()default "GHz")
-            width:        the number of 'lag' channels to extent the frequency
-                          by, i.e. the interval
-                          [bandwidth/frequency-width, bandwidth/frequency+width]
+            width:        the width of the frequency to remove
         """
         if insitu is None: insitu = rcParams['insitu']
@@ -659 +657 @@
             raise ValueError("%s is not a valid unit." % unit)
         try:
-            s = scantable(self._math._lag_flag(self, frequency*base[unit], width))
+            s = scantable(self._math._lag_flag(self, frequency*base[unit],
+                                               width*base[unit]))
         except RuntimeError, msg:
             if rcParams['verbose']:

trunk/src/STMath.cpp

@@ -1381 +1381 @@
 CountedPtr< Scantable >
   asap::STMath::lagFlag( const CountedPtr< Scantable > & in,
-                          double frequency, int width )
+                          double frequency, double width )
 {
   CountedPtr< Scantable > out = getScantable(in, false);
@@ -1399 +1399 @@
       Vector<Float> spec = specCol(i);
       Vector<uChar> flag = flagCol(i);
-      Int lag = Int(spec.nelements()*abs(inc)/frequency);
+      Int lag0 = Int(spec.nelements()*abs(inc)/(frequency+width)+0.5);
+      Int lag1 = Int(spec.nelements()*abs(inc)/(frequency-width)+0.5);
       for (int k=0; k < flag.nelements(); ++k ) {
         if (flag[k] > 0) {
@@ -1407 +1408 @@
       Vector<Complex> lags;
       ffts.fft(lags, spec);
-      Int start =  max(0, lag-width);
-      Int end =  min(Int(lags.nelements()-1), lag+width);
+      Int start =  max(0, lag0);
+      Int end =  min(Int(lags.nelements()-1), lag1);
       if (start == end) {
         lags[start] = Complex(0.0);

trunk/src/STMath.h

@@ -191 +191 @@
   casa::CountedPtr<Scantable>
     lagFlag( const casa::CountedPtr<Scantable>& in, double frequency,
-              int width);
+              double width);
 
 private:

trunk/src/STMathWrapper.h

@@ -157 +157 @@
 
   ScantableWrapper lagFlag( const ScantableWrapper& in,
-                            double frequency, int width )
+                            double frequency, double width )
   { return ScantableWrapper(STMath::lagFlag(in.getCP(), frequency, width)); }