Changeset 272 for trunk/src

Timestamp:

01/24/05 01:00:14 (20 years ago)

Author:

kil064

Message:

add reference time arg. to function 'VelocityAlignment'

Location:

trunk/src

Files:

• SDMath.cc (modified) (8 diffs)
• SDMath.h (modified) (3 diffs)
• SDMathWrapper.cc (modified) (1 diff)
• SDMathWrapper.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -49 +49 @@
 #include <casa/Quanta/MVEpoch.h>
 #include <casa/Quanta/QC.h>
+#include <casa/Quanta/MVTime.h>
 #include <casa/Utilities/Assert.h>
 
@@ -107 +108 @@
 
 
-SDMemTable* SDMath::velocityAlignment (const SDMemTable& in) const
+SDMemTable* SDMath::velocityAlignment (const SDMemTable& in, const String& refTime) const
 {
 
@@ -139 +140 @@
 // Do it
 
-   return velocityAlign (in, velSystem, velUnit, doppler);
+   return velocityAlign (in, velSystem, velUnit, doppler, refTime);
 }
 
@@ -1103 +1104 @@
                                    MFrequency::Types velSystem,
                                    const String& velUnit,
-                                   MDoppler::Types doppler) const
+                                   MDoppler::Types doppler,
+                                   const String& refTime) const
 {
 // Get Header
@@ -1132 +1134 @@
    const uInt nSrcTab = srcTab.nelements();
    cerr << "Found " << srcTab.nelements() << " sources to align " << endl;
-/*
-   cerr << "source table = " << srcTab << endl;
-   cerr << "source idx = " << srcIdx << endl;
-   cerr << "first row = " << firstRow << endl;
-*/
-
-// Set reference Epoch to time of first row
-
-   MEpoch::Ref timeRef = MEpoch::Ref(in.getTimeReference());
+
+// Set reference Epoch to time of first row or given String
+
    Unit DAY(String("d"));
-   Quantum<Double> tQ(times[0], DAY);
-   MVEpoch mve(tQ);
-   MEpoch refTime(mve, timeRef);
+   MEpoch::Ref epochRef(in.getTimeReference());
+   MEpoch refEpoch;
+   if (refTime.length()>0) {
+      refEpoch = epochFromString(refTime, in.getTimeReference());
+   } else {
+      Quantum<Double> tQ(times[0], DAY);
+      MVEpoch mve(tQ);
+      refEpoch = MEpoch(mve, epochRef);
+   }
+   cerr << "Aligning at reference Epoch " << formatEpoch(refEpoch) << endl;
 
 // Set Reference Position
@@ -1166 +1169 @@
          MDirection refDir = in.getDirection(firstRow[iSrc]);
          uInt idx = (iSrc*nFreqIDs) + fqID;
-         vA[idx] = new VelocityAligner<Float>(sC, nChan, refTime, refDir, refPos,
+         vA[idx] = new VelocityAligner<Float>(sC, nChan, refEpoch, refDir, refPos,
                                               velUnit, doppler, velSystem);
       }
@@ -1196 +1199 @@
     Quantum<Double> tQ2(times[iRow],DAY);
     MVEpoch mv2(tQ2);
-    MEpoch epoch(mv2, timeRef);
+    MEpoch epoch(mv2, epochRef);
 
 // Get FreqID vector.  One freqID per IF
@@ -1610 +1613 @@
    }
 }
+
+MEpoch SDMath::epochFromString (const String& str, MEpoch::Types timeRef) const
+{
+   Quantum<Double> qt;
+   if (MVTime::read(qt,str)) {
+      MVEpoch mv(qt);
+      MEpoch me(mv, timeRef);
+      return me;
+   } else {
+      throw(AipsError("Invalid format for Epoch string"));
+   }
+}
+
+
+String SDMath::formatEpoch(const MEpoch& epoch)  const
+{
+   MVTime mvt(epoch.getValue());
+   return mvt.string(MVTime::YMD) + String(" (") + epoch.getRefString() + String(")");
+}
+

trunk/src/SDMath.h

@@ -39 +39 @@
 
 class casa::Table;
+class casa::MEpoch;
+
 
 namespace asap {
@@ -95 +97 @@
 
 // Velocity Alignment
-   SDMemTable* velocityAlignment (const SDMemTable& in) const;
+   SDMemTable* velocityAlignment (const SDMemTable& in, const casa::String& refTime) const;
 
 // Opacity correction
@@ -186 +188 @@
                               casa::MFrequency::Types velSystem,
                               const casa::String& velUnit,
-                              casa::MDoppler::Types doppler) const;
+                              casa::MDoppler::Types doppler,
+                              const casa::String& timeRef) const;
+
+// Convert time String to Epoch
+   casa::MEpoch epochFromString (const casa::String& str, casa::MEpoch::Types timeRef) const;
+
+// Format EPoch
+   casa::String formatEpoch(const casa::MEpoch& epoch)  const;
 };
 

trunk/src/SDMathWrapper.cc

@@ -228 +228 @@
 }
 
-void SDMathWrapper::velocityAlignmentInSitu (SDMemTableWrapper& in)
-{
-  SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.velocityAlignment(*pIn);
-  *pIn = *pOut;
-  delete pOut;
-}
-
-
-SDMemTableWrapper SDMathWrapper::velocityAlignment (const SDMemTableWrapper& in)
-{
-  const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.velocityAlignment(*pIn));
+void SDMathWrapper::velocityAlignmentInSitu (SDMemTableWrapper& in, const std::string& refTime)
+{
+  SDMemTable* pIn = in.getPtr();
+  SDMath sdm;
+  SDMemTable* pOut = sdm.velocityAlignment(*pIn, String(refTime));
+  *pIn = *pOut;
+  delete pOut;
+}
+
+
+SDMemTableWrapper SDMathWrapper::velocityAlignment (const SDMemTableWrapper& in,
+                                                    const std::string& refTime)
+{
+  const CountedPtr<SDMemTable>& pIn = in.getCP();
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.velocityAlignment(*pIn, String(refTime)));
 }
 

trunk/src/SDMathWrapper.h

@@ -85 +85 @@
 
 // Apply velocity alignment
-  void velocityAlignmentInSitu (SDMemTableWrapper& in);
-  SDMemTableWrapper velocityAlignment(const SDMemTableWrapper& in);
+  void velocityAlignmentInSitu (SDMemTableWrapper& in, const std::string& refTime);
+  SDMemTableWrapper velocityAlignment(const SDMemTableWrapper& in, const std::string& refTime);
 
 // Apply opacity correction