Changeset 397 for trunk/src

Timestamp:

02/09/05 13:06:53 (20 years ago)

Author:

kil064

Message:

add support in frequency alignment for a perIF (caters to
manual doppler tracking) or perFreqID mode (caters to no
doppler tracking)

Location:

trunk/src

Files:

• SDMath.cc (modified) (16 diffs)
• SDMath.h (modified) (4 diffs)

trunk/src/SDMath.cc

@@ -111 +111 @@
 
 
-SDMemTable* SDMath::frequencyAlignment (const SDMemTable& in, const String& refTime, const String& method) const
-{
-
+SDMemTable* SDMath::frequencyAlignment (const SDMemTable& in, const String& refTime, 
+                                         const String& method, Bool perFreqID) const
+{
 // Get frame info from Table
 
@@ -131 +131 @@
 // Do it
 
-   return frequencyAlign (in, freqSystem, refTime, method);
+   return frequencyAlign (in, freqSystem, refTime, method, perFreqID);
 }
 
@@ -1361 +1361 @@
 SDMemTable* SDMath::frequencyAlign (const SDMemTable& in,
                                    MFrequency::Types freqSystem,
-                                   const String& refTime, const String& methodStr) const
+                                   const String& refTime, 
+                                   const String& methodStr,
+                                   Bool perFreqID) const
 {
 // Get Header
@@ -1381 +1383 @@
    Vector<Double> times = mjdCol.getColumn();
 
-// Generate DataDesc table
+// Generate DataDesc table 
  
    Matrix<uInt> ddIdx;
    SDDataDesc dDesc;
-   generateDataDescTable (ddIdx, dDesc, nIF, in, tabIn, srcCol, fqIDCol);
+   generateDataDescTable (ddIdx, dDesc, nIF, in, tabIn, srcCol, fqIDCol, perFreqID);
 
 // Get reference Epoch to time of first row or given String
@@ -1404 +1406 @@
    MPosition refPos = in.getAntennaPosition();
 
-// Create FrequencyAligner Block. One VA for each possible
-// source/freqID combination
+// Create FrequencyAligner Block. One FA for each possible
+// source/freqID (perFreqID=True) or source/IF (perFreqID=False) combination
 
    PtrBlock<FrequencyAligner<Float>* > a(dDesc.length());
-   generateFrequencyAligners (a, dDesc, in, nChan, freqSystem, refPos, refEpoch);
-
-// Generate and fill output Frequency Tabke
+   generateFrequencyAligners (a, dDesc, in, nChan, freqSystem, refPos, 
+                              refEpoch, perFreqID);
+
+// Generate and fill output Frequency Table.  WHen perFreqID=True, there is one output FreqID
+// for each entry in the SDDataDesc table.  However, in perFreqID=False mode, there may be
+// some degeneracy, so we need a little translation map
 
    SDFrequencyTable freqTabOut = in.getSDFreqTable();
@@ -1418 +1423 @@
    Bool linear=True;
 //
+   Vector<uInt> ddFQTrans(dDesc.length(),0);
    for (uInt i=0; i<dDesc.length(); i++) {
 
@@ -1427 +1433 @@
 // Add FreqID
 
-      freqTabOut.addFrequency(sC.referencePixel()[0],
-                              sC.referenceValue()[0],
-                              sC.increment()[0]);
+      uInt idx = freqTabOut.addFrequency(sC.referencePixel()[0],
+                                         sC.referenceValue()[0],
+                                         sC.increment()[0]);
+      ddFQTrans(i) = idx;                                       // output FreqID = ddFQTrans(ddIdx)
    }
 
@@ -1439 +1446 @@
 // New output Table
 
+   cerr << "Create output table" << endl;
    SDMemTable* pTabOut = new SDMemTable(in,True);
    pTabOut->putSDFreqTable(freqTabOut);
@@ -1453 +1461 @@
    Vector<uInt> freqID(nIF);
    uInt ifIdx, faIdx;
+   Vector<Double> xIn;
 //
    for (uInt iRow=0; iRow<nRows; ++iRow) {
@@ -1471 +1480 @@
      Array<Bool> mask = mArrIn.getMask(); 
 
-// cerr << "values in = " << values(IPosition(4,0,0,0,0),IPosition(4,0,0,0,9)) << endl;
-
 // For each row, the Frequency abcissa will be the same regardless
 // of polarization.  For all other axes (IF and BEAM) the abcissa
@@ -1488 +1495 @@
         ifIdx = pos(asap::IFAxis);
         faIdx = ddIdx(iRow,ifIdx);
+
+// Generate abcissa for perIF.  Could cache this in a Matrix
+// on a per scan basis.   Pretty expensive doing it for every row.
+
+        if (!perFreqID) {
+           xIn.resize(nChan);
+           uInt fqID = dDesc.secID(ddIdx(iRow,ifIdx));
+           SpectralCoordinate sC = in.getSpectralCoordinate(fqID);
+           Double w;
+           for (uInt i=0; i<nChan; i++) {
+              sC.toWorld(w,Double(i));
+              xIn[i] = w;
+           }
+        }
 //
         VectorIterator<Float> itValuesVec(itValuesPlane.array(), 1); 
@@ -1497 +1518 @@
         useCachedAbcissa=False;
         while (!itValuesVec.pastEnd()) {     
-           ok = a[faIdx]->align (yOut, maskOut, itValuesVec.vector(),
-                                 itMaskVec.vector(), epoch, useCachedAbcissa,
-                                 interp, extrapolate); 
+           if (perFreqID) {
+              ok = a[faIdx]->align (yOut, maskOut, itValuesVec.vector(),
+                                    itMaskVec.vector(), epoch, useCachedAbcissa,
+                                    interp, extrapolate); 
+           } else {
+              ok = a[faIdx]->align (yOut, maskOut, xIn, itValuesVec.vector(),
+                                    itMaskVec.vector(), epoch, useCachedAbcissa,
+                                    interp, extrapolate); 
+           }
 //
            itValuesVec.vector() = yOut;
@@ -1517 +1544 @@
      }
 
-// cerr << "values out = " << values(IPosition(4,0,0,0,0),IPosition(4,0,0,0,9)) << endl;
-
 // Create SDContainer and put back
 
     SDContainer sc = in.getSDContainer(iRow);
     putDataInSDC(sc, values, mask);
+
+// Set output FreqIDs
+
     for (uInt i=0; i<nIF; i++) {
-       uInt idx = ddIdx(iRow,i);
-       freqID(i) = dDesc.freqID(idx);
+       uInt idx = ddIdx(iRow,i);               // Index into SDDataDesc table
+       freqID(i) = ddFQTrans(idx);             // FreqID in output FQ table
     }
     sc.putFreqMap(freqID);
@@ -1850 +1878 @@
                                     const Table& tabIn,
                                     const ROScalarColumn<String>& srcCol,
-                                    const ROArrayColumn<uInt>& fqIDCol) const
+                                    const ROArrayColumn<uInt>& fqIDCol,
+                                    Bool perFreqID) const
 {
    const uInt nRows = tabIn.nrow();
@@ -1862 +1891 @@
       const MDirection& dir = in.getDirection(iRow);
 //
-      for (uInt iIF=0; iIF<nIF; iIF++) {
-         uInt idx = dDesc.addEntry(srcName, freqIDs[iIF], dir);
-         ddIdx(iRow,iIF) = idx;
+      if (perFreqID) {
+
+// One entry per source/freqID pair
+
+         for (uInt iIF=0; iIF<nIF; iIF++) {
+            ddIdx(iRow,iIF) = dDesc.addEntry(srcName, freqIDs[iIF], dir, 0);
+         }
+      } else {
+
+// One entry per source/IF pair.  Hang onto the FreqID as well
+
+         for (uInt iIF=0; iIF<nIF; iIF++) {
+            ddIdx(iRow,iIF) = dDesc.addEntry(srcName, iIF, dir, freqIDs[iIF]);
+         }
       }
    }
 }
