/eos/atlas/atlascerngroupdisk/proj-sit -> /eos/atlas/atlascerngroupdisk/proj-ascig (CSOPS-2315)

See merge request !75880

John Derek Chapman authored 4 months ago and Duc Ta committed 4 months ago

/eos/atlas/atlascerngroupdisk/proj-sit -> /eos/atlas/atlascerngroupdisk/proj-ascig (CSOPS-2315)

mc20: add material scaling for tracking geometry

See merge request !74346

Maximilian Emanuel Goblirsch-Kolb authored 6 months ago and Duc Ta committed 6 months ago

adding material scaling for tracking geometry

Conflicts:
	Tracking/TrkConditions/TrackingGeometryCondAlg/python/TrkDetDescrToolsConfig.py
	Tracking/TrkDetDescr/TrkDetDescrTools/TrkDetDescrTools/LayerMaterialProvider.h
	Tracking/TrkDetDescr/TrkDetDescrTools/src/LayerMaterialProvider.cxx

OverlayMetadata: allow last part of the simulation tag to differ

See merge request !73272

John Derek Chapman authored 7 months ago and Ahmed Tarek committed 7 months ago

OverlayMetadata: allow last part of the simulation tag to differ

CITest: backport package to legacy release branch

See merge request !73147

Backport the `CITest` package and relevant utilities.

Relates to ATLINFR-5452.

SCT_RodDecoder: Downgrading error to warning in SCT RodDecoder

See merge request !70765

Cristiano Sebastiani authored 10 months ago and Duc Ta committed 10 months ago

SCT_RodDecoder: Downgrading error to warning in SCT RodDecoder

fix comparison step for TCT tests

See merge request atlas/athena!67154

fix comparison step for TCT tests

R22 LLP-related backported bug fixes

See merge request !66863

* As discussed on ATLASEG-343, adding calorimeter isolation calculation for LRT electrons during reco to avoid issues downstream if cells / links are not saved.  This avoids the 'large cluster' saving bug.

* Putting update to references here as well

-----------------------------------
Actually use provided global alignment pixel conditions data.

Actually use provided global alignment Pixel, TRT conditions data.

Use provided global Pixel and TRT alignment conditions data rather
than overriding it with the global alignment from the detector store.

------------------------------------
!49898
6e8b8f0f

Ignoring changes for EMEO muons as they seem to come after the mc20 branch.

---------------------
https://gitlab.cern.ch/atlas/athena/-/merge_requests/4983
a5543634

Ignore com_bit as xAOD::Muon::Author::Commissioning doesn't exist and we aren't comissioning.

!52256

* Ignoring reference changes
* Ignored removal of 'TopoSeededCellLink' from aod_outputs as it wasn't part of this commit
* Ignored thinning related changes, was thinning not done before?  Can't find it.

--------------------------

cellLink for LRT egamma clusters in AOD  ATLASRECTS-6992

----------------
!60425 (diffs)
92216b29

small cleanup following !59679 (cell assoc for lrt)

----------------
!59679
aebe891be28242dd20a9b7

Ignoring CA changes

fix warning in  Pythia8B_i

See merge request !66266

Ewelina Maria Lobodzinska authored 1 year ago and Julien Maurer committed 1 year ago

fix warning in  Pythia8B_i

Modified old InDet__InDetAmbiScoringTool configuration in Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py instead of new one.

MR !57358
850c149f

--------------

Futureproof IDTrig config for LRT

Picked-commit changes ignored for:
InnerDetector/InDetConfig/python/InDetTrackScoringToolsConfig.py
Tools/WorkflowTestRunner/python/References.py

MR !56568
d17b1b78

-------
Fix bug in LRT tracking for electrons (ambiguity EM radius cut 50->300mm)

Add configurable parameter maxEMImpact for the InDetAmbiScoringTool and InDetNNScoringTool and set it to 300mm for the R3Larged0 (LRT) pass.

TileSimAlgs: Fix merging Tile E1 and MBTS cells (ATLASSIM-6580)

See merge request !63407

Siarhei Harkusha authored 1 year ago and Julien Maurer committed 1 year ago

TileSimAlgs: Fix merging Tile E1 and MBTS cells (ATLASSIM-6580)

Tile Hit vector to container tool has been updated to fix merging hits
corresponding to some E1 and MBTS cells (which are really merged in used geometry).

Firstly, old hits are removed using the corresponding collection iterators
and only then new ones (merged) are added to the collection if it is needed,
since addition of new hits to the same collection can invalidate the iterators.

switch all TCT comparisons to fixed references + discard POOL outputs

See merge request !63035

switch all TCT comparisons to fixed references + discard POOL outputs

Use cached AMI tag request in job transforms, 22.0-mc20 edition

See merge request !60178

Tadej Novak authored 2 years ago and Julien Maurer committed 2 years ago

Merge branch 'ami-trf' into 'master'

Use cached AMI tag request in job transforms

See merge request !59882

(cherry picked from commit 245b1f1a)

e655f281 Use cached AMI tag request in job transforms

Add support for reading McEventCollection_p6 to 22.0-mc20

See merge request !58284

John Derek Chapman authored 2 years ago and Julien Maurer committed 2 years ago

Merge branch 'McEventCollection_p6_21.0-mc16d' into '21.0-mc16d'

Add support for reading McEventCollection_p6 to 21.0-mc16d

See merge request !57837