feat: update to actsv45.0.0

calibrations/tpc/TpcDVCalib/Makefile.am

@@ -24,10 +24,6 @@ libTpcDVCalib_la_LDFLAGS = \
   -L$(OFFLINE_MAIN)/lib
 
 libTpcDVCalib_la_LIBADD = \
-  -lActsCore \
-  -lActsPluginTGeo \
-  -lActsExamplesDetectorTGeo \
-  -lActsExamplesFramework \
   -lSubsysReco \
   -ltrackbase_historic_io \
   -ltrack_io \

calibrations/tpc/TpcDVCalib/TrackToCalo.cc

@@ -38,14 +38,7 @@
 #include <trackbase_historic/TrackSeedContainer.h>
 #include <trackbase_historic/TrackSeed.h>
 #include <trackbase_historic/TrackAnalysisUtils.h>
-#include <trackreco/ActsPropagator.h>
-
-#include <Acts/Geometry/GeometryIdentifier.hpp>
-#include <Acts/MagneticField/ConstantBField.hpp>
-#include <Acts/MagneticField/MagneticFieldProvider.hpp>
-#include <Acts/Surfaces/CylinderSurface.hpp>
-#include <Acts/Surfaces/PerigeeSurface.hpp>
-#include <Acts/Geometry/TrackingGeometry.hpp>
+
 
 #include <CLHEP/Vector/ThreeVector.h>
 #include <cmath>

offline/QA/Tracking/CosmicTrackQA.cc

@@ -149,7 +149,7 @@ int CosmicTrackQA::process_event(PHCompositeNode *topNode)
         }
         else
         {
-          Acts::Vector3 loc = surf->transform(geometry->geometry().getGeoContext()).inverse() * (intersection * Acts::UnitConstants::cm);
+          Acts::Vector3 loc = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).inverse() * (intersection * Acts::UnitConstants::cm);
           loc /= Acts::UnitConstants::cm;
           statelx = loc(0);
           statelz = loc(1);
@@ -191,7 +191,7 @@ int CosmicTrackQA::process_event(PHCompositeNode *topNode)
       }
       else
       {
-        Acts::Vector3 loc = surf->transform(geometry->geometry().getGeoContext()).inverse() * (stateglob * Acts::UnitConstants::cm);
+        Acts::Vector3 loc = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).inverse() * (stateglob * Acts::UnitConstants::cm);
         loc /= Acts::UnitConstants::cm;
         statelx = loc(0);
         statelz = loc(1);

offline/packages/TrackerMillepedeAlignment/HelicalFitter.cc

@@ -594,8 +594,8 @@ int HelicalFitter::process_event(PHCompositeNode* /*unused*/)
 
       // fitpoint is the point where the helical fit intersects the plane of the surface
       // Now transform the helix fitpoint to local coordinates to compare with cluster local coordinates
-      Acts::Vector3 fitpoint_local = surf->transform(_tGeometry->geometry().getGeoContext()).inverse() * (fitpoint * Acts::UnitConstants::cm);
-      Acts::Vector3 fitpoint_mvtx_half_local = surf->transform(_tGeometry->geometry().getGeoContext()).inverse() * (fitpoint_mvtx_half * Acts::UnitConstants::cm);
+      Acts::Vector3 fitpoint_local = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()).inverse() * (fitpoint * Acts::UnitConstants::cm);
+      Acts::Vector3 fitpoint_mvtx_half_local = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()).inverse() * (fitpoint_mvtx_half * Acts::UnitConstants::cm);
 
       fitpoint_local /= Acts::UnitConstants::cm;
       fitpoint_mvtx_half_local /= Acts::UnitConstants::cm;
@@ -634,7 +634,7 @@ int HelicalFitter::process_event(PHCompositeNode* /*unused*/)
 
       if (Verbosity() > 1)
       {
-        Acts::Vector3 loc_check = surf->transform(_tGeometry->geometry().getGeoContext()).inverse() * (global * Acts::UnitConstants::cm);
+        Acts::Vector3 loc_check = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()).inverse() * (global * Acts::UnitConstants::cm);
         loc_check /= Acts::UnitConstants::cm;
         std::cout << "    layer " << layer << std::endl
                   << " cluster global " << global(0) << " " << global(1) << " " << global(2) << std::endl
