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

PhysicsAnalysis/DerivationFramework/DerivationFrameworkBPhys/DerivationFrameworkBPhys/Reco_mumu.h

@@ -42,7 +42,7 @@ namespace DerivationFramework {
       /** tools
        */
       ToolHandle<Trk::V0Tools>                    m_v0Tools;
-      ToolHandle<Analysis::JpsiFinder>            m_jpsiFinder;
+      ToolHandle<Analysis::ICandidateSearch>      m_jpsiFinder;
       ToolHandle<Analysis::PrimaryVertexRefitter> m_pvRefitter;
       ServiceHandle<IBeamCondSvc>                 m_beamSpotSvc;