Changeset 923 for trunk/src

Timestamp:

03/24/06 13:32:05 (19 years ago)

Author:

mar637

Message:

fixed az/el data type to be Float. added getChannels function. to get cnumber of channels per row. (nchan retrurns by IF)

Location:

trunk/src

Files:

• Scantable.cpp (modified) (5 diffs)
• Scantable.h (modified) (2 diffs)

trunk/src/Scantable.cpp

@@ -218 +218 @@
   // writing create the measure column
   mdirCol.write(td);
-  td.addColumn(ScalarColumnDesc<Double>("AZIMUTH"));
-  td.addColumn(ScalarColumnDesc<Double>("ELEVATION"));
+  td.addColumn(ScalarColumnDesc<Float>("AZIMUTH"));
+  td.addColumn(ScalarColumnDesc<Float>("ELEVATION"));
   td.addColumn(ScalarColumnDesc<Float>("PARANGLE"));
 
@@ -518 +518 @@
     if ( t.nrow() == 0 ) return 0;
     ROArrayColumn<Float> v(t, "SPECTRA");
-    return v(0).nelements();
+    return v.shape(0)(0);
   }
   return 0;
 }
 
+int Scantable::getChannels(int whichrow) const
+{
+  return specCol_.shape(whichrow)(0);
+}
 
 int Scantable::getBeam(int whichrow) const
@@ -569 +573 @@
                                                 frame)
                             )().getAngle("rad").getValue();
-    azCol_.put(i,azel[0]);
-    elCol_.put(i,azel[1]);
+    azCol_.put(i,Float(azel[0]));
+    elCol_.put(i,Float(azel[1]));
     oss << "azel: " << azel[0]/C::pi*180.0 << " "
         << azel[1]/C::pi*180.0 << " (deg)" << endl;
@@ -768 +772 @@
         const TableRecord& irec = irow.get(0);
         oss << std::right <<setw(8) << "" << std::left << irec.asuInt("IFNO");
-        oss << frequencies().print(irec.asuInt("FREQ_ID"));
+        oss << frequencies().print(irec.asuInt("FREQ_ID")) << irec.asuInt("MOLECULE_ID");
 
         ++iiter;
@@ -856 +860 @@
 void asap::Scantable::setRestFrequencies( double rf, const std::string& unit )
 {
-  ///@todo lookup in line table
+  ///@todo lookup in line table to fill in name and formattedname
   Unit u(unit);
   Quantum<Double> urf(rf, u);

trunk/src/Scantable.h

@@ -233 +233 @@
   int getCycle(int whichrow) const { return cycleCol_(whichrow); }
   int getScan(int whichrow) const { return scanCol_(whichrow); }
+  int getChannels(int whichrow) const;
 
   double getInterval(int whichrow) const
@@ -379 +380 @@
   casa::MDirection::ScalarColumn dirCol_;
   casa::MEpoch::ScalarColumn timeCol_;
-  casa::ScalarColumn<casa::Double> azCol_;
-  casa::ScalarColumn<casa::Double> elCol_;
+  casa::ScalarColumn<casa::Float> azCol_;
+  casa::ScalarColumn<casa::Float> elCol_;
   casa::ScalarColumn<casa::Float> paraCol_;
   casa::ScalarColumn<casa::String> srcnCol_, fldnCol_;