Changeset 1497

Timestamp:

02/04/09 17:42:20 (16 years ago)

Author:

Max Voronkov

Message:

fixed #149. The problem was inside getMask method. In some rare circumstances largely when single channel detections are allowed and with spectral averaging enabled, the method failed to flag the lines which have already been detected and went into infinite loop by detecting them again. The condition of leaving the loop (no new lines found) was never satisfied as a result of this.

Location:

trunk

Files:

• doc/CHANGELOG (modified) (1 diff)
• src/STLineFinder.cpp (modified) (1 diff)

trunk/doc/CHANGELOG

@@ -4 +4 @@
 Release 2.3.0 [2009-01-??]
 
+* Ticket #149 Fixed the bug causing spectral line search to go into an infinite loop
+   in some rare circumstances
 * Ticket #110 Added export to CLASS readable FITS files 
    scantable.save("myfile.fits", "CLASS")

trunk/src/STLineFinder.cpp

@@ -870 +870 @@
        // iterator through lines
        std::list<std::pair<int,int> >::const_iterator cli=lines.begin();
-       for (int ch=0;ch<int(res_mask.size());++ch)
+       for (int ch=0;ch<int(res_mask.size());++ch) {
             if (ch<edge.first || ch>=edge.second) res_mask[ch]=false;
             else if (!mask[ch]) res_mask[ch]=false;
             else {
                     res_mask[ch]=!invert; // no line by default
-                    if (cli==lines.end()) continue;
-                    if (ch>=cli->first && ch<cli->second)
-                        res_mask[ch]=invert; // this is a line
-                    if (ch>=cli->second)
-                        ++cli; // next line in the list
-                 }
-
+                    if (cli!=lines.end())
+                        if (ch>=cli->first && ch<cli->second)
+                             res_mask[ch]=invert; // this is a line
+            }
+            if (cli!=lines.end())
+                if (ch>=cli->second) {
+                    ++cli; // next line in the list
+                }
+       }
        return res_mask;
   }