resolved merge conflicts with master

2016-12-23 14:16:22 +01:00
parent 605502386c c3c01e5de0
commit 38c4293d58
54 changed files with 2297 additions and 829 deletions
--- a/src/include/PMsrHandler.h
+++ b/src/include/PMsrHandler.h
@@ -109,7 +109,6 @@ class PMsrHandler

    virtual void GetGroupingString(Int_t runNo, TString detector, TString &groupingStr);
    virtual Bool_t EstimateN0();
-    virtual Double_t GetAlphaEstimateN0();

    virtual std::string GetDKSTheoryString();
    virtual UInt_t GetDKSTag();