From: Dennis Doering <doering@physik.uni-frankfurt.de>
Date: Thu, 25 Jun 2015 13:46:42 +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=921efea55f6994713099c2bb028ed587bf967f87;p=radhard.git

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

Conflicts:
	MABS_run_analyzer/ChargeSpektrum.c
---

921efea55f6994713099c2bb028ed587bf967f87
diff --cc MABS_run_analyzer/ChargeSpektrum.c
index a6408de,ee658a8..877f6fa
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@@ -171,8 -171,6 +171,11 @@@ void ChargeSpektrum(TString runnumber 
  //     plotAllRuns("");
      plotAllRuns("seed calibrated");
  //     writeObservableToFile("seed threshold calibrated");
 +    writeObservableToFile("seed threshold");
 +	writeObservableToFile("sum threshold");
++
+ //    writeObservableToFile("seed threshold");
++
  	writeObservableToFile("seed threshold calibrated");
 +	writeObservableToFile("sum threshold calibrated");
  }