Changeset 288

Timestamp:

01/24/05 17:54:41 (20 years ago)

Author:

kil064

Message:

track changes to SDMemTable interfgace

File:

• trunk/src/SDMath.cc (modified) (5 diffs)

trunk/src/SDMath.cc

@@ -136 +136 @@
    MDoppler::getType(doppler, dopplerStr);
 
-// Decide on alignment Epoch
-
 // Do it
 
@@ -572 +570 @@
   for (uInt j=0; j<in.nCoordinates(); ++j) {
     CoordinateSystem cSys;
-    cSys.addCoordinate(in.getCoordinate(j));
+    cSys.addCoordinate(in.getSpectralCoordinate(j));
     CoordinateSystem cSysBin = 
       CoordinateUtil::makeBinnedCoordinateSystem(factors, cSys, False);
@@ -1143 +1141 @@
       refEpoch = epochFromString(refTime, in.getTimeReference());
    } else {
-      Quantum<Double> tQ(times[0], DAY);
-      MVEpoch mve(tQ);
-      refEpoch = MEpoch(mve, epochRef);
+      refEpoch = in.getEpoch(0);
    }
    cerr << "Aligning at reference Epoch " << formatEpoch(refEpoch) << endl;
@@ -1151 +1147 @@
 // Set Reference Position
 
-   Vector<Double> antPos = sh.antennaposition;
-   MVPosition mvpos(antPos[0], antPos[1], antPos[2]);
-   MPosition refPos(mvpos);
+   MPosition refPos = in.getAntennaPosition();
 
 // Get Frequency Table
@@ -1165 +1159 @@
    PtrBlock<VelocityAligner<Float>* > vA(nFreqIDs*nSrcTab);
    for (uInt fqID=0; fqID<nFreqIDs; fqID++) {
-      SpectralCoordinate sC = in.getCoordinate(fqID);
+      SpectralCoordinate sC = in.getSpectralCoordinate(fqID);
       for (uInt iSrc=0; iSrc<nSrcTab; iSrc++) {
          MDirection refDir = in.getDirection(firstRow[iSrc]);