Changeset 2978 for trunk/src/STMath.cpp

Timestamp:

07/25/14 23:06:41 (10 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6584, CAS-6787

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: test_sdcal

Put in Release Notes:

Module(s): sd

Description: (1) modified STMath::almacal(), STMath::cwcal(), and the relevant functions so that flag information are properly handled in sdcal's 'ps'(for ALMA and APEX), 'otf', and 'otfraster' modes.

(2) found a bug in SimpleInterpolationHelper::GetFromTime?() and fixed it (the bug was causing a serious issue reported in CAS-6787).

File:

• trunk/src/STMath.cpp (modified) (3 diffs)

trunk/src/STMath.cpp

@@ -12 +12 @@
 
 #include <sstream>
+#include <iostream>
 
 #include <casa/iomanip.h>
@@ -4266 +4267 @@
       // accumulate data
       s->flagsCol_.get( irow, flag ) ;
+      //if row-flagged, all channels set flagged
+      if (s->getFlagRow(irow)) {
+        for (uInt k = 0; k < nchan; ++k) {
+          flag(k) = 1 << 7;
+        }
+      }
       convertArray( bflag, flag ) ;
       s->specCol_.get( irow, spec ) ;
       tsys.assign( s->tsysCol_( irow ) ) ;
-      if ( !allEQ(bflag,True) ) 
-        acc.add( spec, !bflag, tsys, interval[irow], timeVec[irow] ) ;
+      //if ( !allEQ(bflag,True) ) 
+      acc.add( spec, !bflag, tsys, interval[irow], timeVec[irow] ) ;
       double gap = 2.0 * 86400.0 * timeSep[i] / ( interval[jrow] + interval[irow] ) ;
       //cout << "gap[" << i << "]=" << setw(5) << gap << endl ;
@@ -4303 +4310 @@
     irow = rows[len-1] ;
     s->flagsCol_.get( irow, flag ) ;
+    //if row-flagged, all channels set flagged
+    if (s->getFlagRow(irow)) {
+      for (uInt k = 0; k < nchan; ++k) {
+        flag(k) = 1 << 7;
+      }
+    }
     convertArray( bflag, flag ) ;
     s->specCol_.get( irow, spec ) ;
     tsys.assign( s->tsysCol_( irow ) ) ;
-    if (!allEQ(bflag,True) ) 
-      acc.add( spec, !bflag, tsys, interval[irow], timeVec[irow] ) ;
+    //if (!allEQ(bflag,True) ) 
+    acc.add( spec, !bflag, tsys, interval[irow], timeVec[irow] ) ;
     if ( acc.state() ) {
       atab.addRow() ;