Changeset 977 for trunk

Timestamp:

04/04/06 10:40:29 (19 years ago)

Author:

mar637

Message:

Removed align option from average as it is buggy. The user has to provide a vector of aligned scantables.

Location:

trunk/src

Files:

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

trunk/src/STMath.cpp

@@ -60 +60 @@
 
 CountedPtr<Scantable>
-STMath::average( const std::vector<CountedPtr<Scantable> >& scantbls,
+STMath::average( const std::vector<CountedPtr<Scantable> >& in,
                  const std::vector<bool>& mask,
                  const std::string& weight,
-                 const std::string& avmode,
-                 bool alignfreq)
-{
-  if ( avmode == "SCAN" && scantbls.size() != 1 )
+                 const std::string& avmode)
+{
+  if ( avmode == "SCAN" && in.size() != 1 )
     throw(AipsError("Can't perform 'SCAN' averaging on multiple tables"));
   WeightType wtype = stringToWeight(weight);
-
-  std::vector<CountedPtr<Scantable> >* in =
-    const_cast<std::vector<CountedPtr<Scantable> >*>(&scantbls);
-  std::vector<CountedPtr<Scantable> > inaligned;
-  if ( alignfreq ) {
-    // take first row of first scantable as reference epoch
-    String epoch = scantbls[0]->getTime(0);
-    for (int i=0; i< scantbls.size(); ++i ) {
-
-      inaligned.push_back(frequencyAlign(scantbls[i], epoch));
-    }
-    in = &inaligned;
-  }
 
   // output
@@ -87 +73 @@
   bool insitu = insitu_;
   setInsitu(false);
-  CountedPtr< Scantable > out = getScantable((*in)[0], true);
+  CountedPtr< Scantable > out = getScantable(in[0], true);
   setInsitu(insitu);
-  std::vector<CountedPtr<Scantable> >::const_iterator stit = in->begin();
+  std::vector<CountedPtr<Scantable> >::const_iterator stit = in.begin();
   ++stit;
-  while ( stit != in->end() ) {
+  while ( stit != in.end() ) {
     out->appendToHistoryTable((*stit)->history());
     ++stit;
@@ -108 +94 @@
   // set up the output table rows. These are based on the structure of the
   // FIRST scantable in the vector
-  const Table& baset = (*in)[0]->table();
+  const Table& baset = in[0]->table();
 
   Block<String> cols(3);
@@ -118 +104 @@
     cols[3] = String("SRCNAME");
   }
-  if ( avmode == "SCAN"  && in->size() == 1) {
+  if ( avmode == "SCAN"  && in.size() == 1) {
     cols.resize(4);
     cols[3] = String("SCANNO");
@@ -142 +128 @@
 
   for (uInt i=0; i < tout.nrow(); ++i) {
-    for ( int j=0; j < in->size(); ++j ) {
-      const Table& tin = (*in)[j]->table();
+    for ( int j=0; j < in.size(); ++j ) {
+      const Table& tin = in[j]->table();
       const TableRecord& rec = row.get(i);
       ROScalarColumn<Double> tmp(tin, "TIME");
@@ -1002 +988 @@
   pols.push_back(pol0);
   pols.push_back(pol1);
-  CountedPtr< Scantable > out = average(pols, mask, weight, "NONE", false);
+  CountedPtr< Scantable > out = average(pols, mask, weight, "NONE");
   out->table_.rwKeywordSet().define("nPol",Int(1));
   return out;

trunk/src/STMath.h

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

trunk/src/STMathWrapper.h

@@ -40 +40 @@
              const std::vector<bool>& mask,
              const std::string& weight,
-             const std::string& avmode,
-             bool alignfreq)
+             const std::string& avmode )
   {
     std::vector<casa::CountedPtr<Scantable> > sts;