Changeset 2165 for branches/casa-prerelease

Timestamp:

05/11/11 00:52:25 (14 years ago)

Author:

Takeshi Nakazato

Message:

Merge bug fix in trunk (r2164).

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)
• python/flagtoolbar.py (modified) (1 prop)
• src (modified) (1 prop)
• src/MSFiller.cpp (modified) (1 diff)
• src/SConscript (modified) (1 prop)

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

@@ -1384 +1384 @@
     return ;
   } 
-  ROArrayColumn<Float> *tmpTcalCol = new ROArrayColumn<Float>( sctabsel, "TCAL" ) ;
+  ROArrayColumn<Float> *tmpTcalCol = new ROArrayColumn<Float>( sctabsel, colTcal_ ) ;
+  // return if any rows without Tcal value exists
+  Bool notDefined = False ;
+  for ( uInt irow = 0 ; irow < sctabsel.nrow() ; irow++ ) {
+    if ( !tmpTcalCol->isDefined( irow ) ) {
+      notDefined = True ;
+      break ;
+    }
+  }
+  if ( notDefined ) {
+    os_ << "No TCAL value" << LogIO::POST ;
+    delete tmpTcalCol ;
+    table_->tcal().table().addRow(1,True) ;
+    Vector<Float> defaultTcal( 1, 1.0 ) ;
+    ArrayColumn<Float> tcalCol( table_->tcal().table(), "TCAL" ) ;
+    tcalCol.put( 0, defaultTcal ) ;
+    return ;
+  }    
   uInt npol = tmpTcalCol->shape( 0 )(0) ;
   delete tmpTcalCol ;