GlobalSim - fic merge conflicts

python/run_hypo_container.py
	add in setting of expectation values for manula tests

src/GlobalAlgs/Hypothesis/UCL/AlgoDataTypes.h
	remove unneeded header files

src/GlobalAlgs/Hypothesis/UCL/DataCollector.cxx, h
	fix output of GenericTob vectors

src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx,h
	struct->class
	fix bit initialisation
	add constructor with eEmTob as an argument
	data now held in a bitset

src/GlobalAlgs/Hypothesis/UCL/GenericTob.cxx,h
	data now held in a bitset
	fix bit	initialisation

src/GlobalAlgs/Hypothesis/UCL/HypoTestBenchAlg.cxx, h
	allow setting test vectors, expectation values via Properties.

src/GlobalAlgs/Hypothesis/UCL/eEmSortSelectCountContainerAlgTool.cxx
	function to_eEmTob has been moved to eEmTOb constructor

src/GlobalAlgs/Hypothesis/UCL/eEmSortSelectCountContainerComparator.cxx
	add values in hex along those in binary

src/GlobalAlgs/Hypothesis/UCL/eEmTob.cxx, h
	struct->class
	add constructor with GepAlgoHypothesisPortsIn as argument

IsolationSelection: Remove isAssociatedToEG decoration.

See merge request atlas/athena!78371

Scott Snyder authored 1 month ago and Adam Edward Barton committed 1 month ago

IsolationSelection: Remove isAssociatedToEG decoration.

IsolationCloseByCorrection was using the decoration isAssociatedToEG to tell
if a cluster was matched to an EM object.  This decoration was left unlocked,
resulting in warnings further on.  But that decoration is used only within
this tool, so this information would be better maintained locally.
Add it to the internal cache used by the tool rather than having it
as a decoration.

ActsTrackReconstruction: Refactor of TrackFindingAlg (part 1 of N)

See merge request atlas/athena!78315

Krzysztof Ciesla authored 1 month ago and Adam Edward Barton committed 1 month ago

Revert "Reduce scope of SharedHitCounter"

This reverts commit 549757f6638168fa1f08cbd073fd6db3880ef200.

MuonR4 - Introduce SDO algorithm and allow MuonTruthParticles to be built from Geantinos

See merge request atlas/athena!78404

Dimitra Amperiadou authored 1 month ago and Adam Edward Barton committed 1 month ago

MuonR4 - Introduce SDO algorithm and allow MuonTruthParticles to be built from Geantinos

AtlasDetectorID - Refactor

See merge request atlas/athena!78008

Johannes Junggeburth authored 1 month ago and Adam Edward Barton committed 1 month ago

Streamline field assignment

Fix compiler issues

Apply 1 suggestion(s) to 1 file(s)

MuonReadoutGeomR4 - Fixing Geometry Dump

See merge request atlas/athena!78184

Ishan Kiritbhai Vyas authored 1 month ago and Adam Edward Barton committed 1 month ago

Enhancing the stripLayer and padHeight functions. wiregroupCenter in R4 is now at the center of the wiregroup.

2025-03-10: merge of 24.0 into main

See merge request atlas/athena!78402

IDTPM - art test for EF Tracking F100 pipeline

See merge request atlas/athena!78300

Federica Piazza authored 1 month ago and Adam Edward Barton committed 1 month ago

IDTPM - art test for EF Tracking F100 pipeline

Rivet_i, TruthRivetTools: Fix package dependencies for Rivet 4.1.0

See merge request atlas/athena!78401

Remove outdated debug macro from GlobalChi2Fitter

See merge request atlas/athena!78394

Rework residual collection in GlobalChi2Fitter

See merge request atlas/athena!78405

Alexander J Pfleger authored 1 month ago and Adam Edward Barton committed 1 month ago

Rework residual collection in GlobalChi2Fitter

Add separate flags for 1st and 2nd stage RootOutput as well as testvector output

See merge request atlas/athena!78356

Kevin Sedlaczek authored 1 month ago and Adam Edward Barton committed 1 month ago

Add separate flags for 1st and 2nd stage RootOutput as well as testvector output

Thomas Strebler authored 1 month ago and Adam Edward Barton committed 1 month ago

Added 2D TRT eta-phi plots in IDPVM (main)

This reverts commit ddaa9105.

Conflicts:
	InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Hits.cxx
	PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/xAODJetRetriever.cxx
	TileCalorimeter/TilePulseSimulator/TilePulseSimulator/TileSampleGenerator.h
	TileCalorimeter/TilePulseSimulator/src/TileSampleGenerator.cxx
	TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsFromPulse.h
	TileCalorimeter/TileSimAlgs/src/TileDigitsFromPulse.cxx

main-coverity-GlobalSimulation

See merge request atlas/athena!78398

Shaun Roe authored 1 month ago and Adam Edward Barton committed 1 month ago

main-coverity-GlobalSimulation

main-coverity-FPGATrackSimAlgorithms

See merge request atlas/athena!78393

Shaun Roe authored 1 month ago and Adam Edward Barton committed 1 month ago

main-coverity-FPGATrackSimAlgorithms

Introduce CRC validation for the MM trigger L1A elink

See merge request atlas/athena!78378

Simone Francescato authored 1 month ago and Tamara Vazquez Schroeder committed 1 month ago

Introduce CRC validation for the MM trigger L1A elink

introduce shift in as built model for the QL3 modules

See merge request atlas/athena!78374

Patrick Scholer authored 1 month ago and Duc Ta committed 1 month ago

introduce shift in as built model for the QL3 modules

Update Tile Pulse Simulator to add continuous readout mode

See merge request atlas/athena!78304

Antonio Jesus Gomez Delegido authored 1 month ago and Duc Ta committed 1 month ago

Update Tile Pulse Simulator to add continuous readout mode

Fixing the error level of SCT Missing Link Header Error in HI runs

See merge request atlas/athena!76953

Daiya Akiyama authored 1 month ago and Duc Ta committed 1 month ago

Fixing the error level of SCT Missing Link Header Error in HI runs

Update efex electron algo version (ATR-30871)

See merge request atlas/athena!78353

Jared Little authored 1 month ago and Tamara Vazquez Schroeder committed 1 month ago

Update efex electron algo version (ATR-30871)