@@ -647,10 +647,10 @@ int HelicalFitter::process_event(PHCompositeNode* /*unused*/)
 
       if (Verbosity() > 1)
       {
-        Acts::Transform3 transform = surf->transform(_tGeometry->geometry().getGeoContext());
+        Acts::Transform3 transform = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext());
         std::cout << "Transform is:" << std::endl;
         std::cout << transform.matrix() << std::endl;
-        Acts::Vector3 loc_check = surf->transform(_tGeometry->geometry().getGeoContext()).inverse() * (global * Acts::UnitConstants::cm);
+        Acts::Vector3 loc_check = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()).inverse() * (global * Acts::UnitConstants::cm);
         loc_check /= Acts::UnitConstants::cm;
         unsigned int const sector = TpcDefs::getSectorId(cluskey_vec[ivec]);
         unsigned int const side = TpcDefs::getSide(cluskey_vec[ivec]);
@@ -779,7 +779,7 @@ int HelicalFitter::process_event(PHCompositeNode* /*unused*/)
         Acts::Vector3 ideal_center = surf->center(_tGeometry->geometry().getGeoContext()) * 0.1;
         Acts::Vector3 ideal_norm = -surf->normal(_tGeometry->geometry().getGeoContext(),Acts::Vector3(1,1,1), Acts::Vector3(1,1,1));
         Acts::Vector3 const ideal_local(xloc, zloc, 0.0);  // cm
-        Acts::Vector3 ideal_glob = surf->transform(_tGeometry->geometry().getGeoContext()) * (ideal_local * Acts::UnitConstants::cm);
+        Acts::Vector3 ideal_glob = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()) * (ideal_local * Acts::UnitConstants::cm);
         ideal_glob /= Acts::UnitConstants::cm;
         alignmentTransformationContainer::use_alignment = true;
 
@@ -1953,10 +1953,10 @@ void HelicalFitter::get_projectionXY(const Surface& surf, const std::pair<Acts::
   // get surface X and Y unit vectors in global frame
   // transform Xlocal = 1.0 to global, subtract the surface center, normalize to 1
   Acts::Vector3 const xloc(1.0, 0.0, 0.0);  // local coord unit vector in x
-  Acts::Vector3 xglob = surf->transform(_tGeometry->geometry().getGeoContext()) * (xloc * Acts::UnitConstants::cm);
+  Acts::Vector3 xglob = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()) * (xloc * Acts::UnitConstants::cm);
   xglob /= Acts::UnitConstants::cm;
   Acts::Vector3 const yloc(0.0, 1.0, 0.0);
-  Acts::Vector3 yglob = surf->transform(_tGeometry->geometry().getGeoContext()) * (yloc * Acts::UnitConstants::cm);
+  Acts::Vector3 yglob = surf->localToGlobalTransform(_tGeometry->geometry().getGeoContext()) * (yloc * Acts::UnitConstants::cm);
   yglob /= Acts::UnitConstants::cm;
   // These are the local frame unit vectors transformed to the global frame
   Acts::Vector3 const X = (xglob - sensorCenter) / (xglob - sensorCenter).norm();

offline/packages/TrackerMillepedeAlignment/MakeMilleFiles.cc

