Conflicts resolved:
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY13.py
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY23.py
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/python/BPHY4.py
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/python/TEST7.py
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JETM12.py
	PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py

Drop SlimmingHelper legacy config

See merge request atlas/athena!69804

Updating pixel calibration - Adding recovery step

See merge request atlas/athena!69823

L1calo monitoring updates (main GfexSimMonitoring)

See merge request atlas/athena!69824

Will Buttinger authored 1 year ago and Brian Petersen committed 1 year ago

L1calo monitoring updates (main GfexSimMonitoring)

Port updates to splash items from P1

See merge request atlas/athena!69817

Antonia Strubig authored 1 year ago and Brian Petersen committed 1 year ago

Port updates to splash items from P1

Trigger: fix flake8 configuration

See merge request atlas/athena!69830

TauTrig: move from INFO to DEBUG message (ATR-28972)

See merge request atlas/athena!69831

Antonio De Maria authored 1 year ago and Brian Petersen committed 1 year ago

TauTrig: move from INFO to DEBUG message (ATR-28972)

TrigT1CaloFexPerf: delete legacy job options

See merge request atlas/athena!69812

TrigT1CaloCalib: delete legacy job options

See merge request atlas/athena!69815

TrigT1CaloMonitoringTools: delete legacy LVL1CaloMonFlags

See merge request atlas/athena!69826

Calo: remove a number of unused/obsolete python files

See merge request atlas/athena!69827

TriggerTest: fixes for fastMenuDiff test

See merge request atlas/athena!69828

Change the message level in muon hypo for passthrough mode

See merge request atlas/athena!69841

Yohei Yamaguchi authored 1 year ago and Brian Petersen committed 1 year ago

Change the message level in muon hypo for passthrough mode

ControlTest: delete unused legacy tests

See merge request atlas/athena!69843

2024-03-15: merge of 24.0 into main

See merge request atlas/athena!69851

Update version to 23.6.30

See merge request atlas/athena!69861

Ewelina Maria Lobodzinska authored 1 year ago and Walter Lampl committed 1 year ago

Update version to 23.6.30

Clear up warnings about missing containers in simulation jobs

See merge request atlas/athena!69853

John Derek Chapman authored 1 year ago and Walter Lampl committed 1 year ago

Clear up warnings about missing containers in simulation jobs

main-cppcheck-AthContainers

See merge request atlas/athena!69845

Shaun Roe authored 1 year ago and Walter Lampl committed 1 year ago

main-cppcheck-AthContainers

Merge FromWZ and FromTau into one function

See merge request atlas/athena!69847

Andrii Verbytskyi authored 1 year ago and Walter Lampl committed 1 year ago

Merge FromWZ and FromTau into one function

AthExCUDA (Debug Build) Fix, main branch (2024.03.15.)

See merge request atlas/athena!69855

Attila Krasznahorkay authored 1 year ago and Walter Lampl committed 1 year ago

Turn off vptr sanitization for the execute function.

The function makes use of vecmem memory resources, which cannot be
used with -fsanitize=vptr.

Move the Info class outside of the IMCTruthClassifier class

See merge request atlas/athena!69741

Andrii Verbytskyi authored 1 year ago and Walter Lampl committed 1 year ago

Move the Info class outside of the IMCTruthClassifier class

Update AsgClassificationDecorationAlg.cxx - tool must be private for...

See merge request atlas/athena!69848

Will Buttinger authored 1 year ago and Walter Lampl committed 1 year ago

Update AsgClassificationDecorationAlg.cxx - tool must be private for consistency with https://gitlab.cern.ch/atlas/athena/-/blob/main/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/python/AsgAnalysisConfig.py#L380

sTgcPrepData - Remove BCID tag

See merge request atlas/athena!68571

Johannes Junggeburth authored 1 year ago and Walter Lampl committed 1 year ago

sTgcPrepData - Remove BCID tag

CPAlgorithms: distinguish between MC and data when writing output branches

See merge request !69702

Baptiste Ravina authored 1 year ago and Walter Lampl committed 1 year ago

CPAlgorithms: distinguish between MC and data when writing output branches