Skip to content
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.

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

Create Multiple Primary MC-Cluster Associations #1396

Merged
merged 53 commits into from
Sep 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
3c610d6
Pick highest energy contributor as cluster association
ruse-traveler Apr 23, 2024
9a17645
Use particle energy and update highest energy
ruse-traveler Apr 23, 2024
f952345
Make comment consistent
ruse-traveler Apr 23, 2024
732912e
Break contrib loop if remaining energy less than SimCaloHit energy
ruse-traveler Apr 26, 2024
8036e3b
Use max contrib energy rather than max particle energy
ruse-traveler Apr 27, 2024
8c9062c
Skip contribution if same contributor as current max
ruse-traveler Apr 27, 2024
652470d
Merge branch 'main' of github.com:eic/EICrecon into use-highest-energ…
ruse-traveler May 1, 2024
4b432a2
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler May 3, 2024
9189b45
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler May 5, 2024
080d9ae
Rewrite association logic to extend search for biggest contributor ac…
ruse-traveler May 5, 2024
4d4b14c
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler Jun 6, 2024
ab1d88f
Pass collection to association method
ruse-traveler Jun 6, 2024
98ffb61
Make association for each contributing primary
ruse-traveler Jun 17, 2024
067e867
Clean up
ruse-traveler Jun 17, 2024
08b6a24
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler Jun 17, 2024
d5e5983
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 17, 2024
d3ad8d2
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler Aug 26, 2024
706226e
Merge branch 'use-highest-energy-contributor-for-cluster-association'…
ruse-traveler Aug 26, 2024
dd338aa
Add hooks for MCRecoCalorimeterHitAssociations
ruse-traveler Aug 26, 2024
a55634c
Make bookkeepers local
ruse-traveler Aug 26, 2024
d89ed74
Perpare for using hit associations in associate function
ruse-traveler Aug 29, 2024
9ae46b7
Fill in logic for identifying associated sim hits and grabbing primaries
ruse-traveler Aug 30, 2024
e401065
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler Aug 30, 2024
a8c3bdd
Update detector plugins
ruse-traveler Aug 30, 2024
975c222
Clean up
ruse-traveler Aug 30, 2024
731645d
Fix compile errors
ruse-traveler Aug 30, 2024
5bdeb5d
Report association weight in debug messages
ruse-traveler Aug 30, 2024
67ac96a
Make empty collection message more descriptive
ruse-traveler Aug 30, 2024
1c374a5
Use unsigned ints for bookkeeping
ruse-traveler Aug 30, 2024
7a557f1
Create sim hit vector in scope
ruse-traveler Aug 30, 2024
4c5c685
Use hit equality rather than checking Cell IDs
ruse-traveler Aug 30, 2024
0fb25df
Bug fix: add missing EDM4eicVersion.h include
ruse-traveler Sep 3, 2024
6ccc2c7
Remove unnecessary index
ruse-traveler Sep 3, 2024
520fe55
Update comment verbosity
ruse-traveler Sep 3, 2024
24be02f
Make comments more descriptive
ruse-traveler Sep 3, 2024
f51e452
Use count and remove unncessary insert
ruse-traveler Sep 3, 2024
3d20137
Remove unnecessary return
ruse-traveler Sep 3, 2024
a2b9e88
Have get_primary return MCParticle instead of modifying by reference
ruse-traveler Sep 3, 2024
a103d18
Use vector of sim hits instead indices
ruse-traveler Sep 3, 2024
12991e1
Key map-to-contribution on MCParticles, remove other now unnecessary …
ruse-traveler Sep 3, 2024
c621a29
Clean up: make preprocessor directive cleaner
ruse-traveler Sep 3, 2024
ce3e327
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler Sep 9, 2024
8129698
rm unused var
veprbl Sep 9, 2024
0bb21fa
IWYU
veprbl Sep 9, 2024
6755fce
add back SimCalorimeterHitCollection.h
veprbl Sep 10, 2024
6c397b6
add unit test for associations
veprbl Sep 11, 2024
af805d5
add ifdefs
veprbl Sep 11, 2024
4303fe1
IWYU
veprbl Sep 11, 2024
a371e3d
Merge branch 'main' into use-highest-energy-contributor-for-cluster-a…
ruse-traveler Sep 12, 2024
58d02e4
remove ASCII art
veprbl Sep 17, 2024
21b7701
update copyright
veprbl Sep 17, 2024
4965649
std::tie for variable name readability
veprbl Sep 17, 2024
8504160
modify get_primary() routine to stop at first generator particle
veprbl Sep 17, 2024
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
2 changes: 1 addition & 1 deletion src/algorithms/calorimetry/CalorimeterClusterRecoCoG.cc
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ edm4hep::MCParticle CalorimeterClusterRecoCoG::get_primary(const edm4hep::CaloHi
// can be improved!!
edm4hep::MCParticle primary = contributor;
while (primary.parents_size() > 0) {
if (primary.getGeneratorStatus() != 0) break;
primary = primary.getParents(0);
if (primary.getGeneratorStatus() == 1) break;
veprbl marked this conversation as resolved.
Show resolved Hide resolved
}
return primary;
}
Expand Down
Loading