Changeset 2950
- Timestamp:
- 06/20/14 09:54:34 (11 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/STMath.cpp
r2949 r2950 2470 2470 ArrayColumn<Float> specCol(tab, "SPECTRA"); 2471 2471 ArrayColumn<uChar> flagCol(tab, "FLAGTRA"); 2472 ScalarColumn<uInt> flagrowCol(tab, "FLAGROW"); 2472 2473 Vector<Float> spec; 2473 2474 Vector<uChar> flag; 2475 Vector<uInt> flagrow = flagrowCol.getColumn(); 2474 2476 for (uInt i = 0; i < tab.nrow(); ++i) { 2477 if (flagrow[i] != 0) { 2478 // do not process flagged row 2479 continue; 2480 } 2475 2481 specCol.get(i, spec); 2476 2482 flagCol.get(i, flag); … … 2518 2524 ArrayColumn<Float> specCol(tab, "SPECTRA"); 2519 2525 ArrayColumn<uChar> flagCol(tab, "FLAGTRA"); 2526 ScalarColumn<uInt> flagrowCol(tab, "FLAGROW"); 2520 2527 Vector<Float> spec = specCol( 0 ); 2521 2528 uInt nchan = spec.nelements(); … … 2524 2531 Vector<uChar> flag; 2525 2532 Vector<Bool> mask(nchan); 2533 Vector<uInt> flagrow = flagrowCol.getColumn(); 2526 2534 for ( uInt i=0; i<tab.nrow(); ++i) { 2535 if (flagrow[i] != 0) { 2536 // do not process flagged row 2537 continue; 2538 } 2539 2527 2540 specCol.get(i, spec); 2528 2541 flagCol.get(i, flag); -
trunk/src/Scantable.cpp
r2948 r2950 2120 2120 wsum += ( yr - zl ) ; 2121 2121 } 2122 newflag[i] = newflag[i] && oldflag[j];2122 newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ; 2123 2123 } 2124 2124 else { … … 2128 2128 wsum += abs(dnu) ; 2129 2129 } 2130 newflag[i] = newflag[i] && oldflag[j];2130 newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ; 2131 2131 ichan = jj ; 2132 2132 break ; … … 2140 2140 wsum += ( yr - yl ) ; 2141 2141 } 2142 newflag[i] = newflag[i] && oldflag[j];2142 newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ; 2143 2143 } 2144 2144 else { … … 2148 2148 wsum += ( zr - yl ) ; 2149 2149 } 2150 newflag[i] = newflag[i] && oldflag[j];2150 newflag[i] = (newflag[i] && oldflag[j]) ? 1 << 7 : 0 ; 2151 2151 ichan = jj ; 2152 2152 break ;
Note:
See TracChangeset
for help on using the changeset viewer.