]> jspc29.x-matter.uni-frankfurt.de Git - radhard.git/commitdiff
Analyzer: bugfix
authorBenjamin Linnik <blinnik@jspc61.x-matter.uni-frankfurt.de>
Tue, 14 Nov 2017 18:20:31 +0000 (19:20 +0100)
committerBenjamin Linnik <blinnik@jspc61.x-matter.uni-frankfurt.de>
Tue, 14 Nov 2017 18:20:31 +0000 (19:20 +0100)
MABS_run_analyzer/ChargeSpektrum.c

index 0dd2d86cb51ca2cf1ff99869b3861391ec892a84..6a9e1388b528347400f4850af275f3bd0c1ddb37 100644 (file)
@@ -145,7 +145,7 @@ void ChargeSpektrum(TString runnumber = "")
                     
                     if (analysisType.Contains("clas")) { // classic analysis
                         compareHistogramClassVectorClassic.push_back(runs[runi]->histogram->normalized);
-                        if (runi+1 == runnumber)
+                        if (runi+1 == numberRuns) 
                             compareHistogramClassVectorVector.push_back(compareHistogramClassVectorClassic);
                     }           
                     
@@ -159,7 +159,7 @@ void ChargeSpektrum(TString runnumber = "")
                     
                     if (analysisType.Contains("cali")) { // calibrated analysis
                         compareHistogramClassVectorCalibrated.push_back(runs[runi]->histogram->calibrated->normalized);
-                        if (runi+1 == runnumber)
+                        if (runi+1 == numberRuns)
                             compareHistogramClassVectorVector.push_back(compareHistogramClassVectorCalibrated);
                     }  
                     
@@ -174,7 +174,7 @@ void ChargeSpektrum(TString runnumber = "")
                         datainputPosVeto->xaxisTitle = "Voltage";
                         datainputPosVeto->yaxisTitle = "Position Veto";
                         datainputPosVeto->Fill(runs[runi]->labbook.depletionV,runs[runi]->histogramdynamicalthreshold->posVeto,0,0);
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             ntupleVectorDepltetion1.push_back(datainputPosVeto); 
                             ntupleVectorVector.push_back(ntupleVectorDepltetion1);
                         }
@@ -183,7 +183,7 @@ void ChargeSpektrum(TString runnumber = "")
                         prop2ndpixelfire->xaxisTitle = "Voltage";
                         prop2ndpixelfire->yaxisTitle = "Propability for second pixel to fire";
                         prop2ndpixelfire->Fill(runs[runi]->labbook.depletionV,runs[runi]->histogramdynamicalthreshold->clustermultiplicity->GetBinContent(2),0,0);
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             ntupleVectorDepltetion2.push_back(prop2ndpixelfire);
                             ntupleVectorVector.push_back(ntupleVectorDepltetion2);
                         }
@@ -211,7 +211,7 @@ void ChargeSpektrum(TString runnumber = "")
                             numpixelincl->Fill(sumi+1,AverageCharge[sumi],0,0);
                         }
                         ntupleVectorDepltetion3.push_back(numpixelincl);
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             ntupleVectorVector.push_back(ntupleVectorDepltetion3);
                             compareHistogramVectorVector.push_back(compareHistogramVectorDepletion); 
                             compareHistogramVectorVector.push_back(compareHistogramVectorDepletionSum);     
@@ -232,7 +232,7 @@ void ChargeSpektrum(TString runnumber = "")
                         runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->pixeltimefiredDistrib);
                         runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->LeakageCurrentInPixelSorted);
                         
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             compareHistogramVectorVector.push_back(compareHistogramVectorRTSSeed); 
                             compareHistogramVectorVector.push_back(compareHistogramVectorRTSSum); 
                         }
@@ -252,7 +252,7 @@ void ChargeSpektrum(TString runnumber = "")
                         datainputIntSeed->xaxisTitle = "Voltage";
                         datainputIntSeed->yaxisTitle = "Integral of Seed";
                         datainputIntSeed->Fill(runs[runi]->labbook.depletionV,runs[runi]->histogram->integralSeed,0,runs[runi]->histogram->integralSeedErr);
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             ntupleVectorSeed.push_back(datainputIntSeed); 
                             ntupleVectorVector.push_back(ntupleVectorSeed);
                         }
@@ -272,7 +272,7 @@ void ChargeSpektrum(TString runnumber = "")
                         datainputIntSum->xaxisTitle = "Voltage";
                         datainputIntSum->yaxisTitle = "Integral of Sum";
                         datainputIntSum->Fill(runs[runi]->labbook.depletionV,runs[runi]->histogram->integralSum,0,runs[runi]->histogram->integralSumErr);
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             ntupleVectorSum.push_back(datainputIntSum); 
                             ntupleVectorVector.push_back(ntupleVectorSeed);
                         }                 
@@ -345,7 +345,7 @@ void ChargeSpektrum(TString runnumber = "")
                         }
                         ntupleVectorAvgChargeColl.push_back(numpixelincl);
                         
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             compareHistogramVectorVector.push_back(compareHistogramVectorClusterMultiplicity);
                             ntupleVectorVector.push_back(ntupleVectorAvgChargeColl);
                         }
@@ -379,7 +379,7 @@ void ChargeSpektrum(TString runnumber = "")
                         averageChargeCollectedSeed->Fill(runs[runi]->labbook.tempSens,AverageChargeTempSeed,2,0);
                         averageChargeCollectedSum->Fill(runs[runi]->labbook.tempSens,AverageChargeTempSum,2,0);
                         
-                        if (runi+1 == runnumber) {
+                        if (runi+1 == numberRuns) {
                             compareHistogramClassVectorVector.push_back(compareHistogramClassVectorTemp);
                             vectorAverageChargeCollectedSeed.push_back(averageChargeCollectedSeed);
                             vectorAverageChargeCollectedSeed.push_back(averageChargeCollectedSum);