Changeset 1170 for trunk

Timestamp:

08/22/06 13:33:18 (18 years ago)

Author:

mar637

Message:

added line name to setRestFrequency

Location:

trunk/src

Files:

• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (4 diffs)
• ScantableWrapper.h (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -934 +934 @@
   Unit u = Unit(freqTable_.getUnitString());
   if (u == Unit("km/s")) {
-    s = CoordinateUtil::axisLabel(spc,0,True,True,True);
+    s = CoordinateUtil::axisLabel(spc, 0, True,True,  True);
   } else if (u == Unit("Hz")) {
     Vector<String> wau(1);wau = u.getName();
     spc.setWorldAxisUnits(wau);
-    s = CoordinateUtil::axisLabel(spc,0,True,True,False);
+    s = CoordinateUtil::axisLabel(spc, 0, True, True, False);
   }
   return s;
@@ -944 +944 @@
 }
 
-void asap::Scantable::setRestFrequencies( double rf, const std::string& unit )
+void asap::Scantable::setRestFrequencies( double rf, const std::string& name,
+                                          const std::string& unit )
 {
   ///@todo lookup in line table to fill in name and formattedname
   Unit u(unit);
   Quantum<Double> urf(rf, u);
-  uInt id = moleculeTable_.addEntry(urf.getValue("Hz"), "", "");
+  uInt id = moleculeTable_.addEntry(urf.getValue("Hz"), name, "");
   TableVector<uInt> tabvec(table_, "MOLECULE_ID");
   tabvec = id;

trunk/src/Scantable.h

@@ -161 +161 @@
         /**
          * the @ref casa::MDirection for a specific row
-         * @param[in] whichrow the row number 
+         * @param[in] whichrow the row number
          * return casa::MDirection
          */
@@ -176 +176 @@
          * set the direction type as a string, e.g. "J2000"
          * @param[in] the direction type
-         */     
+         */
   void setDirectionRefString(const std::string& refstr="");
   /**
@@ -187 +187 @@
          * return the direction string
          */
-  
+
 
   /**
@@ -345 +345 @@
     { return moleculeTable_.getRestFrequencies(); }
 
-  void setRestFrequencies(double rf, const std::string& = "Hz");
+  void setRestFrequencies(double rf, const std::string& name = "",
+                          const std::string& = "Hz");
   void setRestFrequencies(const std::string& name);
 

trunk/src/ScantableWrapper.h

@@ -146 +146 @@
     { table_->setSourceType(stype); }
 
-  void setRestFrequencies(double rf, const std::string& unit)
-    { table_->setRestFrequencies(rf, unit); }
+  void setRestFrequencies(double rf, const std::string& name,
+                          const std::string& unit)
+    { table_->setRestFrequencies(rf, name, unit); }
 /*
   void setRestFrequencies(const std::string& name) {