Changeset 1145 for trunk

Timestamp:

08/16/06 11:11:45 (18 years ago)

Author:

mar637

Message:

added average_beam which is part of Ticket #45

Location:

trunk

Files:

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

trunk/python/scantable.py

@@ -1021 +1021 @@
         return s
 
+    def average_beam(self, mask=None, weight='none'):
+        """
+        Average the Beams together.
+        Parameters:
+            mask:        An optional mask defining the region, where the
+                         averaging will be applied. The output will have all
+                         specified points masked.
+            weight:      Weighting scheme. 'none' (default), 'var' (1/var(spec)
+                         weighted), or 'tsys' (1/Tsys**2 weighted)
+        """
+        varlist = vars()
+        if mask is None:
+            mask = ()
+        s = scantable(self._math._averagebeams(self, mask, weight.upper()))
+        s._add_history("average_beam", varlist)
+        print_log()
+        return s
+
     def convert_pol(self, poltype=None):
         """
@@ -1331 +1349 @@
         return s
 
-    def mx_quotient(self, mask = None, weight='median'):
+    def mx_quotient(self, mask = None, weight='median', preserve=True):
         """
         Form a quotient using "off" beams when observing in "MX" mode.
         Parameters:
+            mask:           an optional mask to be used when weight == 'stddev'
             weight:         How to average the off beams.  Default is 'median'.
+            preserve:       you can preserve (default) the continuum or
+                            remove it.  The equations used are
+                            preserve: Output = Toff * (on/off) - Toff
+                            remove:   Output = Toff * (on/off) - Ton
         """
         if mask is None: mask = ()
@@ -1342 +1365 @@
         preoff = scantable(self._math._mx_extract(self, 'off'))
         off = preoff.average_time(mask=mask, weight=weight, scanav=False)
-        print_log()
         from asapmath  import quotient
-        q = quotient(on, off)
+        q = quotient(on, off, preserve)
         q._add_history("mx_quotient", varlist)
+        print_log()
         return q
 

trunk/src/STMath.cpp

@@ -96 +96 @@
   ScalarColumn<Double> intColOut(tout,"INTERVAL");
   ScalarColumn<uInt> cycColOut(tout,"CYCLENO");
+  ScalarColumn<uInt> scanColOut(tout,"SCANNO");
 
   // set up the output table rows. These are based on the structure of the
@@ -120 +121 @@
     tout.addRow();
     TableCopy::copyRows(tout, subt, outrowCount, 0, 1);
+    // re-index to 0
+    if ( avmode != "SCAN" && avmode != "SOURCE" ) {
+      scanColOut.put(outrowCount, uInt(0));
+    }
     ++outrowCount;
     ++iter;
@@ -419 +424 @@
                           && t.col("IFNO") == Int(rec.asuInt("IFNO"))
                           && t.col("POLNO") == Int(rec.asuInt("POLNO")) );
+      if ( offsel.nrow() == 0 )
+        throw AipsError("STMath::quotient: no matching off");
       TableRow offrow(offsel);
       const TableRecord& offrec = offrow.get(0);//should be ncycles - take first
@@ -1126 +1133 @@
   Table& tout = pols->table();
   // give all rows the same POLNO
-  TableVector<uInt> vec(tout,"POLNO");
+  TableVector<uInt> vec(tout, "POLNO");
   vec = 0;
-  pols->table_.rwKeywordSet().define("nPol",Int(1));
+  pols->table_.rwKeywordSet().define("nPol", Int(1));
   std::vector<CountedPtr<Scantable> > vpols;
   vpols.push_back(pols);
   CountedPtr< Scantable > out = average(vpols, mask, weight, "NONE");
+  return out;
+}
+
+CountedPtr< Scantable >
+  STMath::averageBeams( const CountedPtr< Scantable > & in,
+                        const std::vector<bool>& mask,
+                        const std::string& weight )
+{
+  bool insitu = insitu_;
+  setInsitu(false);
+  CountedPtr< Scantable > beams = getScantable(in, false);
+  setInsitu(insitu);
+  Table& tout = beams->table();
+  // give all rows the same BEAMNO
+  TableVector<uInt> vec(tout, "BEAMNO");
+  vec = 0;
+  beams->table_.rwKeywordSet().define("nBeam", Int(1));
+  std::vector<CountedPtr<Scantable> > vbeams;
+  vbeams.push_back(beams);
+  CountedPtr< Scantable > out = average(vbeams, mask, weight, "NONE");
   return out;
 }

trunk/src/STMath.h

@@ -91 +91 @@
 
   /**
-    * average polarisations together. really only useful if only linears are
-    *  available.
+    * Average polarisations together. really only useful if only linears are
+    * available.
     * @param in the input Scantable
     * @param mask an optional mask if weight allows one
@@ -102 +102 @@
                           const std::vector<bool>& mask,
                           const std::string& weight );
+
+  /**
+    * Average beams together.
+    * @param in the input Scantable
+    * @param mask an optional mask if weight allows one
+    * @param weight weighting scheme
+    * @return
+    */
+  casa::CountedPtr< Scantable >
+    averageBeams( const casa::CountedPtr< Scantable > & in,
+                   const std::vector<bool>& mask,
+                   const std::string& weight );
 
   casa::CountedPtr<Scantable>

trunk/src/STMathWrapper.h

@@ -60 +60 @@
                           const std::string& weight)
   { return ScantableWrapper(STMath::averagePolarisations(in.getCP(),mask, weight));}
+
+  ScantableWrapper
+    averageBeams( const ScantableWrapper& in,
+                  const std::vector<bool>& mask,
+                  const std::string& weight)
+
+  { return ScantableWrapper(STMath::averageBeams(in.getCP(),mask, weight));}
 
   ScantableWrapper
@@ -144 +151 @@
                                         const std::string& newtype )
   { return ScantableWrapper(STMath::convertPolarisation(in.getCP(),newtype)); }
-  
+
   ScantableWrapper mxExtract( const ScantableWrapper& in,
                               const std::string& scantype="on" )

trunk/src/python_STMath.cpp

@@ -47 +47 @@
         .def("_averagechannel", &STMathWrapper::averageChannel)
         .def("_averagepol", &STMathWrapper::averagePolarisations)
+        .def("_averagebeams", &STMathWrapper::averageBeams)
         .def("_unaryop", &STMathWrapper::unaryOperate)
         .def("_auto_quotient", &STMathWrapper::autoQuotient)