Skip to content

Commit

Permalink
Removing filter timestamp and processObservableList at Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
juanangp committed Oct 9, 2023
1 parent eb131c1 commit 8c48a98
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions source/framework/core/src/TRestDataSet.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -912,20 +912,12 @@ Bool_t TRestDataSet::Merge(const TRestDataSet& dS) {
}
}

if (REST_StringHelper::StringToTimeStamp(fFilterStartTime) >
REST_StringHelper::StringToTimeStamp(dS.GetFilterStartTime()))
fFilterStartTime = dS.GetFilterStartTime();
if (REST_StringHelper::StringToTimeStamp(fFilterEndTime) <
REST_StringHelper::StringToTimeStamp(dS.GetFilterEndTime()))
fFilterEndTime = dS.GetFilterEndTime();
if (fStartTime > dS.GetStartTime()) fStartTime = dS.GetStartTime();
if (fEndTime < dS.GetEndTime()) fEndTime = dS.GetEndTime();

auto fileSelection = dS.GetFileSelection();
fFileSelection.insert(fFileSelection.end(), fileSelection.begin(), fileSelection.end());

fProcessObservablesList = dS.GetProcessObservablesList();

fTotalDuration += dS.GetTotalTimeInSeconds();

return true;
Expand Down

0 comments on commit 8c48a98

Please sign in to comment.