From 53f4466904c67394d65d2cafe6480f2ce8e36a2a Mon Sep 17 00:00:00 2001 From: nemu Date: Mon, 31 Aug 2009 08:12:26 +0000 Subject: [PATCH] fix of ROOT-PPC problem (see MUSR-89) --- src/classes/PRunAsymmetry.cpp | 9 ++------- src/classes/PRunSingleHisto.cpp | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp index baf8ca03..c61ba39d 100644 --- a/src/classes/PRunAsymmetry.cpp +++ b/src/classes/PRunAsymmetry.cpp @@ -332,13 +332,8 @@ bool PRunAsymmetry::PrepareData() // check if post pile up data shall be used unsigned int histoNo[2]; // forward/backward - if (fRunInfo->fFileFormat[0].Contains("ppc")) { - histoNo[0] = runData->fDataBin.size()/2 + fRunInfo->fForwardHistoNo-1; - histoNo[1] = runData->fDataBin.size()/2 + fRunInfo->fBackwardHistoNo-1; - } else { - histoNo[0] = fRunInfo->fForwardHistoNo-1; - histoNo[1] = fRunInfo->fBackwardHistoNo-1; - } + histoNo[0] = fRunInfo->fForwardHistoNo-1; + histoNo[1] = fRunInfo->fBackwardHistoNo-1; // first check if forward/backward given in the msr-file are valid if ((runData->fDataBin.size() < histoNo[0]+1) || (histoNo[0] < 0) || (runData->fDataBin.size() < histoNo[1]+1) || (histoNo[1] < 0)) { diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp index a6c04dc0..b2b619f2 100644 --- a/src/classes/PRunSingleHisto.cpp +++ b/src/classes/PRunSingleHisto.cpp @@ -316,11 +316,7 @@ bool PRunSingleHisto::PrepareData() // check if post pile up data shall be used unsigned int histoNo; - if (fRunInfo->fFileFormat[0].Contains("ppc")) { - histoNo = runData->fDataBin.size()/2 + fRunInfo->fForwardHistoNo-1; - } else { - histoNo = fRunInfo->fForwardHistoNo-1; - } + histoNo = fRunInfo->fForwardHistoNo-1; if ((runData->fDataBin.size() < histoNo) || (histoNo < 0)) { cout << endl << "PRunSingleHisto::PrepareData(): **PANIC ERROR**:";