Changeset 12305 for fact

Timestamp:

10/27/11 21:36:58 (13 years ago)

Author:

neise

Message:

adjusted use of zerosearch() method ... this method doesn't return ints anymore, but struct Region
see Region.h

File:

• fact/tools/rootmacros/fana.C (modified) (5 diffs)

fact/tools/rootmacros/fana.C

@@ +1 @@
+
 #include <TROOT.h>
 #include <TCanvas.h>
@@ -12 +13 @@
 #include <cstdio>
 
+#define HAVE_ZLIB
 #include "fits.h"
 //#include "TPKplotevent.c"
@@ -17 +19 @@
 #include "FOpenCalibFile.c"
 
+#include "Region.h"
+#include "zerosearch.h"
 #include "zerosearch.C"
 
@@ -105 +109 @@
 
 // 2nd slinding window filter
-        int ks2 = 16;
-        vector<double> as2(ks2, 1);
-        double bs2 = ks2;
+        //int ks2 = 16;
+        //vector<double> as2(ks2, 1);
+        //double bs2 = ks2;
         gROOT->SetStyle("Plain");
         
@@ -195 +199 @@
         }
                 
-                vector<int> * zeros = zerosearch( Vcfd2, -1, 10, 20 );
+                vector<Region> * zeros = zerosearch( Vcfd2, -1, 1, 0);
+                ShiftRegionBy(*zeros, -k_slide/2);
+                EnlargeRegion(*zeros, 10, 20);
+                findAbsMaxInRegions( *zeros, Vslide);
                 if (zeros->size() == 0 ){
                         continue;
         }
                 // check value of Vside at zero position        
-                for ( int i=0; i<zeros->size(); i++){
-                        cout << zeros->at(i) << ":\t" << Vslide[ zeros->at(i) ]<<endl;
-                        sp->Fill(Vslide[zeros->at(i)]);
+                for (unsigned int i=0; i<zeros->size(); i++){
+                        cout << zeros->at(i).maxPos << ":\t" << zeros->at(i).maxVal <<endl;
+                        sp->Fill( zeros->at(i).maxVal );
                 }