Changeset 1598 for trunk/src/Scantable.cpp

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

File:

• trunk/src/Scantable.cpp (modified) (4 diffs)

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;