@@ -309,9 +309,9 @@ bool MakeMilleFiles::getLocalVtxDerivativesXY(SvtxTrack* track,
   auto param = propagator.makeTrackParams(firststate, track->get_charge(), surf).value();
   auto perigee = propagator.makeVertexSurface(vertex);
   auto actspropagator = propagator.makePropagator();
-
-  Acts::PropagatorOptions<> options(_tGeometry->geometry().getGeoContext(),
-                                    _tGeometry->geometry().magFieldContext);
+  ActsPropagator::SphenixPropagatorOptions 
+  options(_tGeometry->geometry().getGeoContext(),
+          _tGeometry->geometry().magFieldContext);
 
   auto result = actspropagator.propagate(param, *perigee, options);
 

offline/packages/TrackerMillepedeAlignment/MakeMilleFiles.h

@@ -23,6 +23,7 @@
 
 #include <ActsExamples/EventData/Trajectories.hpp>
 
+#include <fstream>
 #include <string>
 #include <vector>
 

offline/packages/TrackingDiagnostics/TrackResiduals.cc

@@ -1128,7 +1128,7 @@ void TrackResiduals::fillClusterBranchesKF(TrkrDefs::cluskey ckey, SvtxTrack* tr
     {
       // otherwise take the manual calculation for the TPC
       // doing it this way just avoids the bounds check that occurs in the surface class method
-      Acts::Vector3 loct = surf->transform(geometry->geometry().getGeoContext()).inverse() * clusglob_moved;  // global is in mm
+      Acts::Vector3 loct = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).inverse() * clusglob_moved;  // global is in mm
       loct /= Acts::UnitConstants::cm;
 
       loc(0) = loct(0);
@@ -1166,7 +1166,7 @@ void TrackResiduals::fillClusterBranchesKF(TrkrDefs::cluskey ckey, SvtxTrack* tr
 
   auto misaligncenter = surf->center(geometry->geometry().getGeoContext());
   auto misalignnorm = -1 * surf->normal(geometry->geometry().getGeoContext(), Acts::Vector3(1, 1, 1), Acts::Vector3(1, 1, 1));
-  auto misrot = surf->transform(geometry->geometry().getGeoContext()).rotation();
+  auto misrot = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).rotation();
 
   float mgamma = atan2(-misrot(1, 0), misrot(0, 0));
   float mbeta = -asin(misrot(0, 1));
@@ -1183,11 +1183,11 @@ void TrackResiduals::fillClusterBranchesKF(TrkrDefs::cluskey ckey, SvtxTrack* tr
       std::cout << "resids: layer " << layer << " ideal center z " << idealcenter.z() << " mm " << std::endl;
       std::cout << " surface bounds " << surfbounds[0] << "  " << surfbounds[1] << " mm " << std::endl;
       alignmentTransformationContainer::use_alignment = false;
-      Acts::Transform3 transform = surf_ideal->transform(geometry->geometry().getGeoContext());
+      Acts::Transform3 transform = surf_ideal->localToGlobalTransform(geometry->geometry().getGeoContext());
       std::cout << "Ideal transform is:" << std::endl;
       std::cout << transform.matrix() << std::endl;
       alignmentTransformationContainer::use_alignment = true;
-      Acts::Transform3 transform1 = surf_ideal->transform(geometry->geometry().getGeoContext());
+      Acts::Transform3 transform1 = surf_ideal->localToGlobalTransform(geometry->geometry().getGeoContext());
       std::cout << "Alignment transform is:" << std::endl;
       std::cout << transform1.matrix() << std::endl;
 
@@ -1199,8 +1199,8 @@ void TrackResiduals::fillClusterBranchesKF(TrkrDefs::cluskey ckey, SvtxTrack* tr
   //  Acts::Vector3 ideal_local(loc.x(), loc.y(), 0.0);
   auto nominal_loc = geometry->getLocalCoords(ckey, cluster);
   Acts::Vector3 ideal_local(nominal_loc.x(), nominal_loc.y(), 0.0);
-  Acts::Vector3 ideal_glob = surf_ideal->transform(geometry->geometry().getGeoContext()) * (ideal_local * Acts::UnitConstants::cm);
-  auto idealrot = surf_ideal->transform(geometry->geometry().getGeoContext()).rotation();
+  Acts::Vector3 ideal_glob = surf_ideal->localToGlobalTransform(geometry->geometry().getGeoContext()) * (ideal_local * Acts::UnitConstants::cm);
+  auto idealrot = surf_ideal->localToGlobalTransform(geometry->geometry().getGeoContext()).rotation();
 
   //! These calculations are taken from the wikipedia page for Euler angles,
   //! under the Tait-Bryan angle explanation. Formulas for the angles
@@ -1453,7 +1453,7 @@ void TrackResiduals::fillClusterBranchesSeeds(TrkrDefs::cluskey ckey,  // SvtxTr
 
   auto misaligncenter = surf->center(geometry->geometry().getGeoContext());
   auto misalignnorm = -1 * surf->normal(geometry->geometry().getGeoContext(), Acts::Vector3(1, 1, 1), Acts::Vector3(1, 1, 1));
-  auto misrot = surf->transform(geometry->geometry().getGeoContext()).rotation();
+  auto misrot = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).rotation();
 
   float mgamma = atan2(-misrot(1, 0), misrot(0, 0));
   float mbeta = -asin(misrot(0, 1));
@@ -1464,8 +1464,8 @@ void TrackResiduals::fillClusterBranchesSeeds(TrkrDefs::cluskey ckey,  // SvtxTr
   auto idealcenter = surf->center(geometry->geometry().getGeoContext());
   auto idealnorm = -1 * surf->normal(geometry->geometry().getGeoContext(), Acts::Vector3(1, 1, 1), Acts::Vector3(1, 1, 1));
   Acts::Vector3 ideal_local(loc.x(), loc.y(), 0.0);
-  Acts::Vector3 ideal_glob = surf->transform(geometry->geometry().getGeoContext()) * (ideal_local * Acts::UnitConstants::cm);
-  auto idealrot = surf->transform(geometry->geometry().getGeoContext()).rotation();
+  Acts::Vector3 ideal_glob = surf->localToGlobalTransform(geometry->geometry().getGeoContext()) * (ideal_local * Acts::UnitConstants::cm);
+  auto idealrot = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).rotation();
 
   //! These calculations are taken from the wikipedia page for Euler angles,
   //! under the Tait-Bryan angle explanation. Formulas for the angles
@@ -1552,7 +1552,7 @@ void TrackResiduals::fillStatesWithCircleFit(const TrkrDefs::cluskey& key,
   }
   else
   {
-    auto local = (surf->transform(geometry->geometry().getGeoContext())).inverse() * (intersection * Acts::UnitConstants::cm);
+    auto local = (surf->localToGlobalTransform(geometry->geometry().getGeoContext())).inverse() * (intersection * Acts::UnitConstants::cm);
     local /= Acts::UnitConstants::cm;
     m_statelx.push_back(local.x());
     m_statelz.push_back(local.y());
@@ -1579,7 +1579,7 @@ void TrackResiduals::fillStatesWithLineFit(const TrkrDefs::cluskey& key,
     }
     else
     {
-      Acts::Vector3 loct = surf->transform(geometry->geometry().getGeoContext()).inverse() * (intersection * Acts::UnitConstants::cm);
+      Acts::Vector3 loct = surf->localToGlobalTransform(geometry->geometry().getGeoContext()).inverse() * (intersection * Acts::UnitConstants::cm);
       loct /= Acts::UnitConstants::cm;
       m_statelx.push_back(loct(0));
       m_statelz.push_back(loct(1));

offline/packages/intt/CylinderGeomInttHelper.cc

@@ -18,7 +18,7 @@ TVector3 CylinderGeomInttHelper::get_world_from_local_coords(const Surface& surf
   Acts::Vector3 loc(local.x(), local.y(), local.z());
   loc *= Acts::UnitConstants::cm;
 
-  Acts::Vector3 glob = surface->transform(tGeometry->geometry().getGeoContext()) * loc;
+  Acts::Vector3 glob = surface->localToGlobalTransform(tGeometry->geometry().getGeoContext()) * loc;
   glob /= Acts::UnitConstants::cm;
   return TVector3(glob(0), glob(1), glob(2));
 }
@@ -53,7 +53,7 @@ TVector3 CylinderGeomInttHelper::get_local_from_world_coords(const Surface& surf
   global(2) = world[2];
   global *= Acts::UnitConstants::cm;
 
-  Acts::Vector3 local = surface->transform(tGeometry->geometry().getGeoContext()).inverse() * global;
+  Acts::Vector3 local = surface->localToGlobalTransform(tGeometry->geometry().getGeoContext()).inverse() * global;
 
   local /= Acts::UnitConstants::cm;
 

offline/packages/micromegas/CylinderGeomMicromegas.cc

@@ -50,7 +50,7 @@ TVector3 CylinderGeomMicromegas::get_local_from_world_coords( uint tileid, ActsG
 
   // convert to local
   /* this is equivalent to calling surface->globalToLocal but without the "on surface" check, and while returning a full Acts::Vector3 */
-  const auto local = surface->transform(geometry->geometry().getGeoContext()).inverse()*global;
+  const auto local = surface->localToGlobalTransform(geometry->geometry().getGeoContext()).inverse()*global;
   return TVector3(
     local.x()/Acts::UnitConstants::cm,
     local.y()/Acts::UnitConstants::cm,
@@ -109,7 +109,7 @@ TVector3 CylinderGeomMicromegas::get_world_from_local_coords( uint tileid, ActsG
 
   // convert to global
   /* this is equivalent to calling surface->localToGlobal but without assuming that the local point is on surface */
-  const auto global =  surface->transform(geometry->geometry().getGeoContext())*local;
+  const auto global =  surface->localToGlobalTransform(geometry->geometry().getGeoContext())*local;
   return TVector3(
     global.x()/Acts::UnitConstants::cm,
     global.y()/Acts::UnitConstants::cm,

offline/packages/mvtx/CylinderGeom_MvtxHelper.cc

@@ -23,7 +23,7 @@ CylinderGeom_MvtxHelper::get_local_from_world_coords (
 
   global *= Acts::UnitConstants::cm;
 
-  Acts::Vector3 local = surface->transform(tGeometry->geometry().getGeoContext()).inverse() * global;
+  Acts::Vector3 local = surface->localToGlobalTransform(tGeometry->geometry().getGeoContext()).inverse() * global;
   local /= Acts::UnitConstants::cm;
 
   /// The Acts transform swaps a few of the coordinates
@@ -67,7 +67,7 @@ CylinderGeom_MvtxHelper::get_world_from_local_coords (
   Acts::Vector3 loc(local.x(), local.y(), local.z());
   loc *= Acts::UnitConstants::cm;
 
-  Acts::Vector3 glob = surface->transform(tGeometry->geometry().getGeoContext()) * loc;
+  Acts::Vector3 glob = surface->localToGlobalTransform(tGeometry->geometry().getGeoContext()) * loc;
   glob /= Acts::UnitConstants::cm;
 
   return TVector3(glob(0), glob(1), glob(2));

offline/packages/tpc/LaserClusterizer.cc

@@ -872,12 +872,12 @@ namespace
     }
 
     // Convert from ideal TPC coordinates to surface coordinates 
-    Acts::Vector3 local = surface->transform(my_data.tGeometry->geometry().getGeoContext()).inverse() * (ideal * Acts::UnitConstants::cm);
+    Acts::Vector3 local = surface->localToGlobalTransform(my_data.tGeometry->geometry().getGeoContext()).inverse() * (ideal * Acts::UnitConstants::cm);
     local /= Acts::UnitConstants::cm;
 
     // Convert back to TPC coordinates with alignment applied 
     alignmentTransformationContainer::use_alignment = true;
-    Acts::Vector3 global = surface->transform(my_data.tGeometry->geometry().getGeoContext()) * (local * Acts::UnitConstants::cm);
+    Acts::Vector3 global = surface->localToGlobalTransform(my_data.tGeometry->geometry().getGeoContext()) * (local * Acts::UnitConstants::cm);
     global /= Acts::UnitConstants::cm;
     clus->setX(global(0));
     clus->setY(global(1));

offline/packages/tpc/TpcClusterizer.cc

@@ -714,7 +714,7 @@ namespace
     /// convert to Acts units
     global *= Acts::UnitConstants::cm;
     // std::cout << "transform" << std::endl;
-    Acts::Vector3 local = surface->transform(my_data.tGeometry->geometry().getGeoContext()).inverse() * global;
+    Acts::Vector3 local = surface->localToGlobalTransform(my_data.tGeometry->geometry().getGeoContext()).inverse() * global;
     local /= Acts::UnitConstants::cm;
     // std::cout << "done transform" << std::endl;
     //  we need the cluster key and all associated hit keys (note: the cluster key includes the hitset key)
@@ -763,7 +763,7 @@ namespace
         double nn_y = radius * std::sin(nn_phi);
         Acts::Vector3 nn_global(nn_x, nn_y, nn_z);
         nn_global *= Acts::UnitConstants::cm;
-        Acts::Vector3 nn_local = surface->transform(my_data.tGeometry->geometry().geoContext).inverse() * nn_global;
+        Acts::Vector3 nn_local = surface->localToGlobalTransform(my_data.tGeometry->geometry().geoContext).inverse() * nn_global;
         nn_local /= Acts::UnitConstants::cm;
         double nn_t = my_data.m_tdriftmax - std::fabs(nn_z) / my_data.tGeometry->get_drift_velocity();
         clus_base->setLocalX(nn_local(0));

offline/packages/trackbase/ActsGeometry.h

@@ -10,7 +10,6 @@ class TrkrCluster;
 class ActsGeometry
 {
  public:
-  ActsGeometry() = default;
   ~ActsGeometry() = default;
 
   void setGeometry(const ActsTrackingGeometry& tGeometry)

offline/packages/trackbase/ActsGsfTrackFittingAlgorithm.h

@@ -62,7 +62,7 @@ namespace
         MixtureReductionAlgorithm::KLDistance;
     Acts::ComponentMergeMethod mergeMethod =
         Acts::ComponentMergeMethod::eMaxWeight;
-
+    double reverseFilteringCovarianceScaling = 100.;
     ActsSourceLink::SurfaceAccessor m_slSurfaceAccessor;
 
     GsfFitterFunctionImpl(Fitter&& f,
@@ -83,17 +83,18 @@ namespace
       extensions.updater.connect<&Acts::GainMatrixUpdater::operator()<Acts::VectorMultiTrajectory>>(&updater);
 
       Acts::GsfOptions<Acts::VectorMultiTrajectory> gsfOptions{
-          options.geoContext,
-          options.magFieldContext,
-          options.calibrationContext,
-          extensions,
-          options.propOptions,
-          &(*options.referenceSurface),
-          maxComponents,
-          weightCutoff,
-          abortOnError,
-          disableAllMaterialHandling};
+          options.geoContext, options.magFieldContext,
+          options.calibrationContext};
+      gsfOptions.extensions = extensions;
+      gsfOptions.propagatorPlainOptions = options.propOptions;
+      gsfOptions.referenceSurface = options.referenceSurface;
+      gsfOptions.maxComponents = maxComponents;
+      gsfOptions.weightCutoff = weightCutoff;
+      gsfOptions.abortOnError = abortOnError;
+      gsfOptions.disableAllMaterialHandling = disableAllMaterialHandling;
       gsfOptions.componentMergeMethod = mergeMethod;
+      gsfOptions.reverseFilteringCovarianceScaling =
+          reverseFilteringCovarianceScaling;
       gsfOptions.extensions.calibrator.connect<&calibrator_t::calibrate>(
           &calibrator);
       gsfOptions.extensions.surfaceAccessor.connect<&ActsSourceLink::SurfaceAccessor::operator()>(&m_slSurfaceAccessor);
@@ -152,5 +153,6 @@ class ActsGsfTrackFittingAlgorithm
       BetheHeitlerApprox betheHeitlerApprox, std::size_t maxComponents,
       double weightCutoff,
       MixtureReductionAlgorithm finalReductionMethod, bool abortOnError,
-      bool disableAllMaterialHandling, const Acts::Logger& logger = *Acts::getDefaultLogger("GSF", Acts::Logging::FATAL));
+      bool disableAllMaterialHandling, double reverseFilteringCovarianceScaling,
+      const Acts::Logger& logger = *Acts::getDefaultLogger("GSF", Acts::Logging::FATAL));
 };