Changeset 1320 for branches/Release2.1.2/src/STLineFinder.cpp

Timestamp:

03/02/07 11:02:27 (17 years ago)

Author:

mar637

Message:

merge from trunk, to get most recent bug fixes

File:

• branches/Release2.1.2/src/STLineFinder.cpp (modified) (8 diffs)

branches/Release2.1.2/src/STLineFinder.cpp

@@ -50 +50 @@
 //
 // RunningBox -    a running box calculator. This class implements
-//                 interations over the specified spectrum and calculates
+//                 iterations over the specified spectrum and calculates
 //                 running box filter statistics.
 //
@@ -399 +399 @@
           if (last_sign && last_sign!=getAboveMeanSign())
               detect=False;
-          }
-          if (detect) {
-              last_sign=getAboveMeanSign();
-              if (is_detected_before)
-                  cur_line.second=running_box->getChannel()+1;
-              else {
-                  is_detected_before=True;
-                  cur_line.first=running_box->getChannel();
-                  cur_line.second=running_box->getChannel()+1;
-              }
-          } else processCurLine(mask);
+       }
+       if (detect) {
+           last_sign=getAboveMeanSign();
+           if (is_detected_before)
+               cur_line.second=running_box->getChannel()+1;
+           else {
+               is_detected_before=True;
+               cur_line.first=running_box->getChannel();
+               cur_line.second=running_box->getChannel()+1;
+           }
+       } else processCurLine(mask);
   }
   catch (const AipsError &ae) {
@@ -426 +426 @@
   try {
        if (is_detected_before) {
-           if (cur_line.second-cur_line.first>min_nchan) {
+           if (cur_line.second-cur_line.first>=min_nchan) {
                // it was a detection. We need to change the list
                Bool add_new_line=False;
@@ -517 +517 @@
            signs[ch]=getAboveMeanSign();
            // os<<ch<<" "<<spectrum[ch]<<" "<<fabs(running_box->aboveMean())<<" "<<
-           //   threshold*offline_variance<<endl;
+           // threshold*offline_variance<<endl;
 
            const Float buf=running_box->aboveMean();
@@ -523 +523 @@
            else if (buf<0) signs[ch]=-1;
            else if (buf==0) signs[ch]=0;
-        //   os<<ch<<" "<<spectrum[ch]<<" "<<running_box->getLinMean()<<" "<<
-          //              threshold*offline_variance<<endl;
+           //os<<ch<<" "<<spectrum[ch]<<" "<<running_box->getLinMean()<<" "<<
+           //             threshold*offline_variance<<endl;
       }
       if (lines.size())
@@ -768 +768 @@
          // nothing new - proceed to the next step of averaging, if any
          // (to search for broad lines)
-         if (avg_factor>avg_limit) break; // averaging up to avg_limit
+         if (avg_factor>=avg_limit) break; // averaging up to avg_limit
                                           // adjacent channels,
                                           // stop after that
@@ -775 +775 @@
          averageAdjacentChannels(temp_mask,avg_factor);
          continue;
-     }
+     } 
      keepStrongestOnly(temp_mask,new_lines,max_box_nchan);
      // update the list (lines) merging intervals, if necessary
@@ -951 +951 @@
 // they will be find again at the next iteration. This approach
 // increases the number of iterations required, but is able to remove
-// the sidelobes likely to occur near strong lines.
+// spurious detections likely to occur near strong lines.
 // Later a better criterion may be implemented, e.g.
 // taking into consideration the brightness of different lines. Now