From: Tobias Bus <tbus@jspc48.x-matter.uni-frankfurt.de>
Date: Fri, 4 Nov 2016 11:50:51 +0000 (+0100)
Subject: analyzer: commit before change
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=6dcd380320a49f9c44cd6a3cbc4a7374be9d401a;p=radhard.git

analyzer: commit before change
---

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index fa6146d..f0dd821 100644
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -103,15 +103,16 @@ void ChargeSpektrum(TString runnumber = "")
                     // Uncomment below to do classical analysis withour RTS
 //                     compareHistogramClassVector2.push_back(runs[runi]->histogramwoRTS->normalized->calibrated);
 		    
-                     runs[runi]->plotAllHistograms(runs[runi]->histogram);
-                     //compareHistogramClassVector.push_back(runs[runi]->histogram->normalized->calibrated);
+                     runs[runi]->plotAllHistograms(runs[runi]->histogram->normalized->calibrated);
+//                     runs[runi]->plotAllHistograms(runs[runi]->histogramthreshold);
+                     compareHistogramClassVector.push_back(runs[runi]->histogram->normalized);
                      //compareHistogramClassVector2.push_back(runs[runi]->histogram->normalized);
 //                     compareHistogramClassVector2.push_back(runs[runi]->histogramthreshold);
                      compareHistogramVector.push_back(runs[runi]->histogram->normalized->calibrated->Seed);
                      compareHistogramVector2.push_back(runs[runi]->histogram->normalized->Seed);
 		     //runs[runi]->plot1DHistogram(runs[runi]->histogram->normalized->calibrated, runs[runi]->histogram->normalized->calibrated->Seed, "landau", 1);
 //                     runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized->calibrated, runs[runi]->histogramwoRTS->normalized->calibrated->Seed, "landau", true);
-//                     runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized->calibrated, runs[runi]->histogramwoRTS->normalized->calibrated->Sum, "gaus", true);
+                     runs[runi]->plot1DHistogram(runs[runi]->histogram->normalized, runs[runi]->histogram->normalized->Seed, "gaus", true);
                     
 // //                     Uncomment below to do analysis without RTS pixel
 //                     compareHistogramClassVector2.push_back(runs[runi]->histogramwoRTSthreshold);
diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index 5a4a896..358c544 100644
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -251,7 +251,7 @@ void Run::setSystemSpecificParameters()
     systemparam systemparamPXI (800*16,800,75,150,150);
     systemparam systemparamFSBB (2800,2800/4,25,10,100);
     systemparam systemparamUSBMi19 (400/*maxbin*/,400/1/*nbins*/, 25/*vetothreshold*/, 10/*maxbinnoise*/, 100/*nbinsnoise*/);
-    systemparam systemparamPipper2 (1000,1000,15,10,100);
+    systemparam systemparamPipper2 (1000,500,15,10,100);
     if (labbook.system.EqualTo("USB")  && labbook.chipGen.EqualTo("Mi34") )
         cursystemparam = systemparamUSB;
     else if (labbook.system.EqualTo("USB")  && labbook.chipGen.EqualTo("FSBB") )
@@ -965,8 +965,8 @@ void Run::updateDatabase() {
     if (histogramthreshold->normalized->calibrated != 0)
 //         if (histogramthreshold->normalized->calibrated->avgNoiseMinus < 100)
             constructUpdateString(&sqlupdatequery, "Avg.Noise-", histogramthreshold->normalized->calibrated->avgNoiseMinus, 2);
-    constructUpdateString(&sqlupdatequery, "CCE_1",      histogramthreshold->normalized->CCE_in_Perc_1);
-    constructUpdateString(&sqlupdatequery, "CCE_25",     histogramthreshold->normalized->CCE_in_Perc_25);
+    constructUpdateString(&sqlupdatequery, "CCE_1",      histogram->normalized->CCE_in_Perc_1); // because histogramthreshold didn't work well with Pipper2.... why?'
+    constructUpdateString(&sqlupdatequery, "CCE_25",     histogram->normalized->CCE_in_Perc_25);
     constructUpdateString(&sqlupdatequery, "StoN",     histogramthreshold->normalized->StoN, 3);
 //     if (histogramthreshold->normalized->avgNoise < 100)
         constructUpdateString(&sqlupdatequery, "Avg.NoiseADC",  histogramthreshold->normalized->avgNoise);
@@ -2099,7 +2099,8 @@ TCanvas* Run::plot1DHistogram(HistogramType* HistogramTypepointer, TH1F* onehist
         if (withOverflow)
             onehistogram=ShowOverflow(onehistogram);
         onehistogram->Draw();
-        
+        cout << colorcyan << "Harambe died for this" << endlr;
+
         Double_t* parameters = (Double_t *)calloc(9, sizeof(Double_t)); // allocate 9 parameters for safety, maximum 8 used at the moment     
         Float_t maxValue = 0;
         if (fitFuncType!="")