From 018fa1805ef7a73cce703184c84021dfbcf24560 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Sat, 23 May 2026 11:27:31 -0500 Subject: [PATCH] activate and cleanup TrkDiag cmake --- CMakeLists.txt | 1 + TrkDiag/CMakeLists.txt | 36 ++++++++++++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa6bfa5..d2b4385 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,5 +24,6 @@ include(ArtDictionary) include(BuildPlugins) add_subdirectory(CrvInference) +add_subdirectory(TrkDiag) cet_cmake_config() diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index fa07979..4b78e9b 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -18,7 +18,7 @@ cet_make_library( cet_build_plugin(BinnedSpectrumWeight art::module REG_SOURCE src/BinnedSpectrumWeight_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::ConfigTools Offline::MCDataProducts @@ -29,7 +29,7 @@ cet_build_plugin(BinnedSpectrumWeight art::module cet_build_plugin(BkgDiag art::module REG_SOURCE src/BkgDiag_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::DataProducts Offline::GeometryService @@ -40,7 +40,7 @@ cet_build_plugin(BkgDiag art::module cet_build_plugin(ComboHitDiag art::module REG_SOURCE src/ComboHitDiag_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::GeometryService Offline::MCDataProducts @@ -52,7 +52,7 @@ cet_build_plugin(ComboHitDiag art::module cet_build_plugin(HelixDiag art::module REG_SOURCE src/HelixDiag_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::BFieldGeom Offline::GeneralUtilities @@ -67,7 +67,7 @@ cet_build_plugin(HelixDiag art::module cet_build_plugin(ProtonBunchTimeDiag art::module REG_SOURCE src/ProtonBunchTimeDiag_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::DataProducts Offline::MCDataProducts @@ -77,7 +77,7 @@ cet_build_plugin(ProtonBunchTimeDiag art::module cet_build_plugin(RMCWeight art::module REG_SOURCE src/RMCWeight_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::ConfigTools Offline::MCDataProducts @@ -88,14 +88,14 @@ cet_build_plugin(RMCWeight art::module cet_build_plugin(RobustMultiHelixAnalyzer art::module REG_SOURCE src/RobustMultiHelixAnalyzer_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag ) cet_build_plugin(StrawHitDiag art::module REG_SOURCE src/StrawHitDiag_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::DataProducts Offline::GeometryService Offline::MCDataProducts @@ -108,7 +108,7 @@ cet_build_plugin(StrawHitDiag art::module cet_build_plugin(StrawResponseTest art::module REG_SOURCE src/StrawResponseTest_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::ProditionsService Offline::TrackerConditions @@ -117,7 +117,7 @@ cet_build_plugin(StrawResponseTest art::module cet_build_plugin(TimeClusterDiag art::module REG_SOURCE src/TimeClusterDiag_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::CalorimeterGeom Offline::GeneralUtilities @@ -130,7 +130,7 @@ cet_build_plugin(TimeClusterDiag art::module cet_build_plugin(TrackPID art::module REG_SOURCE src/TrackPID_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::CalorimeterGeom Offline::GeometryService @@ -141,7 +141,7 @@ cet_build_plugin(TrackPID art::module cet_build_plugin(TrackQuality art::module REG_SOURCE src/TrackQuality_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::AnalysisConditions Offline::GlobalConstantsService @@ -154,7 +154,7 @@ cet_build_plugin(TrackQuality art::module cet_build_plugin(TrkGeomTest art::module REG_SOURCE src/TrkGeomTest_module.cc LIBRARIES REG - Offline::TrkDiag + ArtAnalysis::TrkDiag Offline::GeometryService Offline::ProditionsService @@ -166,15 +166,11 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - Offline::TrkDiag + ArtAnalysis::TrkDiag ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrkCaloHitPID.weights.xml ${CURRENT_BINARY_DIR} data/TrkCaloHitPID.weights.xml COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) - -install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkDiag) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ArtAnalysis/TrkDiag) install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkDiag/fcl) +install_fhicl(SUBDIRS fcl SUBDIRNAME ArtAnalysis/TrkDiag/fcl)