Anylyzer: Added column to represent the number of frames really found in folder to...

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index 7944e4eb088de98acf9a86a0e27ec29ec75687c2..231d85f697c68ed8ea14459a51172b11a562dddc 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -171,7 +171,7 @@ void ChargeSpektrum(TString runnumber = "")
 //                 runs[runi]->analyzeFrame(8319);
                 
                 // creates or opens .root file, can analyze the RAW data
-                runs[runi]->error=runs[runi]->analyzeRun(true); // creates or opens .root file, can analyze the RAW data
+                runs[runi]->error=runs[runi]->analyzeRun(false); // creates or opens .root file, can analyze the RAW data
                 if (!runs[runi]->error)
                 {
             //         gROOT->SetBatch(kTRUE);

diff --git a/MABS_run_analyzer/MAPS.c b/MABS_run_analyzer/MAPS.c
index f9ebc41bd33f4b79cac0cf16f450ab4138a132b4..495bda47d0131f6041bafc585052604a2f9d238d 100644 (file)
--- a/MABS_run_analyzer/MAPS.c
+++ b/MABS_run_analyzer/MAPS.c
@@ -445,7 +445,7 @@ bool MAPS::checkDataFiles( Int_t MaxFiles ) {
 bool MAPS::checkDataFile( UInt_t FileNr, UInt_t &Frames ) {
 
     TString            FILENAME = fInDir+Form("/RUN_%i_%i.rz",fRunNumber,FileNr);
-    cout << FILENAME<< endl;
+//     cout << FILENAME<< endl;
     ifstream   inn(FILENAME, ios::binary);
 //     Int_t Pixels=0;
     if( !inn.good() )
@@ -1222,7 +1222,7 @@ void MAPS::hitana() {
         
 //         Begin loop over all negative CDS pixel
 //         Determine clusters around them
-        for(Int_t rechargingpixeli=0; rechargingpixeli<rechargePixellist.size(); rechargingpixeli++)
+        for(UInt_t rechargingpixeli=0; rechargingpixeli<rechargePixellist.size(); rechargingpixeli++)
         {
             seedrow = (rechargePixellist[rechargingpixeli])/fColumns;            // row of seed
             seedcolumn = (rechargePixellist[rechargingpixeli])%fColumns;            // column of seed

diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index 837bffa4f2384d97c9b88f32867ce6daab66bdf9..b07e6cae92463af8a34edaa45c82b7e6c108b957 100644 (file)
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -233,6 +233,7 @@ Bool_t Run::analyzeRun(Bool_t force)
         if (!runAllreadyAnalyzed() || force)
         {
             if (processed->initNewRootFile()) return 1;
+            frames_found = processed->GetNumberFrames();
             /// progress meter, temporal variable
             ULong_t progress_tmp=-1;
             /// progress meter
@@ -590,6 +591,8 @@ void Run::constructUpdateString(string *sqlupdatequery, const string databaseval
 }
 
 void Run::updateDatabase() {
+    
+    
     string sqlupdatequery = "";
     constructUpdateString(&sqlupdatequery, "Gain",       gain);
     constructUpdateString(&sqlupdatequery, "SumPeak",    histogram.posSum, 4);
@@ -600,6 +603,7 @@ void Run::updateDatabase() {
     constructUpdateString(&sqlupdatequery, "Avg.Noise-", histogramCalibrated.avgNoiseMinus, 2);
     constructUpdateString(&sqlupdatequery, "CCE_1",      CCE_in_Perc_1);
     constructUpdateString(&sqlupdatequery, "CCE_25",     CCE_in_Perc_25);
+    constructUpdateString(&sqlupdatequery, "Frames_found", frames_found,100000000);
     
     if (sqlupdatequery.length()>0)
     {

diff --git a/MABS_run_analyzer/Run.h b/MABS_run_analyzer/Run.h
index a31fe6cc89426cb1676afe305924a63f6fefcf2f..bab97345a32bce76ed3f5b73fb6a1d56d8ee8f33 100644 (file)
--- a/MABS_run_analyzer/Run.h
+++ b/MABS_run_analyzer/Run.h
@@ -117,6 +117,9 @@ private:
     /// see #devided_lower_matr_min
     const Float_t devided_upper_matr_max = 16.0;
     
+    /// number of frames found in given folder
+    ULong_t frames_found = 0;
+    
     /**
      * @brief Generates a human readable string with information about the run
      * 
@@ -206,7 +209,7 @@ private:
     };
     systemparam systemparamUSB {
         2800, // maxbin;
-        2800/16,// nbins;
+        2800/8,// nbins;
         25, //vetothreshold
         10,
         100