adding fixes for closeBy correction for combining PHYS with LLP1 and FTAG

Fix for adding in CloseByIsolation correction when running multiple derivation formats. See ATLASG-2539. Temporarily removed the writing out of information to be able to do CloseByIso correction when reading the derivations.

assigned to @schaffer

added 1 commit

• 64a7cfd0 - removing extra logging output

Compare with previous version

marked this merge request as ready

Jenkins please retry a build

Hi @schaffer, since a few days, following https://its.cern.ch/jira/browse/ATLINFR-5053, the build needs to be explicitly required when undrafting.

This merge request affects 4 packages:

• PhysicsAnalysis/AnalysisCommon/IsolationSelection
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys

Affected files list will not be printed in this case

Adding @nishu ,@sanmay ,@stavrop ,@dshope ,@jojungge ,@emmat ,@jburzyns ,@mvanadia ,@nicolaid ,@yoyamagu ,@bdong ,@zmarshal ,@fsforza ,@rcreager ,@jcatmore ,@oducu ,@dtrischu ,@szambito ,@apsallid ,@calpigia ,@fcardill ,@gartoni as watchers

added Analysis BTagging Derivation analysis-review-required main review-pending-level-1 labels

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)(FullSim|Hit).*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

added Run2-Derivation-output-changed Run3-Derivation-output-changed labels

CI Result FAILURE (hash 64a7cfd0)

	Athena	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 77428]

Thanks @schaffer! For organisation purposes, given we are going to build 24.0.11 tomorrow (and I know there is an LLP production queuing + the big PHYS/PHYSLITE production on Run2/Run3 data and MC), I'm wondering if we need to push to have this MR merged today or it's not super urgent (e.g. it can go in next week release).

Thanks!

Cristiano

marked this merge request as draft

marked this merge request as ready

added 1 commit

• b84c4c29 - added in renaming of algs, and added back in the running of the augmentation...

Compare with previous version

Added names to algs. Should no longer have changes in PHYS output as previous CI checks found.

build area is cleaned as the previous build was for the MR labeled as full-build

This merge request affects 4 packages:

• PhysicsAnalysis/AnalysisCommon/IsolationSelection
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkLLP
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys

Affected files list will not be printed in this case

Adding @nishu ,@sanmay ,@stavrop ,@dshope ,@jojungge ,@emmat ,@jburzyns ,@mvanadia ,@nicolaid ,@yoyamagu ,@bdong ,@zmarshal ,@fsforza ,@rcreager ,@jcatmore ,@oducu ,@dtrischu ,@szambito ,@apsallid ,@calpigia ,@fcardill ,@gartoni as watchers

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)(FullSim|Hit).*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

CI Result SUCCESS (hash b84c4c29)

	Athena	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 77450]