Changeset 1598 for trunk

Timestamp:

07/08/09 11:22:27 (15 years ago)

Author:

Malte Marquarding

Message:

Ticket #170: added scantable.get_coordinate(row). Note that this in the specified reference frame NOT in the basese frame, e.g. usually LSRK/BARY not TOPO. That means that coord.to_frequency(coord.get_rerencepixel()) != coord.get_reference_value(). You need to run {{{freq_align to rectify this

Location:

trunk/src

Files:

• Scantable.cpp (modified) (4 diffs)
• Scantable.h (modified) (5 diffs)
• ScantableWrapper.h (modified) (3 diffs)
• python_Scantable.cpp (modified) (1 diff)
• python_asap.cpp (modified) (1 diff)
• python_asap.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -691 +691 @@
     specCol_.get(whichrow, arr);
   } else {
-    CountedPtr<STPol> stpol(STPol::getPolClass(Scantable::factories_, 
+    CountedPtr<STPol> stpol(STPol::getPolClass(Scantable::factories_,
                                                basetype));
     uInt row = uInt(whichrow);
@@ -875 +875 @@
     Double tm;
     table_.keywordSet().get("UTC",tm);
-    return MEpoch(MVEpoch(tm));  
+    return MEpoch(MVEpoch(tm));
   }
 }
@@ -882 +882 @@
 {
   return formatDirection(getDirection(uInt(whichrow)));
+}
+
+
+SpectralCoordinate Scantable::getSpectralCoordinate(int whichrow) const {
+  const MPosition& mp = getAntennaPosition();
+  const MDirection& md = getDirection(whichrow);
+  const MEpoch& me = timeCol_(whichrow);
+  Double rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
+  return freqTable_.getSpectralCoordinate(md, mp, me, rf,
+                                          mfreqidCol_(whichrow));
 }
 
@@ -896 +906 @@
     return stlout;
   }
-
-  const MPosition& mp = getAntennaPosition();
-  const MDirection& md = getDirection(whichrow);
-  const MEpoch& me = timeCol_(whichrow);
-  Double rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
-  SpectralCoordinate spc =
-    freqTable_.getSpectralCoordinate(md, mp, me, rf, mfreqidCol_(whichrow));
+  SpectralCoordinate spc = getSpectralCoordinate(whichrow);
   Vector<Double> pixel(nchan);
   Vector<Double> world;

trunk/src/Scantable.h

@@ -27 +27 @@
 
 #include <measures/TableMeasures/ScalarMeasColumn.h>
+
+#include <coordinates/Coordinates/SpectralCoordinate.h>
 
 #include "Logger.h"
@@ -166 +168 @@
    */
   casa::MDirection getDirection( int whichrow ) const;
-  
+
   /**
    * get the direction type as a string, e.g. "J2000"
@@ -184 +186 @@
    * @return a string describing the direction reference
    */
-  std::string getDirectionRefString() const;    
+  std::string getDirectionRefString() const;
 
   /**
@@ -355 +357 @@
 
   void shift(int npix);
+
+  casa::SpectralCoordinate getSpectralCoordinate(int whichrow) const;
 
   void convertDirection(const std::string& newframe);
@@ -406 +410 @@
    * @param[in] flag true or false
    */
-  void parallactify(bool flag) 
+  void parallactify(bool flag)
   {focus().setParallactify(flag);}
 private:

trunk/src/ScantableWrapper.h

@@ -20 +20 @@
 #include "STFit.h"
 #include "Scantable.h"
+#include "STCoordinate.h"
 
 namespace asap {
@@ -215 +216 @@
     { table_->parallactify(flag); }
 
+  STCoordinate getCoordinate(int row) {
+    return STCoordinate(table_->getSpectralCoordinate(row));
+  }
+
 private:
   casa::CountedPtr<Scantable> table_;
@@ -221 +226 @@
 } // namespace
 #endif
-

trunk/src/python_Scantable.cpp

@@ -125 +125 @@
     .def("_getdirectionvec", &ScantableWrapper::getDirectionVector)
     .def("_parallactify", &ScantableWrapper::parallactify)
+    .def("get_coordinate", &ScantableWrapper::getCoordinate)
   ;
 };

trunk/src/python_asap.cpp

@@ -75 +75 @@
   asap::python::python_LineCatalog();
   asap::python::python_Logger();
+  asap::python::python_STCoordinate();
 
 #ifndef HAVE_LIBPYRAP

trunk/src/python_asap.h

@@ -47 +47 @@
     void python_LineCatalog();
     void python_Logger();
+    void python_STCoordinate();
 
   } // python