Merge pull request #10 from MuonColliderSoft/kk_subdetectorHitNumbers

Add subdetectorHitNumbers to EVENT::Track.
MuonColliderSoft · Jun 18, 2022 · d824821 · d824821
2 parents d834029 + ed20117
commit d824821
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 33 deletions.
diff --git a/.clang-format b/.clang-format
@@ -14,15 +14,23 @@ IncludeCategories:
     Priority:        3
     SortPriority:    0
     CaseSensitive:   false
-  - Regex:           '^<UTIL/.*\.h>'
+  - Regex:           '^<EVENT/.*\.h>'
     Priority:        4
     SortPriority:    0
     CaseSensitive:   false
-  - Regex:           '^<.*'
+  - Regex:           '^<IMPL/.*\.h>'
     Priority:        5
     SortPriority:    0
     CaseSensitive:   false
-  - Regex:           '.*'
+  - Regex:           '^<UTIL/.*\.h>'
     Priority:        6
     SortPriority:    0
     CaseSensitive:   false
+  - Regex:           '^<.*'
+    Priority:        7
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        8
+    SortPriority:    0
+    CaseSensitive:   false
diff --git a/ACTSTracking/ACTSDuplicateRemoval.hxx b/ACTSTracking/ACTSDuplicateRemoval.hxx
@@ -2,6 +2,7 @@
 #define ACTSDuplicateRemoval_h 1
 
 #include <EVENT/Track.h>
+
 #include <marlin/Processor.h>
 
 //! \brief Remove track duplicates

diff --git a/ACTSTracking/ACTSSeededCKFTrackingProc.hxx b/ACTSTracking/ACTSSeededCKFTrackingProc.hxx
@@ -1,10 +1,11 @@
 #ifndef ACTSSeededCKFTrackingProc_h
 #define ACTSSeededCKFTrackingProc_h 1
 
+#include <EVENT/TrackerHit.h>
+
 #include <UTIL/CellIDDecoder.h>
 
 #include <Acts/Definitions/Units.hpp>
-#include <EVENT/TrackerHit.h>
 
 #include "ACTSProcBase.hxx"
 #include "GeometryIdSelector.hxx"

diff --git a/ACTSTracking/ACTSTruthCKFTrackingProc.hxx b/ACTSTracking/ACTSTruthCKFTrackingProc.hxx
@@ -1,10 +1,11 @@
 #ifndef ACTSTruthCKFTrackingProc_h
 #define ACTSTruthCKFTrackingProc_h 1
 
+#include <EVENT/TrackerHit.h>
+
 #include <UTIL/CellIDDecoder.h>
 
 #include <Acts/Definitions/Units.hpp>
-#include <EVENT/TrackerHit.h>
 
 #include "ACTSProcBase.hxx"
 

diff --git a/ACTSTracking/ACTSTruthTrackingProc.hxx b/ACTSTracking/ACTSTruthTrackingProc.hxx
@@ -1,10 +1,11 @@
 #ifndef ACTSTruthTrackingProc_h
 #define ACTSTruthTrackingProc_h 1
 
+#include <EVENT/TrackerHit.h>
+
 #include <UTIL/CellIDDecoder.h>
 
 #include <Acts/Definitions/Units.hpp>
-#include <EVENT/TrackerHit.h>
 
 #include "ACTSProcBase.hxx"
 

diff --git a/ACTSTracking/GeometryIdMappingTool.hxx b/ACTSTracking/GeometryIdMappingTool.hxx
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <UTIL/CellIDDecoder.h>
-
 #include <EVENT/SimTrackerHit.h>
 #include <EVENT/TrackerHit.h>
