Skip to content

Commit 789145d

Browse files
karabowiChristianTackeGSI
authored andcommitted
Replace FairRunAna::Run(Long64_t) by RunSingleEntry(Long64_t)
Deprecated `FairRunAna::Run(Long64_t)` and replaced by newly introduced `FairRunAna::RunSingleEntry(Long64_t)`. Changed description of `FairRunAna::Run(Int_t, Int_t)` to match the actual function behaviour. Addresses issue #1397.
1 parent f254428 commit 789145d

4 files changed

Lines changed: 17 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,11 @@ file an issue, so that we can see how to handle this.
8181
* The functionality, introduced to enable event reconstruction, is not used.
8282
* It can be enabled with `-DBUILD_EVENT_BUILDER=ON`.
8383
* Deprecated `FairRun::SetEventHeader(FairEventHeader*)`
84-
* Use `FairRun::SetEventHeader(std::unique_ptr<FairEventHeader> EvHeader)`, which
85-
indicates the ownership transferring.
84+
* Use `FairRun::SetEventHeader(std::unique_ptr<FairEventHeader> EvHeader)`,
85+
which indicates the ownership transferring.
86+
* Deprecated `FairRunAna::Run(Long64_t entry)`
87+
* Functionality unclear due to dubious `Run(int)` and `Run(long)`.
88+
* Use `FairRunAna::RunSingleEntry(Long64_t entry)` instead.
8689
8790
### Other Notable Changes
8891
* Consider calling `fairroot_check_root_cxxstd_compatibility()`

fairroot/base/steer/FairRunAna.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ void FairRunAna::RunMQ(Long64_t entry)
475475
//_____________________________________________________________________________
476476

477477
//_____________________________________________________________________________
478-
void FairRunAna::Run(Long64_t entry)
478+
void FairRunAna::RunSingleEntry(Long64_t entry)
479479
{
480480
fRootManager->ReadEvent(entry);
481481
CheckRunIdChanged();

fairroot/base/steer/FairRunAna.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,18 @@ class FairRunAna : public FairRun
3535
FairRunAna();
3636
/**initialize the run manager*/
3737
void Init() override;
38-
/**Run from event number NStart to event number NStop */
38+
/** Run analysis:
39+
* for the whole input if NEntry == NStop == 0,
40+
* for NEntry entries if NStop == 0,
41+
* from NEntry until NStop entry is reached
42+
* from NEntry to the end of input, if NStop = -1 */
3943
void Run(Int_t NStart = 0, Int_t NStop = 0) override;
4044
/**Run over the whole input file with timpe window delta_t as unit (entry)*/
4145
void Run(Double_t delta_t);
46+
/** \deprecated Replaced by unambiguous RunSingleEntry(entry)*/
47+
[[deprecated("Replaced by unambiguous RunSingleEntry(entry)")]] void Run(Long64_t entry) { RunSingleEntry(entry); }
4248
/**Run for the given single entry*/
43-
void Run(Long64_t entry);
49+
void RunSingleEntry(Long64_t entry);
4450
/**Run event reconstruction from event number NStart to event number NStop */
4551
/** \deprecated Deprecated along with FairEventBuilder. */
4652
[[deprecated("Deprecated along with FairEventBuilder.")]] void RunEventReco(Int_t NStart, Int_t NStop);

fairroot/eventdisplay/FairEventManager.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,23 +179,23 @@ void FairEventManager::GotoEvent(Int_t event)
179179
fEntry = event;
180180
fTimeMin = 0;
181181
fTimeMax = DBL_MAX;
182-
fRunAna->Run(static_cast<Long64_t>(event));
182+
fRunAna->RunSingleEntry(fEntry);
183183
}
184184

185185
void FairEventManager::NextEvent()
186186
{
187187
fEntry += 1;
188188
fTimeMin = 0;
189189
fTimeMax = DBL_MAX;
190-
fRunAna->Run(static_cast<Long64_t>(fEntry));
190+
fRunAna->RunSingleEntry(fEntry);
191191
}
192192

193193
void FairEventManager::PrevEvent()
194194
{
195195
fEntry -= 1;
196196
fTimeMin = 0;
197197
fTimeMax = DBL_MAX;
198-
fRunAna->Run(static_cast<Long64_t>(fEntry));
198+
fRunAna->RunSingleEntry(fEntry);
199199
}
200200

201201
void FairEventManager::Close() {}

0 commit comments

Comments
 (0)