Changeset 862 for trunk

Timestamp:

03/01/06 14:01:16 (19 years ago)

Author:

mar637

Message:

added history append to average and merge

File:

• trunk/src/STMath.cpp (modified) (5 diffs)

trunk/src/STMath.cpp

@@ -69 +69 @@
   CountedPtr< Scantable > out = getScantable(in[0], true);
   setInsitu(insitu);
+  std::vector<CountedPtr<Scantable> >::const_iterator stit = in.begin();
+  ++stit;
+  while ( stit != in.end() ) {
+    out->appendToHistoryTable((*stit)->history());
+    ++stit;
+  }
 
   Table& tout = out->table();
@@ -81 +87 @@
 
   // set up the output table rows. These are based on the structure of the
-  // FIRST scantabel in the vector
+  // FIRST scantable in the vector
   const Table& baset = in[0]->table();
 
@@ -803 +809 @@
 {
   if ( in.size() < 2 ) {
-    throw(AipsError("Need at least two scantables to perform merge."));
+    throw(AipsError("Need at least two scantables to perform a merge."));
   }
   std::vector<CountedPtr < Scantable > >::const_iterator it = in.begin();
-  ++it;
   bool insitu = insitu_;
   setInsitu(false);
-  CountedPtr< Scantable > out = getScantable(in[0], false);
+  CountedPtr< Scantable > out = getScantable(*it, false);
   setInsitu(insitu);
   Table& tout = out->table();
@@ -815 +820 @@
   ScalarColumn<uInt> scannocol(tout,"SCANNO"),focusidcol(tout,"FOCUS_ID");
   uInt newscanno = max(scannocol.getColumn())+1;
+  ++it;
   while ( it != in.end() ){
     if ( ! (*it)->conformant(*out) ) {
@@ -823 +829 @@
       continue;
     }
+    out->appendToHistoryTable((*it)->history());
     const Table& tab = (*it)->table();
     TableIterator scanit(tab, "SCANNO");