analyzer: found a big bug in integral function, it was a sum not an integral all...

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index e632ea15bdd0f897540d909fcb4b7b4964fa5a38..6d48a5a5788c90a73f1407bdfe489e352a1f71fe 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -105,8 +105,8 @@ void ChargeSpektrum(TString runnumber = "")
 //                    compareHistogramClassVector.push_back(runs[runi]->histogramwoRTS->normalized);
 //                     compareHistogramClassVector2.push_back(runs[runi]->histogramwoRTS);
 //                     compareHistogramClassVector.push_back(runs[runi]->histogram->normalized);
-                    compareHistogramClassVector2.push_back(runs[runi]->histogramwoRTS->normalized);
-                    compareHistogramClassVector.push_back(runs[runi]->histogram->normalized);
+//                    compareHistogramClassVector2.push_back(runs[runi]->histogramwoRTS->normalized);
+                    compareHistogramClassVector.push_back(runs[runi]->histogramwoRTS->normalized);
 //                     runs[runi]->plot1DHistogram(runs[runi]->histogram, runs[runi]->histogramwoRTS->pixeltimefired, "", 0);
                      //compareHistogramClassVector.push_back(runs[runi]->histogramwoRTS);
 //                     compareHistogramClassVector2.push_back(runs[runi]->histogramthreshold);
@@ -116,7 +116,10 @@ void ChargeSpektrum(TString runnumber = "")
 //                  runs[runi]->plot1DHistogram(runs[runi]->histogram->normalized->calibrated, runs[runi]->processed->fNoiseInfo.fPedestals, "", 1);
 //                  runs[runi]->plot1DHistogram(runs[runi]->histogram->normalized, runs[runi]->histogramwoRTS->normalized->calibrated->Seed, "landau", 1, 1, 0, 200);
 //              runs[runi]->plot1DHistogram(runs[runi]->histogram, runs[runi]->histogramwoRTS->pixeltimefiredsorted, "", 0);
-//                     runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized->calibrated, runs[runi]->histogramwoRTS->normalized->calibrated->Seed, "landau", true);
+
+// Integralberechnung vom Veto Peak
+                    runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized, runs[runi]->histogramwoRTS->normalized->Seed, "GaussTail", true);
+
 //                     runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized->calibrated, runs[runi]->histogramwoRTS->normalized->calibrated->Sum, "gaus", true);
                     
 // //                     Uncomment below to do analysis without RTS pixel

diff --git a/MABS_run_analyzer/HistogramType.c b/MABS_run_analyzer/HistogramType.c
index 238be69ae4cb1da0f185fafad7d4104155a6a8de..4ef06b18099b40289505251fcfb539d46b26425c 100644 (file)
--- a/MABS_run_analyzer/HistogramType.c
+++ b/MABS_run_analyzer/HistogramType.c
@@ -351,7 +351,7 @@ Double_t* HistogramType::FitPerform(TH1F* histogrampointer, TString fitFuncType,
 //                 cout << colorred << gMinuit->fCstatu.Data() << endlr;            
             } while (gMinuit->fCstatu.Contains("FAILED") && fittries++ < 8);
             posMax = histogrampointer->GetXaxis()->GetBinCenter(histogrampointer->GetMaximumBin()); // Methode 1
-            integralPeak = histogrampointer->Integral(min+fittries*min/20, histogrampointer->GetXaxis()->FindBin(posMaxValHist));
+            integralPeak = histogrampointer->Integral(min+fittries*min/20, histogrampointer->GetXaxis()->FindBin(posMaxValHist), "width");
 //             if (verbose)
 //             {
 //                 cout << coloryellow << "min " << histogrampointer->GetXaxis()->GetBinCenter( min ) << endlr;
