Changeset 2247 for branches

Timestamp:

07/25/11 14:57:22 (13 years ago)

Author:

Takeshi Nakazato

Message:

merged changes in trunk (r2209,r2202,r2243

Location:

branches/parallel

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• python/flagtoolbar.py (modified) (1 prop)
• src (modified) (1 prop)
• src/FillerBase.cpp (modified) (2 diffs)
• src/FillerBase.h (modified) (1 diff)
• src/SConscript (modified) (1 prop)
• src/STFit.cpp (modified) (2 diffs)
• src/STFocus.cpp (modified) (4 diffs)
• src/STFrequencies.cpp (modified) (7 diffs)
• src/STHistory.cpp (modified) (1 diff)
• src/STMolecules.cpp (modified) (3 diffs)
• src/STWeather.cpp (modified) (1 diff)

branches/parallel/src/FillerBase.cpp

@@ -12 +12 @@
 
 #include <casa/Containers/RecordField.h>
+#include <tables/Tables/ExprNode.h>
 
 #include "FillerBase.h"
@@ -176 +177 @@
 }
 
+void FillerBase::setWeather2(Float temperature, 
+                             Float pressure,
+                             Float humidity,
+                             Float windspeed, 
+                             Float windaz)
+{
+  uInt id ;
+  Table tab = table_->weather().table() ;
+  Table subt = tab( tab.col("TEMPERATURE") == temperature \
+                    && tab.col("PRESSURE") == pressure \
+                    && tab.col("HUMIDITY") == humidity \
+                    && tab.col("WINDSPEED") == windspeed \
+                    && tab.col("WINDAZ") == windaz, 1 ) ;
+  Int nrow = tab.nrow() ;
+  Int nrowSel = subt.nrow() ;
+  if ( nrowSel == 0 ) {
+    tab.addRow( 1, True ) ;
+    TableRow row( tab ) ;
+    TableRecord &rec = row.record() ;
+    RecordFieldPtr<casa::uInt> rfpi ;
+    rfpi.attachToRecord( rec, "ID" ) ;
+    *rfpi = (uInt)nrow ;
+    RecordFieldPtr<casa::Float> rfp ;
+    rfp.attachToRecord( rec, "TEMPERATURE" ) ;
+    *rfp = temperature ;
+    rfp.attachToRecord( rec, "PRESSURE" ) ;
+    *rfp = pressure ;
+    rfp.attachToRecord( rec, "HUMIDITY" ) ;
+    *rfp = humidity ;
+    rfp.attachToRecord( rec, "WINDSPEED" ) ;
+    *rfp = windspeed ;
+    rfp.attachToRecord( rec, "WINDAZ" ) ;
+    *rfp = windaz ;
+    row.put( nrow, rec ) ;
+    id = (uInt)nrow ;
+  }
+  else {
+    ROTableColumn tc( subt, "ID" ) ;
+    id = tc.asuInt( 0 ) ;
+  }
+  RecordFieldPtr<uInt> mweatheridCol(row_.record(), "WEATHER_ID");
+  *mweatheridCol = id;
+}
+
+void FillerBase::setTcal2(const String& tcaltime,
+                          const Vector<Float>& tcal)
+{
+  uInt id = 0 ;
+  Table tab = table_->tcal().table() ;
+  Table result =
+    //tab( nelements(tab.col("TCAL")) == uInt (tcal.size()) && 
+    //     all(tab.col("TCAL")== tcal) &&
+    //     tab.col("TIME") == tcaltime, 1 ) ;
+    tab( nelements(tab.col("TCAL")) == uInt (tcal.size()) && 
+         all(tab.col("TCAL")== tcal), 1 ) ;
+
+  if ( result.nrow() > 0 ) {
+    ROTableColumn tmpCol( result, "ID" ) ;
+    tmpCol.getScalar( 0, id ) ;
+  }
+  else {
+    uInt rno = tab.nrow();
+    tab.addRow();
+    TableColumn idCol( tab, "ID" ) ;
+    TableColumn tctimeCol( tab, "TIME" ) ;
+    ArrayColumn<Float> tcalCol( tab, "TCAL" ) ;
+    // get last assigned _id and increment
+    if ( rno > 0 ) {
+      idCol.getScalar(rno-1, id);
+      id++;
+    }
+    tctimeCol.putScalar(rno, tcaltime);
+    tcalCol.put(rno, tcal);
+    idCol.putScalar(rno, id);
+  }
+
+  RecordFieldPtr<uInt> mcalidCol(row_.record(), "TCAL_ID");
+  *mcalidCol = id;
+}
+
 };

branches/parallel/src/FillerBase.h

@@ -77 +77 @@
                             casa::Float windspeed=0.0f,
                             casa::Float windaz=0.0f);
