Skip to content

Flatten calo-entrant truth into calohitsmc.entrantSimIds #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zwl0331 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Flatten calo-entrant truth into calohitsmc.entrantSimIds #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e1881d
Flatten calo-entrant truth into calohitsmc.entrantSimIds
zwl0331 Jul 29, 2026
abd1e27
Verify entrant source identity via the product's CaloHitMC Ptr
zwl0331 Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions inc/CaloHitInfoMC.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace mu2e
std::vector<float> momentumIns; // list of the momentum of the SimParticle when entering in the disk
std::vector<int> simParticleIds; // list of simparticle ids
std::vector<MCRelationship> simRels; // relationship to the particle that deposited the most energy in the calo Hit
std::vector<int> entrantSimIds; // calo-entrant (shower originator) SimParticle id per deposit, aligned with simParticleIds; filled only when calo.mc.entrantTag is configured
int clusterIdx_; // Cluster index
int caloHitIdx_; // index into calohits branch, -1 if unset; calohitsmc is NOT index-aligned with calohits

Expand Down
3 changes: 2 additions & 1 deletion inc/InfoMCStructHelper.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "EventNtuple/inc/CaloClusterInfoMC.hh"
#include "EventNtuple/inc/CaloHitInfoMC.hh"
#include "EventNtuple/inc/CaloDigiMCInfo.hh"
#include "Offline/MCDataProducts/inc/CaloHitEntrant.hh"
#include "EventNtuple/inc/MCStepInfo.hh"
#include "EventNtuple/inc/MCStepSummaryInfo.hh"
#include "EventNtuple/inc/SurfaceStepInfo.hh"
Expand Down Expand Up @@ -75,7 +76,7 @@ namespace mu2e {
void fillVDInfo(KalSeed const& kseed, const KalSeedMC& kseedmc, std::vector<std::vector<MCStepInfo>>& all_vdinfos);
void fillHitInfoMCs(const KalSeed& kseed, const KalSeedMC& kseedmc, std::vector<std::vector<TrkStrawHitInfoMC>>& all_tshinfomcs);
void fillCaloClusterInfoMC(CaloClusterMC const& ccmc, std::vector<CaloClusterInfoMC>& ccimc);
void fillCaloHitInfoMC(CaloHitMC const& chmc, std::vector<CaloHitInfoMC>& chimc, int clusterIdx = -1);
void fillCaloHitInfoMC(CaloHitMC const& chmc, std::vector<CaloHitInfoMC>& chimc, int clusterIdx = -1, const CaloHitEntrant* entrant = nullptr);
void fillCaloDigiMCInfo(CaloShowerSim const& shower, std::vector<CaloDigiMCInfo>& calodigimc);
void fillCaloDigiSimInfos(CaloShowerSim const& shower, std::vector<SimInfo>& cdsis);
void fillCaloSimInfos(CaloClusterMC const& ccmc, std::vector<SimInfo>& csis);
Expand Down
30 changes: 29 additions & 1 deletion src/EventNtupleMaker_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "Offline/MCDataProducts/inc/KalSeedMC.hh"
#include "Offline/MCDataProducts/inc/CaloClusterMC.hh"
#include "Offline/MCDataProducts/inc/CaloHitMC.hh"
#include "Offline/MCDataProducts/inc/CaloHitEntrant.hh"
#include "Offline/MCDataProducts/inc/ProtonBunchTimeMC.hh"
#include "Offline/RecoDataProducts/inc/KalSeed.hh"
#include "Offline/RecoDataProducts/inc/KalSeedAssns.hh"
Expand Down Expand Up @@ -220,6 +221,7 @@ namespace mu2e {
fhicl::Atom<bool> fillDigis {Name("fillDigis"), Comment("Fill standalone calodigismc. branch")};
fhicl::Atom<bool> fillDigiSim {Name("fillDigiSim"), Comment("Fill calodigisim. branch")};
fhicl::Atom<art::InputTag> showerSimTag{Name("showerSimTag"), Comment("Tag for CaloShowerSim collection")};
fhicl::Atom<art::InputTag> entrantTag {Name("entrantTag"), Comment("Tag for CaloHitEntrantCollection (calo-entrant truth in calohitsmc.entrantSimIds); empty disables"), art::InputTag()};
};
fhicl::Table<MCConfig> mc{Name("mc"), Comment("Calorimeter MC filling options")};
};
Expand Down Expand Up @@ -366,6 +368,7 @@ namespace mu2e {
std::map<TrkFitBranchIndex, std::vector<std::vector<MCStepInfo>>> _allMCVDInfos;
art::Handle<CaloClusterMCCollection> _ccmcch;
art::Handle<CaloHitMCCollection> _chmcch;
art::Handle<CaloHitEntrantCollection> _caloEntrants;
std::map<TrkFitBranchIndex, std::vector<CaloClusterInfoMC>> _allMCTCHIs;
// hit level info branches
std::map<TrkFitBranchIndex, std::vector<std::vector<TrkStrawHitInfo>>> _allTSHIs;
Expand Down Expand Up @@ -982,8 +985,33 @@ namespace mu2e {
}
}
if(fillCaloHitsMC()){
// Optional calo-entrant truth: the CaloHitEntrantCollection is
// index-parallel to the CaloHitMCCollection by construction.
const CaloHitEntrantCollection* entrants = nullptr;
if(!_conf.calo().mc().entrantTag().empty()){
event.getByLabel(_conf.calo().mc().entrantTag(),_caloEntrants);
if(!_caloEntrants.isValid()){
throw cet::exception("EventNtuple") << "CaloHitEntrantCollection not found for entrantTag \"" << _conf.calo().mc().entrantTag().encode() << "\"\n";
}
entrants = _caloEntrants.product();
if(entrants->size() != _chmcch->size()){
throw cet::exception("EventNtuple") << "CaloHitEntrantCollection size " << entrants->size() << " != CaloHitMCCollection size " << _chmcch->size() << "\n";
}
// Source identity: each entrant carries a Ptr to the CaloHitMC it was
// computed for; require it to be entry i of the collection this fill
// iterates, so a product built from a different CaloHitMCCollection
// (or reordered) cannot be flattened silently.
for(size_t i = 0; i < entrants->size(); ++i){
const auto& hmcPtr = (*entrants)[i].caloHitMC();
if(hmcPtr.id() != _chmcch.id() || hmcPtr.key() != i){
throw cet::exception("EventNtuple") << "CaloHitEntrant " << i << " references CaloHitMC (ProductID " << hmcPtr.id() << ", key " << hmcPtr.key() << ") but this fill iterates (ProductID " << _chmcch.id() << ", key " << i << ")\n";
}
}
}
size_t entrantIdx = 0;
for(const auto& hitmc : *_chmcch.product()){
_infoMCStructHelper.fillCaloHitInfoMC(hitmc,_caloHIMCs);
_infoMCStructHelper.fillCaloHitInfoMC(hitmc,_caloHIMCs,-1,entrants ? &(*entrants)[entrantIdx] : nullptr);
++entrantIdx;
}
}
if(fillCaloClsMC()){
Expand Down
15 changes: 14 additions & 1 deletion src/InfoMCStructHelper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "Offline/MCDataProducts/inc/StepPointMC.hh"
#include "Offline/MCDataProducts/inc/SimParticle.hh"
#include "Offline/MCDataProducts/inc/MCRelationship.hh"
#include "cetlib_except/exception.h"

#include "Offline/TrackerGeom/inc/Tracker.hh"
#include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh"
Expand Down Expand Up @@ -381,9 +382,13 @@ namespace mu2e {
ccimcs.push_back(ccimc);
}

void InfoMCStructHelper::fillCaloHitInfoMC(CaloHitMC const& chmc, std::vector<CaloHitInfoMC>& chimcs, int clusterIdx) {
void InfoMCStructHelper::fillCaloHitInfoMC(CaloHitMC const& chmc, std::vector<CaloHitInfoMC>& chimcs, int clusterIdx, const CaloHitEntrant* entrant) {
CaloHitInfoMC chimc;
auto const& edeps = chmc.energyDeposits();
if (entrant != nullptr && entrant->entrants().size() != edeps.size()) {
throw cet::exception("EventNtuple") << "CaloHitEntrant has " << entrant->entrants().size()
<< " entrants but CaloHitMC has " << edeps.size() << " energy deposits\n";
}
chimc.crystalID_ = chmc.crystalID();
chimc.nsim = edeps.size();
chimc.eDep = chmc.totalEnergyDep();
Expand All @@ -393,13 +398,21 @@ namespace mu2e {
if (chimc.nsim > 0){
chimc.eprimary = edeps.front().energyDep();
chimc.tprimary = edeps.front().time();
size_t iedep = 0;
for (auto const& edep : edeps){
auto simid = edep.sim()->id().asInt();
chimc.tDeps.push_back(edep.time());
chimc.eDeps.push_back(edep.energyDep());
chimc.momentumIns.push_back(edep.momentumIn());
chimc.simParticleIds.push_back(simid);
chimc.simRels.push_back(MCRelationship(edep.sim(),edeps.front().sim()));
// entrantSimIds aligned with simParticleIds; -1 marks a deposit the
// upstream CaloEntrantTruthMaker could not resolve
if (entrant != nullptr) {
const auto& ep = entrant->entrants()[iedep];
chimc.entrantSimIds.push_back(ep.isNonnull() ? ep->id().asInt() : -1);
}
++iedep;
}
}
chimcs.push_back(chimc);
Expand Down