Changeset 3024 for trunk/src

Timestamp:

02/09/15 16:11:36 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): scantable, sdbaseline

Description: Fixed *Baseline functions so that FLAGROW is set for spectra in which baseline subtraction is not operated (due to flagged channels).

File:

• trunk/src/Scantable.cpp (modified) (8 diffs)

trunk/src/Scantable.cpp

@@ -3086 +3086 @@
                             params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           params.resize(nModel);
@@ -3180 +3182 @@
                             params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           params.resize(nModel);
@@ -3266 +3270 @@
                             params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           params.resize(nModel);
@@ -3360 +3366 @@
                             params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           params.resize(nModel);
@@ -3950 +3958 @@
                             pieceEdges, params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           pieceEdges.resize(nPiece+1);
@@ -4049 +4059 @@
                             pieceEdges, params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           pieceEdges.resize(nPiece+1);
@@ -4730 +4742 @@
                             params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           params.resize(nModel);
@@ -4840 +4854 @@
                             params, nClipped);
       } else {
+        // no valid channels to fit (flag the row)
+        flagrowCol_.put(whichrow, 1);
         if (outBaselineTable) {
           params.resize(nModel);