From 6f779fd6db4a0d165df58939d77b680329fc7f04 Mon Sep 17 00:00:00 2001 From: nemu Date: Tue, 20 Oct 2009 05:42:45 +0000 Subject: [PATCH] fixed bug with t0 handling in case of ADDRUN and missing t0's in the msr-file, but t0's present in the data file (MUSR-94). Fixed another memory leak in PRunDataHandler PSIBIN (I am really not happy about the PSIBIN class handling because of the deep copy) --- src/classes/PRunAsymmetry.cpp | 2 +- src/classes/PRunDataHandler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp index c121a55d..ade82862 100644 --- a/src/classes/PRunAsymmetry.cpp +++ b/src/classes/PRunAsymmetry.cpp @@ -366,7 +366,7 @@ bool PRunAsymmetry::PrepareData() // get T0's of the to be added run int t0Add[2] = {0, 0}; // check if the t0's are given in the msr-file - if (i >= fRunInfo->fT0.size()) { // t0's are NOT in the msr-file + if (2*i+1 >= fRunInfo->fT0.size()) { // t0's are NOT in the msr-file // check if the t0's are in the data file if (addRunData->GetT0s().size() != 0) { // t0's in the run data // keep the proper t0's. For asymmetry runs, forward/backward are holding the histo no diff --git a/src/classes/PRunDataHandler.cpp b/src/classes/PRunDataHandler.cpp index 166a962c..b95e46e9 100644 --- a/src/classes/PRunDataHandler.cpp +++ b/src/classes/PRunDataHandler.cpp @@ -949,7 +949,7 @@ Bool_t PRunDataHandler::ReadPsiBinFile() for (Int_t j=0; j