Remove outdated ACTS components in preparation of version upgrade (#408)

* remove mentions of acts in preparation of version upgrade

* fix

* fix

* fix

* fix

Detector/DetComponents/CMakeLists.txt

@@ -11,13 +11,12 @@ gaudi_depends_on_subdirs( FWCore
 find_package(ROOT COMPONENTS MathCore GenVector Geom Tree)
 
 find_package(Eigen)
-find_package(Acts COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin)
 
 
 gaudi_add_module(DetComponents
                  src/*.cpp
-                 INCLUDE_DIRS GaudiKernel ROOT DD4hep Geant4 FWCore DetInterface DetSegmentation DetCommon Acts Eigen
-                 LINK_LIBRARIES GaudiKernel ROOT DD4hep ${DD4hep_COMPONENT_LIBRARIES} DetSegmentation DetCommon  FWCore ActsCore ActsDD4hepPlugin)
+                 INCLUDE_DIRS GaudiKernel ROOT DD4hep Geant4 FWCore DetInterface DetSegmentation DetCommon Eigen
+                 LINK_LIBRARIES GaudiKernel ROOT DD4hep ${DD4hep_COMPONENT_LIBRARIES} DetSegmentation DetCommon  FWCore)
 target_link_libraries(DetComponents ${Geant4_LIBRARIES})
 include(CTest)
 gaudi_add_test(RedoSegmentationXYZ

Detector/DetFCChhTrackerTkLayout/CMakeLists.txt

@@ -7,11 +7,6 @@ gaudi_depends_on_subdirs(GaudiKernel Detector/DetCommon)
 
 
 
-find_package(Eigen)
-
-find_package(Acts COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin DigitizationPlugin)
-
-#include( DD4hep )
 
 find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
 
@@ -20,8 +15,8 @@ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/triplet DESTINATION ${CMAKE_INSTALL_
 
 gaudi_add_module(DetFCChhTrackerTkLayout
                  src/*.cpp
-                 INCLUDE_DIRS FWCore DD4hep ROOT Geant4 DetCommon Eigen  Acts
-                 LINK_LIBRARIES FWCore GaudiKernel DD4hep ROOT DetCommon ActsCore ActsDD4hepPlugin)
+                 INCLUDE_DIRS FWCore DD4hep ROOT Geant4 DetCommon Eigen 
+                 LINK_LIBRARIES FWCore GaudiKernel DD4hep ROOT DetCommon)
 
 set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")

Detector/DetFCChhTrackerTkLayout/src/BeamTube_geo.cpp

@@ -1,6 +1,5 @@
 
 
-#include "Acts/Plugins/DD4hep/ActsExtension.hpp"
 #include "DD4hep/DetFactoryHelper.h"
 
 using dd4hep::Volume;
@@ -13,9 +12,6 @@ static dd4hep::Ref_t create_element(dd4hep::Detector& lcdd, xml_h e, dd4hep::Sen
   std::string det_name = x_det.nameStr();
   // Make DetElement
   DetElement beamtube(det_name, x_det.id());
-  Acts::ActsExtension* detvolume = new Acts::ActsExtension();
-  detvolume->addType("beampipe", "layer");
-  beamtube.addExtension<Acts::ActsExtension>(detvolume);
   dd4hep::xml::Dimension x_det_dim(x_det.dimensions());
   Tube tube_shape(x_det_dim.rmin(), x_det_dim.rmax(), x_det_dim.z());
   Volume tube_vol(det_name, tube_shape, lcdd.material(x_det_dim.attr<std::string>("material")));

Detector/DetFCChhTrackerTkLayout/src/TkLayoutBarrel_Geo.cpp

@@ -1,11 +1,6 @@
 
 #include "DetCommon/DetUtils.h"
 
-#include "Acts/Plugins/DD4hep/ActsExtension.hpp"
-#include "Acts/Surfaces/PlanarBounds.hpp"
-#include "Acts/Surfaces/RectangleBounds.hpp"
-#include "Acts/Surfaces/TrapezoidBounds.hpp"
-#include "Acts/Utilities/Units.hpp"
 
 #include "DD4hep/DetFactoryHelper.h"
 
@@ -32,10 +27,6 @@ static dd4hep::Ref_t createTkLayoutTrackerBarrel(dd4hep::Detector& lcdd,
   // has min/max dimensions of tracker for visualization etc.
   std::string detectorName = xmlDet.nameStr();
   DetElement topDetElement(detectorName, xmlDet.id());
-  // detElement owns extension
-  Acts::ActsExtension* detWorldExt = new Acts::ActsExtension();
-  detWorldExt->addType("barrel", "detector");
-  topDetElement.addExtension<Acts::ActsExtension>(detWorldExt);
   dd4hep::Tube topVolumeShape(dimensions.rmin(), dimensions.rmax(), (dimensions.zmax() - dimensions.zmin()) * 0.5);
   Volume topVolume(detectorName, topVolumeShape, lcdd.air());
   topVolume.setVisAttributes(lcdd.invisible());
@@ -61,12 +52,6 @@ static dd4hep::Ref_t createTkLayoutTrackerBarrel(dd4hep::Detector& lcdd,
     PlacedVolume placedLayerVolume = topVolume.placeVolume(layerVolume);
     placedLayerVolume.addPhysVolID("layer", layerCounter);
     DetElement lay_det(topDetElement, "layer" + std::to_string(layerCounter), layerCounter);
-    // the local coordinate systems of modules in dd4hep and acts differ
-    // see http://acts.web.cern.ch/ACTS/latest/doc/group__DD4hepPlugins.html
-    Acts::ActsExtension* layerExtension = new Acts::ActsExtension();
-    layerExtension->addType("sensitive cylinder", "layer");
-    layerExtension->addType("axes", "definitions", "XzY");
-    lay_det.addExtension<Acts::ActsExtension>(layerExtension);
     lay_det.setPlacement(placedLayerVolume);
     dd4hep::xml::Component xModuleComponentsOdd = xModulePropertiesOdd.child("components");
     integratedModuleComponentThickness = 0;
@@ -116,10 +101,6 @@ static dd4hep::Ref_t createTkLayoutTrackerBarrel(dd4hep::Detector& lcdd,
                 placedModuleVolume.addPhysVolID("module", moduleCounter);
                 moduleVolume.setSensitiveDetector(sensDet);
                 DetElement mod_det(lay_det, "module" + std::to_string(moduleCounter), moduleCounter);
-
-                Acts::ActsExtension* moduleExtension = new Acts::ActsExtension();
-                mod_det.addExtension<Acts::ActsExtension>(moduleExtension);
-
                 mod_det.setPlacement(placedModuleVolume);
                 ++moduleCounter;
               }

Detector/DetFCChhTrackerTkLayout/src/TkLayoutEndcap_Geo.cpp

@@ -1,7 +1,6 @@
 
 #include "DetCommon/DetUtils.h"
 #include "DD4hep/DetFactoryHelper.h"
-#include "Acts/Plugins/DD4hep/ActsExtension.hpp"
 
 using dd4hep::Volume;
 using dd4hep::DetElement;
@@ -28,9 +27,6 @@ static dd4hep::Ref_t createTkLayoutTrackerEndcap(dd4hep::Detector& lcdd,
   std::string detName = xmlDet.nameStr();
   DetElement worldDetElement(detName, xmlDet.id());
   DetElement posEcapDetElement(worldDetElement, "posEndcap", 0);
-  Acts::ActsExtension* ecapDetExt = new Acts::ActsExtension();
-  ecapDetExt->addType("endcap", "detector");
-  posEcapDetElement.addExtension<Acts::ActsExtension>(ecapDetExt);
 
 
 
@@ -61,12 +57,6 @@ static dd4hep::Ref_t createTkLayoutTrackerEndcap(dd4hep::Detector& lcdd,
 
       discVolumeVec.emplace_back("disc", discShape, lcdd.air());
       discDetElementVec.emplace_back(posEcapDetElement, "disc" + std::to_string(discCounter), discCounter);
-      Acts::ActsExtension* detlayer = new Acts::ActsExtension();
-      detlayer->addType("sensitive disk", "layer");
-      // the local coordinate systems of modules in dd4hep and acts differ
-      // see http://acts.web.cern.ch/ACTS/latest/doc/group__DD4hepPlugins.html
-      detlayer->addType("axes", "definitions", "XZY");
-      discDetElementVec.back().addExtension<Acts::ActsExtension>(detlayer);
 
       // iterate over rings
       for (dd4hep::xml::Collection_t xRingColl(xCurrentRings, _U(ring)); (nullptr != xRingColl); ++xRingColl) {
@@ -139,10 +129,6 @@ static dd4hep::Ref_t createTkLayoutTrackerEndcap(dd4hep::Detector& lcdd,
               placedComponentVolume.addPhysVolID("component", compCounter);
               componentVolume.setSensitiveDetector(sensDet);
               DetElement moduleDetElement(discDetElementVec.back(), "comp" + std::to_string(compCounter), compCounter);
-
-              Acts::ActsExtension* moduleExtension = new Acts::ActsExtension();
-              moduleDetElement.addExtension<Acts::ActsExtension>(moduleExtension);
-
               moduleDetElement.setPlacement(placedComponentVolume);
               ++compCounter;
             }

Examples/CMakeLists.txt

@@ -79,17 +79,3 @@ gaudi_add_test(GeantUserLimits
 gaudi_add_test(GeantFullSimParticleGunFCCee
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                FRAMEWORK options/geant_fullsim_fccee_pgun.py)
-
-# Test of the format-checker:
-gaudi_add_test(FormatCheckerOneFile
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMAND ./checkformat ./Examples/src/CreateSampleJet.cpp)
-gaudi_add_test(FormatCheckerSeveralFiles
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMAND ./checkformat ./Examples/src/CreateSampleJet.cpp ./Examples/src/CreateSampleJet.h)
-gaudi_add_test(FormatCheckerDirectory
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMAND ./checkformat ./Examples/src/)
-gaudi_add_test(FormatCheckerInPlace
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMAND ./checkformat -if ./Examples/src/CreateSampleJet.cpp)

Reconstruction/RecTracker/CMakeLists.txt

@@ -9,28 +9,23 @@ gaudi_depends_on_subdirs(GaudiAlg FWCore Detector/DetInterface Sim/SimG4Interfac
 find_package(CLHEP)
 find_package(FCCEDM)
 find_package(PODIO)
+find_package(Eigen)
 
 find_package(ROOT REQUIRED COMPONENTS Geom)
-find_package(Acts COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin)
 
 gaudi_install_python_modules()
 gaudi_add_library(TrackingUtils
                  src/lib/*.cpp
-                 INCLUDE_DIRS DD4hep HepMC  FWCore  FCCEDM PODIO  DetInterface RecInterface SimG4Interface ROOT
+                 INCLUDE_DIRS DD4hep HepMC  FWCore  FCCEDM PODIO  DetInterface RecInterface SimG4Interface ROOT Eigen
                  LINK_LIBRARIES GaudiAlgLib FCCEDM PODIO DD4hep ROOT 
                  PUBLIC_HEADERS RecTracker tricktrack) 
 
 gaudi_add_module(RecTracker
                  src/components/*.cpp
-                 INCLUDE_DIRS DD4hep Geant4 FWCore SimG4Common SimG4Interface  ROOT RecInterface TrackingUtils Acts CLHEP
-                 LINK_LIBRARIES ROOT GaudiAlgLib FCCEDM PODIO DD4hep TrackingUtils ActsCore ActsDD4hepPlugin CLHEP)
+                 INCLUDE_DIRS DD4hep Geant4 FWCore SimG4Common SimG4Interface  ROOT RecInterface TrackingUtils CLHEP Eigen
+                 LINK_LIBRARIES ROOT GaudiAlgLib FCCEDM PODIO DD4hep TrackingUtils CLHEP)
 
 
-gaudi_add_library(ActsLogger
-                 src/lib/ACTSLogger.cpp
-                 INCLUDE_DIRS ROOT FWCore HepMC FCCEDM PODIO DD4hep DetInterface RecInterface Acts
-                 NO_PUBLIC_HEADERS
-                 LINK_LIBRARIES ROOT GaudiAlgLib FCCEDM PODIO DD4hep ActsCore)
 
 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/options DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/Reconstruction/RecTracker)