+
+
+
+
 
 MEpoch SDMath::epochFromString (const String& str, MEpoch::Types timeRef) const
@@ -1895 +1939 @@
                                         MFrequency::Types system,
                                         const MPosition& refPos,
-                                        const MEpoch& refEpoch) const
+                                        const MEpoch& refEpoch,
+                                        Bool perFreqID) const
 {
    for (uInt i=0; i<dDesc.length(); i++) {
-      uInt freqID = dDesc.freqID(i);
-      const MDirection& refDir = dDesc.direction(i);
-//
-      SpectralCoordinate sC = in.getSpectralCoordinate(freqID);
-      a[i] = new FrequencyAligner<Float>(sC, nChan, refEpoch, refDir, refPos, system);
+      uInt ID = dDesc.ID(i);
+      uInt secID = dDesc.secID(i);
+      const MDirection& refDir = dDesc.secDir(i);
+//
+      if (perFreqID) {
+
+// One aligner per source/FreqID pair.  
+
+         SpectralCoordinate sC = in.getSpectralCoordinate(ID);
+         a[i] = new FrequencyAligner<Float>(sC, nChan, refEpoch, refDir, refPos, system);
+      } else {
+
+// One aligner per source/IF pair.  But we still need the FreqID to
+// get the right SC.  Hence the messing about with the secondary ID
+
+         SpectralCoordinate sC = in.getSpectralCoordinate(secID);
+         a[i] = new FrequencyAligner<Float>(sC, nChan, refEpoch, refDir, refPos, system);
+      }
    }
 }

trunk/src/SDMath.h

@@ -112 +112 @@
 // Frequency Alignment
    SDMemTable* frequencyAlignment (const SDMemTable& in, const casa::String& refTime,
-                                   const casa::String& method) const;
+                                   const casa::String& method, casa::Bool perFreqID) const;
 
 // Opacity correction
@@ -191 +191 @@
                               casa::MFrequency::Types system,
                               const casa::String& timeRef,
-                              const casa::String& method) const;
+                              const casa::String& method, casa::Bool perIF) const;
 
 // Generate frequency aligners
@@ -199 +199 @@
                                    casa::MFrequency::Types system,
                                    const casa::MPosition& refPos,
-                                   const casa::MEpoch& refEpoch) const;
+                                   const casa::MEpoch& refEpoch, casa::Bool perFreqID) const;
 
 // Generate data description table (combines source and freqID)
@@ -208 +208 @@
                                const casa::Table& tabIn,
                                const casa::ROScalarColumn<casa::String>& srcCol,
-                               const casa::ROArrayColumn<casa::uInt>& fqIDCol) const;
+                               const casa::ROArrayColumn<casa::uInt>& fqIDCol,
+                               casa::Bool perFreqID) const;
 
 // Function to get the current cursor location