@@ -366,7 +366,7 @@ Double_t* HistogramType::FitPerform(TH1F* histogrampointer, TString fitFuncType,
         } else {
             histogrampointer->Fit(fitFunc, "N,Q,W", "", noiseborder, posMaxValHist);
             noiseborder = FindBorderToPeak(histogrampointer, noiseborder,fitFunc->GetParameter(1), verbose); // starting point of histogram integration
-            integralPeak = histogrampointer->Integral(histogrampointer->GetXaxis()->FindBin(noiseborder), histogrampointer->GetXaxis()->FindBin(posMaxValHist));
+            integralPeak = histogrampointer->Integral(histogrampointer->GetXaxis()->FindBin(noiseborder), histogrampointer->GetXaxis()->FindBin(posMaxValHist), "width");
             posMax = fitFunc->GetMaximumX(); // Methode 2
             fitFunc->SetLineStyle(1); // normal for the following fits
             if (verbose)
@@ -629,7 +629,7 @@ Double_t* HistogramType::FitPerform(TH1F* histogrampointer, TString fitFuncType,
         //parameters[7] = FindBorderToPeak(histogrampointer, noiseborder,def_peakcenter, verbose); // starting point of histogram integration
         parameters[7] = parameters[1] - 2*parameters[2] ; // starting point of histogram integration
         parameters[8] = parameters[1] + 2*parameters[2] ; // end point of histogram integration
-        parameters[6] = histogrampointer->Integral(histogrampointer->GetXaxis()->FindBin( parameters[1] - 2*parameters[2]  ), histogrampointer->GetXaxis()->FindBin( parameters[1] + 2*parameters[2])); // integral value of histogram (NOT fit)
+        parameters[6] = histogrampointer->Integral(histogrampointer->GetXaxis()->FindBin( parameters[1] - 2*parameters[2]  ), histogrampointer->GetXaxis()->FindBin( parameters[1] + 2*parameters[2]), "width"); // integral value of histogram (NOT fit)
         
         TF1 *bgfct = new TF1("f1","[0] +[1]*x",0,posMaxValHist);
         bgfct->SetParameters(parameters[5],parameters[4]);     
@@ -637,10 +637,14 @@ Double_t* HistogramType::FitPerform(TH1F* histogrampointer, TString fitFuncType,
         parameters[6] -= integralbg;       
         
         if (verbose) {
+                       cout << colorcyan << "Depletion voltage: " << labbook->depletionV << endlr;                     
             cout << colorcyan << "Integral from bin : " << histogrampointer->FindBin(parameters[7])  << " to " << histogrampointer->GetXaxis()->FindBin(parameters[8]) << endlr;  
-            cout << colorcyan << "Integral from val : " << parameters[7] << " to " << parameters[8] << endlr;  
-            cout << colorcyan << "Integral value: " << parameters[6] << endlr;            
-            cout << colorcyan << "Integral bg: " << integralbg << endlr;            
+            cout << colorcyan << "Integral from val : " << parameters[7] << " to " << parameters[8] << endlr;      
+            cout << colorcyan << "Integral bg: " << integralbg << endlr;      
+            cout << colorcyan << "Integral value without bg: " << parameters[6] << endlr;              
+                       cout << colorcyan << "Integral value with bg: " << parameters[6] + integralbg << endlr;          
+                       cout << colorcyan << "Gauss Sigma: " << parameters[2] << endlr;                         
+            cout << colorcyan << "Number of events : " << frames_found << endlr;                             
         }
 
 //             DEBUG
@@ -842,9 +846,8 @@ Bool_t HistogramType::integrateSr90Spectra(TH1F* histogrampointer, Int_t frames_
             }
         }
     }
-//     sr90IntegralVal = histogrampointer->integral(thresholdbincurcandidate,histogrampointer->GetNbinsX(), sr90IntegralErr);
-    sr90IntegralVal = histogrampointer->Integral(thresholdbincurcandidate,histogrampointer->GetNbinsX());
-//     histogrampointer->Integral(min+fittries*min/20, histogrampointer->GetXaxis()->FindBin(posMaxValHist));
+    sr90IntegralVal = histogrampointer->Integral(thresholdbincurcandidate,histogrampointer->GetNbinsX(), "width");
+//     histogrampointer->Integral(min+fittries*min/20, histogrampointer->GetXaxis()->FindBin(posMaxValHist), "width");
 //     for (
 //     cout << "Integrate from bin " << thresholdbincurcandidate << " to " <<  histogrampointer->GetNbinsX() << endl;
 //     sr90IntegralErr /= sr90IntegralVal/100;