Manual cherry pick of pixel ladder shape fix

Fix for overlap in Pixel. Manual cherry pick of MR !34961 (merged)

added Geometry InnerDetector Run2-FullSim-output-changed alsoTargeting:21.9 labels

changed title from Merge branch 'pixeloverlap' into 'master' to Manual cherry pick of pixel ladder shape fix

This merge request affects 1 package:

• InnerDetector/InDetDetDescr/PixelGeoModel

Adding @goetz ,@lshan ,@battagl ,@sroe ,@stsuno as watchers

added 21.3 review-pending-level-1 labels

CI Result FAILURE (hash f50ca133)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 44864]

Hi @jchapman , here's the merge request of the changes for 21.3 and 21.9. Should I send you the new reference files?

Cheers, Yee

Hi @yyap,

Yes, please send me the new reference files for 21.3 and 21.9 (if you already have it, otherwise that one can wait until the MR for 21.9 is generated).

Cheers,

John

Hi @jchapman,

Sure, please find the two files attached.

Btw, I've also included in this MR the change for another overlap in the same volume which was only fixed in master a while back (see commit)

Cheers,

Yee 219myHITS.pool.root

213myHITS.pool.root

The failed test is due to a time out unrelated to this MR. Approving.

Michele (L1 reviewer)

added review-approved label and removed review-pending-level-1 label

Thanks @yyap. I've added the new files on eos.
Could you update this line from v1 to v2 please?
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/Tools/PROCTools/python/RunTier0TestsTools.py#L26
( You can update this line to v3 as well if you like:
https://gitlab.cern.ch/atlas/athena/-/blob/21.3/Tools/PROCTools/python/RunTier0TestsTools.py#L27
but then the sweep to 21.9 will fail as that line is already v2 there. )

added 1 commit

• f386d108 - update reference file

Compare with previous version

This merge request affects 2 packages:

• InnerDetector/InDetDetDescr/PixelGeoModel
• Tools/PROCTools

Adding @goetz ,@amete ,@stsuno ,@lshan ,@battagl ,@sroe as watchers

added Tools review-pending-level-1 labels and removed review-approved label

Hi @jchapman , It's done. Does it mean that another merge request is needed for 21.9?

Yee

Yes, the alsoTargeting:21.9 label will cause the commits from this merge request to be cherry-picked to 21.9 once it is merged. We will then just have to add another commit to update the reference file version to that new merge request.
Alternatively, you could just cherry-pick the commits manually to 21.9 and change the reference file version and manually make a new merge request.

Cheers,

John

CI Result FAILURE (hash f386d108)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 44874]

Did you run the jobs on an SLC6 or CC7 machine? This will alter the output. I think the CI runs on SLC6 nodes for 21.3 and 21.9.

Cheers,

John

Apologies for previously marking this as a timeout issue, indeed this all test were and are still failing. I am passing this back to the user.

Michele

added review-user-action-required label and removed review-pending-level-1 label

Hi @jchapman , indeed I had been using CC7. Attached are the new files using SLC6.

Cheers, Yee

213myHITS.pool.root 219myHITS.pool.root

Jenkins please retry a build

Files updated - thanks!

This merge request affects 2 packages:

• InnerDetector/InDetDetDescr/PixelGeoModel
• Tools/PROCTools

Adding @goetz ,@amete ,@stsuno ,@lshan ,@battagl ,@sroe as watchers

added review-pending-level-1 label and removed review-user-action-required label

CI Result SUCCESS (hash f386d108)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 157
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 44902]

The tests now pass and the warnings are the usual long list of 21.X, approving.

Cheers,

Michele

added review-approved label and removed review-pending-level-1 label

resolved all threads

mentioned in commit d3810cde

merged

added sweep:done label

added sweep:failed label

Sweep summary
failed:

• 21.9

This is failure to sweep was expected (see above), but it should be trivial to resolve in a manual sweep. @yyap, can you sweep the changes manually when you get a chance please?

Done, see 36858.

Yee

removed sweep:failed label

Thanks @yyap!

mentioned in merge request !37305 (merged)

mentioned in commit 5ea3d5dc