404 acts tracking with b0 trackers

src/algorithms/tracking/TrackerSourceLinker.cc

@@ -44,6 +44,7 @@ eicrecon::TrackerSourceLinkerResult *eicrecon::TrackerSourceLinker::produce(std:
     std::list<eicrecon::IndexSourceLink> linkStorage;
     auto sourceLinks = std::vector<std::shared_ptr<eicrecon::IndexSourceLink>>();
     auto measurements = std::make_shared<eicrecon::MeasurementContainer>();
+    auto dd4hepGeo = m_acts_context->dd4hepDetector();
 
     m_log->debug("Hits size: {}  measurements->size: {}", trk_hits.size(), measurements->size());
 
@@ -80,19 +81,24 @@ eicrecon::TrackerSourceLinkerResult *eicrecon::TrackerSourceLinker::produce(std:
 
         Acts::Vector2 loc = Acts::Vector2::Zero();
         Acts::Vector2 pos;
+        auto hit_det = hit->getCellID()&0xFF;
+        auto onSurfaceTolerance = 0.1*Acts::UnitConstants::um;      // By default, ACTS uses 0.1 micron as the on surface tolerance
+        if (hit_det==dd4hepGeo->constant<int>("B0Tracker_Station_1_ID")){
+         onSurfaceTolerance = 1*Acts::UnitConstants::um;           // FIXME Ugly hack for testing B0. Should be a way to increase this tolerance in geometry.
+        }
+
         try {
             // transform global position into local coordinates
             // geometry context contains nothing here
             pos = surface->globalToLocal(
                     Acts::GeometryContext(),
                     {hit_pos.x, hit_pos.y, hit_pos.z},
-                    {0, 0, 0}).value();
+                    {0, 0, 0}, onSurfaceTolerance).value();
 
             loc[Acts::eBoundLoc0] = pos[0];
             loc[Acts::eBoundLoc1] = pos[1];
         }
         catch(std::exception &ex) {
-
             m_log->warn("Can't convert globalToLocal for hit: vol_id={} det_id={} CellID={} x={} y={} z={}",
                         vol_id, hit->getCellID()&0xFF, hit->getCellID(), hit_pos.x, hit_pos.y, hit_pos.z);
             continue;

src/detectors/B0TRK/B0TRK.cc

@@ -12,9 +12,6 @@
 #include <global/digi/SiliconTrackerDigi_factory.h>
 #include <global/tracking/TrackerHitReconstruction_factory.h>
 
-#include <algorithms/digi/SiliconTrackerDigiConfig.h>
-#include <algorithms/tracking/TrackerHitReconstructionConfig.h>
-
 
 extern "C" {
 void InitPlugin(JApplication *app) {
@@ -26,15 +23,12 @@ void InitPlugin(JApplication *app) {
     SiliconTrackerDigiConfig digi_default_cfg;
     digi_default_cfg.threshold = 0 * dd4hep::keV;
     digi_default_cfg.timeResolution = 8;
-    app->Add(new JChainFactoryGeneratorT<SiliconTrackerDigi_factory>({"B0TrackerHits"}, "B0TrackerHitRawHit", digi_default_cfg));
+    app->Add(new JChainFactoryGeneratorT<SiliconTrackerDigi_factory>({"B0TrackerHits"}, "B0TrackerRawHits", digi_default_cfg));
 
     // Convert raw digitized hits into hits with geometry info (ready for tracking)
     TrackerHitReconstructionConfig hit_reco_cfg;
     hit_reco_cfg.time_resolution = 8;
-    app->Add(new JChainFactoryGeneratorT<TrackerHitReconstruction_factory>(
-            {"B0TrackerHitRawHit"},     // Input data collection tags
-            "B0TrackerRecHits",         // Output data tag
-             hit_reco_cfg));            // Hit reco default config for factories
+    app->Add(new JChainFactoryGeneratorT<TrackerHitReconstruction_factory>({"B0TrackerRawHits"},"B0TrackerRecHits", hit_reco_cfg));
 
 }
 } // extern "C"

src/detectors/B0TRK/CMakeLists.txt

@@ -6,21 +6,20 @@ get_filename_component(PLUGIN_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
 # Setting default includes, libraries and installation paths
 plugin_add(${PLUGIN_NAME})
 
-# The macro grabs sources as *.cc *.cpp *.c and headers as *.h *.hh *.hpp
-# Then correctly sets sources for ${_name}_plugin and ${_name}_library targets
-# Adds headers to the correct installation directory
-plugin_glob_all(${PLUGIN_NAME})
-
 # Find dependencies
 plugin_add_dd4hep(${PLUGIN_NAME})
 plugin_add_acts(${PLUGIN_NAME})
 plugin_add_cern_root(${PLUGIN_NAME})
 plugin_add_event_model(${PLUGIN_NAME})
 
-# Add include directories
-# (same as target_include_directories but for both plugin and library)
-#plugin_include_directories(${PLUGIN_NAME} SYSTEM PUBLIC ... )
+# The macro grabs sources as *.cc *.cpp *.c and headers as *.h *.hh *.hpp
+# Then correctly sets sources for ${_name}_plugin and ${_name}_library targets
+# Adds headers to the correct installation directory
+plugin_glob_all(${PLUGIN_NAME})
+
+# Add include directories (works same as target_include_directories)
+# plugin_include_directories(${PLUGIN_NAME} SYSTEM PUBLIC ... )
 
 # Add libraries
 # (same as target_include_directories but for both plugin and library)
-#plugin_link_libraries(${PLUGIN_NAME} ... )
+plugin_link_libraries(${PLUGIN_NAME} algorithms_digi_library algorithms_tracking_library)

src/detectors/CMakeLists.txt

@@ -8,7 +8,6 @@ add_subdirectory(ZDC)
 add_subdirectory(B0ECAL)
 
 # Tracking detectors
-add_subdirectory(B0TRK)     # B0 tracker
 add_subdirectory(BTRK)      # Barrel tracker
 add_subdirectory(BVTX)      # Barrel vertex
 add_subdirectory(ECGEM)     # EndCap GEM
@@ -18,6 +17,8 @@ add_subdirectory(RPOTS)     # Roman Pots
 add_subdirectory(FOFFMTRK)   # OffMom tracker
 add_subdirectory(ECTOF)     # Endcap TOF
 add_subdirectory(BTOF)      # Barrel TOF
+add_subdirectory(B0TRK)     # B0 tracker
 add_subdirectory(LUMISPECCAL)  # Lumi spectrometer calorimeter
+
 # PID detectors
 add_subdirectory(DRICH)

src/global/tracking/tracking.cc

@@ -33,14 +33,16 @@ void InitPlugin(JApplication *app) {
 
     // Tracker hits collector
     app->Add(new JChainFactoryGeneratorT<TrackerHitCollector_factory>(
-                     {
-                         "SiBarrelTrackerRecHits",      // Si tracker hits
+                      {
+                         "SiBarrelTrackerRecHits",          // Si tracker hits
                          "SiBarrelVertexRecHits",
                          "SiEndcapTrackerRecHits",
                          "TOFBarrelRecHit",             // TOF hits
                          "TOFEndcapRecHits",
-                         "MPGDBarrelRecHits",           // MPGD
-                         "MPGDDIRCRecHits"},
+                         "MPGDBarrelRecHits",        // MPGD
+                         "MPGDDIRCRecHits",
+                         "B0TrackerRecHits"          // B0TRK
+                      },
 
                       "CentralTrackingRecHits"));    // Output collection name
 

src/utilities/eicrecon/eicrecon.cc

@@ -30,13 +30,13 @@ std::vector<std::string> EICRECON_DEFAULT_PLUGINS = {
         "BHCAL",
         "FHCAL",
         "B0ECAL",
-        "B0TRK",
         "ZDC",
         "BTRK",
         "BVTX",
         "DRICH",
         "ECTRK",
         "MPGD",
+        "B0TRK",
         "RPOTS",
 	"FOFFMTRK",
         "BTOF",