Merge pull request #36525 from fabiocos/fc-mtdtracking

MTD reconstruction: Implementation of MTDTrayBarrelLayer::groupedCompatibleDets()
cms-sw · Dec 19, 2021 · 0e96354 · 0e96354
2 parents d6e4d7d + 2374b32
commit 0e96354
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/RecoMTD/DetLayers/src/MTDDetTray.cc b/RecoMTD/DetLayers/src/MTDDetTray.cc
@@ -129,8 +129,14 @@ vector<GeometricSearchDet::DetWithState> MTDDetTray::compatibleDets(const Trajec
 vector<DetGroup> MTDDetTray::groupedCompatibleDets(const TrajectoryStateOnSurface& startingState,
                                                    const Propagator& prop,
                                                    const MeasurementEstimator& est) const {
-  // FIXME should return only 1 group
-  edm::LogError("MTDDetLayers") << "dummy implementation of MTDDetTray::groupedCompatibleDets()";
+  vector<GeometricSearchDet::DetWithState> detWithStates;
+
+  detWithStates = compatibleDets(startingState, prop, est);
+
   vector<DetGroup> result;
+  if (!detWithStates.empty()) {
+    result.push_back(DetGroup(detWithStates));
+  }
+  LogTrace("MTDDetLayers") << "MTDdetTray Compatible modules: " << result.size();
   return result;
 }
diff --git a/RecoMTD/DetLayers/src/MTDTrayBarrelLayer.cc b/RecoMTD/DetLayers/src/MTDTrayBarrelLayer.cc
@@ -163,9 +163,16 @@ vector<GeometricSearchDet::DetWithState> MTDTrayBarrelLayer::compatibleDets(
 vector<DetGroup> MTDTrayBarrelLayer::groupedCompatibleDets(const TrajectoryStateOnSurface& startingState,
                                                            const Propagator& prop,
                                                            const MeasurementEstimator& est) const {
-  // FIXME should return only 1 group
-  edm::LogError("MTDDetLayers") << "dummy implementation of MTDTrayBarrelLayer::groupedCompatibleDets()";
-  return vector<DetGroup>();
+  vector<GeometricSearchDet::DetWithState> detWithStates;
+
+  detWithStates = compatibleDets(startingState, prop, est);
+
+  vector<DetGroup> result;
+  if (!detWithStates.empty()) {
+    result.push_back(DetGroup(detWithStates));
+  }
+  LogTrace("MTDDetLayers") << "MTDTrayBarrelLayer Compatible rods: " << result.size();
+  return result;
 }
 
 GeomDetEnumerators::SubDetector MTDTrayBarrelLayer::subDetector() const { return theBasicComps.front()->subDetector(); }