Reintegrated irt-2.1d changes into a master branch by alexander-kiselev · Pull Request #2515 · eic/EICrecon

alexander-kiselev · 2026-02-25T03:23:59Z

Makes IRT2 codes consistent with irt-2.1e branches in EDM4eic/irt/epic repositories and 26.02.0-stable image

TODO:

for more information, see https://pre-commit.ci

``` /home/runner/work/EICrecon/EICrecon/src/algorithms/pid/G4DataInterpolation.cc: In member function 'double G4DataInterpolation::GetInterpolatedValue(double, order) const': /home/runner/work/EICrecon/EICrecon/src/algorithms/pid/G4DataInterpolation.cc:85:14: error: comparison of integer expressions of different signedness: 'int' and 'unsigned int' [-Werror=sign-compare] 85 | if (ibin == tdim - 1) | ~~~~~^~~~~~~~~~~ cc1plus: all warnings being treated as errors ```

/home/runner/work/EICrecon/EICrecon/src/algorithms/pid/IrtInterfaceJsonParser.cc: In member function 'void eicrecon::IrtInterface::JsonParser()': /home/runner/work/EICrecon/EICrecon/src/algorithms/pid/IrtInterfaceJsonParser.cc:104:26: error: comparison of integer expressions of different signedness: 'int' and 'std::map<TString, IRT2::CherenkovRadiator*>::size_type' {aka 'long unsigned int'} [-Werror=sign-compare] 104 | if (rnum == reco->GetMyRICH()->Radiators().size()) { | ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/algorithms/pid/IrtInterfaceJsonParser.cc:110:44: error: comparison of integer expressions of different signedness: 'unsigned int' and 'int' [-Werror=sign-compare] 110 | for (unsigned ir = 0; ir < rnum; ir++) | ~~~^~~~~~

This resolves conflict and brings this algorithm in compliance with the interface. In file included from /home/runner/work/EICrecon/EICrecon/src/algorithms/pid/IrtInterfaceJsonParser.cc:7: /home/runner/work/EICrecon/EICrecon/src/algorithms/pid/IrtInterface.h:77:8: error: 'eicrecon::IrtInterface::init' hides overloaded virtual function [-Werror,-Woverloaded-virtual] 77 | void init(DD4hep_service& service, IrtConfig& config, std::shared_ptr<spdlog::logger>& logger); | ^ /opt/local/include/algorithms/algorithm.h:87:16: note: hidden overloaded virtual function 'algorithms::Algorithm<algorithms::Input<edm4hep::MCParticleCollection, edm4eic::TrackCollection, edm4eic::MCRecoTrackParticleAssociationCollection, edm4eic::TrackSegmentCollection, edm4hep::SimTrackerHitCollection>, algorithms::Output<edm4eic::IrtRadiatorInfoCollection, edm4eic::IrtParticleCollection>>::init' declared here: different number of parameters (0 vs 3) 87 | virtual void init() {} | ^ 1 error generated.

for more information, see https://pre-commit.ci

…UPPORT

In file included from /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:19: /home/runner/work/EICrecon/EICrecon/src/extensions/jana/JOmniFactory.h:540:8: error: 'void JOmniFactory<AlgoT, ConfigT>::Process(const std::shared_ptr<const JEvent>&) [with AlgoT = eicrecon::IrtInterface_factory; ConfigT = eicrecon::IrtConfig]' was hidden [-Werror=overloaded-virtual=] 540 | void Process(const std::shared_ptr<const JEvent>& event) override { | ^~~~~~~ In file included from /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:23: /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h:52:8: note: by 'void eicrecon::IrtInterface_factory::Process(int64_t, uint64_t)' 52 | void Process(int64_t run_number, uint64_t event_number) { | ^~~~~~~ /home/runner/work/EICrecon/EICrecon/src/extensions/jana/JOmniFactory.h:538:16: error: 'void JOmniFactory<AlgoT, ConfigT>::Process(int32_t, uint64_t) [with AlgoT = eicrecon::IrtInterface_factory; ConfigT = eicrecon::IrtConfig; int32_t = int; uint64_t = long unsigned int]' was hidden [-Werror=overloaded-virtual=] 538 | virtual void Process(int32_t /* run_number */, uint64_t /* event_number */) {}; | ^~~~~~~ /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h:52:8: note: by 'void eicrecon::IrtInterface_factory::Process(int64_t, uint64_t)' 52 | void Process(int64_t run_number, uint64_t event_number) { | ^~~~~~~ /home/runner/work/EICrecon/EICrecon/src/extensions/jana/JOmniFactory.h:536:16: error: 'void JOmniFactory<AlgoT, ConfigT>::ChangeRun(int32_t) [with AlgoT = eicrecon::IrtInterface_factory; ConfigT = eicrecon::IrtConfig; int32_t = int]' was hidden [-Werror=overloaded-virtual=] 536 | virtual void ChangeRun(int32_t /* run_number */) override {}; | ^~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h:50:8: note: by 'void eicrecon::IrtInterface_factory::ChangeRun(int64_t)' 50 | void ChangeRun(int64_t run_number) {} | ^~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h: In member function 'void eicrecon::IrtInterface_factory::ChangeRun(int64_t)': /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h:50:26: error: unused parameter 'run_number' [-Werror=unused-parameter] 50 | void ChangeRun(int64_t run_number) {} | ~~~~~~~~^~~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h: In member function 'void eicrecon::IrtInterface_factory::Process(int64_t, uint64_t)': /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h:52:24: error: unused parameter 'run_number' [-Werror=unused-parameter] 52 | void Process(int64_t run_number, uint64_t event_number) { | ~~~~~~~~^~~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/global/pid/IrtInterface_factory.h:52:45: error: unused parameter 'event_number' [-Werror=unused-parameter] 52 | void Process(int64_t run_number, uint64_t event_number) { | ~~~~~~~~~^~~~~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc: In function 'void InitPlugin(JApplication*)': /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:171:20: error: unused variable 'bf' [-Werror=unused-variable] 171 | bool bf = sf->GetCrossing(x0, n0, &from, false); | ^~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:172:20: error: unused variable 'br' [-Werror=unused-variable] 172 | bool br = sr->GetCrossing(x0, n0, &to, false); | ^~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:186:31: error: comparison of integer expressions of different signedness: 'int' and 'unsigned int' [-Werror=sign-compare] 186 | for (int i = 0; i < numPlanes; i++) { | ~~^~~~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc: In lambda function: /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:213:79: error: unused parameter 'p' [-Werror=unused-parameter] 213 | std::function<bool(edm4eic::TrackPoint)>([](edm4eic::TrackPoint p) { return true; }); | ~~~~~~~~~~~~~~~~~~~~^ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc: In function 'void InitPlugin(JApplication*)': /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:338:22: error: unused variable 'bf' [-Werror=unused-variable] 338 | bool bf = sf->GetCrossing(x0, n0, &from, false); | ^~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:339:22: error: unused variable 'br' [-Werror=unused-variable] 339 | bool br = sr->GetCrossing(x0, n0, &to, false); | ^~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:353:33: error: comparison of integer expressions of different signedness: 'int' and 'unsigned int' [-Werror=sign-compare] 353 | for (int i = 0; i < numPlanes; i++) { | ~~^~~~~~~~~~~ /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc: In lambda function: /home/runner/work/EICrecon/EICrecon/src/detectors/RICH-IRT/RICH-IRT.cc:380:40: error: unused parameter 'p' [-Werror=unused-parameter] 380 | [](edm4eic::TrackPoint p) { return true; }); | ~~~~~~~~~~~~~~~~~~~~^ cc1plus: all warnings being treated as errors

for more information, see https://pre-commit.ci

This reverts commit 8484aa0.

for more information, see https://pre-commit.ci

wdconinc · 2026-07-21T15:18:34Z

+  if (m_ReconstructionFactory) {
+    delete m_ReconstructionFactory;
+    m_ReconstructionFactory = nullptr;
+  } //if
+
+  if (m_Event) {
+    delete m_Event;
+    m_Event = nullptr;
+  } //if
+
+  if (m_irt_detector) {
+    for (auto [name, rad] : m_irt_detector->Radiators()) {
+      if (rad && rad->m_RefractiveIndex) {
+        delete rad->m_RefractiveIndex;
+        rad->m_RefractiveIndex = nullptr;
+      }
+    }
+  }


Can we use smart pointers here and rely on RAII for deletion? Likely makes destructor sufficient as default.

My thought too. I suspect IRT2 won't use smart pointers inside due to ROOT streamer issues. I will treat m_Event/m_ReconstructionFactory that we have full control over.

wdconinc · 2026-07-21T15:46:06Z

+  auto dd4hep_service = app->GetService<DD4hep_service>();
+  auto det            = dd4hep_service->detector();


Anti-pattern to parse geometry in plugin. In this case we don't use the geometry beyond checking that the specific RICH is there, so we can skip this here and rely on the algorithm not doing anything if the RICH is not in the geometry.

I'm not sure. I think this is a valid question and the FIXME states as much. I suspect, there might be a crash whenever IRT2 tries to access a detector that is not in the configuration, and this is a guard against that. I don't think it's in scope to fix that now - we'll need to revisit this.

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>

for more information, see https://pre-commit.ci

Conflicts: src/detectors/PFRICH/PFRICH.cc

for more information, see https://pre-commit.ci

alexander-kiselev and others added 2 commits February 24, 2026 22:21

Reintegrated irt-2.1d changes into a master branch

e0de0ec

[pre-commit.ci] auto fixes from pre-commit.com hooks

e7701f7

for more information, see https://pre-commit.ci

github-actions Bot added topic: PID Relates to PID reconstruction topic: infrastructure labels Feb 25, 2026

alexander-kiselev and others added 26 commits March 9, 2026 08:15

ReconstructedParticle -> Track in IrtParticle; removed IrtEvent

769f63a

ReconstructedParticle -> Track in IrtParticle; removed IrtEvent

8b271b2

[pre-commit.ci] auto fixes from pre-commit.com hooks

58f52bf

for more information, see https://pre-commit.ci

ReconstructedParticle -> Track in IrtParticle; removed IrtEvent

6b73f02

[pre-commit.ci] auto fixes from pre-commit.com hooks

a68f724

for more information, see https://pre-commit.ci

ReconstructedParticle -> Track in IrtParticle; removed IrtEvent

be09a9e

[pre-commit.ci] auto fixes from pre-commit.com hooks

1d9513e

for more information, see https://pre-commit.ci

fixes for conflict resolution

ad58b1c

[pre-commit.ci] auto fixes from pre-commit.com hooks

6216a30

for more information, see https://pre-commit.ci

Merge branch 'main' into irt-2.1e

f471bde

transition from using particles to using tracks

5a06ff5

address getSimID/getRecID deprecation

ea3385b

[pre-commit.ci] auto fixes from pre-commit.com hooks

32b27d6

for more information, see https://pre-commit.ci

linux-eic-shell.yml: switch to eic.opensciencegrid.org

8484aa0

fix: reorder member initialization to match declaration order

f17159b

[pre-commit.ci] auto fixes from pre-commit.com hooks

9c29cda

for more information, see https://pre-commit.ci

cmake: add plugin_add_irt2, compile code conditionally on WITH_IRT2_S…

50fa413

…UPPORT

[pre-commit.ci] auto fixes from pre-commit.com hooks

a12a7d7

for more information, see https://pre-commit.ci

Revert "linux-eic-shell.yml: switch to eic.opensciencegrid.org"

c158721

This reverts commit 8484aa0.

one more warning

9da3746

RICH-IRT should depend on algorithms_tracking_library

530c94e

[pre-commit.ci] auto fixes from pre-commit.com hooks

8abdcf3

for more information, see https://pre-commit.ci

veprbl added 2 commits July 20, 2026 14:22

JEventProcessorPODIO: add IRT collections

c14074f

delete rad->m_RefractiveIndex

438d9e8

veprbl temporarily deployed to github-pages July 20, 2026 19:44 — with GitHub Actions Inactive

veprbl and others added 3 commits July 20, 2026 16:25

remove commented code

c17024f

avoid using iostream

ef63f81

[pre-commit.ci] auto fixes from pre-commit.com hooks

5753deb

for more information, see https://pre-commit.ci

pre-commit-ci Bot temporarily deployed to github-pages July 20, 2026 22:41 Inactive

wdconinc reviewed Jul 21, 2026

View reviewed changes

veprbl and others added 14 commits July 21, 2026 12:03

Update src/algorithms/pid/IrtInterface.cc

6e2c748

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>

Update src/global/pid/IrtInterface_factory.h

d8b3b3d

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>

consistent getUniqueID

68ae17f

m_Event/m_ReconstructionFactory are now smart pointers

6d2e7e5

remove printfs

19156cd

remove unneeded scoping

419ea4b

avoid using PodioVector3_to_TVector3

28eeff4

explicit unit conversion

cfa252a

remove unrelated change

2e5aa36

use std::vector instead of C-style array

fd9c63d

IrtConfig: remove explicit constructor

569a123

remove extra scope

4ceada5

[pre-commit.ci] auto fixes from pre-commit.com hooks

37c87b7

for more information, see https://pre-commit.ci

Merge branch 'main' into irt-2.1e

0121a37

veprbl temporarily deployed to github-pages July 21, 2026 18:51 — with GitHub Actions Inactive

veprbl and others added 4 commits July 21, 2026 17:29

Merge branch 'main' into irt-2.1e

402a07a

Merge remote-tracking branch 'origin/main' into irt-2.1e

25eb32c

Conflicts: src/detectors/PFRICH/PFRICH.cc

upgrade to using links

c6b5131

[pre-commit.ci] auto fixes from pre-commit.com hooks

0614472

for more information, see https://pre-commit.ci

pre-commit-ci Bot temporarily deployed to github-pages July 21, 2026 23:17 Inactive

veprbl and others added 2 commits July 22, 2026 12:34

Correct unit conversion, edm4hep/edm4eic is already in edm4eic units

fc9e876

[pre-commit.ci] auto fixes from pre-commit.com hooks

13b596d

for more information, see https://pre-commit.ci

	// local random generator
	auto seed = m_uid.getUniqueID(*headers, name());
	std::default_random_engine generator(seed);
	std::normal_distribution<double> gaussian;

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Reintegrated irt-2.1d changes into a master branch#2515

Reintegrated irt-2.1d changes into a master branch#2515
alexander-kiselev wants to merge 125 commits into
mainfrom
irt-2.1e

alexander-kiselev commented Feb 25, 2026 •

edited by veprbl

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wdconinc Jul 21, 2026

Uh oh!

veprbl Jul 21, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wdconinc Jul 21, 2026

Uh oh!

veprbl Jul 21, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		auto dd4hep_service = app->GetService<DD4hep_service>();
		auto det = dd4hep_service->detector();

Uh oh!

Conversation

alexander-kiselev commented Feb 25, 2026 • edited by veprbl Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wdconinc Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

veprbl Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wdconinc Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

veprbl Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

alexander-kiselev commented Feb 25, 2026 •

edited by veprbl

Loading