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 8d09813f23ba24d73e5f6258b3d57db73b677c65..188050642c2902e3e1b960a6de19fc543f2c6fde 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -265,8 +265,8 @@ void ChargeSpektrum(TString runnumber = "")
                             compareHistogramVectorRTSSeed.push_back(runs[runi]->histogramwoRTS->normalized->Seed);
                             compareHistogramVectorRTSSum.push_back(*(runs[runi]->histogramwoRTS->normalized->Sum));
                             
-                            runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->pixeltimefiredDistrib, "gaus", false, true);
-                            runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->LeakageCurrentInPixelSorted);
+                            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); 

diff --git a/MABS_run_analyzer/Run.cpp b/MABS_run_analyzer/Run.cpp
index 347b8724c47b8027fa1487afb427b61ba9b2714c..84356b07131def684bd5d401cfa22874be93d716 100644 (file)
--- a/MABS_run_analyzer/Run.cpp
+++ b/MABS_run_analyzer/Run.cpp
@@ -1066,13 +1066,13 @@ void Run::updateDatabase() {
     if (histogramwoRTS != 0) {
         constructUpdateString(&sqlupdatequery, "RTSpixel",       histogramwoRTS->normalized->RTSpixel.size());
         constructUpdateString(&sqlupdatequery, "RTSpixel_percentage",       histogramwoRTS->normalized->percentageofRTSpixel);
-        constructUpdateString(&sqlupdatequery, "LeakageCurMedADC",  histogramwoRTS->medianLeakageCurrent);
-        constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC",  histogramwoRTS->avgLeakageCurrentInChip);
+        constructUpdateString(&sqlupdatequery, "LeakageCurMedADC",  histogram->medianLeakageCurrent);
+        constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC",  histogram->avgLeakageCurrentInChip);
         if (histogramwoRTS->calibrated != 0) {
-            constructUpdateString(&sqlupdatequery, "LeakageCurAvgE",  histogramwoRTS->calibrated->avgLeakageCurrentInChip);     
-            constructUpdateString(&sqlupdatequery, "LeakageCurfA",  histogramwoRTS->calibrated->medianLeakageCurrent);      
-            constructUpdateString(&sqlupdatequery, "LeakageCurfA+",  histogramwoRTS->calibrated->medianLeakageCurrentPlus);      
-            constructUpdateString(&sqlupdatequery, "LeakageCurfA-",  histogramwoRTS->calibrated->medianLeakageCurrentMinus);      
+            constructUpdateString(&sqlupdatequery, "LeakageCurAvgE",  histogram->calibrated->avgLeakageCurrentInChip);     
+            constructUpdateString(&sqlupdatequery, "LeakageCurfA",  histogram->calibrated->medianLeakageCurrent);      
+            constructUpdateString(&sqlupdatequery, "LeakageCurfA+",  histogram->calibrated->medianLeakageCurrentPlus);      
+            constructUpdateString(&sqlupdatequery, "LeakageCurfA-",  histogram->calibrated->medianLeakageCurrentMinus);      
             constructUpdateString(&sqlupdatequery, "CalibrationPeak",  Fe55run.posVeto, 4, -1, 1000);             
         }
     }