Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed calling of external process's endprocess() method #141

Merged
merged 2 commits into from
Mar 8, 2022
Merged

fixed calling of external process's endprocess() method #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b9b157
fixed calling of external process's endprocess() method
nkx111 Feb 21, 2022
55bf0fd
TRestProcessRunner - Formatting
lobis Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion source/framework/core/src/TRestProcessRunner.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,11 +466,12 @@ void TRestProcessRunner::RunProcess() {
if (finish) break;
}

// make analysis tree filled with observables, which may used in EndProcess()
fAnalysisTree->GetEntry(fAnalysisTree->GetEntries() - 1);
for (int i = 0; i < fThreadNumber; i++) {
fThreads[i]->EndProcess();
}

if (fRunInfo->GetFileProcess() != NULL) fRunInfo->GetFileProcess()->EndProcess();
fProcStatus = kFinished;

#ifdef TIME_MEASUREMENT
Expand Down
2 changes: 1 addition & 1 deletion source/framework/core/src/TRestRun.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ Int_t TRestRun::GetNextEvent(TRestEvent* targetevt, TRestAnalysisTree* targettre
goto GetEventExt;
}
fInputEvent = eve;
if (fFileProcess != nullptr) fFileProcess->EndProcess();
// if (fFileProcess != nullptr) fFileProcess->EndProcess();
return -1;
}

Expand Down