From e61fda5481d1ad5cbe7e8ffc4a89bcf8e8571455 Mon Sep 17 00:00:00 2001
From: Juliette Alimena <juliette.alimena@cern.ch>
Date: Tue, 18 Jun 2024 10:56:55 +0200
Subject: [PATCH] update to latest HEP-FCC

---
 .../dataframe/FCCAnalyses/VertexingUtils.h    | 20 +------------
 .../src/ReconstructedParticle2Track.cc        | 30 -------------------
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/analyzers/dataframe/FCCAnalyses/VertexingUtils.h b/analyzers/dataframe/FCCAnalyses/VertexingUtils.h
index 4c4241518f..3659fbf3d6 100644
--- a/analyzers/dataframe/FCCAnalyses/VertexingUtils.h
+++ b/analyzers/dataframe/FCCAnalyses/VertexingUtils.h
@@ -44,7 +44,6 @@ namespace VertexingUtils{
     ROOT::VecOps::RVec< TVector3 >  updated_track_momentum_at_vertex;
     ROOT::VecOps::RVec< TVectorD >  updated_track_parameters;
     ROOT::VecOps::RVec<float> final_track_phases;
-    ROOT::VecOps::RVec<edm4hep::TrackState> tracks;   // added to keep track of the tracks that are associated to each vertex, used in SV finder from LCFI+ to merge vertices
   };
 
   /// Structure to keep useful information that is related to the V0
@@ -85,23 +84,6 @@ namespace VertexingUtils{
   /// Retrieve the number of reconstructed vertices from the collection of vertex object
   int get_Nvertex( ROOT::VecOps::RVec<FCCAnalysesVertex> TheVertexColl );
 
-  /// Merge vertices that are within 10*error of position or 1 mm, of each other
-  ROOT::VecOps::RVec<FCCAnalysesVertex> mergeVertices ( ROOT::VecOps::RVec<FCCAnalysesVertex> vertices_in );
-
-  /// selection of tracks based on the transverse momentum pT
-  struct sel_pt_tracks {
-    sel_pt_tracks(float arg_min_pt);
-    float m_min_pt = 0;
-    ROOT::VecOps::RVec<edm4hep::TrackState> operator() (ROOT::VecOps::RVec<edm4hep::TrackState> in);
-  };
-
-  /// selection of tracks based on the impact paramter d0
-  struct sel_d0_tracks {
-    sel_d0_tracks(float arg_min_d0);
-    float m_min_d0 = 0;
-    ROOT::VecOps::RVec<edm4hep::TrackState> operator() (ROOT::VecOps::RVec<edm4hep::TrackState> in);
-  };
-
   /// Retrieve a single FCCAnalyses vertex from the collection of vertex object
   FCCAnalysesVertex get_FCCAnalysesVertex(ROOT::VecOps::RVec<FCCAnalysesVertex> TheVertexColl, int index );
 
@@ -333,7 +315,7 @@ namespace VertexingUtils{
  /// --- Internal methods needed by the code of  Franco B:
   TVectorD get_trackParam( edm4hep::TrackState & atrack, bool Units_mm = false) ;
   TMatrixDSym get_trackCov( const edm4hep::TrackState &  atrack, bool Units_mm = false) ;
-  
+
   TVectorD ParToACTS(TVectorD Par);
   TMatrixDSym CovToACTS(TMatrixDSym Cov,TVectorD Par);
 
diff --git a/analyzers/dataframe/src/ReconstructedParticle2Track.cc b/analyzers/dataframe/src/ReconstructedParticle2Track.cc
index 385dab19bb..f8aa59e890 100644
--- a/analyzers/dataframe/src/ReconstructedParticle2Track.cc
+++ b/analyzers/dataframe/src/ReconstructedParticle2Track.cc
@@ -242,36 +242,6 @@ namespace ReconstructedParticle2Track{
   }
 
 
-
-
-
-
-
-ROOT::VecOps::RVec<float> 
-getRP2TRK_mom(ROOT::VecOps::RVec<edm4hep::ReconstructedParticleData> in,  
-	      ROOT::VecOps::RVec<edm4hep::TrackState> tracks) {
-  ROOT::VecOps::RVec<float> result;
-  for (auto & p: in) {
-    if (p.tracks_begin<tracks.size())
-      result.push_back(VertexingUtils::get_trackMom(tracks.at(p.tracks_begin)));
-    else result.push_back(std::nan(""));
-  }
-  return result;
-}
-
-ROOT::VecOps::RVec<float> 
-getRP2TRK_charge(ROOT::VecOps::RVec<edm4hep::ReconstructedParticleData> in,  
-		 ROOT::VecOps::RVec<edm4hep::TrackState> tracks) {
-  ROOT::VecOps::RVec<float> result;
-  for (auto & p: in) {
-    if (p.tracks_begin<tracks.size())
-      result.push_back(p.charge);
-    else result.push_back(std::nan(""));
-  }
-  return result;
-}
-
->>>>>>> c34b863c3 (adding the implementation of LCFIPlus vertexing module and the necessary funtions to exploit vertex properties in VertexingUtils)
 ROOT::VecOps::RVec<float>
 getRP2TRK_D0(ROOT::VecOps::RVec<edm4hep::ReconstructedParticleData> in,
              ROOT::VecOps::RVec<edm4hep::TrackState> tracks) {