Change default name in more places

key4hep · Dec 3, 2024 · 25a7e82 · 25a7e82
1 parent cdac65f
commit 25a7e82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/converter/include/k4SimDelphes/DelphesEDM4HepOutputConfiguration.h b/converter/include/k4SimDelphes/DelphesEDM4HepOutputConfiguration.h
@@ -81,7 +81,7 @@ namespace k4SimDelphes {
      * Name of the RecoMCParticleLinkCollection holding the links of
      * generated to reconstructed particles.
      */
-    std::string RecoMCParticleLinkCollectionName{"MCRecoAssociations"};
+    std::string RecoMCParticleLinkCollectionName{"RecoMCLink"};
   };
 
   template <typename T> std::ostream& operator<<(std::ostream& os, std::vector<T> const& container) {
@@ -160,7 +160,7 @@ namespace k4SimDelphes {
     }
 
     settings.RecoMCParticleLinkCollectionName =
-        confReader->GetString("EDM4HepOutput::RecoMCParticleLinkCollectionName", "MCRecoAssociations");
+        confReader->GetString("EDM4HepOutput::RecoMCParticleLinkCollectionName", "RecoMCLink");
 
     return settings;
   }

diff --git a/framework/k4SimDelphes/examples/options/edm4hep_output_config.tcl b/framework/k4SimDelphes/examples/options/edm4hep_output_config.tcl
@@ -8,5 +8,5 @@ module EDM4HepOutput EDM4HepOutput {
     add MissingETCollections             MissingET
     add ScalarHTCollections              ScalarHT
     set RecoParticleCollectionName       ReconstructedParticles
-    set MCRecoAssociationCollectionName  MCRecoAssociations
+    set MCRecoAssociationCollectionName  RecoMCLink
  }
diff --git a/tests/src/compare_delphes_converter_outputs.cpp b/tests/src/compare_delphes_converter_outputs.cpp
@@ -51,9 +51,8 @@ template <typename DelphesT, typename EDM4HepT, typename MsgF, typename... MsgAr
 void assertSameKinematics(const DelphesT* delphesCand, const EDM4HepT& edm4hepCand, MsgF msgF, MsgArgs&&... msgArgs) {
   if (!compareKinematics(delphesCand, edm4hepCand)) {
     const auto& p4 = delphesCand->P4();
-    std::cerr << msgF(std::forward<MsgArgs>(msgArgs)...) << ": "
-              << "(" << p4.Px() << ", " << p4.Py() << ", " << p4.Pz() << ", " << p4.E() << ")"
-              << " vs " << k4SimDelphes::getP4(edm4hepCand) << std::endl;
+    std::cerr << msgF(std::forward<MsgArgs>(msgArgs)...) << ": " << "(" << p4.Px() << ", " << p4.Py() << ", " << p4.Pz()
+              << ", " << p4.E() << ")" << " vs " << k4SimDelphes::getP4(edm4hepCand) << std::endl;
     std::exit(1);
   }
 }
@@ -397,7 +396,7 @@ int main(int, char* argv[]) {
       return 1;
     }
 
-    auto& mcRecoAssocColl = frame.get<edm4hep::RecoMCParticleLinkCollection>("MCRecoAssociations");
+    auto& mcRecoAssocColl = frame.get<edm4hep::RecoMCParticleLinkCollection>("RecoMCLink");
 
     compareCollectionElements<Track>(tracks, recoColl, "EFlowTrack", 0, mcRecoAssocColl);
     compareCollectionElements<Tower>(ecalClusters, recoColl, "EFlowPhoton", tracks->GetEntries(), mcRecoAssocColl);