Merge pull request #77 from clementhelsens/master

move to acts v5.0.0

Author: clementhelsens

analyzers/dataframe/VertexFinderActs.cc

@@ -8,8 +8,8 @@
 #include "Acts/Vertexing/ImpactPointEstimator.hpp"
 #include "Acts/Vertexing/HelicalTrackLinearizer.hpp"
 //V5.0
-//#include "Acts/Definitions/Algebra.hpp"
-//#include "Acts/Definitions/Units.hpp"
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
 
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -40,7 +40,7 @@ VertexingUtils::FCCAnalysesVertex VertexFinderActs::VertexFinderAMVF(ROOT::VecOp
   const auto& magFieldContext = Acts::MagneticFieldContext();
 
   // Set up EigenStepper
-  Acts::ConstantBField bField(Acts::Vector3D(0., 0., 2_T));
+  Acts::ConstantBField bField(Acts::Vector3(0., 0., 2_T));
   Acts::EigenStepper<Acts::ConstantBField> stepper(bField);
 
   // Set up the propagator
@@ -151,7 +151,7 @@ VertexingUtils::FCCAnalysesVertex VertexFinderActs::VertexFinderAMVF(ROOT::VecOp
 
     // Create track parameters and add to track list
     std::shared_ptr<Acts::PerigeeSurface> perigeeSurface;
-    Acts::Vector3D beamspotPos;
+    Acts::Vector3 beamspotPos;
     beamspotPos << 0.0, 0.0, 0.0;
     perigeeSurface = Acts::Surface::makeShared<Acts::PerigeeSurface>(beamspotPos);
 
@@ -173,12 +173,7 @@ VertexingUtils::FCCAnalysesVertex VertexFinderActs::VertexFinderAMVF(ROOT::VecOp
   for (const auto& trk : allTracks) {
     tracksPtr.push_back(&trk);
   }
-  
-  //std::cout << " --- n trk " << tracksPtr.size() << std::endl;
-  
-  // find vertices
-  auto result = finder.find(tracksPtr, finderOpts, state);
-  
+
 
   VertexingUtils::FCCAnalysesVertex TheVertex;
   edm4hep::VertexData edm4hep_vertex;
@@ -196,6 +191,18 @@ VertexingUtils::FCCAnalysesVertex VertexFinderActs::VertexFinderAMVF(ROOT::VecOp
   TheVertex.updated_track_momentum_at_vertex = updated_track_momentum_at_vertex;
 
 
+  TheVertex.ntracks = Ntr; 
+  if ( Ntr <= 1) return TheVertex;   // can not reconstruct a vertex with only one track...
+
+  
+  //std::cout << " --- n trk " << tracksPtr.size() << std::endl;
+  
+  // find vertices
+  auto result = finder.find(tracksPtr, finderOpts, state);
+  
+
+
+
   //std::cout << "result  " << result.ok() << std::endl;
   if (not result.ok()) {
     //std::cout << "Error in vertex finder: " << result.error().message() << std::endl;

analyzers/dataframe/VertexFitterActs.cc

@@ -8,12 +8,15 @@
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
-#include "Acts/Utilities/Definitions.hpp"
-#include "Acts/Utilities/Units.hpp"
 #include "Acts/Vertexing/FullBilloirVertexFitter.hpp"
 #include "Acts/Vertexing/HelicalTrackLinearizer.hpp"
 #include "Acts/Vertexing/Vertex.hpp"
 
+//V5.0
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+
+
 #include "TMath.h"
 
 using namespace VertexFitterActs;
@@ -35,7 +38,7 @@ VertexingUtils::FCCAnalysesVertex VertexFitterActs::VertexFitterFullBilloir(ROOT
   const auto& magFieldContext = Acts::MagneticFieldContext();
 
   // Set up EigenStepper
-  Acts::ConstantBField bField(Acts::Vector3D(0., 0., 2_T));
+  Acts::ConstantBField bField(Acts::Vector3(0., 0., 2_T));
   Acts::EigenStepper<Acts::ConstantBField> stepper(bField);
 
   // Set up the propagator
@@ -57,13 +60,13 @@ VertexingUtils::FCCAnalysesVertex VertexFitterActs::VertexFitterFullBilloir(ROOT
   // Constraint for vertex fit
   Acts::Vertex<Acts::BoundTrackParameters> myConstraint;
   // Some abitrary values
-  Acts::SymMatrix4D myCovMat = Acts::SymMatrix4D::Zero();
+  Acts::SymMatrix4 myCovMat = Acts::SymMatrix4::Zero();
   myCovMat(0, 0) = 30.;
   myCovMat(1, 1) = 30.;
   myCovMat(2, 2) = 30.;
   myCovMat(3, 3) = 30.;
   myConstraint.setFullCovariance(std::move(myCovMat));
-  myConstraint.setFullPosition(Acts::Vector4D(0, 0, 0, 0));
+  myConstraint.setFullPosition(Acts::Vector4(0, 0, 0, 0));
 
 
   Acts::VertexingOptions<Acts::BoundTrackParameters> vfOptions(geoContext, magFieldContext);
@@ -112,7 +115,7 @@ VertexingUtils::FCCAnalysesVertex VertexFitterActs::VertexFitterFullBilloir(ROOT
 
     // Create track parameters and add to track list
     std::shared_ptr<Acts::PerigeeSurface> perigeeSurface;
-    Acts::Vector3D beamspotPos;
+    Acts::Vector3 beamspotPos;
     beamspotPos << 0.0, 0.0, 0.0;
     perigeeSurface = Acts::Surface::makeShared<Acts::PerigeeSurface>(beamspotPos);