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

Photon Gradient Boosted Tree Filter #216

Merged
merged 48 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
660ecc1
Added #include <fmt/ranges.h>
Gregtom3 May 7, 2024
7307377
Version of hipo changed
Gregtom3 May 7, 2024
116b328
Base start for the integration of PhotonGBT
Gregtom3 May 15, 2024
80002ed
Changed banks for PhotonGBT input
Gregtom3 May 15, 2024
84b14e3
Ability to now read data from the calo banks
Gregtom3 May 15, 2024
83cbec3
GetMass() function added
Gregtom3 May 16, 2024
fe934ba
More nearest neighbor logic
Gregtom3 May 16, 2024
1b8b52a
Completed loading of nearest neighbor information
Gregtom3 May 16, 2024
b35c7a7
Photon Model now has RGA, RGC compatibility. Also appended new info t…
Gregtom3 May 17, 2024
28caac4
float --> double for the threshold
Gregtom3 May 17, 2024
8f5dab4
Removed unnecessary debug statements. Added options for the photon ML…
Gregtom3 May 17, 2024
f910120
Added photon gbt validator
Gregtom3 May 17, 2024
6e4dfb7
Description
Gregtom3 May 17, 2024
26a29bb
Merge branch 'main' into greg-dev
Gregtom3 May 17, 2024
e56e690
Comments, and needs root
Gregtom3 May 17, 2024
d011c91
Merge branch 'greg-dev' of https://github.com/Gregtom3/iguana into gr…
Gregtom3 May 17, 2024
d18d127
Update src/iguana/algorithms/clas12/PhotonGBTFilter.cc
Gregtom3 May 20, 2024
f589635
Capture variables in lambda
Gregtom3 May 20, 2024
dbc7f02
Additions to CODEOWNERS
Gregtom3 May 20, 2024
de347c8
Reshuffling of calo_row_data, likely useful for other algorithms
Gregtom3 May 20, 2024
95c1e3b
Merge remote-tracking branch 'origin/main' into greg-dev
c-dilks May 21, 2024
967bc64
refactor: move everything to its own dir, following PR #206
c-dilks May 21, 2024
29814fa
Rename
Gregtom3 May 21, 2024
20f988b
Rename in meson
Gregtom3 May 21, 2024
4614dfc
Update CODEOWNERS
Gregtom3 May 22, 2024
80a2bba
Update CODEOWNERS
Gregtom3 May 22, 2024
623df41
Update meson.build
Gregtom3 May 22, 2024
fadb4b7
Removed photon-ML example
Gregtom3 May 22, 2024
7ab9788
Update src/iguana/algorithms/clas12/PhotonGBTFilter/Algorithm.cc
Gregtom3 May 22, 2024
ed5342b
Update src/iguana/algorithms/clas12/PhotonGBTFilter/Validator.cc
Gregtom3 May 22, 2024
0c24ef9
Removed meson.build line for photon-ML example
Gregtom3 May 22, 2024
1f599ec
Shuffled location of #include <fmt/ranges.h>
Gregtom3 May 22, 2024
183c2e0
Moved calo_row_data into PhotonGBTFilter
Gregtom3 May 22, 2024
10cd2e3
FillHistograms private
Gregtom3 May 22, 2024
c075b0a
Merge branch 'main' into greg-dev
Gregtom3 May 22, 2024
b8381bf
Cleaned up Validator
Gregtom3 May 22, 2024
1f57568
Merge branch 'greg-dev' of https://github.com/Gregtom3/iguana into gr…
Gregtom3 May 22, 2024
563accd
Reading in threshold and pass from GetOptionScalar
Gregtom3 May 22, 2024
c4823e4
Major bug fixes in ML input data structure, new pass1 and pass2 model…
Gregtom3 May 23, 2024
fca1f7f
Update src/iguana/algorithms/clas12/PhotonGBTFilter/Algorithm.cc
Gregtom3 May 23, 2024
7bb33e5
Public-->Private methods, dropping of particle_type_map
Gregtom3 May 23, 2024
50f59fd
Clang off for models
Gregtom3 May 23, 2024
292af90
Simplified usage of calo_map by pulling elements first
Gregtom3 May 23, 2024
1e89d3a
Moving calo_row_data to private
Gregtom3 May 23, 2024
fb02933
Swapped order of algorithms
Gregtom3 May 24, 2024
f20edf3
Comments about particleBank loops
Gregtom3 May 28, 2024
1c54f8c
Calo bank getRows comment
Gregtom3 May 28, 2024
2de3bb0
Merge branch 'main' into greg-dev
c-dilks May 28, 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: 2 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# @c-dilks Christopher Dilks
# @RichCap Richard Capobianco
# @rtysonCLAS12 Richard Tyson
# @Gregtom3 Gregory Matousek
#################################################################################

