Changeset 521 for trunk/src

Timestamp:

02/28/05 22:27:17 (20 years ago)

Author:

kil064

Message:

add restFreqIDs to summary listing

File:

• trunk/src/SDMemTable.cc (modified) (8 diffs)

trunk/src/SDMemTable.cc

@@ -389 +389 @@
      throw (AipsError("You must have 1,2 or 4 polarizations to get the Stokes parameters"));
   }
+
+// For full conversion we are only supporting linears at the moment
+
+  if (nPol() > 2) {
+     String antName;
+     table_.keywordSet().get("AntennaName", antName);
+     Instrument inst = SDAttr::convertInstrument (antName, True);
+     SDAttr sdAtt;
+     if (sdAtt.feedPolType(inst) != LINEAR) {
+       throw(AipsError("Only linear polarizations are supported"));
+     }
+  }
+//
   Array<Float> arr;
   stokesCol_.get(whichRow, arr);
-
+//
   if (doPol && (polSel_==1 || polSel_==2)) {       //   Q,U --> P, P.A.
 
@@ -1464 +1477 @@
   String name;
   Vector<uInt> freqIDs, listFQ;
+  Vector<uInt> restFreqIDs, listRestFQ;
   uInt nInt;
 
@@ -1475 +1489 @@
     // Find all the FreqIDs in this scan
     listFQ.resize(0);      
+    listRestFQ.resize(0);      
     for (uInt j=startInt(i); j<endInt(i)+1; j++) {
       freqidCol_.get(j, freqIDs);
       for (uInt k=0; k<freqIDs.nelements(); k++) {
         mathutil::addEntry(listFQ, freqIDs(k));
+      }
+//
+      restfreqidCol_.get(j, restFreqIDs);
+      for (uInt k=0; k<restFreqIDs.nelements(); k++) {
+        mathutil::addEntry(listRestFQ, restFreqIDs(k));
       }
     }
@@ -1489 +1509 @@
         << setw(3) << std::right << nInt  << setw(3) << " x " << std::left
         << setw(6) <<  tInt
-        << " " << listFQ << endl;
+        << " " << listFQ << " " << listRestFQ << endl;
   }
   oss << endl;
@@ -1697 +1717 @@
    // If multiple restfreqs, must be length nIF. In this
    // case we will just replace the rest frequencies
+   // We can't disinguish scalar and vector of length 1
    const uInt nRestFreqs = restFreqs.nelements();
    Int idx = -1;
@@ -1706 +1727 @@
          throw (AipsError("Number of rest frequencies must be equal to the number of IFs"));
       }
-      cout << "Replacing rest frequencies with given list, one per IF" << endl;
+      cout << "Replacing rest frequencies, one per IF, with given list : " << restFreqs << endl;
       sdft.deleteRestFrequencies();
       for (uInt i=0; i<nRestFreqs; i++) {
@@ -1717 +1738 @@
       Quantum<Double> rf(restFreqs[0], unit);
       idx = sdft.addRestFrequency(rf.getValue("Hz"));
-      cout << "Selecting given rest frequency" << endl;
+      if (whichIF>=0) {
+         cout << "Selecting given rest frequency (" << restFreqs[0] << ") for IF " << whichIF << endl;
+      } else {
+         cout << "Selecting given rest frequency (" << restFreqs[0] << ") for all IFs" << endl;
+      }
    }
    
@@ -1730 +1755 @@
          srcnCol_.get(i, srcName);
          restfreqidCol_.get(i,restFreqIDs);       
-
          if (idx==-1) {
            // Replace vector of restFreqs; one per IF.