Changeset 401

Timestamp:

02/09/05 22:28:48 (19 years ago)

Author:

kil064

Message:

add rest freq specification by line name
add function spectraLines to list known lines

Location:

trunk/src

Files:

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

trunk/src/SDMemTable.cc

@@ -742 +742 @@
 // Set reference frame conversion  (requires row)
 
-  MDirection direct = getDirection(whichRow);
+  MDirection dir = getDirection(whichRow);
   MEpoch epoch = getEpoch(whichRow);
   MPosition pos = getAntennaPosition();
-  if (!spec.setReferenceConversion(mtype,epoch,pos,direct)) {
+//
+  if (!spec.setReferenceConversion(mtype,epoch,pos,dir)) {
     throw(AipsError("Couldn't convert frequency frame."));
   }
@@ -1326 +1327 @@
 }
 
-casa::Bool SDMemTable::setRestFreqs (const casa::Vector<Double>& restFreqs, const String& sUnit,
-                                     const casa::String& source,
-                                     casa::Int whichIF)
+Bool SDMemTable::setRestFreqs (const Vector<Double>& restFreqsIn, 
+                                     const String& sUnit,
+                                     const vector<string>& lines,
+                                     const String& source,
+                                     Int whichIF)
 {
    const Int nIFs = nIF();
@@ -1335 +1338 @@
    }
 
+// FInd vector of restfrequencies
+// Double takes precedence over String
+
+   Unit unit;
+   Vector<Double> restFreqs;
+   if (restFreqsIn.nelements()>0) {
+      restFreqs.resize(restFreqsIn.nelements());
+      restFreqs = restFreqsIn;
+      unit = Unit(sUnit);
+   } else if (lines.size()>0) {
+      const uInt nLines = lines.size();
+      unit = Unit("Hz");
+      restFreqs.resize(nLines);
+      MFrequency lineFreq;
+      for (uInt i=0; i<nLines; i++) {
+         String tS(lines[i]);
+         tS.upcase();
+         if (MeasTable::Line(lineFreq, tS)) {
+            restFreqs[i] = lineFreq.getValue().getValue();          // Hz
+         } else {
+            String s = String(lines[i]) + String(" is an unrecognized spectral line");
+            throw(AipsError(s));
+         }
+      }
+   } else {
+      throw(AipsError("You have not specified any rest frequencies or lines"));
+   }
+
 // If multiple restfreqs, must be length nIF. In this
 // case we will just replace the rest frequencies
@@ -1340 +1371 @@
 
    const uInt nRestFreqs = restFreqs.nelements();
-   Unit unit(sUnit);
    Int idx = -1;
    SDFrequencyTable sdft = getSDFreqTable();
@@ -1408 +1438 @@
 }
 
+void SDMemTable::spectralLines () const
+{
+   Vector<String> lines = MeasTable::Lines();
+   MFrequency lineFreq;
+   Double freq;
+//
+   cerr.flags(std::ios_base::left);
+   cerr << "Line      Frequency (Hz)" << endl;
+   cerr << "-----------------------" << endl;
+   for (uInt i=0; i<lines.nelements(); i++) {
+     MeasTable::Line(lineFreq, lines[i]);
+     freq = lineFreq.getValue().getValue();          // Hz
+//
+     cerr << setw(11) << lines[i] << setprecision(10) << freq << endl;
+   }
+}
 
 void SDMemTable::renumber()

trunk/src/SDMemTable.h

@@ -120 +120 @@
   virtual casa::Bool setRestFreqs (const casa::Vector<casa::Double>& restFreqs, 
                                    const casa::String& unit,
+                                   const std::vector<std::string>& lines,
                                    const casa::String& source,
                                    casa::Int whichIF=-1);
+
+// List lines
+   void spectralLines() const;
 
 // Get/Set flux unit

trunk/src/SDMemTableWrapper.h

@@ -145 +145 @@
   }
 
-  bool setRestFreqs (const std::vector<double>& restfreqs, const std::string& unit, 
-                     const std::string& source, int whichIF) {
+  bool setRestFreqs(const std::vector<double>& restfreqs, 
+                    const std::string& unit, 
+                    const std::vector<std::string>& lines,
+                    const std::string& source, int whichIF) {
     casa::Vector<casa::Double> restFreqs2(restfreqs);
     return table_->setRestFreqs(restFreqs2, casa::String(unit),
-                                casa::String(source),
+                                lines, casa::String(source),
                                 casa::Int(whichIF));
   }
+
+  void spectralLines() const {table_->spectralLines();}
 
   std::vector<double> getRestFreqs() {

trunk/src/python_SDMemTable.cc

@@ -51 +51 @@
     .def("getbeam", &SDMemTableWrapper::getBeam)
     .def("getpol", &SDMemTableWrapper::getPol)
+    .def("_lines", &SDMemTableWrapper::spectralLines)
     .def("nif", &SDMemTableWrapper::nIF)
     .def("nbeam", &SDMemTableWrapper::nBeam)