* @c-dilks
Expand All @@ -13,3 +14,4 @@ src/iguana/algorithms/clas12/ZVertexFilter/* @rtysonCLAS12
src/iguana/algorithms/clas12/SectorFinder/* @rtysonCLAS12
src/iguana/algorithms/clas12/FTEnergyCorrection/* @asligonulacar
src/iguana/services/YAMLReader.* @rtysonCLAS12 @c-dilks
src/iguana/algorithms/clas12/PhotonGBTFilter/* @Gregtom3
1 change: 1 addition & 0 deletions src/iguana/algorithms/Algorithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <hipo4/bank.h>


#include "iguana/algorithms/AlgorithmBoilerplate.h"
#include "iguana/services/Object.h"
#include "iguana/services/YAMLReader.h"
Expand Down
52 changes: 38 additions & 14 deletions src/iguana/algorithms/TypeDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,66 @@ namespace iguana {
/// 3-vector container type
using vector3_t = std::tuple<vector_element_t, vector_element_t, vector_element_t>;
/// 4-vector container type
using vector4_t = std::tuple<vector_element_t, vector_element_t, vector_element_t, vector_element_t>;
using vector4_t = std::tuple<vector_element_t, vector_element_t, vector_element_t, vector_element_t>;

/// Light-weight namespace for particle constants
namespace particle {
// clang-format off

/// PDG codes
enum PDG {
electron = 11,
pi_plus = 211,
pi_minus = -211,
proton = 2212
electron = 11,
photon = 22,
proton = 2212,
antiproton = -2212,
neutron = 2112,
antineutron = -2112,
pi_plus = 211,
pi_minus = -211,
kaon_plus = 321,
kaon_minus = -321
};

/// Particle names
const std::unordered_map<PDG, std::string> name{
{ electron, "electron" },
{ pi_plus, "pi_plus" },
{ photon, "photon" },
{ proton, "proton" },
{ antiproton, "antiproton" },
{ neutron, "neutron" },
{ antineutron, "antineutron" },
{ pi_plus, "pi_plus" },
{ pi_minus, "pi_minus" },
{ proton, "proton" }
{ kaon_plus, "kaon_plus" },
{ kaon_minus, "kaon_minus" }
};

/// Particle titles
const std::unordered_map<PDG, std::string> title{
{ electron, "e^{-}" },
{ pi_plus, "#pi^{+}" },
{ electron, "e^{-}" },
{ photon, "#gamma" },
{ proton, "p" },
{ antiproton, "#bar{p}" },
{ neutron, "n" },
{ antineutron, "#bar{n}" },
{ pi_plus, "#pi^{+}" },
{ pi_minus, "#pi^{-}" },
{ proton, "p" }
{ kaon_plus, "K^{+}" },
{ kaon_minus, "K^{-}" }
};

/// Particle mass in GeV
const std::unordered_map<PDG, double> mass{
{ electron, 0.00051099895000 },
{ pi_plus, 0.13957039 },
{ pi_minus, 0.13957039 },
{ proton, 0.93827208816 }
{ electron, 0.000511 },
{ photon, 0.0 },
{ proton, 0.938272 },
{ antiproton, 0.938272 },
{ neutron, 0.939565 },
{ antineutron, 0.939565 },
{ pi_plus, 0.139570 },
{ pi_minus, 0.139570 },
{ kaon_plus, 0.493677 },
{ kaon_minus, 0.493677 }
};

// clang-format on
Expand Down
Loading
Loading