Changeset 2308 for branches

Timestamp:

09/21/11 10:15:44 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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...

Merge fix on trunk (r2306).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/asdm2ASAP/ASDMReader.cc (modified) (3 diffs)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• external-alma/oldasdm2ASAP/OldASDMReader.cc (modified) (3 diffs)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/external-alma/asdm2ASAP/ASDMReader.cc

@@ -2 +2 @@
 #include <sstream>
 #include "limits.h"
-#include "float.h"
+//#include "float.h"
 
 #include <measures/Measures/MEpoch.h>
@@ -1233 +1233 @@
     //ReceiverBand rb = rrows[0]->getFrequencyBand() ;
     int row0 = -1 ;
-    double eps = DBL_MAX ;
+    //double eps = DBL_MAX ;
+    double eps = 1.0e10 ;
     for ( unsigned int irow = 0 ; irow < nrow ; irow++ ) {
       CalAtmosphereRow *atmrow = atmrows[irow] ;
@@ -1364 +1365 @@
   apos[2] = antennaPosition_[2].getValue( Unit("m") ) ;
   
-  double eps = DBL_MAX ;
+  //double eps = DBL_MAX ;
+  double eps = 1.0e10 ;
   int retval = -1 ;
   for ( unsigned int ir = 0 ; ir < weatherStation_.size() ; ir++ ) {

branches/casa-prerelease/pre-asap/external-alma/oldasdm2ASAP/OldASDMReader.cc

@@ -2 +2 @@
 #include <sstream>
 #include "limits.h"
-#include "float.h"
+//#include "float.h"
 
 #include <measures/Measures/MEpoch.h>
@@ -1233 +1233 @@
     //ReceiverBand rb = rrows[0]->getFrequencyBand() ;
     int row0 = -1 ;
-    double eps = DBL_MAX ;
+    //double eps = DBL_MAX ;
+    double eps = 1.0e10 ;
     for ( unsigned int irow = 0 ; irow < nrow ; irow++ ) {
       CalAtmosphereRow *atmrow = atmrows[irow] ;
@@ -1364 +1365 @@
   apos[2] = antennaPosition_[2].getValue( Unit("m") ) ;
   
-  double eps = DBL_MAX ;
+  //double eps = DBL_MAX ;
+  double eps = 1.0e10 ;
   int retval = -1 ;
   for ( unsigned int ir = 0 ; ir < weatherStation_.size() ; ir++ ) {