Analyzer: Leakage current fix, rts pixel are considered in leakage current calculation

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index 39b6b68759e5c3a94abd74e702797bf65abcdd3f..2e734f83eb8680f304cce48523fab393d307f9e0 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -266,7 +266,6 @@ void ChargeSpektrum(TString runnumber = "")
                             compareHistogramVectorRTSSum.push_back(*(runs[runi]->histogramwoRTS->normalized->Sum));
                             
                             runs[runi]->plot1DHistogram(runs[runi]->histogram->pixeltimefiredDistrib, "gaus", false, true);
-                            runs[runi]->plot1DHistogram(runs[runi]->histogram->LeakageCurrentInPixelSorted);
                             
                             if (runi+1 == numberRuns) {
                                 compareHistogramVectorVector.push_back(compareHistogramVectorRTSSeed); 
@@ -274,6 +273,18 @@ void ChargeSpektrum(TString runnumber = "")
                             }
                         }
                         
+                        
+                        if (analysisType.Contains("leak")) { // analyze cluster formation
+                            // Plot leakage current            
+                            compareHistogramLeakageCurrent.push_back(runs[runi]->histogram->LeakageCurrentDistrib);
+                            if (runi+1 == numberRuns) {
+                                compareHistogramVectorVector.push_back(compareHistogramLeakageCurrent);     
+                            }
+                            
+                            runs[runi]->plot1DHistogram(runs[runi]->histogramdynamicalthreshold->Veto, "GaussTail", true);
+                            runs[runi]->plot1DHistogram(runs[runi]->histogram->LeakageCurrentInPixelSorted, "", false, true);
+                        }
+                        
                         if (analysisType.Contains("seedf")) { // seedfit: seed integral anaylsis
                             runs[runi]->plot1DHistogram( HistogramTypeDefaultPt->normalized->Seed, "gaus", true, false, false, HistogramTypeDefaultPt->fixedThresholdValue);
                             runs[runi]->plot1DHistogram( runs[runi]->histogramdynamicalthreshold->normalized->Seed, "gaus", true, false, false, HistogramTypeDefaultPt->fixedThresholdValue);
@@ -448,18 +459,6 @@ void ChargeSpektrum(TString runnumber = "")
                         
                         
                         
-                        if (analysisType.Contains("leak")) { // analyze cluster formation
-                            // Plot leakage current            
-                            compareHistogramLeakageCurrent.push_back(HistogramTypeDefaultPt->LeakageCurrentDistrib);
-                            if (runi+1 == numberRuns) {
-                                compareHistogramVectorVector.push_back(compareHistogramLeakageCurrent);     
-                            }
-                            
-                            runs[runi]->plot1DHistogram(runs[runi]->histogramdynamicalthreshold->Veto, "GaussTail", true);
-                            runs[runi]->plot1DHistogram(HistogramTypeDefaultPt->LeakageCurrentInPixelSorted, "", false, true);
-                        }
-                        
-                        
                         
                         // write all histograms to a dat file, can be imported by ORIGIN or Excel. Leave this line ;)
                         runs[runi]->writeAllHistogramsToFile();