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

diff --git a/MABS_run_analyzer/Run.cpp b/MABS_run_analyzer/Run.cpp
index 84356b07131def684bd5d401cfa22874be93d716..2d28e8103bfc8cb43cc829e9f9d5a8c1d0e9019c 100644 (file)
--- a/MABS_run_analyzer/Run.cpp
+++ b/MABS_run_analyzer/Run.cpp
@@ -1062,19 +1062,21 @@ void Run::updateDatabase() {
     constructUpdateString(&sqlupdatequery, "Avg.NoiseADC",  histogramclassToUseForDB->normalized->avgNoise, 2, 0 , 1000);
     constructUpdateString(&sqlupdatequery, "Avg.NoiseADC+",  histogramclassToUseForDB->normalized->avgNoisePlus, 2, 0 , 1000);
     constructUpdateString(&sqlupdatequery, "Avg.NoiseADC-",  histogramclassToUseForDB->normalized->avgNoiseMinus, 2, 0 , 1000);
+    constructUpdateString(&sqlupdatequery, "LeakageCurMedADC",  histogram->medianLeakageCurrent);
+    constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC",  histogram->avgLeakageCurrentInChip);
     constructUpdateString(&sqlupdatequery, "Frames_found", frames_found, 100000000);
+    if (histogram->calibrated != 0) {
+        constructUpdateString(&sqlupdatequery, "LeakageCurAvgE",  histogram->calibrated->avgLeakageCurrentInChip);     
+        constructUpdateString(&sqlupdatequery, "LeakageCurfA",  histogram->calibrated->medianLeakageCurrent);      
+        constructUpdateString(&sqlupdatequery, "LeakageCurfA+",  histogram->calibrated->medianLeakageCurrentPlus);      
+        constructUpdateString(&sqlupdatequery, "LeakageCurfA-",  histogram->calibrated->medianLeakageCurrentMinus);
+    }
+    if (Fe55run.posVeto > 0) {
+        constructUpdateString(&sqlupdatequery, "CalibrationPeak",  Fe55run.posVeto, 4, -1, 1000);             
+    }
     if (histogramwoRTS != 0) {
         constructUpdateString(&sqlupdatequery, "RTSpixel",       histogramwoRTS->normalized->RTSpixel.size());
         constructUpdateString(&sqlupdatequery, "RTSpixel_percentage",       histogramwoRTS->normalized->percentageofRTSpixel);
-        constructUpdateString(&sqlupdatequery, "LeakageCurMedADC",  histogram->medianLeakageCurrent);
-        constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC",  histogram->avgLeakageCurrentInChip);
-        if (histogramwoRTS->calibrated != 0) {
-            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);             
-        }
     }
     if (histogramclassToUseForDB->normalized->calibrated != 0)
         if (labbook.source.Contains("Sr") && histogramclassToUseForDB->normalized->calibrated->sr90IntegralVal > 0)