From 12b509b8dad31fe26f806230820901f876c45c71 Mon Sep 17 00:00:00 2001 From: Birgit Stapf Date: Wed, 20 Nov 2024 17:46:08 +0100 Subject: [PATCH 1/4] clang format --- converter/src/DelphesEDM4HepConverter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converter/src/DelphesEDM4HepConverter.cc b/converter/src/DelphesEDM4HepConverter.cc index d4b9110..aed0fac 100644 --- a/converter/src/DelphesEDM4HepConverter.cc +++ b/converter/src/DelphesEDM4HepConverter.cc @@ -39,8 +39,8 @@ namespace k4SimDelphes { * ensure that products required by later stages are producd early enough */ constexpr std::array PROCESSING_ORDER = { - "GenParticle", "Track", "Tower", "ParticleFlowCandidate", "Muon", "Electron", "Photon", - "Jet", "MissingET", "SclalarHT"}; + "GenParticle", "Track", "Tower", "ParticleFlowCandidate", "Muon", "Electron", "Photon", + "Jet", "MissingET", "ScalarHT"}; template void sortBranchesProcessingOrder(std::vector& branches, From c43ac9e719796734ab322e2631b1ac401bab5fb6 Mon Sep 17 00:00:00 2001 From: Birgit Stapf Date: Fri, 20 Dec 2024 11:44:18 +0100 Subject: [PATCH 2/4] clangformat --- converter/src/DelphesEDM4HepConverter.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/converter/src/DelphesEDM4HepConverter.cc b/converter/src/DelphesEDM4HepConverter.cc index aed0fac..e69fb3c 100644 --- a/converter/src/DelphesEDM4HepConverter.cc +++ b/converter/src/DelphesEDM4HepConverter.cc @@ -435,11 +435,9 @@ namespace k4SimDelphes { } void DelphesEDM4HepConverter::processScalarHT(const TClonesArray* delphesCollection, std::string const& branch) { - auto* collection = createCollection(branch); + auto* collection = createCollection>(branch); auto* delphesCand = static_cast(delphesCollection->At(0)); - - auto cand = collection->create(); - cand.addToParameters(delphesCand->HT); + collection->push_back(delphesCand->HT); } template From 160d49309878ae54c26b9770ebb279099349b6fd Mon Sep 17 00:00:00 2001 From: Birgit Stapf Date: Fri, 20 Dec 2024 12:00:56 +0100 Subject: [PATCH 3/4] update doc that scalarht is now userdatacollection --- doc/output_config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/output_config.md b/doc/output_config.md index 9f064b7..0566be9 100644 --- a/doc/output_config.md +++ b/doc/output_config.md @@ -109,7 +109,7 @@ classes. For the conversion the Delphes classes are taken from the `TreeWriter` | `Electron` | `ReconstructedParticle` (subset collection) | | `Photon` | `ReconstructedParticle` (subset collection) | | `MissingET` | `ReconstructedParticle` | -| `ScalarHT` | `ParticleID` | +| `ScalarHT` | `UserDataCollection` | | `ParticleFlowCandidate` | `ReconstructedParticle` | | n/a | `RecoMCParticleLink` | From 3e7161a745318851603d42f02af8ab85fabb7f44 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Fri, 20 Dec 2024 13:10:24 +0100 Subject: [PATCH 4/4] Specify type in documentation --- doc/output_config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/output_config.md b/doc/output_config.md index 0566be9..35123b3 100644 --- a/doc/output_config.md +++ b/doc/output_config.md @@ -109,7 +109,7 @@ classes. For the conversion the Delphes classes are taken from the `TreeWriter` | `Electron` | `ReconstructedParticle` (subset collection) | | `Photon` | `ReconstructedParticle` (subset collection) | | `MissingET` | `ReconstructedParticle` | -| `ScalarHT` | `UserDataCollection` | +| `ScalarHT` | `UserDataCollection` | | `ParticleFlowCandidate` | `ReconstructedParticle` | | n/a | `RecoMCParticleLink` |