Changeset 1078 for trunk/src

Timestamp:

07/06/06 11:28:58 (18 years ago)

Author:

mar637

Message:

added scan averaging to average_channel

Location:

trunk/src

Files:

• STMath.cpp (modified) (3 diffs)
• STMath.h (modified) (1 diff)
• STMathWrapper.h (modified) (1 diff)

trunk/src/STMath.cpp

@@ -191 +191 @@
 CountedPtr< Scantable >
   STMath::averageChannel( const CountedPtr < Scantable > & in,
-                          const std::string & mode )
+                          const std::string & mode,
+                          const std::string& avmode )
 {
   // clone as this is non insitu
@@ -207 +208 @@
   cols[1] = String("IFNO");
   cols[2] = String("POLNO");
+  if ( avmode == "SCAN") {
+    cols.resize(4);
+    cols[3] = String("SCANNO");
+  }
   uInt outrowCount = 0;
   uChar userflag = 1 << 7;
@@ -222 +227 @@
     specCol.get(0, tmp);
     uInt nchan = tmp.nelements();
+    // have to do channel by channel here as MaskedArrMath
+    // doesn't have partialMedians
     Vector<uChar> flags = flagCol.getColumn(Slicer(Slice(0)));
     Vector<Float> outspec(nchan);

trunk/src/STMath.h

@@ -61 +61 @@
   casa::CountedPtr<Scantable>
     averageChannel( const casa::CountedPtr<Scantable> & in,
-                     const std::string& mode = "MEDIAN");
+                    const std::string& mode = "MEDIAN",
+                    const std::string& avmode = "SCAN");
 
   casa::CountedPtr< Scantable >

trunk/src/STMathWrapper.h

@@ -49 +49 @@
   ScantableWrapper
     averageChannel( const ScantableWrapper& in,
-                    const std::string& mode = "MEDIAN")
+                    const std::string& mode = "MEDIAN",
+                    const std::string& avmode = "NONE")
   {
-    return ScantableWrapper(STMath::averageChannel(in.getCP(), mode));
+    return ScantableWrapper(STMath::averageChannel(in.getCP(), mode, avmode));
   }