Skip to content

Split vector<MCRelationship> branches for uproot #387

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

Open
AndrewEdmonds11 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Split vector<MCRelationship> branches for uproot #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion inc/CaloClusterInfoMC.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ namespace mu2e
float eprimary; // primary particle true energy in this cluster
float tprimary; // primary particle average time
std::vector<int> simParticleIds; // list of simparticle ids
std::vector<MCRelationship> simRels; // relationship to the particle that deposited the most energy in the calo cluster
std::vector<int8_t> simRelRels; // relationship to the particle that deposited the most energy in the calo cluster (see MCRelationship for more details)
std::vector<int8_t> simRelRems; // distance of relationship to the particle that deposited the most energy in the calo cluster (see MCRelationship for more details)
std::vector<int> hits_; // vector of branch indices of hits in the cluster
MCRelationship prel; // relationship of the cluster primary particle to the event primary
CaloClusterInfoMC() : nsim(0), etot(0.0), tavg(0.0), eprimary(0.0), tprimary(0.0){}
Expand Down
3 changes: 2 additions & 1 deletion inc/CaloDigiMCInfo.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ namespace mu2e
std::vector<float> tDeps; // list of times of energy deposits
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 digi
std::vector<int8_t> simRelRels; // relationship to the particle that deposited the most energy in the calo digi (see MCRelationship for more details)
std::vector<int8_t> simRelRems; // distance of relationship to the particle that deposited the most energy in the calo digi (see MCRelationship for more details)
int caloHitIdx_; // CaloHit index
int crystalID_; // Crystal ID from CaloShowerSim
int diskID_; // Offline disk ID number
Expand Down
4 changes: 3 additions & 1 deletion inc/CaloHitInfoMC.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ namespace mu2e
std::vector<float> tDeps; // list of times of energy deposits
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<int8_t> simRelRels; // relationship to the particle that deposited the most energy in the calo hit (see MCRelationship for more details)
std::vector<int8_t> simRelRems; // distance of relationship to the particle that deposited the most energy in the calo hit (see MCRelationship for more details)

int clusterIdx_; // Cluster index
int caloHitIdx_; // index into calohits branch, -1 if unset; calohitsmc is NOT index-aligned with calohits

Expand Down
14 changes: 11 additions & 3 deletions src/InfoMCStructHelper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,9 @@ namespace mu2e {
ccimc.tavg += edep.time();
auto simid = edep.sim()->id().asInt();
ccimc.simParticleIds.push_back(simid);
ccimc.simRels.push_back(MCRelationship(edep.sim(),edeps.front().sim()));
MCRelationship simRel(edep.sim(),edeps.front().sim());
ccimc.simRelRels.push_back(simRel.relationship());
ccimc.simRelRems.push_back(simRel.removal());
}
ccimc.tavg /= ccimc.nsim;
}
Expand All @@ -399,7 +401,10 @@ namespace mu2e {
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()));
MCRelationship simRel(edep.sim(),edeps.front().sim());
chimc.simRelRels.push_back(simRel.relationship());
chimc.simRelRems.push_back(simRel.removal());

}
}
chimcs.push_back(chimc);
Expand Down Expand Up @@ -439,7 +444,10 @@ namespace mu2e {
calodigimc.eDeps.push_back(step->energyDepG4());
calodigimc.momentumIns.push_back(step->momentumIn());
calodigimc.simParticleIds.push_back(simid);
calodigimc.simRels.push_back(MCRelationship(step->simParticle(),steps.front()->simParticle()));
MCRelationship simRel(step->simParticle(),steps.front()->simParticle());
calodigimc.simRelRels.push_back(simRel.relationship());
calodigimc.simRelRems.push_back(simRel.removal());

}
}
}
Expand Down