Changeset 3044 for trunk/src

Timestamp:

08/07/15 16:42:16 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a bug fix)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): scantable.sinusoid_baseline and scantable.auto_sinusoid_baseline methods

Description: Fix to seg fault when wave numbers of sinusoidal fitting is empty.

File:

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

trunk/src/Scantable.cpp

@@ -4765 +4765 @@
     if (!applyFFT) {
       nWaves = selectWaveNumbers(addNWaves, rejectNWaves);
+      if (nWaves.size()==0) //no wave numbers to fit
+        throw(AipsError("No valid wave numbers to fit"));
       modelReservoir = getSinusoidModelReservoir(nWaves, nChanNos);
     }
@@ -4771 +4773 @@
       std::vector<float> sp = getSpectrum(whichrow);
       chanMask = getCompositeChanMask(whichrow, mask);
-      std::vector<std::vector<double> > model;
+      std::vector<std::vector<double> > model; 
+      bool canfit = true;
       if (applyFFT) {
         nWaves = selectWaveNumbers(whichrow, chanMask, true, fftMethod, fftThresh, 
                                    addNWaves, rejectNWaves);
+        if (nWaves.size()==0) {// no wave numbers to fit.
+          canfit = false;
+          break;
+        }
         model = getSinusoidModel(nWaves, sp.size());
       } else {
@@ -4784 +4791 @@
 
       //if (flagrowCol_(whichrow) == 0) {
-      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
+      if (canfit && flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;
@@ -4882 +4889 @@
     if (!applyFFT) {
       nWaves = selectWaveNumbers(addNWaves, rejectNWaves);
+      if (nWaves.size()==0) //no wave numbers to fit
+        throw(AipsError("No valid wave numbers to fit"));
       modelReservoir = getSinusoidModelReservoir(nWaves, nChanNos);
     }
@@ -4890 +4899 @@
       chanMask = getCompositeChanMask(whichrow, mask, edge, currentEdge, lineFinder);
       std::vector<std::vector<double> > model;
+      bool canfit=true;
       if (applyFFT) {
         nWaves = selectWaveNumbers(whichrow, chanMask, true, fftMethod, fftThresh, 
                                    addNWaves, rejectNWaves);
+        if (nWaves.size()==0) { // no wave numbers to fit.
+          canfit = false;
+          break;
+        }
         model = getSinusoidModel(nWaves, sp.size());
       } else {
@@ -4902 +4916 @@
 
       //if (flagrowCol_(whichrow) == 0) {
-      if (flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
+      if (canfit && flagrowCol_(whichrow)==0 && nValidMask(chanMask)>0) {
         int nClipped = 0;
         std::vector<float> res;