Changeset 2048 in Sophya

Timestamp:

Jun 10, 2002, 10:04:42 AM (23 years ago)

Author:

ansari

Message:

StatNTuple(Mean-sigma) ajoute a SimpleCleaner - Reza 10/6/2002

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• simcleaner.cc (modified) (7 diffs)
• simcleaner.h (modified) (3 diffs)

trunk/ArchTOIPipe/ProcWSophya/simcleaner.cc

@@ -22 +22 @@
 
   SetRange();
+  FillMeanSigNTuple();
+  char* noms[] = {"sn","mean","sigma"};
+  meansignt = new NTuple(3,noms);
+
   totnscount = 0;
   totnbblock = 0;
@@ -101 +105 @@
     
 
-    int nbblkok = 0;
     int ns_flg2p_last = 0;
     int ns_flg2m_last = 0;
@@ -111 +114 @@
     double last_sum = 0.;
     double last_sum2 = 0.;
-    double meanx_forlast = 0.;
-    bool fg_last_meansig = false;
  
     // Boucle sur les sampleNum
@@ -198 +199 @@
         putData(2, k, wsize, vout.Data());
       }
-      if (!fgout) continue;
+
+      if (fg_meansignt) {  // Remplissage du NTuple mean-sigma  
+        float xnt[5];
+        xnt[0] = k;
+        xnt[1] = cur_mean;
+        xnt[2] = cur_sig;
+        meansignt->Fill(xnt);
+      }
+
+      if (!fgout) { 
+        klast+=wsize;
+        totnscount+=wsize;
+        totnbblock++;
+        continue;
+      }
 
       // Calcul des flags en sortie
@@ -270 +285 @@
       }
 
+      if (fg_meansignt) {  // Remplissage du NTuple mean-sigma  
+        float xnt[5];
+        xnt[0] = k;
+        xnt[1] = cur_mean;
+        xnt[2] = cur_sig;
+        meansignt->Fill(xnt);
+      }
+
       if (fgout)  for(j=0; j<wsize; j++) { 
         double x = vinc(j);
@@ -311 +334 @@
           }
         }
-      }
-
-      putData(0, k, wsize, vinc.Data(), vfgc.Data());
+        putData(0, k, wsize, vinc.Data(), vfgc.Data());
+      }
+
       
       klast+=wsize;
@@ -319 +342 @@
       totnbblock++;      
     }
-    
+
+    meansignt->Info()["SampleCount"] = ProcessedSampleCount();
+    meansignt->Info()["GlMean"] = GetGlMean();
+    meansignt->Info()["GlSigma2"] = GetGlSigma2();
+    meansignt->Info()["OutOfRange"] = ns_outofrange;
+    meansignt->Info()["NSFlag1+"] = ns_flag1p;
+    meansignt->Info()["NSFlag1-"] = ns_flag1m;
+    meansignt->Info()["NSFlag2+"] = ns_flag2p;
+    meansignt->Info()["NSFlag2-"] = ns_flag2m;
+
     cout << " SimpleCleaner::run() - End of processing " 
          << " TotNbBlocks= " << totnbblock << " ProcSamples=" << totnscount << endl;

trunk/ArchTOIPipe/ProcWSophya/simcleaner.h

@@ -11 +11 @@
 #include "toiprocessor.h"
 #include "tvector.h"
-#include "poly.h"
+#include "ntuple.h"
 
 // ---- Calcul de ligne de base 
@@ -31 +31 @@
 
   void          SetMeanSigWindow(int wsz=256, int nbw=5);
+
+  inline void    FillMeanSigNTuple(bool fg = false) 
+    { fg_meansignt = fg; }
+  inline NTuple& GetMeanSigNTuple() { return *meansignt; }
 
   inline void   SetRange(double min=-9.e19, double max=+9.e19)
@@ -78 +82 @@
   double gl_sum, gl_sum2;  // Global Sum(x) - Sum(x^2)
   int_4 ns_glms;             // Nb d'echantillon pour  Global Sum(x) - Sum(x^2)
+
+  bool fg_meansignt;
+  NTuple* meansignt;
 };