Changeset 2930 for trunk

Timestamp:

04/17/14 11:35:34 (10 years ago)

Author:

Malte Marquarding

Message:

Use weather information as that is provide at MOPRA now

Location:

trunk

Files:

• python/scantable.py (modified) (3 diffs)
• src/STWeather.cpp (modified) (1 diff)

trunk/python/scantable.py

@@ -1098 +1098 @@
     def get_weather(self, row=-1):
         """\
-        Return the weather informations.
+        Return the weather information.
 
         Parameters:
@@ -1109 +1109 @@
 
         """
-
+        if row >= len(self):
+            raise IndexError("row out of range")
         values = self._get_column(self._get_weather, row)
         if row > -1:
@@ -1119 +1120 @@
             out = []
             for r in values:
-
                 out.append({'temperature': r[0],
                             'pressure': r[1], 'humidity' : r[2],

trunk/src/STWeather.cpp

@@ -85 +85 @@
   /// @todo this is a zero implementation as none of the telescopes
   /// fills in this information (yet)
-  uInt nrow = table_.nrow();
-  if ( nrow == 0 ) {
+// test if this already exists
+  Table result = table_( near(table_.col("TEMPERATURE"), temp)
+                         && near(table_.col("PRESSURE"), pressure)
+                         && near(table_.col("WINDSPEED"), wspeed)
+                         && near(table_.col("WINDAZ"), waz)
+                         && near(table_.col("HUMIDITY"), humidity), 1 );
+  uInt resultid = 0;
+  if ( result.nrow() > 0) {
+    ROScalarColumn<uInt> c(result, "ID");
+    c.get(0, resultid);
+  } else {
+    uInt rno = table_.nrow();
     table_.addRow();
-    TableRow row(table_);
-    TableRecord& rec = row.record();
-    RecordFieldPtr< Float > rfp;
-    rfp.attachToRecord(rec,"TEMPERATURE");
-    *rfp = temp;
-    rfp.attachToRecord(rec,"PRESSURE");
-    *rfp = pressure;
-    rfp.attachToRecord(rec,"HUMIDITY");
-    *rfp = humidity;
-    rfp.attachToRecord(rec,"WINDSPEED");
-    *rfp = wspeed;
-    rfp.attachToRecord(rec,"WINDAZ");
-    *rfp = waz;
-    row.put(table_.nrow()-1, rec);
+    // get last assigned freq_id and increment
+    if ( rno > 0 ) {
+      idCol_.get(rno-1, resultid);
+      resultid++;
+    }
+    temperatureCol_.put(rno, temp);
+    pressureCol_.put(rno, pressure);
+    windspeedCol_.put(rno, wspeed);
+    windazCol_.put(rno, waz);
+    humidityCol_.put(rno, humidity);
+    idCol_.put(rno, resultid);
   }
-  return 0;
+  return resultid;
 }