21.2 BPHY18 Tool Development

Following discussion in ATLBPHYS-109

xAODBPhy tools are updated to allow the storing of associated electrons

JpsiPlus1/2Track(s) are restructured to allow the dimuon to have customised mass hypothesis (this is to allow use of electron candidates).

The JpsiUpsilon Tools are adapted to use a common interface, this is to allow them to be used interchangeable in BPhys algorithms.

Some function headers are adjusted for simpler calling.

Vertex fits can now mix tracks from two different containers (InDet or GSF tracks).

JpsiFinder_ee algorithm is reintroduced

Redundant includes are removed and unused packages removed from cmake file.

cc @wwalko

This merge request affects 3 packages:

• Event/xAOD/xAODBPhys
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys
• PhysicsAnalysis/JpsiUpsilonTools

Adding @wwalko ,@abarton ,@rbianchi as watchers

added 21.2 Analysis EDM review-pending-level-1 labels

changed the description

Hi @abarton,

thank you for this work and the merge request. Did you have a chance to check that BPHY5 and BPHY8 still provide the same output on data with and without these changes to the core tools?

Thank you,

w.w.

Sorry I forgot to mention I have tested BPHY4 and BPHY5 and they produce identical output.

Hi @abarton,

thank you. Would you be set up to do the same test with BPHY8?

Thanks,

w.w.

BPHY8 is also identical

Hi @abarton,

great. Many thanks for this additional check!

Cheers,

w.w.

CI Result SUCCESS

	AnalysisBase	AnalysisTop	AthAnalysis	AthDerivation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20878-2019-02-04-18-23
AnalysisBase: number of compilation errors 0, warnings 0
AnalysisTop: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 1
AthDerivation: number of compilation errors 0, warnings 54
CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33283]

Could you please update the copyright statements in the files related to this MR?

Thanks, Johannes (L1)

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

added 1 commit

• 32f8077a - Update Copyright statements

Compare with previous version

This merge request affects 3 packages:

• Event/xAOD/xAODBPhys
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys
• PhysicsAnalysis/JpsiUpsilonTools

Adding @wwalko ,@abarton ,@rbianchi as watchers

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

CI Result SUCCESS

	AnalysisBase	AnalysisTop	AthAnalysis	AthDerivation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20878-2019-02-06-14-36
AnalysisBase: number of compilation errors 0, warnings 9
AnalysisTop: number of compilation errors 0, warnings 9
AthAnalysis: number of compilation errors 0, warnings 10
AthDerivation: number of compilation errors 0, warnings 54
For experts only: Jenkins output [CI-MERGE-REQUEST 33419]

The changes are quite extensive. Passing to L2 for further review.

Jason (L1 shifter)

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

Beside comments changes look OK. Is the BPHY18 output going to change?

added review-user-action-required label

added 6 commits

• 4a6f8172 - Additional tweaks to get it working
• 33347746 - move warning messages in JpsiFinder_ee
• 2649b641 - Add ability to use ee combinations in JpsiPlus1Track
• 078ff9ae - Remove unused includes and links
• f88d999c - Update Copyright statements
• 85561f22 - Comment Cleanup

Compare with previous version

@wwalko I've dropped the job options changes because they need a lot of cleanup and probably aren't finished anyway.

This merge request affects 3 packages:

• Event/xAOD/xAODBPhys
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys
• PhysicsAnalysis/JpsiUpsilonTools

Adding @wwalko ,@abarton ,@rbianchi as watchers

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

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

resolved all discussions

CI Result SUCCESS

	AnalysisBase	AnalysisTop	AthAnalysis	AthDerivation
externals
cmake
make
required tests
optional tests

Full details available at NICOS MR-20878-2019-02-07-15-17
AnalysisBase: number of compilation errors 0, warnings 9
AnalysisTop: number of compilation errors 0, warnings 9
AthAnalysis: number of compilation errors 0, warnings 10
AthDerivation: number of compilation errors 0, warnings 54
For experts only: Jenkins output [CI-MERGE-REQUEST 33484]

Changes look fine, approving.

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

mentioned in commit b34713a4

merged

added sweep:ignore label