Changeset 830 for trunk

Timestamp:

02/17/06 15:49:59 (19 years ago)

Author:

mar637

Message:

added getEntry to support export for STWriter.

Location:

trunk/src

Files:

• STFrequencies.cpp (modified) (1 diff)
• STFrequencies.h (modified) (2 diffs)
• STMolecules.cpp (modified) (1 diff)
• STMolecules.h (modified) (1 diff)
• STTcal.cpp (modified) (1 diff)
• STTcal.h (modified) (1 diff)
• STTemplates.cpp (modified) (2 diffs)
• STWeather.cpp (modified) (1 diff)
• STWeather.h (modified) (1 diff)

trunk/src/STFrequencies.cpp

@@ -92 +92 @@
 
 
+
+void STFrequencies::getEntry( Double& refpix, Double& refval, Double& inc,
+                              uInt id )
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if (t.nrow() == 0 ) {
+    throw(AipsError("STFrequencies::getEntry - freqID out of range"));
+  }
+  ROTableRow row(t);
+  // get first row - there should only be one matching id
+  const TableRecord& rec = row.get(0);
+  refpix = rec.asDouble("REFPIX");
+  refval = rec.asDouble("REFVAL");
+  inc = rec.asDouble("INCREMENT");
+}
+
 SpectralCoordinate STFrequencies::getSpectralCoordinate( uInt freqID )
 {

trunk/src/STFrequencies.h

@@ -43 +43 @@
                        casa::Double inc );
 
-  //const casa::Table& table() const { return table_; }
-  //casa::Table table() { return table_; }
+  void getEntry( casa::Double& refpix, casa::Double& refval,
+                 casa::Double& inc, casa::uInt id );
 
   casa::SpectralCoordinate getSpectralCoordinate( casa::uInt freqID );
@@ -59 +59 @@
   void rescale(casa::Float factor, const std::string& mode);
 
-  float getRefFreq(casa::uInt d, casa::uInt channel);
+  float getRefFreq(casa::uInt id, casa::uInt channel);
 
   std::string print(int id=-1);

trunk/src/STMolecules.cpp

@@ -78 +78 @@
 }
 
+void STMolecules::getEntry( Double restfreq, String& name,
+                            String& formattedname, uInt id )
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if (t.nrow() == 0 ) {
+    throw(AipsError("STMolecules::getEntry - id out of range"));
+  }
+  ROTableRow row(t);
+  // get first row - there should only be one matching id
+  const TableRecord& rec = row.get(0);
+  restfreq = rec.asDouble("RESTFREQUENCY");
+  name = rec.asString("NAME");
+  formattedname = rec.asString("FORMATTEDNAME");
 }
+
+} //namespace

trunk/src/STMolecules.h

@@ -36 +36 @@
                        const casa::String& formattedname="");
 
+  void getEntry( casa::Double restfreq, casa::String& name,
+                 casa::String& formattedname, casa::uInt id);
+
 private:
   void setup();

trunk/src/STTcal.cpp

@@ -74 +74 @@
 }
 
+void STTcal::getEntry( String& time, Vector<Float>& tcal, uInt id )
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if (t.nrow() == 0 ) {
+    throw(AipsError("STTcal::getEntry - id out of range"));
+  }
+  ROTableRow row(t);
+  // get first row - there should only be one matching id
+  const TableRecord& rec = row.get(0);
+  time = rec.asString("TIME");
+  tcal.resize();
+  Vector<Float> out;
+  rec.get("TCAL",out);
+  tcal = out;
 }
 
+} //namespace
+

trunk/src/STTcal.h

@@ -36 +36 @@
   casa::uInt addEntry( const casa::String& time,
                        const casa::Vector<casa::Float>& tcal);
+  void getEntry( casa::String& time, casa::Vector<casa::Float>& tcal,
+                 casa::uInt id );
 
 private:

trunk/src/STTemplates.cpp

@@ -34 +34 @@
 #include <casa/namespace.h>
 #include <casa/Exceptions/Error.cc>
-//#include <casa/Exceptions/Error2.cc>
 #include <casa/Utilities/CountedPtr.cc>
-//#include <casa/Utilities/CountedPtr2.cc>
 
 namespace asap {
@@ -110 +108 @@
                         const Vector<Bool>&,
                         Bool, Bool);
-  template uInt addEntry(Vector<uInt>&, uInt);
-  template void extendLastArrayAxis(Array<Int>&, const Array<Int>&,
-                                   const Int& initVal);
 }
 //template Array<Bool> SDPolUtil::stokesData (Array<Bool>& dataIn, Bool);

trunk/src/STWeather.cpp

@@ -82 +82 @@
 }
 
+void STWeather::getEntry( Float& temperature, Float& pressure,
+                          Float& humidity, Float& windspeed, Float& windaz,
+                          uInt id )
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if (t.nrow() == 0 ) {
+    throw(AipsError("STWeather::getEntry - id out of range"));
+  }
+  ROTableRow row(t);
+  // get first row - there should only be one matching id
+  const TableRecord& rec = row.get(0);
+  temperature = rec.asFloat("TEMPERATURE");
+  pressure = rec.asDouble("PRESSURE");
+  humidity = rec.asDouble("HUMIDITY");
+  windspeed = rec.asDouble("WINDSPEED");
+  windaz = rec.asDouble("WINDAZ");
 }
+
+}
+

trunk/src/STWeather.h

@@ -35 +35 @@
   casa::uInt addEntry( casa::Float temperature, casa::Float pressure,
                        casa::Float humidity,
-                       casa::Float windspeed, casa::Float  windaz);
+                       casa::Float windspeed, casa::Float windaz);
+
+  void getEntry( casa::Float& temperature, casa::Float& pressure,
+                       casa::Float& humidity,
+                       casa::Float& windspeed, casa::Float& windaz,
+                       casa::uInt id);
 
 private: