Changeset 940 for trunk/src

Timestamp:

03/30/06 15:34:32 (19 years ago)

Author:

mar637

Message:

added averagePolarisations; added log output to frequencyAlign; removed couts; made frequencyAlign non insitu

Location:

trunk/src

Files:

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

trunk/src/STMath.cpp

@@ -77 +77 @@
     String epoch = scantbls[0]->getTime(0);
     for (int i=0; i< scantbls.size(); ++i ) {
+
       inaligned.push_back(frequencyAlign(scantbls[i], epoch));
     }
@@ -978 +979 @@
 
 CountedPtr< Scantable >
+  STMath::averagePolarisations( const CountedPtr< Scantable > & in,
+                                const std::vector<bool>& mask,
+                                const std::string& weight )
+{
+  if (in->getPolType() != "linear"  || in->npol() != 2 )
+    throw(AipsError("averagePolarisations can only be applied to two linear polarisations."));
+  CountedPtr<Scantable> pol0( new Scantable(*in), false);
+  CountedPtr<Scantable> pol1( new Scantable(*in), false);
+  Table& tpol0 = pol0->table();
+  Table& tpol1 = pol1->table();
+  Vector<uInt> pol0rows = tpol0(tpol0.col("POLNO") == 0).rowNumbers();
+  Vector<uInt> pol1rows = tpol1(tpol1.col("POLNO") == 1).rowNumbers();
+  tpol0.removeRow(pol1rows);
+  tpol1.removeRow(pol0rows);
+  // give both tables the same POLNO
+  TableVector<uInt> vec(tpol1,"POLNO");
+  vec = 0;
+  std::vector<CountedPtr<Scantable> > pols;
+  pols.push_back(pol0);
+  pols.push_back(pol1);
+  CountedPtr< Scantable > out = average(pols, mask, weight, "NONE", false);
+  out->table_.rwKeywordSet().define("nPol",Int(1));
+  return out;
+}
+
+
+CountedPtr< Scantable >
   asap::STMath::frequencyAlign( const CountedPtr< Scantable > & in,
                                 const std::string & refTime,
                                 const std::string & method)
 {
+  // clone as this is not working insitu
+  bool insitu = insitu_;
+  setInsitu(false);
   CountedPtr< Scantable > out = getScantable(in, false);
+  setInsitu(insitu);
   Table& tout = out->table();
   // clear ouput frequency table
-  Table ftable = out->frequencies().table();
-  ftable.removeRow(ftable.rowNumbers());
+  //Table ftable = out->frequencies().table();
+  //ftable.removeRow(ftable.rowNumbers());
   // Get reference Epoch to time of first row or given String
   Unit DAY(String("d"));
@@ -1003 +1035 @@
   }
   MPosition refPos = in->getAntennaPosition();
-/*  ostringstream oss;
-  oss << "Aligned at reference Epoch " << formatEpoch(refEpoch)
-      << " in frame " << MFrequency::showType(freqSystem);
-  pushLog(String(oss));
-*/
+
   InterpolateArray1D<Double,Float>::InterpolationMethod interp;
   Int interpMethod(stringToIMethod(method));
@@ -1016 +1044 @@
   }
   MFrequency::Types system = in->frequencies().getFrame();
-  out->frequencies().setFrame(system, true);
+  MVTime mvt(refEpoch.getValue());
+  String epochout = mvt.string(MVTime::YMD) + String(" (") + refEpoch.getRefString() + String(")");
+  ostringstream oss;
+  oss << "Aligned at reference Epoch " << epochout
+      << " in frame " << MFrequency::showType(system);
+  pushLog(String(oss));
   // set up the iterator
   Block<String> cols(4);
@@ -1041 +1074 @@
       ScalarColumn<uInt> freqidCol(ftab, "FREQ_ID");
       // get the SpectralCoordinate for the freqid, which we are iterating over
-      cout << freqidCol.getColumn() << endl;
       SpectralCoordinate sC = in->frequencies().getSpectralCoordinate(freqidCol(0));
       FrequencyAligner<Float> fa( sC, nchan, refEpoch,
@@ -1086 +1118 @@
                              interp, False);
           // back into scantable
-          cout << spec[spec.nelements()/2] << " --- " << specOut[specOut.nelements()/2] << endl;
           flagOut.resize(maskOut.nelements());
           convertArray(flagOut, maskOut);
@@ -1097 +1128 @@
         ++timeiter;
       }
-      // nect FREQ_ID
+      // next FREQ_ID
       ++fiter;
     }
@@ -1103 +1134 @@
     ++iter;
   }
-  return out;
-}
+  // set this afterwards to ensure we are doing insitu correctly.
+  out->frequencies().setFrame(system, true);
+  return out;
+}

trunk/src/STMath.h

@@ -59 +59 @@
              const std::string& avmode = "SCAN",
              bool alignfreq = false );
+  casa::CountedPtr< Scantable >
+    averagePolarisations( const casa::CountedPtr< Scantable > & in,
+                                const std::vector<bool>& mask,
+                                const std::string& weight );
 
   casa::CountedPtr<Scantable>

trunk/src/STMathWrapper.h

@@ -47 +47 @@
     return ScantableWrapper(STMath::average(sts, mask, weight, avmode, alignfreq));
   }
+  ScantableWrapper
+    averagePolarisations( const ScantableWrapper& in,
+                          const std::vector<bool>& mask,
+                          const std::string& weight)
+  { return ScantableWrapper(STMath::averagePolarisations(in.getCP(),mask, weight));}
 
   ScantableWrapper

trunk/src/python_STMath.cpp

@@ -45 +45 @@
         .def("_setinsitu", &STMathWrapper::setInsitu)
         .def("_average", &STMathWrapper::average)
+        .def("_averagepol", &STMathWrapper::averagePolarisations)
         .def("_unaryop", &STMathWrapper::unaryOperate)
         .def("_quotient", &STMathWrapper::quotient)