Changeset 2247 for branches/parallel/src/FillerBase.cpp

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)
• src (modified) (1 prop)
• src/FillerBase.cpp (modified) (2 diffs)

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;
+}
+
 };