Changeset 2136 for branches

Timestamp:

04/14/11 21:06:53 (14 years ago)

Author:

WataruKawasaki

Message:

merged bug fixes from trunk (r2135)

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/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/RowAccumulator.cpp (modified) (1 diff)
• src/SConscript (modified) (1 prop)
• src/STMath.cpp (modified) (1 diff)

branches/casa-prerelease/pre-asap/src/RowAccumulator.cpp

@@ -52 +52 @@
   timeSum_ = 0.0;
   timeSumNoMask_ = 0.0;
+
+  initialized_ = False;
 }
 
 void RowAccumulator::initialize(const uInt size, const uInt tsysSize)
 {
-    reset(size, tsysSize);
-    initialized_ = True;
+  reset(size, tsysSize);
+  initialized_ = True;
 }
 

branches/casa-prerelease/pre-asap/src/STMath.cpp

@@ -306 +306 @@
     acc.reset();
   }
+
   if (rowstodelete.nelements() > 0) {
-    //cout << rowstodelete << endl;
     os << rowstodelete << LogIO::POST ;
     tout.removeRow(rowstodelete);