Changeset 2950 for trunk/src

Timestamp:

06/20/14 09:54:34 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6582

Ready for Test: Yes

Interface Changes: Yes/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...

Smoothing functions are updated so that flagged rows are not processed.
Flag value for regridding function is changed from 1 to 128.

Location:

trunk/src

Files:

• STMath.cpp (modified) (3 diffs)
• Scantable.cpp (modified) (4 diffs)

trunk/src/STMath.cpp

@@ -2470 +2470 @@
     ArrayColumn<Float> specCol(tab, "SPECTRA");
     ArrayColumn<uChar> flagCol(tab, "FLAGTRA");
+    ScalarColumn<uInt> flagrowCol(tab, "FLAGROW");
     Vector<Float> spec;
     Vector<uChar> flag;
+    Vector<uInt> flagrow = flagrowCol.getColumn();
     for (uInt i = 0; i < tab.nrow(); ++i) {
+      if (flagrow[i] != 0) {
+        // do not process flagged row
+        continue;
+      }
       specCol.get(i, spec);
       flagCol.get(i, flag);
@@ -2518 +2524 @@
     ArrayColumn<Float> specCol(tab, "SPECTRA");
     ArrayColumn<uChar> flagCol(tab, "FLAGTRA");
+    ScalarColumn<uInt> flagrowCol(tab, "FLAGROW");
     Vector<Float> spec = specCol( 0 );
     uInt nchan = spec.nelements();
@@ -2524 +2531 @@
     Vector<uChar> flag;
     Vector<Bool> mask(nchan);
+    Vector<uInt> flagrow = flagrowCol.getColumn();
     for ( uInt i=0; i<tab.nrow(); ++i) {
+      if (flagrow[i] != 0) {
+        // do not process flagged row
+        continue;
+      }
+      
       specCol.get(i, spec);
       flagCol.get(i, flag);

trunk/src/Scantable.cpp

@@ -2120 +2120 @@
             wsum += ( yr - zl ) ;
           }
-          newflag[i] = newflag[i] && oldflag[j] ;
+          newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ;
         }
         else {
@@ -2128 +2128 @@
             wsum += abs(dnu) ;
           }
-          newflag[i] = newflag[i] && oldflag[j] ;
+          newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ;
           ichan = jj ;
           break ;
@@ -2140 +2140 @@
             wsum += ( yr - yl ) ;
           }
-          newflag[i] = newflag[i] && oldflag[j] ;
+          newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ;
         }
         else {
@@ -2148 +2148 @@
             wsum += ( zr - yl ) ;
           }
-          newflag[i] = newflag[i] && oldflag[j] ;
+          newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ;
           ichan = jj ;
           break ;