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/JpsiUpsilonTools/JpsiUpsilonTools/JpsiPlus1Track.h

@@ -47,16 +47,15 @@ namespace Analysis {
         virtual StatusCode finalize() override;
         
         static const InterfaceID& interfaceID() { return IID_JpsiPlus1Track;};
-        static double getInvariantMass(const xAOD::TrackParticle* trk1, double mass1,
-                                             const xAOD::TrackParticle* trk2, double mass2,
-                                             const xAOD::TrackParticle* trk3, double mass3);
+        static double getInvariantMass(const std::vector<const xAOD::TrackParticle*> &trk, double mass1,
+                                             double mass2, double mass3);
  
 
       
         //-------------------------------------------------------------------------------------
         //Doing Calculation and inline functions
         virtual StatusCode performSearch(xAOD::VertexContainer*& , xAOD::VertexAuxContainer*& ) override;
-        xAOD::Vertex* fit(const xAOD::TrackParticle*, const xAOD::TrackParticle*, const xAOD::TrackParticle*, bool, double, const xAOD::TrackParticleContainer*);
+        xAOD::Vertex* fit(const std::vector<const xAOD::TrackParticle*>&, const xAOD::TrackParticleContainer*, const xAOD::TrackParticleContainer*) const;
         //-------------------------------------------------------------------------------------
         
     private:
@@ -87,6 +86,11 @@ namespace Analysis {
         double m_trkTrippletPt       ;
         double m_trkDeltaZ           ;
         int m_requiredNMuons;
+        std::vector<double> m_muonMasses;
+        std::vector<int>    m_useGSFTrackIndices;
+        std::string         m_TrkParticleGSFCollection;
+        std::bitset<3>      m_useGSFTrack;
+
     };
 } // end of namespace
 #endif