Changeset 386 for trunk

Timestamp:

02/08/05 14:00:43 (20 years ago)

Author:

kil064

Message:

support RESTFREQID column in SDMemTable object

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (16 diffs)
• SDMemTable.h (modified) (4 diffs)
• SDMemTableWrapper.h (modified) (1 diff)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -167 +167 @@
   td.addColumn(ScalarColumnDesc<Double>("INTERVAL"));
   td.addColumn(ArrayColumnDesc<uInt>("FREQID"));
+  td.addColumn(ArrayColumnDesc<uInt>("RESTFREQID"));
   td.addColumn(ArrayColumnDesc<Double>("DIRECTION"));
   td.addColumn(ScalarColumnDesc<String>("FIELDNAME"));
@@ -193 +194 @@
   integrCol_.attach(table_, "INTERVAL");
   freqidCol_.attach(table_, "FREQID");
+  restfreqidCol_.attach(table_, "RESTFREQID");
   dirCol_.attach(table_, "DIRECTION");
   fldnCol_.attach(table_, "FIELDNAME");
@@ -434 +436 @@
   }
 
-// Continue with km/s or Hz.  Get FreqID
+// Continue with km/s or Hz.  Get FreqIDs
 
   Vector<uInt> freqIDs;
   freqidCol_.get(whichRow, freqIDs);
   uInt freqID = freqIDs(IFSel_);
+  restfreqidCol_.get(whichRow, freqIDs);
+  uInt restFreqID = freqIDs(IFSel_);
 
 // Get SpectralCoordinate, set reference frame conversion,
 // velocity conversion, and rest freq state
 
-  SpectralCoordinate spc = getSpectralCoordinate(freqID, whichRow);
+  SpectralCoordinate spc = getSpectralCoordinate(freqID, restFreqID, whichRow);
   Vector<Double> pixel(nChan());
   indgen(pixel);
@@ -486 +490 @@
   Vector<uInt> freqIDs;
   freqidCol_.get(whichRow, freqIDs);
-  uInt freqID = freqIDs(IFSel_);
+  uInt freqID = freqIDs(IFSel_);  
+  restfreqidCol_.get(whichRow, freqIDs);
+  uInt restFreqID = freqIDs(IFSel_);
 
 // Get SpectralCoordinate, with frame, velocity, rest freq state set
 
-  SpectralCoordinate spc = getSpectralCoordinate(freqID, whichRow);
+  SpectralCoordinate spc = getSpectralCoordinate(freqID, restFreqID, whichRow);
 //
   String s = "Channel";
@@ -705 +711 @@
 
 
-SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID, 
-                                                     uInt whichRow) const
+SpectralCoordinate SDMemTable::getSpectralCoordinate(uInt freqID, uInt restFreqID,
+                                                     uInt whichRow) const
 {
 
@@ -715 +721 @@
   Table t = table_.keywordSet().asTable("FREQUENCIES");
 
-// Get rest frequencies from table, one per IF ???
-
-  Vector<Double> vec;
-  t.keywordSet().get("RESTFREQS",vec);
-  if (vec.nelements() > 0) {
-    spec.setRestFrequencies(vec);
-
-// Select rest freq
-
-    if (IFSel_ < vec.nelements()) {
-       spec.selectRestFrequency(uInt(IFSel_));
-    } else {
-       cerr << "There is no rest frequency for this IF; selecting rest freq for IF=0" << endl;
-       spec.selectRestFrequency(0u);
-    }
+// Set rest frequency
+
+  Vector<Double> restFreqIDs;
+  t.keywordSet().get("RESTFREQS",restFreqIDs);
+  if (restFreqID < restFreqIDs.nelements()) {                  // SHould always be true
+    spec.setRestFrequency(restFreqIDs(restFreqID),True);
   }
 
@@ -856 +853 @@
 SDFrequencyTable SDMemTable::getSDFreqTable() const
 {
+cerr << "ENter SDMemTbale::getSDFreqTable" << endl;
+
   const Table& t = table_.keywordSet().asTable("FREQUENCIES");
   SDFrequencyTable sdft;
@@ -893 +892 @@
   Vector<Double> restFreqs;
   t.keywordSet().get("RESTFREQS", restFreqs);
+cerr << "old restfreqs from Table = " << restFreqs << endl;
+cerr << "add them to SDFreqTable" << endl;
   for (uInt i=0; i<restFreqs.nelements(); i++) {
      sdft.addRestFrequency(restFreqs[i]);
   }
   sdft.setRestFrequencyUnit(String("Hz"));
+cerr << "Exit getSDFreqTable" << endl;
 //
   return sdft;
@@ -905 +907 @@
   uInt rno = table_.nrow();
   table_.addRow();
-
-//  mjd.put(rno, sdc.timestamp);
+//
   timeCol_.put(rno, sdc.timestamp);
   srcnCol_.put(rno, sdc.sourcename);
@@ -916 +917 @@
   integrCol_.put(rno, sdc.interval);
   freqidCol_.put(rno, sdc.getFreqMap());
+  restfreqidCol_.put(rno, sdc.getRestFreqMap());
   dirCol_.put(rno, sdc.getDirection());
   rbeamCol_.put(rno, sdc.refbeam);
@@ -924 +926 @@
   paraCol_.put(rno, sdc.parangle);
   histCol_.put(rno, sdc.getHistory());
-
+//
   return true;
 }
@@ -944 +946 @@
   sdc.tcal[0] = tc[0];sdc.tcal[1] = tc[1];
   tcaltCol_.get(whichRow, sdc.tcaltime);
+//
   Array<Float> spectrum;
   Array<Float> tsys;
@@ -950 +953 @@
   Array<Double> direction;
   Vector<String> histo;
+//
   specCol_.get(whichRow, spectrum);
   sdc.putSpectrum(spectrum);
@@ -958 +962 @@
   freqidCol_.get(whichRow, fmap);
   sdc.putFreqMap(fmap);
+  restfreqidCol_.get(whichRow, fmap);
+  sdc.putRestFreqMap(fmap);
   dirCol_.get(whichRow, direction);
   sdc.putDirection(direction);
@@ -1335 +1341 @@
 }
 
+casa::Bool SDMemTable::selectRestFreq (casa::Double restFreq, const String& unit,
+                                       const casa::String& source,
+                                       casa::Int whichIF)
+{
+   const Int nIFs = nIF();
+   if (whichIF>=nIFs) {
+      throw(AipsError("Illegal IF index"));
+   }
+
+// Find rest frequency.  Add it if necessary
+
+   SDFrequencyTable sdft = getSDFreqTable();
+   Quantum<Double> rf(restFreq, Unit(unit));
+   uInt idx = sdft.addRestFrequency(rf.getValue("Hz"));
+
+// Replace
+
+   Bool empty = source.empty();
+   Bool ok = False;
+   if (putSDFreqTable(sdft)) {
+      const uInt nRow = table_.nrow();
+      String srcName;
+      Vector<uInt> restFreqIDs;
+      for (uInt i=0; i<nRow; i++) {
+         srcnCol_.get(i, srcName);
+         restfreqidCol_.get(i,restFreqIDs);       
+//
+         if (empty || source==srcName) {
+            if (whichIF<0) {
+               restFreqIDs = idx;
+            } else {              
+               restFreqIDs(whichIF) = idx;
+            }
+         }
+//
+         restfreqidCol_.put(i,restFreqIDs);       
+      }
+      ok = True;
+   } else {
+      ok = False;
+   }
+//
+   return ok;
+}
+
+
 void SDMemTable::renumber()
 {
@@ -1355 +1407 @@
   }
 }
