From: Dennis Doering <doering@physik.uni-frankfurt.de>
Date: Thu, 11 Jun 2015 10:59:15 +0000 (+0200)
Subject: Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:radhard
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4f452827b1d69ff0d778402962e6406cb0659667;p=radhard.git

Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:radhard

Conflicts:
	MABS_run_analyzer/Run.c
---

4f452827b1d69ff0d778402962e6406cb0659667
diff --cc MABS_run_analyzer/Run.c
index 991f9b9,ff8cf4f..c4fb854
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@@ -600,8 -609,9 +609,10 @@@ 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);
-     
+     constructUpdateString(&sqlupdatequery, "Frames_found", frames_found,100000000);
+     constructUpdateString(&sqlupdatequery, "Sr90IntegralVal", sr90IntegralVal,1000000000);
 -    
++  
      if (sqlupdatequery.length()>0)
      {
          try