+    void setWeather2(casa::Float temperature=0.0f,
+                            casa::Float pressure=0.0f,
+                            casa::Float humidity=0.0f,
+                            casa::Float windspeed=0.0f,
+                            casa::Float windaz=0.0f);
     void setTcal(const casa::String& caltime="",
+                         const casa::Vector<casa::Float>& tcal=casa::Vector<casa::Float>());
+    void setTcal2(const casa::String& caltime="",
                          const casa::Vector<casa::Float>& tcal=casa::Vector<casa::Float>());
     void setScanRate(const casa::Vector<casa::Double>& srate=casa::Vector<casa::Double>());

branches/parallel/src/STFit.cpp

@@ -90 +90 @@
   // replace
   if ( id > -1 ) {
-    Table t = table_(table_.col("ID") == id );
+    Table t = table_(table_.col("ID") == id, 1 );
     if (t.nrow() > 0) {
       rno = t.rowNumbers(table_)[0];
@@ -129 +129 @@
 void STFit::getEntry( STFitEntry& fit, uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFit::getEntry - id out of range"));

branches/parallel/src/STFocus.cpp

@@ -106 +106 @@
                           && near(table_.col("MOUNT"), mount)
                           && near(table_.col("XYPHASE"), xyphase)
-                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset)
+                          && near(table_.col("XYPHASEOFFSET"), xyphaseoffset), 1
                           );
   uInt resultid = 0;
@@ -139 +139 @@
                                 uInt id) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFocus::getEntry - id out of range"));
@@ -161 +161 @@
 {
   Float total = 0.0f;
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFocus::getTotalAngle - id out of range"));
@@ -181 +181 @@
 casa::Float STFocus::getFeedHand( casa::uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFocus::getEntry - id out of range"));

branches/parallel/src/STFrequencies.cpp

@@ -88 +88 @@
   // test if this already exists
   Table result = table_( near(table_.col("REFVAL"), refval)
-                    && near(table_.col("REFPIX"), refpix)
-                    && near(table_.col("INCREMENT"), inc) );
+                         && near(table_.col("REFPIX"), refpix)
+                         && near(table_.col("INCREMENT"), inc), 1 );
   uInt resultid = 0;
   if ( result.nrow() > 0) {
@@ -116 +116 @@
                               uInt id )
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFrequencies::getEntry - freqID out of range"));
@@ -130 +130 @@
 void STFrequencies::setEntry( Double refpix, Double refval, Double inc, uInt id )
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STFrequencies::getEntry - freqID out of range"));
@@ -147 +147 @@
 SpectralCoordinate STFrequencies::getSpectralCoordinate( uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
 
   if (t.nrow() == 0 ) {
@@ -309 +309 @@
   ostringstream oss;
   if ( id < 0 ) t = table_;
-  else  t = table_(table_.col("ID") == Int(id) );
+  else  t = table_(table_.col("ID") == Int(id), 1 );
   ROTableRow row(t);
   for (uInt i=0; i<t.nrow(); ++i) {
@@ -337 +337 @@
 float STFrequencies::getRefFreq( uInt id, uInt channel )
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if ( t.nrow() == 0 ) throw(AipsError("Selected Illegal frequency id"));
   ROTableRow row(t);
@@ -441 +441 @@
 void STFrequencies::shiftRefPix(int npix, uInt id)
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1  );
   if ( t.nrow() == 0 ) throw(AipsError("Selected Illegal frequency id"));
   ScalarColumn<Double> tcol(t, "REFPIX");

branches/parallel/src/STHistory.cpp

@@ -71 +71 @@
 void asap::STHistory::getEntry( String& item, uInt id)
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STHistory::getEntry - id out of range"));

branches/parallel/src/STMolecules.cpp

@@ -108 +108 @@
   Table result =
     table_( nelements(table_.col("RESTFREQUENCY")) == uInt (restfreq.size()) && 
-            all(table_.col("RESTFREQUENCY")== restfreq) );
+            all(table_.col("RESTFREQUENCY")== restfreq), 1 );
   uInt resultid = 0;
   if ( result.nrow() > 0) {
@@ -152 +152 @@
                             Vector<String>& formattedname, uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STMolecules::getEntry - id out of range"));
@@ -182 +182 @@
 {
   std::vector<double> out;
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STMolecules::getRestFrequency - id out of range"));

branches/parallel/src/STWeather.cpp

@@ -110 +110 @@
                           uInt id ) const
 {
-  Table t = table_(table_.col("ID") == Int(id) );
+  Table t = table_(table_.col("ID") == Int(id), 1 );
   if (t.nrow() == 0 ) {
     throw(AipsError("STWeather::getEntry - id out of range"));