+

trunk/src/SDMemTable.h

@@ -83 +83 @@
 
   //get the data wrapped up in a meta container
+
   SDContainer getSDContainer(casa::uInt whichRow=0) const;
   SDHeader getSDHeader() const;
@@ -118 +119 @@
   virtual void setCoordInfo(std::vector<string> theinfo);
 
+// Select RestFreqID.  FInds the restFreq ID for specified restFreq,
+// and updates RESTFREQID column of table for specified IF index
+// (-1 means all IFs) and source combination
+  virtual casa::Bool selectRestFreq (casa::Double restFreq, const casa::String& unit,
+                                     const casa::String& source,
+                                     casa::Int whichIF=-1);
+
 // Get/Set flux unit
   std::string getFluxUnit() const;
@@ -185 +193 @@
   casa::SpectralCoordinate getSpectralCoordinate(casa::uInt whichIdx) const;
 
-  // Return SC. Set velocity conversion state (unit,doppler), 
-  // set rest frequencies.  If row number given (>-0), also set
+  // Return SC. Set velocity conversion state (unit,doppler), and
+  // rest frequency.  If row number given (>=0), also set
   // frame conversion layer (needs direction & time which require row)
-  casa::SpectralCoordinate getSpectralCoordinate(casa::uInt whichIdx, casa::uInt row) const;
+  casa::SpectralCoordinate getSpectralCoordinate(casa::uInt freqID, 
+                                                 casa::uInt restFreqID,
+                                                 casa::uInt row) const;
 
   // Set just the reference value, pixel and increment into the table
@@ -232 +242 @@
   casa::ArrayColumn<casa::Double> dirCol_;
   casa::ArrayColumn<casa::uChar> flagsCol_;
-  casa::ArrayColumn<casa::uInt> freqidCol_;
+  casa::ArrayColumn<casa::uInt> freqidCol_, restfreqidCol_;
   casa::ArrayColumn<casa::String> histCol_;
 };

trunk/src/SDMemTableWrapper.h

@@ -149 +149 @@
   }
 
+  bool selectRestFreq(double freq, const std::string& unit, 
+                      const std::string& source, int whichIF) {
+    return table_->selectRestFreq(casa::Double(freq), casa::String(unit),
+                                  casa::String(source),
+                                  casa::Int(whichIF));
+  }
+
   std::vector<double> getRestFreqs() {
     return table_->getRestFreqs();

trunk/src/python_SDMemTable.cc

@@ -89 +89 @@
     .def("_setrestfreqs",  &SDMemTableWrapper::setRestFreqs)
     .def("_getrestfreqs",  &SDMemTableWrapper::getRestFreqs)
+    .def("_selectrestfreq",  &SDMemTableWrapper::selectRestFreq)
     .def("_setcoordinfo", &SDMemTableWrapper::setCoordInfo)
     .def("_getcoordinfo", &SDMemTableWrapper::getCoordInfo)