Ignore:
Timestamp:
06/26/14 18:08:46 (10 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: Yes CAS-6582, CAS-6571

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...

Take into account row and channel flag when generating caltables.


File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/STCalibration.cpp

    r2955 r2958  
    5858  ROArrayColumn<uChar> flagCol(scantable_->table(), "FLAGTRA");
    5959  ROScalarColumn<uInt> freqidCol(scantable_->table(), "FREQ_ID");
     60  ROScalarColumn<uInt> flagrowCol(scantable_->table(), "FLAGROW");
     61  Vector<uInt> flagrow = flagrowCol.getColumn();
    6062
    6163  // dummy Tsys: the following process doesn't need Tsys but RowAccumulator
     
    7880    else if (len == 1) {
    7981      uInt irow = rows[0];
    80       appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
    81                  freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow),
    82                  flagCol(irow));
     82      if (flagrow[irow] == 0) {
     83        appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
     84                   freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow),
     85                   flagCol(irow));
     86      }
    8387      iter.next();
    8488      continue;
     
    107111      convertArray(bflag, flag);
    108112      specCol.get(irow, spec);
    109       if ( !allEQ(bflag,True) )
     113      if ( !allEQ(bflag,True) && flagrow[irow] == 0 )
    110114        acc.add( spec, !bflag, tsys, intervalSec[irow], timeSec[irow] ) ;
    111115      timeCen += timeSec[irow];
     
    131135          const uChar userFlag = 1 << 7;
    132136          for (uInt k = 0; k < flag.nelements(); ++k) {
    133             if (mask[k] == True)
     137            if (mask[k] == False)
    134138              flag[k] = userFlag;
    135139          }
Note: See TracChangeset for help on using the changeset viewer.