Changeset 2004 in Sophya for trunk

Timestamp:

May 15, 2002, 6:03:43 PM (23 years ago)

Author:

ansari

Message:

Correction bugs de SimpleOffsetEstimator - Reza 15/5/2002

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• simoffset.cc (modified) (5 diffs)
• simoffset.h (modified) (1 diff)

trunk/ArchTOIPipe/ProcWSophya/simoffset.cc

@@ -16 +16 @@
 
 SimpleOffsetEstimator::SimpleOffsetEstimator(int mwsz, int nptfit, int degpol)
-  : poly(degpol)
+  : poly((degpol > 1)?degpol:1)
 {
   mWSz = (mwsz > 8) ? mwsz : 8;
   nPtFit = (nptfit > degpol+2) ? nptfit : degpol+2;
+  degPol = (degpol > 1)?degpol:1;
   totnscount = 0;
   totnbblock = 0;
@@ -32 +33 @@
 {
   os << "\n ------------------------------------------------------ \n" 
-     << " SimpleDeglitcher::PrintStatus() - MeanWSize= " << mWSz << " NPtFit=" 
-     << nPtFit << " DegPoly=" << poly.Degre() << endl;
+     << " SimpleOffsetEstimator::PrintStatus() - MeanWSize= " << mWSz << " NPtFit=" 
+     << nPtFit << " DegPoly=" << degPol << " poly.Degre()=" << poly.Degre() << endl;
   TOIProcessor::PrintStatus(os);
   os << " ProcessedSampleCount=" << ProcessedSampleCount() << endl;
@@ -115 +116 @@
 
     int nbblkok = 0;
-    
+
+    bool fginiXYdone = false;
+
     double sn0 = 0.;
     double nok = 0.;
@@ -140 +143 @@
         nok++;
       }
-      if (nbblkok == 0) {
+      
+      sn0 = (double)(k+wsize/2);
+      
+      if (!fginiXYdone) {
+        if (nok > 0.5) {
+          mean /= nok;
+          meanx /= nok;
+          sig = sig/nok-mean*mean;      
+        }
         X = RegularSequence(k+wsize*0.5, (double)wsize);
         Y = mean;
         YErr = (nok > 0.5) ? sqrt(mean) : 1.;
-      }
-      
-      sn0 = (double)(k+wsize/2);
-      
+        fginiXYdone = true; 
+      }
+
       if (nok > 3.) {
         mean /= nok;
@@ -161 +171 @@
       X0 = X;
       X0 -= sn0;
-      poly.Fit(X,Y,YErr,poly.Degre(),errCoef);
-      
+      if (nbblkok > poly.Degre()+1) 
+        poly.Fit(X0,Y,YErr,degPol,errCoef);
+      else {
+        poly[0] = mean;
+        for(int jj=1; jj<=poly.Degre(); jj++) poly[jj] = 0.;
+      }
+      /*
+      if (nbblkok < 8) {
+        cout << "------ DBG-X " << nbblkok << "," << nok << " degre=" << poly.Degre() << endl;
+        cout << "DBG-A X0=" << X0 << endl;
+        cout << "DBG-A Y=" << Y << endl;
+        cout << "DBG-A YErr=" << YErr << endl;
+        cout << "DBG-A poly= " << poly << endl;
+      }
+      */
       
       // Calcul des valeurs d'offset en sortie

trunk/ArchTOIPipe/ProcWSophya/simoffset.h

@@ -43 +43 @@
   int mWSz;
   int nPtFit;
+  int degPol;
   Poly poly;
   bool ntpoly;