Changeset 2961 for trunk

Timestamp:

06/29/14 16:29:17 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-6587)

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs:

Put in Release Notes: No

Module(s): asapfitter, asaplinefind

Description: handling of FLAGROW column in STLineFinder::findLines and asapfitter.fit.

Location:

trunk

Files:

• python/asapfitter.py (modified) (1 diff)
• src/STLineFinder.cpp (modified) (1 diff)

trunk/python/asapfitter.py

@@ -157 +157 @@
 
         if self.data is not None:
+            if self.data._getflagrow(row):
+                raise RuntimeError,"Can not fit flagged row."
             self.x = self.data._getabcissa(row)
             self.y = self.data._getspectrum(row)

trunk/src/STLineFinder.cpp

@@ -980 +980 @@
   // taking flagged channels into account
   if (useScantable) {
+    if (scan->getFlagRow(whichRow))
+      throw AipsError("STLineFinder::findLines - flagged scantable row.");
     vector<bool> flaggedChannels = scan->getMask(whichRow);
     if (flaggedChannels.size()) {