Changeset 455 for trunk/src/SDMemTable.h

Timestamp:

02/16/05 12:29:26 (19 years ago)

Author:

mar637

Message:

• added FITS subtable for fitting and relevant functions to set fits and put/get SDFitContainer
• cleanup

File:

• trunk/src/SDMemTable.h (modified) (9 diffs)

trunk/src/SDMemTable.h

@@ -36 +36 @@
 #include <vector>
 // AIPS++
- #include <casa/aips.h>
+#include <casa/aips.h>
 #include <casa/Arrays/MaskedArray.h>
 #include <casa/BasicSL/String.h>
@@ -49 +49 @@
 
 namespace asap {
-
+  
 class SDContainer;
 class SDHeader;
 class SDFrequencyTable;
-
+class SDFitTable;
 
 
@@ -95 +95 @@
   virtual std::vector<bool> getMask(casa::Int whichRow=0) const;
 
-
   // When we can handle input correlations being either circular or
-  // linear, we should probably have functions; getLinear, getCircular, getStokes
-  // since one can inter-convert between all three regardless of the input
-  // provided there are 4 polarizations. For now, we are assuming, if
-  // there are 4 polarizations, that we have linears.  getSpectrum 
-  // is then 'getLinear', getStokesSpectrum is 'getStokes' and getCircularSpectrum
-  // is 'getCircular'  
-
-
-  // Get Stokes at cursor location. One of either I,Q,U,V or I,P,PA,V (doPol=True)
-  // If the latter, you can add a PA offset (degrees)
+  // linear, we should probably have functions; getLinear,
+  // getCircular, getStokes since one can inter-convert between all
+  // three regardless of the input provided there are 4
+  // polarizations. For now, we are assuming, if there are 4
+  // polarizations, that we have linears.  getSpectrum is then
+  // 'getLinear', getStokesSpectrum is 'getStokes' and
+  // getCircularSpectrum is 'getCircular'
+
+
+  // Get Stokes at cursor location. One of either I,Q,U,V or I,P,PA,V
+  // (doPol=True) If the latter, you can add a PA offset (degrees)
   virtual std::vector<float> getStokesSpectrum(casa::Int whichRow=0, 
                                                casa::Bool doPol=casa::False,
@@ -130 +130 @@
   casa::MDirection getDirection(casa::Int whichRow=0,
                                 casa::Bool refBeam=casa::False) const; 
-//
+
   std::string getSourceName(casa::Int whichRow=0) const;
   double getInterval(casa::Int whichRow=0) const;
@@ -137 +137 @@
   virtual void setCoordInfo(std::vector<string> theinfo);
 
-// Set RestFreqID.  source="" and IF=-1 means select all
-  virtual casa::Bool setRestFreqs (const casa::Vector<casa::Double>& restFreqs, 
-                                   const casa::String& unit,
-                                   const std::vector<std::string>& lines,
-                                   const casa::String& source,
-                                   casa::Int whichIF=-1);
-
-// List lines
-   void spectralLines() const;
-
-// Get/Set flux unit
+  // Set RestFreqID.  source="" and IF=-1 means select all
+  virtual casa::Bool setRestFreqs(const casa::Vector<casa::Double>& restFreqs, 
+                                  const casa::String& unit,
+                                  const std::vector<std::string>& lines,
+                                  const casa::String& source,
+                                  casa::Int whichIF=-1);
+
+  // List lines
+  void spectralLines() const;
+
+  // Get/Set flux unit
   std::string getFluxUnit() const;
   void setFluxUnit (const std::string& unit);
-
-// Set Instrument
+  
+  // Set Instrument
   void setInstrument (const std::string& instrument);
 
@@ -243 +243 @@
   static Instrument convertInstrument(const casa::String& instrument,
                                       casa::Bool throwIt);
-
+  
+  bool putSDFitTable(const SDFitTable& sdft);
+  SDFitTable getSDFitTable() const;
+
+  void addFit(casa::uInt whichRow,
+              const casa::Vector<casa::Double>& p, 
+              const casa::Vector<casa::Bool>& m,
+              const casa::Vector<casa::String>& f, 
+              const casa::Vector<casa::Int>& c);
+  
 private:
   // utility func for nice printout
   casa::String formatSec(casa::Double x) const;
   casa::String formatDirection(const casa::MDirection& md) const;
-  std::vector<float> getFloatSpectrum (const casa::Array<casa::Float>& arr) const;
+  std::vector<float> getFloatSpectrum(const casa::Array<casa::Float>& arr) const;
   void setup();
   void attach();
@@ -254 +263 @@
 
   // Generate start and end for shape and current cursor selection
-  void setCursorSlice(casa::IPosition& start, casa::IPosition& end, const casa::IPosition& shape) const;
-
-  // Convert Vector to vector
-  std::vector<float> convertVector (const casa::Vector<casa::Float>& in) const;
-
+  void setCursorSlice(casa::IPosition& start, casa::IPosition& end, 
+                      const casa::IPosition& shape) const;
 
   // the current cursor into the array
@@ -266 +272 @@
   casa::Table table_;
 
-// Cached Columns to avoid reconstructing them for each row get/put
+  // Cached Columns to avoid reconstructing them for each row get/put
   casa::ScalarColumn<casa::Double> timeCol_, integrCol_;
   casa::ScalarColumn<casa::Float> azCol_, elCol_, paraCol_;
@@ -276 +282 @@
   casa::ArrayColumn<casa::uInt> freqidCol_, restfreqidCol_;
   casa::ArrayColumn<casa::String> histCol_;
+  casa::ArrayColumn<casa::Int> fitCol_;
   casa::ROArrayColumn<casa::Float> stokesCol_;
 };