Don't use radiusOfInnermostHit for EDM4hep tracks

and compute it from hits when going from EDM4hep to LCIO. See key4hep/EDM4hep#326
key4hep · Jun 20, 2024 · edb9c9b · edb9c9b
1 parent 7ab25a5
commit edb9c9b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.ipp b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.ipp
@@ -1,6 +1,8 @@
 #include "k4EDM4hep2LcioConv/MappingUtils.h"
 
 #include <cassert>
+#include <cmath>
+#include <limits>
 
 namespace EDM4hep2LCIOConv {
 
@@ -23,7 +25,15 @@ std::unique_ptr<lcio::LCCollectionVec> convertTracks(const edm4hep::TrackCollect
       lcio_tr->setNdf(edm_tr.getNdf());
       lcio_tr->setdEdx(edm_tr.getDEdx());
       lcio_tr->setdEdxError(edm_tr.getDEdxError());
-      lcio_tr->setRadiusOfInnermostHit(edm_tr.getRadiusOfInnermostHit());
+      double radius = std::numeric_limits<double>::max();
+      for (const auto& hit : edm_tr.getTrackerHits()) {
+        radius = std::min(radius, std::sqrt(hit.getPosition()[0] * hit.getPosition()[0] +
+                                            hit.getPosition()[1] * hit.getPosition()[1]));
+      }
+      if (radius == std::numeric_limits<double>::max()) {
+        radius = 0;
+      }
+      lcio_tr->setRadiusOfInnermostHit(radius);
 
       // Loop over the hit Numbers in the track
       lcio_tr->subdetectorHitNumbers().resize(edm_tr.subdetectorHitNumbers_size());

diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.ipp b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.ipp
@@ -348,7 +348,6 @@ std::unique_ptr<edm4hep::TrackCollection> convertTracks(const std::string& name,
     lval.setNdf(rval->getNdf());
     lval.setDEdx(rval->getdEdx());
     lval.setDEdxError(rval->getdEdxError());
-    lval.setRadiusOfInnermostHit(rval->getRadiusOfInnermostHit());
 
     auto subdetectorHitNum = rval->getSubdetectorHitNumbers();
     for (auto hitNum : subdetectorHitNum) {

diff --git a/tests/src/CompareEDM4hepLCIO.cc b/tests/src/CompareEDM4hepLCIO.cc
@@ -3,6 +3,7 @@
 
 #include "IMPL/TrackerHitImpl.h"
 
+#include <cmath>
 #include <cstdint>
 
 /**
@@ -312,7 +313,17 @@ bool compare(const EVENT::Track* lcioElem, const edm4hep::Track& edm4hepElem, co
   ASSERT_COMPARE_VALS(lcioElem->getdEdx(), dxQuantities[0].value, "dEdx in DxQuantities in Track");
   ASSERT_COMPARE_VALS(lcioElem->getdEdxError(), dxQuantities[0].error, "dEdxError in DxQuantities in Track");
 
-  ASSERT_COMPARE(lcioElem, edm4hepElem, getRadiusOfInnermostHit, "radiusOfInnermostHit in Track");
+  double radius = std::numeric_limits<double>::max();
+  for (const auto& hit : edm4hepElem.getTrackerHits()) {
+    radius = std::min(
+        radius, std::sqrt(hit.getPosition()[0] * hit.getPosition()[0] + hit.getPosition()[1] * hit.getPosition()[1]));
+  }
+  if (radius == std::numeric_limits<double>::max()) {
+    radius = 0;
+  }
+    ASSERT_COMPARE_VALS_FLOAT(lcioElem->getRadiusOfInnermostHit(), radius, lcioElem->getRadiusOfInnermostHit() / 1e6,
+                              "radiusOfInnermostHit in Track");
+  }
 
   ASSERT_COMPARE_RELATION(lcioElem, edm4hepElem, getTracks, objectMaps.tracks, "Tracks in Track");
 

diff --git a/tests/src/ComparisonUtils.h b/tests/src/ComparisonUtils.h
@@ -118,6 +118,12 @@ bool compareValuesNanSafe(LCIO lcioV, EDM4hepT edm4hepV, const std::string& msg)
     return false;                                                                                                      \
   }
 
+#define ASSERT_COMPARE_VALS_FLOAT(lcioV, edm4hepV, tol, msg)                                                           \
+  if (std::abs(lcioV - edm4hepV) > tol) {                                                                              \
+    std::cerr << msg << " (LCIO: " << (lcioV) << ", EDM4hep: " << (edm4hepV) << ")" << std::endl;                      \
+    return false;                                                                                                      \
+  }
+
 #define ASSERT_COMPARE(lcioE, edm4hepE, func, msg)                                                                     \
   {                                                                                                                    \
     const auto lcioV = lcioE->func();                                                                                  \

diff --git a/tests/src/EDM4hep2LCIOUtilities.cc b/tests/src/EDM4hep2LCIOUtilities.cc
@@ -199,7 +199,6 @@ edm4hep::TrackCollection createTracks(const int num_elements, const int subdetec
     elem.setType(2); // TODO specific type
     elem.setChi2(i * 10.f);
     elem.setNdf(i * 12);
-    elem.setRadiusOfInnermostHit(i * 5.f);
 
     elem.setDEdx(i);
     elem.setDEdxError(i / std::sqrt(i + 1));