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

Conflicts:
	MABS_run_analyzer/Run.c

diff --cc MABS_run_analyzer/ChargeSpektrum.c
Simple merge

diff --cc MABS_run_analyzer/Run.c
index 991f9b9765b0ab61f689235729771e5fb2a88098,ff8cf4f7226f981856cff9c75a34f2dc6a53ac96..c4fb8542938d7085e79ccb390c38440f0dacc7ab
--- 1/MABS_run_analyzer/Run.c
--- 2/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 

diff --cc MABS_run_analyzer/Run.h
Simple merge