Changeset 2160 for branches

Timestamp:

05/02/11 12:48:22 (13 years ago)

Author:

Takeshi Nakazato

Message:

Merge bug fix in trunk (r2159).

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) (5 diffs)
• src/SConscript (modified) (1 prop)

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

@@ -224 +224 @@
     isSysCal_ = False ;
   else {
-    if ( !caltab.tableDesc().isColumn( colTcal_ ) ) 
+    if ( !caltab.tableDesc().isColumn( colTcal_ ) ) {
       colTcal_ = "TCAL" ;
-    if ( !caltab.tableDesc().isColumn( colTsys_ ) ) 
+      if ( !caltab.tableDesc().isColumn( colTcal_ ) ) 
+        colTcal_ = "NONE" ;
+    }
+    if ( !caltab.tableDesc().isColumn( colTsys_ ) ) {
       colTsys_ = "TSYS" ;
+      if ( !caltab.tableDesc().isColumn( colTcal_ ) ) 
+        colTsys_ = "NONE" ;
+    }
   }
 //   colTcal_ = "TCAL" ;
@@ -643 +649 @@
             scInterval = scIntervalCol->getColumn() ;
             delete scIntervalCol ;
-            scTsysCol.attach( caltabsel, colTsys_ ) ;
+            if ( colTsys_ != "NONE" )
+              scTsysCol.attach( caltabsel, colTsys_ ) ;
           }
 
@@ -806 +813 @@
                 // TSYS
                 Matrix<Float> tsys ;
-                if ( sysCalIdx[irow] != -1 )
+                if ( sysCalIdx[irow] != -1 && colTsys_ != "NONE" )
                   tsys = scTsysCol( irow ) ;
                 else 
@@ -813 +820 @@
                 // TCAL_ID
                 Block<uInt> tcalids( npol, 0 ) ;
-                if ( sysCalIdx[irow] != -1 ) {
+                if ( sysCalIdx[irow] != -1 && colTcal_ != "NONE" ) {
                   tcalids = getTcalId( feedId, spwId, scTime[sysCalIdx[irow]] ) ;
                 }
@@ -1357 +1364 @@
   }
 
+  if ( colTcal_ == "NONE" ) {
+    // add dummy row
+    os_ << "No TCAL column" << LogIO::POST ;
+    table_->tcal().table().addRow(1,True) ;
+    Vector<Float> defaultTcal( 1, 1.0 ) ;
+    ArrayColumn<Float> tcalCol( table_->tcal().table(), "TCAL" ) ;
+    tcalCol.put( 0, defaultTcal ) ;
+    return ;
+  }
+
   Table sctab = mstable_.sysCal() ;
   if ( sctab.nrow() == 0 ) {