From: Dennis Doering <doering@physik.uni-frankfurt.de>
Date: Thu, 11 Jun 2015 10:54:07 +0000 (+0200)
Subject: Noise in ADU now inserted to database
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=376f1f22287d9f6f651889d6bb0d4dc837d75bab;p=radhard.git

Noise in ADU now inserted to database
---

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index 7944e4e..164114d 100644
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -171,7 +171,7 @@ void ChargeSpektrum(TString runnumber = "")
 //                 runs[runi]->analyzeFrame(8319);
                 
                 // creates or opens .root file, can analyze the RAW data
-                runs[runi]->error=runs[runi]->analyzeRun(true); // creates or opens .root file, can analyze the RAW data
+                runs[runi]->error=runs[runi]->analyzeRun(false); // creates or opens .root file, can analyze the RAW data
                 if (!runs[runi]->error)
                 {
             //         gROOT->SetBatch(kTRUE);
@@ -196,7 +196,8 @@ void ChargeSpektrum(TString runnumber = "")
 //     plotAllRuns("");
     plotAllRuns("threshold calibrated");
 //     writeObservableToFile("seed threshold calibrated");
-    writeObservableToFile("seed threshold calibrated");
+    writeObservableToFile("seed threshold");
+	writeObservableToFile("seed threshold calibrated");
 }
 
 Int_t ReadRunList(std::vector<int>* runlist)
@@ -282,7 +283,8 @@ Bool_t writeObservableToFile()
     TString headerInfo = "";
     for(Int_t runi=0;runi<numberRuns;runi++) // loop over runs read from file
     {
-        headerInfo+=runs[runi]->runcode+"\t\t\t";
+		TString labbookTempSens=Form("%d",runs[runi]->labbook.tempSens);
+        headerInfo+=runs[runi]->runcode+"\t"+labbookTempSens+"\t";
     }
     TH1F* plothistogrampointer = *runs[0]->plothistogrampointer;
     TString runnumberListe=Form("%s_",plothistogrampointer->GetName());
@@ -295,7 +297,7 @@ Bool_t writeObservableToFile()
             {
                 plothistogrampointer = *runs[runi]->plothistogrampointer;
                 runnumberListe+=Form("%d_",runs[runi]->labbook.runnumber);
-                header+=Form("%d\t%s\t", runs[runi]->labbook.runnumber, plothistogrampointer->GetName());
+                header+=Form("%d\t%d_%s\t", runs[runi]->labbook.runnumber, runs[runi]->labbook.runnumber, plothistogrampointer->GetName());
             }
         }
 	}
diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index 837bffa..991f9b9 100644
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -600,6 +600,7 @@ void Run::updateDatabase() {
     constructUpdateString(&sqlupdatequery, "Avg.Noise-", histogramCalibrated.avgNoiseMinus, 2);
     constructUpdateString(&sqlupdatequery, "CCE_1",      CCE_in_Perc_1);
     constructUpdateString(&sqlupdatequery, "CCE_25",     CCE_in_Perc_25);
+	constructUpdateString(&sqlupdatequery, "Avg.NoiseADC",  histogram.avgNoise);
     
     if (sqlupdatequery.length()>0)
     {