Changeset 2235 for trunk/external-alma

Timestamp:

07/19/11 12:52:35 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-1913

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Updated a way to search appropriate weather information based on time.
Also, pressure should be diveded by 100.0 since ASDM stores pressure
in Pa while MS stores pressure in hPa.

File:

• trunk/external-alma/asdm2ASAP/ASDMReader.cc (modified) (4 diffs)

trunk/external-alma/asdm2ASAP/ASDMReader.cc

@@ -1240 +1240 @@
                                  float &windaz ) 
 {
+  casa::String funcName = "getWeatherInfo" ;
+
   temperature = 0.0 ;
   pressure = 0.0 ;
@@ -1264 +1266 @@
   unsigned int nrow = wrows->size() ;
   //logsink_->postLocally( LogMessage("There are "+String::toString(nrow)+" rows for given context: stationId "+String::toString(weatherStationId_),LogOrigin(className_,funcName,WHERE)) ) ;
-  ArrayTime startTime = tint.getStart() ;
+  ArrayTime startTime = getMidTime( tint ) ;
   if ( startTime < (*wrows)[0]->getTimeInterval().getStart() ) {
     temperature = (*wrows)[0]->getTemperature().get() ;
-    pressure = (*wrows)[0]->getPressure().get() ;
+    pressure = (*wrows)[0]->getPressure().get() ; 
     humidity = (*wrows)[0]->getRelHumidity().get() ;
     windspeed = (*wrows)[0]->getWindSpeed().get() ;
     windaz = (*wrows)[0]->getWindDirection().get() ;
   }
-  else if ( startTime > (*wrows)[nrow-1]->getTimeInterval().getStart() ) {
+  else if ( startTime > getEndTime( (*wrows)[nrow-1]->getTimeInterval() ) ) {
     temperature = (*wrows)[nrow-1]->getTemperature().get() ;
     pressure = (*wrows)[nrow-1]->getPressure().get() ;
@@ -1282 +1284 @@
     for ( unsigned int irow = 1 ; irow < wrows->size() ; irow++ ) {
       wrow = (*wrows)[irow-1] ;
-      if ( startTime < (*wrows)[irow]->getTimeInterval().getStart() ) {
+      ArrayTime tStart = wrow->getTimeInterval().getStart() ;
+      ArrayTime tEnd = (*wrows)[irow]->getTimeInterval().getStart() ;
+      if ( startTime >= tStart && startTime <= tEnd ) {
         temperature = wrow->getTemperature().get() ;
         pressure = wrow->getPressure().get() ;
@@ -1292 +1296 @@
     }
   }
+
+  // Pa -> hPa
+  pressure /= 100.0 ;
 
   return ;