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.

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

Add Gaudi algorithm to perform MVA calibration of cluster energies #68

Merged
merged 7 commits into from
Feb 29, 2024
Merged

Add Gaudi algorithm to perform MVA calibration of cluster energies #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b104ea4
add code to perform MVA calibration of cluster energies
giovannimarchiori Feb 27, 2024
6c5d836
move find_package to main cmake file and update list of dependencies …
giovannimarchiori Feb 28, 2024
3c4bdac
implement comments from PR review
giovannimarchiori Feb 28, 2024
827f514
Merge branch 'main' into gmarchio-main-20240222
giovannimarchiori Feb 28, 2024
d29850f
implement comments from PR review
giovannimarchiori Feb 28, 2024
c0283a0
fix a couple of warnings
giovannimarchiori Feb 28, 2024
665a667
get rid of a warning from another class (not related to this PR..)
giovannimarchiori Feb 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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ find_package(k4FWCore) # implicit: Gaudi
find_package(EDM4HEP 0.10.1) # implicit: Podio
find_package(DD4hep)
find_package(k4geo)
find_package(ONNXRuntime)
#---------------------------------------------------------------


Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ source /cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh
* k4FWCore
* DD4hep
* k4geo
* ONNXRuntime


## Building
Expand Down
6 changes: 3 additions & 3 deletions RecCalorimeter/src/components/CorrectCaloClusters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ edm4hep::ClusterCollection* CorrectCaloClusters::initializeOutputClusters(
for (auto const& inCluster: *inClusters) {
auto outCluster = inCluster.clone();
verbose() << "Cluster position:" << endmsg;
verbose() << " x: " << outCluster.position().x << endmsg;
verbose() << " y: " << outCluster.position().y << endmsg;
verbose() << " z: " << outCluster.position().z << endmsg;
verbose() << " x: " << outCluster.getPosition().x << endmsg;
verbose() << " y: " << outCluster.getPosition().y << endmsg;
verbose() << " z: " << outCluster.getPosition().z << endmsg;
outClusters->push_back(outCluster);
}

Expand Down
9 changes: 8 additions & 1 deletion RecFCCeeCalorimeter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
# Package: RecFCCeeCalorimeter
################################################################################

# ONNX DEPENDENCIES
giovannimarchiori marked this conversation as resolved.
Show resolved Hide resolved
# includes
include_directories("${ONNXRUNTIME_INCLUDE_DIRS}")
# libs
link_directories("${ONNXRUNTIME_LIBRARY_DIRS}")

file(GLOB _module_sources src/components/*.cpp)
gaudi_add_module(k4RecFCCeeCalorimeterPlugins
SOURCES ${_module_sources}
Expand All @@ -16,8 +22,8 @@ gaudi_add_module(k4RecFCCeeCalorimeterPlugins
DD4hep::DDG4
ROOT::Core
ROOT::Hist
${ONNXRUNTIME_LIBRARY}
)

install(TARGETS k4RecFCCeeCalorimeterPlugins
EXPORT k4RecCalorimeterTargets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
Expand Down Expand Up @@ -51,3 +57,4 @@ add_test(NAME FCCeeLAr_benchmarkCalibration
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
)
set_test_env(FCCeeLAr_benchmarkCalibration)

Loading
Loading