Changeset 2958 for trunk/src

Timestamp:

06/26/14 18:08:46 (11 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.

Location:

trunk/src

Files:

• STCalSkyTable.h (modified) (1 diff)
• STCalTsys.cpp (modified) (1 diff)
• STCalTsysTable.h (modified) (1 diff)
• STCalibration.cpp (modified) (4 diffs)

trunk/src/STCalSkyTable.h

@@ -57 +57 @@
   casa::Vector<casa::Float> getElevation() {return elCol_.getColumn();}
   casa::Matrix<casa::Float> getSpectra() {return spectraCol_.getColumn();}
+  casa::Matrix<casa::uChar> getFlagtra() {return flagtraCol_.getColumn();}
   casa::uInt nchan(casa::uInt ifno);
 

trunk/src/STCalTsys.cpp

@@ -91 +91 @@
       size_t end = std::min((size_t)channel_range[i] + 1, averaged_data.size());
       os << LogIO::DEBUGGING << "start=" << start << ", end=" << end << LogIO::POST;
-      //Vector<Float> segment = any_data(Slice(start, end - 1, 1, False));
-      //averaged_value += sum(segment);
-      //num_value += segment.size();
       float sum_per_segment = 0.0;
+      size_t count = 0;
       for (size_t j = start; j < end; ++j) {
-        sum_per_segment += any_data[j];
+        if (channel_flag[j] == 0) {
+          sum_per_segment += any_data[j];
+          count += 1;
+        }
       }
       averaged_value += sum_per_segment;
-      num_value += end - start;
+      num_value += count;
     }
     averaged_value /= (Float)num_value;

trunk/src/STCalTsysTable.h

@@ -55 +55 @@
   casa::Vector<casa::Float> getElevation() {return elCol_.getColumn();}
   casa::Matrix<casa::Float> getTsys() {return tsysCol_.getColumn();}
+  casa::Matrix<casa::uChar> getFlagtra() {return flagtraCol_.getColumn();}
   casa::uInt nchan(casa::uInt ifno);
 

trunk/src/STCalibration.cpp

@@ -58 +58 @@
   ROArrayColumn<uChar> flagCol(scantable_->table(), "FLAGTRA");
   ROScalarColumn<uInt> freqidCol(scantable_->table(), "FREQ_ID");
+  ROScalarColumn<uInt> flagrowCol(scantable_->table(), "FLAGROW");
+  Vector<uInt> flagrow = flagrowCol.getColumn();
 
   // dummy Tsys: the following process doesn't need Tsys but RowAccumulator 
@@ -78 +80 @@
     else if (len == 1) {
       uInt irow = rows[0];
-      appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
-                 freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow),
-                 flagCol(irow));
+      if (flagrow[irow] == 0) {
+        appenddata(0, 0, current.asuInt("BEAMNO"), current.asuInt("IFNO"), current.asuInt("POLNO"),
+                   freqidCol(irow), timeSec[irow], elevation[irow], specCol(irow),
+                   flagCol(irow));
+      }
       iter.next();
       continue;
@@ -107 +111 @@
       convertArray(bflag, flag);
       specCol.get(irow, spec);
-      if ( !allEQ(bflag,True) ) 
+      if ( !allEQ(bflag,True) && flagrow[irow] == 0 ) 
         acc.add( spec, !bflag, tsys, intervalSec[irow], timeSec[irow] ) ;
       timeCen += timeSec[irow];
@@ -131 +135 @@
           const uChar userFlag = 1 << 7;
           for (uInt k = 0; k < flag.nelements(); ++k) {
-            if (mask[k] == True)
+            if (mask[k] == False)
               flag[k] = userFlag;
           }