+
+#include <UTIL/CellIDDecoder.h>
+
 #include <unordered_map>
 
 namespace ACTSTracking {

diff --git a/ACTSTracking/Helpers.hxx b/ACTSTracking/Helpers.hxx
@@ -1,12 +1,13 @@
 #pragma once
 
+#include <EVENT/LCEvent.h>
+#include <EVENT/Track.h>
+#include <EVENT/TrackState.h>
+
 #include <Acts/EventData/TrackParameters.hpp>
 #include <Acts/MagneticField/MagneticFieldProvider.hpp>
 #include <Acts/TrackFinding/CombinatorialKalmanFilter.hpp>
 #include <Acts/TrackFitting/KalmanFitter.hpp>
-#include <EVENT/LCEvent.h>
-#include <EVENT/Track.h>
-#include <EVENT/TrackState.h>
 
 #include "SourceLink.hxx"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # v1.1.0 (upcoming)
 	- Fix paths for running ACTSTracking outside of a release.
 	- Remove dependance on custom ACTS by configuring layer detection envelope in ACTSProcBase.
+    - Add subdetector hit numbers to Track object.
 
 # v1.0.0
 	- Initial release.
diff --git a/src/ACTSDuplicateRemoval.cxx b/src/ACTSDuplicateRemoval.cxx
@@ -1,8 +1,10 @@
 #include "ACTSDuplicateRemoval.hxx"
 
 #include <EVENT/LCCollection.h>
+
 #include <IMPL/LCCollectionVec.h>
 #include <IMPL/LCFlagImpl.h>
+
 #include <algorithm>
 
 namespace ACTSTracking {

diff --git a/src/ACTSSeededCKFTrackingProc.cxx b/src/ACTSSeededCKFTrackingProc.cxx
@@ -1,5 +1,14 @@
 #include "ACTSSeededCKFTrackingProc.hxx"
 
+#include <EVENT/MCParticle.h>
+#include <EVENT/SimTrackerHit.h>
+
+#include <IMPL/LCCollectionVec.h>
+#include <IMPL/LCFlagImpl.h>
+#include <IMPL/LCRelationImpl.h>
+#include <IMPL/TrackImpl.h>
+#include <IMPL/TrackerHitPlaneImpl.h>
+
 #include <UTIL/LCRelationNavigator.h>
 #include <UTIL/LCTrackerConf.h>
 
@@ -17,13 +26,6 @@
 #include <Acts/TrackFinding/MeasurementSelector.hpp>
 #include <Acts/TrackFitting/GainMatrixSmoother.hpp>
 #include <Acts/TrackFitting/GainMatrixUpdater.hpp>
-#include <EVENT/MCParticle.h>
-#include <EVENT/SimTrackerHit.h>
-#include <IMPL/LCCollectionVec.h>
-#include <IMPL/LCFlagImpl.h>
-#include <IMPL/LCRelationImpl.h>
-#include <IMPL/TrackImpl.h>
-#include <IMPL/TrackerHitPlaneImpl.h>
 
 using namespace Acts::UnitLiterals;
 

diff --git a/src/ACTSTruthCKFTrackingProc.cxx b/src/ACTSTruthCKFTrackingProc.cxx
@@ -1,5 +1,13 @@
 #include "ACTSTruthCKFTrackingProc.hxx"
 
+#include <EVENT/MCParticle.h>
+#include <EVENT/SimTrackerHit.h>
+
+#include <IMPL/LCCollectionVec.h>
+#include <IMPL/LCFlagImpl.h>
+#include <IMPL/LCRelationImpl.h>
+#include <IMPL/TrackerHitPlaneImpl.h>
+
 #include <UTIL/LCRelationNavigator.h>
 #include <UTIL/LCTrackerConf.h>
 
@@ -12,12 +20,6 @@
 #include <Acts/TrackFinding/MeasurementSelector.hpp>
 #include <Acts/TrackFitting/GainMatrixSmoother.hpp>
 #include <Acts/TrackFitting/GainMatrixUpdater.hpp>
-#include <EVENT/MCParticle.h>
-#include <EVENT/SimTrackerHit.h>
-#include <IMPL/LCCollectionVec.h>
-#include <IMPL/LCFlagImpl.h>
-#include <IMPL/LCRelationImpl.h>
-#include <IMPL/TrackerHitPlaneImpl.h>
 
 using namespace Acts::UnitLiterals;
 

diff --git a/src/ACTSTruthTrackingProc.cxx b/src/ACTSTruthTrackingProc.cxx
@@ -1,5 +1,14 @@
 #include "ACTSTruthTrackingProc.hxx"
 
+#include <EVENT/MCParticle.h>
+#include <EVENT/SimTrackerHit.h>
+
+#include <IMPL/LCCollectionVec.h>
+#include <IMPL/LCFlagImpl.h>
+#include <IMPL/LCRelationImpl.h>
+#include <IMPL/TrackImpl.h>
+#include <IMPL/TrackerHitPlaneImpl.h>
+
 #include <UTIL/LCRelationNavigator.h>
 #include <UTIL/LCTrackerConf.h>
 
@@ -9,13 +18,6 @@
 #include <Acts/TrackFitting/GainMatrixSmoother.hpp>
 #include <Acts/TrackFitting/GainMatrixUpdater.hpp>
 #include <Acts/TrackFitting/KalmanFitter.hpp>
-#include <EVENT/MCParticle.h>
-#include <EVENT/SimTrackerHit.h>
-#include <IMPL/LCCollectionVec.h>
-#include <IMPL/LCFlagImpl.h>
-#include <IMPL/LCRelationImpl.h>
-#include <IMPL/TrackImpl.h>
-#include <IMPL/TrackerHitPlaneImpl.h>
 
 using namespace Acts::UnitLiterals;
 

diff --git a/src/Helpers.cxx b/src/Helpers.cxx
@@ -2,6 +2,10 @@
 
 #include <IMPL/TrackImpl.h>
 #include <IMPL/TrackStateImpl.h>
+
+#include <UTIL/CellIDDecoder.h>
+#include <UTIL/LCTrackerConf.h>
+
 #include <filesystem>
 
 #include "config.h"
@@ -104,8 +108,17 @@ EVENT::Track* ACTS2Marlin_track(
   std::reverse(statesOnTrack.begin(), statesOnTrack.end());
 
   // Save hits
+  UTIL::CellIDDecoder<lcio::TrackerHit> decoder(
+      lcio::LCTrackerCellID::encoding_string());
+  EVENT::IntVec& subdetectorHitNumbers = track->subdetectorHitNumbers();
   for (EVENT::TrackerHit* hit : hitsOnTrack) {
     track->addHit(hit);
+
+    uint32_t sysid = decoder(hit)["system"];
+    if (subdetectorHitNumbers.size() <= sysid) {
+      subdetectorHitNumbers.resize(sysid + 1, 0);
+    }
+    subdetectorHitNumbers[sysid]++;
   }
 
   // Save the track states at hits

diff --git a/src/TrackTruthProc.cxx b/src/TrackTruthProc.cxx
@@ -1,12 +1,13 @@
 #include "TrackTruthProc.hxx"
 
-#include <UTIL/LCRelationNavigator.h>
-
 #include <EVENT/MCParticle.h>
 #include <EVENT/SimTrackerHit.h>
 #include <EVENT/Track.h>
+
 #include <IMPL/LCCollectionVec.h>
 
+#include <UTIL/LCRelationNavigator.h>
+
 #include "Helpers.hxx"
 
 // ----- include for verbosity dependend logging ---------