]> jspc29.x-matter.uni-frankfurt.de Git - radhard.git/commitdiff
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:radhard
authorDennis Doering <doering@physik.uni-frankfurt.de>
Thu, 25 Jun 2015 13:46:42 +0000 (15:46 +0200)
committerDennis Doering <doering@physik.uni-frankfurt.de>
Thu, 25 Jun 2015 13:46:42 +0000 (15:46 +0200)
Conflicts:
MABS_run_analyzer/ChargeSpektrum.c

1  2 
MABS_run_analyzer/ChargeSpektrum.c

index a6408de1493f9280ab2875df6538377c2f3d0e22,ee658a811f8c5b1b86479fe856a6e2a7849bbcd9..877f6fac71bae05c110ee74b854d9b8dd4946d96
@@@ -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");
  }