Changeset 847 for trunk/src/Scantable.h

Timestamp:

02/24/06 10:03:21 (18 years ago)

Author:

mar637

Message:

numerous changes before move to new svn repository sourcecode.atnf.csiro.au

File:

• trunk/src/Scantable.h (modified) (3 diffs)

trunk/src/Scantable.h

@@ -217 +217 @@
   int ncycle(int scanno=-1) const;
 
-  double getInterval(int scanno=0) const;
-
-  float getTsys(int scanno=0) const;
-
-  std::vector<bool> getMask(int whichrow=0) const;
-  std::vector<float> getSpectrum(int whichrow=0) const;
+  int getBeam(int whichrow) const;
+  int getIF(int whichrow) const;
+  int getPol(int whichrow) const;
+
+  double getInterval(int whichrow) const
+    { return integrCol_(whichrow); }
+
+  float getTsys(int whichrow) const;
+  float getElevation(int whichrow) const
+    { return elCol_(whichrow); }
+  float getAzimuth(int whichrow) const
+    { return azCol_(whichrow); }
+  float getParangle(int whichrow) const
+    { return paraCol_(whichrow); }
+
+  std::vector<bool> getMask(int whichrow) const;
+  std::vector<float> getSpectrum(int whichrow) const;
 
   std::vector<float> getStokesSpectrum( int whichrow=0,
@@ -245 +256 @@
   std::string getTime(int whichrow=-1, bool showdate=true) const;
 
+  // returns unit, conversion frame, doppler, base-frame
+
+  /**
+   * Get the frequency set up
+   * This is forwarded to the STFrequencies subtable
+   * @return unit, frame, doppler
+   */
+  std::vector<std::string> getCoordInfo() const
+    { return freqTable_.getInfo(); };
+
+  void setCoordInfo(std::vector<string> theinfo)
+    { return freqTable_.setInfo(theinfo); };
+
+  std::string getAbcissaLabel(int whichrow) const;
+  std::vector<double> getRestFrequencies() const
+    { return moleculeTable_.getRestFrequencies(); }
+
+  void setRestFrequencies(double rf, const std::string& = "Hz");
+  void setRestFrequencies(const std::string& name);
 
   STFrequencies& frequencies() { return freqTable_; }
@@ -316 +346 @@
 
   // Cached Columns to avoid reconstructing them for each row get/put
-  casa::ScalarColumn<casa::Double> timeCol_, integrCol_;
+  casa::ScalarColumn<casa::Double> integrCol_;
   casa::MDirection::ScalarColumn dirCol_;
+  casa::MEpoch::ScalarColumn timeCol_;
   casa::ScalarColumn<casa::Double> azCol_;
   casa::ScalarColumn<casa::Double> elCol_;
   casa::ScalarColumn<casa::Float> paraCol_;
   casa::ScalarColumn<casa::String> srcnCol_, fldnCol_;
-  casa::ScalarColumn<casa::uInt> scanCol_, beamCol_, cycleCol_;
+  casa::ScalarColumn<casa::uInt> scanCol_, beamCol_, ifCol_, polCol_, cycleCol_;
   casa::ScalarColumn<casa::Int> rbeamCol_;
   casa::ArrayColumn<casa::Float> specCol_, tsCol_;