Skip to content
Snippets Groups Projects
Commit 30f00baa authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'ProduceSegments' into 'main'

Set ITkRotCreatorCfg as a private tool instead of public to avoid inconsistencies with multiple tracking passes configuration

See merge request !70972
parents 9d8c7e60 856f987c
No related branches found
No related tags found
31 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77733Draft: add new HLT NN JVT, augmented with additional tracking information,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!76343Draft: MooTrackBuilder: Recalibrate NSW hits in refine method,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74430Draft: Fixing upper bound for Delayed Jet Triggers,!73963Changing the path of the histograms to "Expert" area,!73875updating ID ART reference plots,!73874AtlasCLHEP_RandomGenerators: Fix cppcheck warnings.,!73449Add muon detectors to DarkJetPEBTLA partial event building,!73343Draft: [TrigEgamma] Add photon ringer chains on bootstrap mechanism,!72972Update L1Calo Jet Trigger Efficiency Monitoring algorithm,!72336Fixed TRT calibration crash,!72176Draft: Improving L1TopoOnline chain that now gets no-empty plots. Activating it by default,!72012Draft: Separate JiveXMLConfig.py into Config files,!71876Fix MET trigger name in MissingETMonitoring,!71820Draft: Adding new TLA End-Of-Fill (EOF) chains and removing obsolete DIPZ chains,!71279Draft: ATR-29330: Move L1_4J15 and the HLT chains seeded by it in the MC Menu,!70972Set ITkRotCreatorCfg as a private tool instead of public to avoid inconsistencies with multiple tracking passes configuration
......@@ -43,9 +43,7 @@ def ITkSeedToTrackConversionToolCfg(
if "RIO_OnTrackCreator" not in kwargs:
from TrkConfig.TrkRIO_OnTrackCreatorConfig import ITkRotCreatorCfg
RotCreator = acc.popToolsAndMerge(ITkRotCreatorCfg(flags))
acc.addPublicTool(RotCreator)
kwargs.setdefault("RIO_OnTrackCreator", RotCreator)
kwargs.setdefault("RIO_OnTrackCreator", acc.popToolsAndMerge(ITkRotCreatorCfg(flags)))
extension = flags.Tracking.ActiveConfig.extension
if extension == flags.Tracking.PrimaryPassConfig.value:
......
......@@ -84,7 +84,7 @@ namespace InDet
//@{
PublicToolHandle<Trk::IExtrapolator> m_extrapolator
{this, "Extrapolator","Trk::Extrapolator", "extrapolator"};
PublicToolHandle<Trk::IRIO_OnTrackCreator > m_rotcreator
ToolHandle<Trk::IRIO_OnTrackCreator > m_rotcreator
{this, "RIO_OnTrackCreator", "Trk::RIO_OnTrackCreator/InDetRotCreator", "Creator ROT"};
//@}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment