Changeset 2958 for trunk/src/STCalTsys.cpp

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:

• trunk/src/STCalTsys.cpp (modified) (1 diff)

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;