Changeset 488 for trunk

Timestamp:

02/21/05 11:36:17 (20 years ago)

Author:

mar637

Message:

• added merging of history tables

Location:

trunk/src

Files:

• SDMath.cc (modified) (14 diffs)
• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -112 +112 @@
 
 
-SDMemTable* SDMath::frequencyAlignment (const SDMemTable& in, const String& refTime, 
-                                         const String& method, Bool perFreqID) const
+SDMemTable* SDMath::frequencyAlignment(const SDMemTable& in, 
+                                       const String& refTime, 
+                                       const String& method, 
+                                       Bool perFreqID) const
 {
 // Get frame info from Table
@@ -132 +134 @@
 // Do it
 
-   return frequencyAlign (in, freqSystem, refTime, method, perFreqID);
+   return frequencyAlign(in, freqSystem, refTime, method, perFreqID);
 }
 
@@ -153 +155 @@
 
   SDMemTable* pTabOut = new SDMemTable(*in[0],True);
-
+  if (in.nelements() > 1) {
+    for (uInt i=1; i < in.nelements(); ++i) {
+      pTabOut->appendToHistoryTable(in[i]->getHistoryTable());
+    }
+  }
 // Setup
 
@@ -376 +382 @@
 
 
-CountedPtr<SDMemTable> SDMath::binaryOperate (const CountedPtr<SDMemTable>& left,
-                                              const CountedPtr<SDMemTable>& right,
-                                              const String& op, Bool preserve,
-                                              Bool doTSys)  const
+CountedPtr<SDMemTable> SDMath::binaryOperate(const CountedPtr<SDMemTable>& 
+                                             left,
+                                             const CountedPtr<SDMemTable>& 
+                                             right,
+                                             const String& op, Bool preserve,
+                                             Bool doTSys) const
 {
 
@@ -435 +443 @@
 
   SDMemTable* pTabOut = new SDMemTable(*left, True);
-
+  pTabOut->appendToHistoryTable(right->getHistoryTable());
 // Loop over rows
 
@@ -488 +496 @@
         if (doTSys) sc.putTsys(tSysLeftArr/tSysRightArr);
      } else if (what==4) {
-        if (preserve) {     
-           MaskedArray<Float> tmp = (tSysRightArr * mLeft / *pMRight) - tSysRightArr;
-           putDataInSDC(sc, tmp.getArray(), tmp.getMask());
-        } else {
-           MaskedArray<Float> tmp = (tSysRightArr * mLeft / *pMRight) - tSysLeftArr;
-           putDataInSDC(sc, tmp.getArray(), tmp.getMask());
-        }
-        sc.putTsys(tSysRightArr);
+       if (preserve) {     
+         MaskedArray<Float> tmp = (tSysRightArr * mLeft / *pMRight) - 
+           tSysRightArr;
+         putDataInSDC(sc, tmp.getArray(), tmp.getMask());
+       } else {
+         MaskedArray<Float> tmp = (tSysRightArr * mLeft / *pMRight) - 
+           tSysLeftArr;
+         putDataInSDC(sc, tmp.getArray(), tmp.getMask());
+       }
+       sc.putTsys(tSysRightArr);
      }
 
@@ -504 +514 @@
   if (pMRight) delete pMRight;
   pTabOut->resetCursor();
-//
+
   return CountedPtr<SDMemTable>(pTabOut);
 }
@@ -629 +639 @@
 }
 
-SDMemTable* SDMath::resample (const SDMemTable& in, const String& methodStr,
-                              Float width) const
+SDMemTable* SDMath::resample(const SDMemTable& in, const String& methodStr,
+                             Float width) const
 //
 // Should add the possibility of width being specified in km/s. This means
@@ -789 +799 @@
    return pOut;
 }
-
-
 
 SDMemTable* SDMath::averagePol(const SDMemTable& in, const Vector<Bool>& mask,
@@ -1018 +1026 @@
 
 
-SDMemTable* SDMath::convertFlux (const SDMemTable& in, Float D, Float etaAp, 
-                                 Float JyPerK, Bool doAll) const
+SDMemTable* SDMath::convertFlux(const SDMemTable& in, Float D, Float etaAp, 
+                                Float JyPerK, Bool doAll) const
 // 
 // etaAp = aperture efficiency (-1 means find)
@@ -1107 +1115 @@
 
 
-SDMemTable* SDMath::gainElevation (const SDMemTable& in, const Vector<Float>& coeffs,
-                                   const String& fileName,
-                                   const String& methodStr, Bool doAll) const
+SDMemTable* SDMath::gainElevation(const SDMemTable& in, 
+                                  const Vector<Float>& coeffs,
+                                  const String& fileName,
+                                  const String& methodStr, Bool doAll) const
 {
 
@@ -1188 +1197 @@
  
 
-SDMemTable* SDMath::opacity (const SDMemTable& in, Float tau, Bool doAll) const
+SDMemTable* SDMath::opacity(const SDMemTable& in, Float tau, Bool doAll) const
 {
 
@@ -1220 +1229 @@
 
 
-void SDMath::rotateXYPhase (SDMemTable& in, Float value, Bool doAll)
+void SDMath::rotateXYPhase(SDMemTable& in, Float value, Bool doAll)
 //
 // phase in degrees
@@ -1270 +1279 @@
 }     
 
-
-
 // 'private' functions
 

trunk/src/SDMemTable.cc

@@ -47 +47 @@
 #include <tables/Tables/TableParse.h>
 #include <tables/Tables/TableDesc.h>
+#include <tables/Tables/TableCopy.h>
 #include <tables/Tables/SetupNewTab.h>
 #include <tables/Tables/ScaColDesc.h>
@@ -1509 +1510 @@
 }
 
+Table SDMemTable::getHistoryTable() const
+{
+  return table_.keywordSet().asTable("HISTORY");
+}
+
+void SDMemTable::appendToHistoryTable(const Table& otherHist)
+{
+  Table t = table_.rwKeywordSet().asTable("HISTORY");
+  const String sep = "--------------------------------------------------------------------------------";
+  addHistory(sep);
+  TableCopy::copyRows(t, otherHist, t.nrow(), 0, otherHist.nrow());
+  addHistory(sep);
+}
+
 void SDMemTable::addHistory(const std::string& hist)
 {
@@ -1532 +1547 @@
   return stlout;
 }
+
+
 /*
   void SDMemTable::maskChannels(const std::vector<Int>& whichChans ) {

trunk/src/SDMemTable.h

@@ -195 +195 @@
   std::vector<std::string> getHistory() const;
   void addHistory(const std::string& hist);
+
+  casa::Table getHistoryTable() const;
+  void appendToHistoryTable(const casa::Table& otherHist);
 
   // write to disk as aips++ table