Changeset 1643 for trunk/src

Timestamp:

10/03/09 16:03:32 (15 years ago)

Author:

Max Voronkov

Message:

line finder: new noise estimation code has been resonably debugged and plugged in. Same functionality as before.

File:

• trunk/src/STLineFinder.cpp (modified) (4 diffs)

trunk/src/STLineFinder.cpp

@@ -317 +317 @@
   // buffer size
   const size_t nSamples = itsBufferFull ? itsVariances.size(): itsSampleNumber;
-  AlwaysAssert( (nSamples > 0) && (nSamples < itsVariances.size()), AipsError);
+  AlwaysAssert( (nSamples > 0) && (nSamples <= itsVariances.size()), AipsError);
   return nSamples;
 }
@@ -423 +423 @@
   // buffer size
   const size_t nSamples = numberOfSamples();
-  AlwaysAssert(nSamples < itsSortedIndices.size(), AipsError);
+  AlwaysAssert(nSamples <= itsSortedIndices.size(), AipsError);
   for (size_t i=0; i<nSamples; ++i) {
        itsSortedIndices[i]=i;
@@ -711 +711 @@
       // an assumption made: lines occupy a small part of the spectrum
 
-      std::vector<float> variances(edge.second-edge.first);
-      DebugAssert(variances.size(),AipsError);
-
-      for (;running_box->haveMore();running_box->next())
-           variances[running_box->getChannel()-edge.first]=
-                                running_box->getLinVariance();
-
-      // in the future we probably should do a proper Chi^2 estimation
-      // now a simple 80% of smaller values will be used.
-      // it may degrade the performance of the algorithm for weak lines
-      // due to a bias of the Chi^2 distribution.
-      stable_sort(variances.begin(),variances.end());
-
-      Float offline_variance=0;
-      uInt offline_cnt=uInt(0.8*variances.size());
-      if (!offline_cnt) offline_cnt=variances.size(); // no much else left,
-                                    // although it is very inaccurate
-      for (uInt n=0;n<offline_cnt;++n)
-           offline_variance+=variances[n];
-      offline_variance/=Float(offline_cnt);
+      DebugAssert(edge.second-edge.first,AipsError);
+      LFNoiseEstimator ne(edge.second-edge.first);
+
+      for (;running_box->haveMore();running_box->next()) {
+           ne.add(running_box->getLinVariance());
+      }
+
+      const Float offline_variance = ne.meanLowest80Percent();
 
       // actual search algorithm
@@ -909 +897 @@
                 const casa::uInt &whichRow) throw(casa::AipsError)
 {
-  //const int minboxnchan=4;
   if (scan.null())
       throw AipsError("STLineFinder::findLines - a scan should be set first,"