Changeset 2410 for trunk/src

Timestamp:

02/17/12 13:58:12 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-3606/CAS-3757

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: sdbaseline unit test

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed a bug that baseline functions doesn't work when multi-IF with different
nchan are processed at once.

Location:

trunk/src

Files:

• STLineFinder.cpp (modified) (2 diffs)
• Scantable.cpp (modified) (1 diff)

trunk/src/STLineFinder.cpp

@@ -943 +943 @@
 void STLineFinder::setData(const std::vector<float> &in_spectrum)
 {
-  spectrum = Vector<Float>(in_spectrum);
+  //spectrum = Vector<Float>(in_spectrum);
+  spectrum.assign( Vector<Float>(in_spectrum) );
   useScantable = false;
 }
@@ -966 +967 @@
   // no mask given...
   if (in_mask.size() == 0) {
-    mask = Vector<Bool>(nchan,True);
+    //mask = Vector<Bool>(nchan,True);
+    mask.assign( Vector<Bool>(nchan,True) );
   } else {
     // use provided mask
-    mask=Vector<Bool>(in_mask);
+    //mask=Vector<Bool>(in_mask);
+    mask.assign( Vector<Bool>(in_mask) );
   }
   if (mask.nelements()!=nchan)

trunk/src/Scantable.cpp

@@ -3189 +3189 @@
   std::vector<bool> mask = getMask(whichrow);
   uInt maskSize = mask.size();
-  if (maskSize != inMask.size()) {
-    throw(AipsError("mask sizes are not the same."));
-  }
-  for (uInt i = 0; i < maskSize; ++i) {
-    mask[i] = mask[i] && inMask[i];
+  if (inMask.size() != 0) {
+    if (maskSize != inMask.size()) {
+      throw(AipsError("mask sizes are not the same."));
+    }
+    for (uInt i = 0; i < maskSize; ++i) {
+      mask[i] = mask[i] && inMask[i];
+    }
   }