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)
This commit is contained in:
parent
62cf91fbbf
commit
6f779fd6db
@ -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
|
||||
|
@ -949,7 +949,7 @@ Bool_t PRunDataHandler::ReadPsiBinFile()
|
||||
for (Int_t j=0; j<psiBin.get_histoLength_bin(); j++) {
|
||||
histoData.push_back(histo[j]);
|
||||
}
|
||||
delete histo;
|
||||
delete[] histo;
|
||||
runData.AppendDataBin(histoData);
|
||||
histoData.clear();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user