Changeset 1375 for trunk

Timestamp:

07/12/07 11:57:05 (17 years ago)

Author:

mar637

Message:

export WCS info to ASCII file, this required returng const& of STSubTables. This partly addresses Ticket #110

Location:

trunk/src

Files:

• STAsciiWriter.cpp (modified) (1 diff)
• STFrequencies.cpp (modified) (2 diffs)
• STFrequencies.h (modified) (1 diff)
• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (1 diff)

trunk/src/STAsciiWriter.cpp

@@ -120 +120 @@
     addLine(of, "Beam No", rec.asuInt("BEAMNO"));
     addLine(of, "IF No", rec.asuInt("IFNO"));
+    String wcs = stable.frequencies().print(rec.asuInt("FREQ_ID"), True);
+    addLine(of, "WCS", wcs);
+    addLine(of, "Rest Freq.", 
+            stable.molecules().getRestFrequency(rec.asuInt("MOLECULE_ID") ));
     of << setfill('#') << setw(70) << "" << setfill(' ') << endl;
 

trunk/src/STFrequencies.cpp

@@ -274 +274 @@
 }
 
-std::string STFrequencies::print( int id )
+std::string STFrequencies::print( int id, Bool strip ) const
 {
   Table t;
@@ -284 +284 @@
     const TableRecord& rec = row.get(i);
     oss <<  setw(8)
-    << t.keywordSet().asString("FRAME") << setw(16) << setprecision(8)
-    << rec.asDouble("REFVAL") << setw(7)
-    << rec.asDouble("REFPIX") << setw(12)
-    << rec.asDouble("INCREMENT") << endl;
-  }
-  return String(oss);
+        << t.keywordSet().asString("FRAME") << setw(16) << setprecision(8)
+        << rec.asDouble("REFVAL") << setw(7)
+        << rec.asDouble("REFPIX")
+        << setw(12)
+        << rec.asDouble("INCREMENT");
+  }
+  String outstr(oss);
+  if (strip) {
+    int f = outstr.find_first_not_of(' ');
+    int l = outstr.find_last_not_of(' ', outstr.size());
+    if (f < 0) { 
+      f = 0; 
+    }
+    if ( l < f  || l < f ) { 
+      l = outstr.size();
+    }
+    return outstr.substr(f,l);
+  }
+  return outstr;
 }
 

trunk/src/STFrequencies.h

@@ -145 +145 @@
    * @return a string
    */
-  std::string print(int id=-1);
+  std::string print(int id=-1, casa::Bool strip=casa::False) const;
 
   std::vector<std::string> getInfo() const;

trunk/src/Scantable.cpp

@@ -837 +837 @@
         oss << setw(10) << "";
         oss << setw(3) << std::right << irec.asuInt("IFNO") << std::left
-            << setw(2) << "" << frequencies().print(irec.asuInt("FREQ_ID"));
+            << setw(2) << "" << frequencies().print(irec.asuInt("FREQ_ID"))
+            << endl;
 
         ++iiter;

trunk/src/Scantable.h

@@ -361 +361 @@
 
   STFrequencies& frequencies() { return freqTable_; }
+  const STFrequencies& frequencies() const { return freqTable_; }
   STWeather& weather() { return weatherTable_; }
+  const STWeather& weather() const { return weatherTable_; }
   STFocus& focus() { return focusTable_; }
+  const STFocus& focus() const { return focusTable_; }
   STTcal& tcal() { return tcalTable_; }
+  const STTcal& tcal() const { return tcalTable_; }
   STMolecules& molecules() { return moleculeTable_; }
+  const STMolecules& molecules() const { return moleculeTable_; }
   STHistory& history() { return historyTable_; }
+  const STHistory& history() const { return historyTable_; }
   STFit& fit() { return fitTable_; }
+  const STFit& fit() const { return fitTable_; }
 
   std::vector<std::string> columnNames() const;