diff --git a/CMakeLists.txt b/CMakeLists.txt index 329d7b072..078a1919f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,20 +17,25 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR) # cmake_policy(VERSION 3.19) find_package(cetmodules 3.24.01 REQUIRED) -#project(icaruscode VERSION 10.20.09 LANGUAGES CXX) -set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 10.20.09p01) -project(icaruscode LANGUAGES CXX) +# Version tag will be always stored in ${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING +# (which is a special MRB provision to support free(r) version string forms which CMake does not) +# and also propagated to CMake's version when the format is compatible +set(ProjectName "icaruscode") +set(${ProjectName}_CMAKE_PROJECT_VERSION_STRING "10.20.09p01") # this is our project version! + +if ( "${${ProjectName}_CMAKE_PROJECT_VERSION_STRING}" MATCHES "^[0-9]+(\\.[0-9]+(\\.[0-9]+(\\.[0-9]+)?)?)?$" ) + set(OptionalVersionArg VERSION "${${ProjectName}_CMAKE_PROJECT_VERSION_STRING}") +endif() +project(${ProjectName} ${OptionalVersionArg} LANGUAGES CXX) +unset(ProjectName) +unset(OptionalVersionArg) message(STATUS "\n-- =============================================================================" - "\n-- === *** Start of configuration of ${PROJECT_NAME} ***" - "\n-- ===") - -# cetbuildtools contains our cmake modules -#find_package(cetbuildtools REQUIRED) - -#list(APPEND CMAKE_MODULE_PATH $ENV{CANVAS_ROOT_IO_DIR}/Modules $ENV{ART_DIR}/Modules ) + "\n-- === *** Start of configuration of ${PROJECT_NAME} ${${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING} ***" + "\n-- ===" + ) include(CetCMakeEnv) cet_cmake_env() @@ -115,7 +120,6 @@ message(STATUS "\n-- ===" "\n-- === *** End of configuration of ${PROJECT_NAME} ***" "\n-- =============================================================================" - "\n-- SQLITE3: ${SQLITE3}" "\n-- " ) diff --git a/icaruscode/Analysis/CMakeLists.txt b/icaruscode/Analysis/CMakeLists.txt index c3a4af189..310a69d35 100644 --- a/icaruscode/Analysis/CMakeLists.txt +++ b/icaruscode/Analysis/CMakeLists.txt @@ -41,17 +41,17 @@ set( MODULE_LIBRARIES Eigen3::Eigen ) -cet_build_plugin(AnalysisTree art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(HitEfficiencyAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSPurityDQM art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(RawDigitAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TPCPurityInfoAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TPCPurityMonitor art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(AnalysisTree art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(HitEfficiencyAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSPurityDQM art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(RawDigitAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TPCPurityInfoAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TPCPurityMonitor art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) set_property(SOURCE TPCPurityMonitor_module.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) -cet_build_plugin(ThroughgoingmuonAnalyzer art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(ThroughgoingmuonAnalyzer art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) set_property(SOURCE ThroughgoingmuonAnalyzer_module.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) -cet_build_plugin(TrackHitAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(WireAna art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(TrackHitAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(WireAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) #install_headers() install_fhicl() diff --git a/icaruscode/Analysis/overburden/CMakeLists.txt b/icaruscode/Analysis/overburden/CMakeLists.txt index 8e580a70a..5d1af3ca0 100644 --- a/icaruscode/Analysis/overburden/CMakeLists.txt +++ b/icaruscode/Analysis/overburden/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_build_plugin(OBAnaICARUS art::module LIBRARIES +cet_build_plugin(OBAnaICARUS art::module LIBRARIES PRIVATE larcorealg::Geometry larcore::Geometry_Geometry_service larsim::Simulation diff --git a/icaruscode/Analysis/tools/BasicRawDigitAnalysis_tool.cc b/icaruscode/Analysis/tools/BasicRawDigitAnalysis_tool.cc index 23d8026d6..afb2bc34f 100755 --- a/icaruscode/Analysis/tools/BasicRawDigitAnalysis_tool.cc +++ b/icaruscode/Analysis/tools/BasicRawDigitAnalysis_tool.cc @@ -10,7 +10,7 @@ #include "messagefacility/MessageLogger/MessageLogger.h" #include "larcore/Geometry/WireReadout.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "lardataalg/DetectorInfo/DetectorClocks.h" #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "larevt/CalibrationDBI/Interface/DetPedestalService.h" diff --git a/icaruscode/Analysis/tools/BasicWireAnalysis_tool.cc b/icaruscode/Analysis/tools/BasicWireAnalysis_tool.cc index 1e986f922..da9fe9bc2 100755 --- a/icaruscode/Analysis/tools/BasicWireAnalysis_tool.cc +++ b/icaruscode/Analysis/tools/BasicWireAnalysis_tool.cc @@ -14,7 +14,7 @@ #include "larevt/CalibrationDBI/Interface/DetPedestalProvider.h" #include "larreco/HitFinder/HitFinderTools/IWaveformTool.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "TH1.h" #include "TH2.h" diff --git a/icaruscode/Analysis/tools/CMakeLists.txt b/icaruscode/Analysis/tools/CMakeLists.txt index e2d75716e..826df5f0b 100644 --- a/icaruscode/Analysis/tools/CMakeLists.txt +++ b/icaruscode/Analysis/tools/CMakeLists.txt @@ -6,6 +6,8 @@ set( TOOL_LIBRARIES lardataobj::Simulation lardataalg::DetectorInfo icaruscode::TPC_SignalProcessing_RawDigitFilter_Algorithms + larreco::WaveformTool + sbnobj::ICARUS_TPC larcorealg::Geometry larcore::Geometry_Geometry_service lardata::RecoObjects @@ -34,18 +36,18 @@ set( TOOL_LIBRARIES FFTW3::FFTW3 ) -cet_build_plugin(BasicHitAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(BasicRawDigitAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(BasicTrackAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(BasicWireAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(HitEfficiencyAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(HitFinderAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE HitFinderAnalysis_tool.cc) +cet_build_plugin(BasicHitAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(BasicRawDigitAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(BasicTrackAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(BasicWireAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(HitEfficiencyAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(HitFinderAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) set_property(SOURCE HitFinderAnalysis_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) -cet_build_plugin(SpacePointAnalysisMC art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE SpacePointAnalysisMC_tool.cc) +cet_build_plugin(SpacePointAnalysisMC art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) set_property(SOURCE SpacePointAnalysisMC_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) -cet_build_plugin(SpacePointAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE SpacePointAnalysis_tool.cc) +cet_build_plugin(SpacePointAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) set_property(SOURCE SpacePointAnalysis_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) -cet_build_plugin(TrackHitEfficiencyAnalysis art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE TrackHitEfficiencyAnalysis_tool.cc) +cet_build_plugin(TrackHitEfficiencyAnalysis art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) set_property(SOURCE TrackHitEfficiencyAnalysis_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) install_headers() diff --git a/icaruscode/Analysis/tools/MCTruth/CMakeLists.txt b/icaruscode/Analysis/tools/MCTruth/CMakeLists.txt index 3f97aa003..49630ed98 100644 --- a/icaruscode/Analysis/tools/MCTruth/CMakeLists.txt +++ b/icaruscode/Analysis/tools/MCTruth/CMakeLists.txt @@ -58,9 +58,9 @@ set(TOOL_LIBRARIES lardataobj::RecoBase CLHEP::Random ) -cet_build_plugin(AssociationsTruth art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(BackTrackerTruth art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(MCTruthTestAna art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(AssociationsTruth art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(BackTrackerTruth art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(MCTruthTestAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() install_source() diff --git a/icaruscode/Analysis/trigger/CMakeLists.txt b/icaruscode/Analysis/trigger/CMakeLists.txt index 5a5c9e3af..02b680bbe 100644 --- a/icaruscode/Analysis/trigger/CMakeLists.txt +++ b/icaruscode/Analysis/trigger/CMakeLists.txt @@ -16,7 +16,7 @@ art_make_library( ) cet_build_plugin(TimedTrackSelector art::module - LIBRARIES + LIBRARIES PRIVATE icarusalg::Utilities lardataobj::AnalysisBase lardataobj::RecoBase @@ -25,7 +25,7 @@ cet_build_plugin(TimedTrackSelector art::module ) cet_build_plugin(TimedTrackSelectorCRT art::module - LIBRARIES + LIBRARIES PRIVATE icarusalg::Utilities lardataobj::AnalysisBase lardataobj::RecoBase @@ -34,7 +34,7 @@ cet_build_plugin(TimedTrackSelectorCRT art::module ) cet_build_plugin(BeamGateInfoFromTracks art::module - LIBRARIES + LIBRARIES PRIVATE lardataobj::Simulation lardataobj::AnalysisBase lardataobj::RecoBase @@ -42,7 +42,7 @@ cet_build_plugin(BeamGateInfoFromTracks art::module ) cet_build_plugin(BeamGateInfoFromTracksCRT art::module - LIBRARIES + LIBRARIES PRIVATE lardataobj::Simulation lardataobj::AnalysisBase lardataobj::RecoBase @@ -50,7 +50,7 @@ cet_build_plugin(BeamGateInfoFromTracksCRT art::module ) cet_build_plugin(TimeTrackTreeStorage art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode_Analysis_trigger icaruscode_PMT_Algorithms icaruscode_Decode_DataProducts @@ -72,7 +72,7 @@ cet_build_plugin(TimeTrackTreeStorage art::module ) cet_build_plugin(TimeTrackTreeStorageCRT art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::Analysis_trigger icaruscode_CRTUtils icaruscode::PMT_Algorithms diff --git a/icaruscode/CRT/CMakeLists.txt b/icaruscode/CRT/CMakeLists.txt index f3bb9c332..71801e435 100644 --- a/icaruscode/CRT/CMakeLists.txt +++ b/icaruscode/CRT/CMakeLists.txt @@ -22,7 +22,7 @@ art_make_library( ) cet_build_plugin(CRTDetSim art::module - LIBRARIES + LIBRARIES PRIVATE larcorealg::Geometry sbnobj::ICARUS_CRT sbnobj::Common_CRT @@ -38,7 +38,7 @@ cet_build_plugin(CRTDetSim art::module ) cet_build_plugin(CRTSimHitProducer art::module - LIBRARIES + LIBRARIES PRIVATE larcorealg::Geometry sbnobj::ICARUS_CRT sbnobj::Common_CRT @@ -54,7 +54,7 @@ cet_build_plugin(CRTSimHitProducer art::module ) cet_build_plugin( CRTTrueHitProducer art::module - LIBRARIES + LIBRARIES PRIVATE larcorealg::Geometry sbnobj::ICARUS_CRT sbnobj::Common_CRT @@ -75,7 +75,7 @@ cet_build_plugin( CRTTrueHitProducer art::module ) cet_build_plugin(CRTTrackProducer art::module - LIBRARIES + LIBRARIES PRIVATE larcorealg::Geometry sbnobj::ICARUS_CRT sbnobj::Common_CRT @@ -92,7 +92,7 @@ cet_build_plugin(CRTTrackProducer art::module ) cet_build_plugin(CRTSimAnalysis art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils @@ -112,7 +112,7 @@ cet_build_plugin(CRTSimAnalysis art::module ) cet_build_plugin(CRTDataAnalysis art::module - LIBRARIES + LIBRARIES PRIVATE artdaq_core::artdaq-core_Data sbnobj::ICARUS_CRT sbnobj::Common_CRT @@ -133,7 +133,7 @@ cet_build_plugin(CRTDataAnalysis art::module ) cet_build_plugin(CRTCalibrationAnalysis art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::Common_CRT icaruscode_CRTUtils larcore::Geometry_Geometry_service @@ -153,7 +153,7 @@ cet_build_plugin(CRTCalibrationAnalysis art::module cet_build_plugin(CrtOpHitMatchAnalysis art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils @@ -172,7 +172,7 @@ cet_build_plugin(CrtOpHitMatchAnalysis art::module ) cet_build_plugin(CRTPMTMatchingAna art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils @@ -193,7 +193,7 @@ cet_build_plugin(CRTPMTMatchingAna art::module ) cet_build_plugin(CRTPMTMatchingProducer art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::Common_CRT icaruscode::CRTUtils larcore::Geometry_Geometry_service @@ -205,7 +205,7 @@ cet_build_plugin(CRTPMTMatchingProducer art::module ) cet_build_plugin(CRTTruthMatchAnalysis art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils @@ -225,7 +225,7 @@ cet_build_plugin(CRTTruthMatchAnalysis art::module ) cet_build_plugin( CRTAutoVeto art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils @@ -252,7 +252,7 @@ cet_build_plugin( CRTAutoVeto art::module ) cet_build_plugin( FlashResAna art::module - LIBRARIES + LIBRARIES PRIVATE larcore::Geometry_Geometry_service larcorealg::Geometry nusimdata::SimulationBase @@ -277,7 +277,7 @@ cet_build_plugin( FlashResAna art::module ) cet_build_plugin( PhotBackground art::module - LIBRARIES + LIBRARIES PRIVATE larcore::Geometry_Geometry_service larcorealg::Geometry nusimdata::SimulationBase @@ -300,7 +300,7 @@ cet_build_plugin( PhotBackground art::module ) cet_build_plugin(CRTTPCMatchingAna art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils @@ -329,10 +329,11 @@ cet_build_plugin(CRTTPCMatchingAna art::module ROOT::RooFit ROOT::RooFitCore ) -simple_plugin(CRTTPCTruthEff module +cet_build_plugin(CRTTPCTruthEff art::module + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT - icaruscode_CRTUtils + icaruscode::CRTUtils larcorealg::Geometry larcore::Geometry_Geometry_service larsim::Simulation lardataobj::Simulation @@ -361,7 +362,7 @@ simple_plugin(CRTTPCTruthEff module ) cet_build_plugin(CRTT0Tagging art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::IcarusObj icaruscode_CRTMatchingUtils icaruscode_CRTUtils diff --git a/icaruscode/CRT/CRTDecoder/CMakeLists.txt b/icaruscode/CRT/CRTDecoder/CMakeLists.txt index 7d4a8d814..342744766 100644 --- a/icaruscode/CRT/CRTDecoder/CMakeLists.txt +++ b/icaruscode/CRT/CRTDecoder/CMakeLists.txt @@ -103,7 +103,7 @@ install_headers() install_source() cet_build_plugin( BernCRTAna art::module - LIBRARIES + LIBRARIES PRIVATE art::Framework_Services_Registry art_root_io::tfile_support art_root_io::TFileService_service @@ -115,7 +115,7 @@ cet_build_plugin( BernCRTAna art::module ) cet_build_plugin( CrtNoiseMonTool art::module - LIBRARIES + LIBRARIES PRIVATE art::Framework_Services_Registry art_root_io::tfile_support art_root_io::TFileService_service @@ -126,7 +126,7 @@ cet_build_plugin( CrtNoiseMonTool art::module ) cet_build_plugin( CrtCalAnalysis art::module - LIBRARIES + LIBRARIES PRIVATE art::Framework_Services_Registry art_root_io::tfile_support art_root_io::TFileService_service @@ -138,7 +138,7 @@ cet_build_plugin( CrtCalAnalysis art::module ) cet_build_plugin( AnaProducer art::module - LIBRARIES + LIBRARIES PRIVATE art::Framework_Services_Registry art_root_io::tfile_support art_root_io::TFileService_service @@ -153,7 +153,7 @@ cet_build_plugin( AnaProducer art::module ) cet_build_plugin( CRTEventProducer art::module - LIBRARIES + LIBRARIES PRIVATE art::Framework_Services_Registry art_root_io::tfile_support art_root_io::TFileService_service @@ -169,7 +169,7 @@ cet_build_plugin( CRTEventProducer art::module ) cet_build_plugin( DecoderICARUSCRT art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode_Utilities art::Framework_Services_Registry art_root_io::tfile_support diff --git a/icaruscode/CRT/CRTLegacyCode/CMakeLists.txt b/icaruscode/CRT/CRTLegacyCode/CMakeLists.txt index 26bceb946..a83c6c0e1 100644 --- a/icaruscode/CRT/CRTLegacyCode/CMakeLists.txt +++ b/icaruscode/CRT/CRTLegacyCode/CMakeLists.txt @@ -1,5 +1,5 @@ cet_build_plugin(CRTTzeroProducer art::module - LIBRARIES + LIBRARIES PRIVATE larcorealg::Geometry sbnobj::ICARUS_CRT sbnobj::Common_CRT @@ -15,7 +15,7 @@ cet_build_plugin(CRTTzeroProducer art::module ) cet_build_plugin(CRTT0Matching art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::Common_CRT icaruscode_CRTUtils larcore::Geometry_Geometry_service @@ -52,7 +52,7 @@ cet_build_plugin(CRTT0Matching art::module cet_build_plugin(CRTT0MatchingAna art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_CRT sbnobj::Common_CRT icaruscode_CRTUtils diff --git a/icaruscode/Decode/CMakeLists.txt b/icaruscode/Decode/CMakeLists.txt index 906e433ba..92d29f217 100644 --- a/icaruscode/Decode/CMakeLists.txt +++ b/icaruscode/Decode/CMakeLists.txt @@ -28,13 +28,13 @@ set( MODULE_LIBRARIES Eigen3::Eigen ) -cet_build_plugin(DaqDecoderICARUSTPC art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(DaqDecoderICARUSTPCwROI art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(DaqDecoderICARUSTrigger art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterNoiseICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(MCDecoderICARUSTPCwROI art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(DaqDecoderICARUSTPC art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(DaqDecoderICARUSTPCwROI art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(DaqDecoderICARUSTrigger art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterNoiseICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(MCDecoderICARUSTPCwROI art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) -cet_build_plugin(DaqDecoderICARUSPMT art::module LIBRARIES +cet_build_plugin(DaqDecoderICARUSPMT art::module LIBRARIES PRIVATE icaruscode::Timing icaruscode::Decode_DecoderTools_Dumpers icaruscode::Decode_DecoderTools @@ -56,7 +56,7 @@ cet_build_plugin(DaqDecoderICARUSPMT art::module LIBRARIES lardata::Utilities ) -cet_build_plugin(PMTconfigurationExtraction art::module LIBRARIES +cet_build_plugin(PMTconfigurationExtraction art::module LIBRARIES PRIVATE icaruscode::Decode_DecoderTools sbnobj::Common_PMT_Data sbnobj::Common_Trigger @@ -65,7 +65,7 @@ cet_build_plugin(PMTconfigurationExtraction art::module LIBRARIES cetlib_except::cetlib_except ) -cet_build_plugin(TriggerConfigurationExtraction art::module LIBRARIES +cet_build_plugin(TriggerConfigurationExtraction art::module LIBRARIES PRIVATE icaruscode_Decode_DecoderTools icaruscode_Decode_DataProducts art::Framework_Services_Registry @@ -73,7 +73,7 @@ cet_build_plugin(TriggerConfigurationExtraction art::module LIBRARIES cetlib_except::cetlib_except ) -cet_build_plugin(DumpPMTconfiguration art::module LIBRARIES +cet_build_plugin(DumpPMTconfiguration art::module LIBRARIES PRIVATE sbnobj::Common_PMT_Data lardataobj::RawData messagefacility::MF_MessageLogger @@ -82,14 +82,14 @@ cet_build_plugin(DumpPMTconfiguration art::module LIBRARIES ) -cet_build_plugin(DumpTriggerConfiguration art::module LIBRARIES +cet_build_plugin(DumpTriggerConfiguration art::module LIBRARIES PRIVATE icaruscode_Decode_DataProducts messagefacility::MF_MessageLogger fhiclcpp::fhiclcpp cetlib_except::cetlib_except ) -cet_build_plugin(DumpArtDAQfragments art::module LIBRARIES +cet_build_plugin(DumpArtDAQfragments art::module LIBRARIES PRIVATE icaruscode::Decode_DecoderTools_Dumpers larcorealg::headers artdaq_core::artdaq-core_Data @@ -98,7 +98,7 @@ cet_build_plugin(DumpArtDAQfragments art::module LIBRARIES cetlib_except::cetlib_except ) -cet_build_plugin(DumpTrigger art::module LIBRARIES +cet_build_plugin(DumpTrigger art::module LIBRARIES PRIVATE sbnobj::Common_Trigger lardataobj::Simulation lardataobj::RawData @@ -108,7 +108,7 @@ cet_build_plugin(DumpTrigger art::module LIBRARIES lardataalg::DetectorInfo ) -cet_build_plugin(CopyDaqICARUSTPC art::module LIBRARIES +cet_build_plugin(CopyDaqICARUSTPC art::module LIBRARIES PRIVATE sbnobj::Common_Trigger artdaq_core::artdaq-core_Data messagefacility::MF_MessageLogger @@ -116,7 +116,7 @@ cet_build_plugin(CopyDaqICARUSTPC art::module LIBRARIES cetlib_except::cetlib_except ) -cet_build_plugin(OverlayProducts art::module LIBRARIES +cet_build_plugin(OverlayProducts art::module LIBRARIES PRIVATE icaruscode::Timing sbnobj::Common_PMT_Data larcore::Geometry_Geometry_service diff --git a/icaruscode/Decode/ChannelMapping/CMakeLists.txt b/icaruscode/Decode/ChannelMapping/CMakeLists.txt index 770b8d084..86b2fb7a3 100644 --- a/icaruscode/Decode/ChannelMapping/CMakeLists.txt +++ b/icaruscode/Decode/ChannelMapping/CMakeLists.txt @@ -4,7 +4,7 @@ art_make_library( EXCLUDE "ChannelMapDumper.cxx" LIBRARIES icarusalg::Utilities - larcorealg::CoreUtils + larcorealg::headers art::Framework_Services_Registry fhiclcpp::fhiclcpp messagefacility::MF_MessageLogger @@ -33,7 +33,7 @@ art_make_library( ) cet_build_plugin(ICARUSChannelMapSQLite art::service - LIBRARIES + LIBRARIES PRIVATE icaruscode::Decode_ChannelMapping art::Framework_Principal messagefacility::MF_MessageLogger @@ -41,7 +41,7 @@ cet_build_plugin(ICARUSChannelMapSQLite art::service ) cet_build_plugin(ICARUSChannelMapPostGres art::service - LIBRARIES + LIBRARIES PRIVATE icaruscode::Decode_ChannelMapping art::Framework_Principal messagefacility::MF_MessageLogger diff --git a/icaruscode/Decode/ChannelMapping/Legacy/CMakeLists.txt b/icaruscode/Decode/ChannelMapping/Legacy/CMakeLists.txt index db2b982fc..e6ca3e508 100644 --- a/icaruscode/Decode/ChannelMapping/Legacy/CMakeLists.txt +++ b/icaruscode/Decode/ChannelMapping/Legacy/CMakeLists.txt @@ -1,6 +1,7 @@ cet_enable_asserts() art_make_library( + EXCLUDE "ICARUSChannelMap.cc" LIBRARIES icaruscode::Decode_ChannelMapping art::Utilities @@ -11,18 +12,18 @@ art_make_library( ) cet_build_plugin(ChannelMapSQLite art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode::Decode_ChannelMapping ) cet_build_plugin(ChannelMapPostGres art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode::Decode_ChannelMapping ) cet_build_plugin(ICARUSChannelMap art::service - LIBRARIES - icaruscode::Decode_ChannelMapping_Legacy + LIBRARIES PUBLIC icaruscode::Decode_ChannelMapping_Legacy # service interface + LIBRARIES PRIVATE icaruscode::Decode_ChannelMapping art::Framework_Principal messagefacility::MF_MessageLogger diff --git a/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.cc b/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.cc new file mode 100644 index 000000000..c88f65dbc --- /dev/null +++ b/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.cc @@ -0,0 +1,34 @@ +/** + * @file icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.cc + * @brief Wrapper service for `icarusDB::ICARUSChannelMapProvider`. + * @author Gianluca Petrillo (petrillo@slac.stanford.edu) + */ + +#include "icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.h" +#include "icaruscode/Decode/ChannelMapping/RunPeriods.h" // RunPeriod::Runs0to2 + +// framework libraries +#include "art/Framework/Services/Registry/ActivityRegistry.h" +#include "messagefacility/MessageLogger/MessageLogger.h" + + +// ----------------------------------------------------------------------------- +icarusDB::ICARUSChannelMap::ICARUSChannelMap + (const fhicl::ParameterSet& pset, art::ActivityRegistry& reg) + : ICARUSChannelMapProvider(pset) +{ + reg.sPreBeginRun.watch(this, &ICARUSChannelMap::preBeginRun); + forPeriod(RunPeriod::Runs0to2); // prepare for some run, in case anybody asks +} + + +// ----------------------------------------------------------------------------- +void icarusDB::ICARUSChannelMap::preBeginRun(art::Run const& run) { + if (forRun(run.run())) { + mf::LogDebug{ "ICARUSChannelMap" } + << "Loaded mapping for run " << run.run(); + } +} + + +// ----------------------------------------------------------------------------- diff --git a/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.h b/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.h new file mode 100644 index 000000000..90ee3e1ab --- /dev/null +++ b/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.h @@ -0,0 +1,71 @@ +/** + * @file icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.h + * @brief Wrapper service for `icarusDB::ICARUSChannelMapProvider`. + * @author Gianluca Petrillo (petrillo@slac.stanford.edu) + */ + +#ifndef ICARUSCODE_DECODE_CHANNELMAPPING_LEGACY_ICARUSCHANNELMAP_H +#define ICARUSCODE_DECODE_CHANNELMAPPING_LEGACY_ICARUSCHANNELMAP_H + +#include "icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMapProvider.h" + +// framework libraries +#include "art/Framework/Services/Registry/ActivityRegistry.h" +// #include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" +#include "art/Framework/Principal/Run.h" +#include "fhiclcpp/ParameterSet.h" +#include "cetlib_except/exception.h" + + +// ----------------------------------------------------------------------------- +namespace icarusDB { class ICARUSChannelMap; } +/** + * @brief LArSoft service for ICARUS channel mapping (legacy implementation). + * + * This service provides access to ICARUS channel mapping database, using a + * backend in a _art_ tool chosen by the configuration. + * + * This service implements the generic channel mapping access service provider + * interface `icarusDB::IICARUSChannelMapProvider`. + * To use the channel mapping, include in your code the header of the service + * interface `icarusDB::IICARUSChannelMap`, and access the service provider via: + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} + * icarusDB::IICARUSChannelMapProvider const& channelMapping + * = *lar::providerFrom(); + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * or similar (`lar::providerFrom()` is in `larcore/CoreUtils/ServiceUtils.h`) + * or directly the service via + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} + * icarusDB::IICARUSChannelMapProvider const& channelMapping + * = *art::ServiceHandle(); + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * + * For details on the interface, see `icarusDB::IICARUSChannelMapProvider`. + * For details on the implementation, see + * `icarusDB::ICARUSChannelMapProvider`. + * + * @note For production and processes that need robustness, using the SQLite + * database and backend (`icarusDB::ICARUSChannelMapSQLite`) is suggested + * instead. That database is local to the process and not subject to + * network interruptions. + * + */ +class icarusDB::ICARUSChannelMap: public ICARUSChannelMapProvider { + + /// Prepares the mapping for the specified run. + void preBeginRun(art::Run const& run); + + public: + + ICARUSChannelMap(const fhicl::ParameterSet& pset, art::ActivityRegistry& reg); + +}; // class icarusDB::ICARUSChannelMap + + +// ----------------------------------------------------------------------------- +// DECLARE_ART_SERVICE_INTERFACE_IMPL(icarusDB::ICARUSChannelMap, icarusDB::IICARUSChannelMap, SHARED) + + +// ----------------------------------------------------------------------------- + +#endif // ICARUSCODE_DECODE_CHANNELMAPPING_LEGACY_ICARUSCHANNELMAP_H diff --git a/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap_service.cc b/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap_service.cc index 0fccd0f4a..2cf7aad0e 100644 --- a/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap_service.cc +++ b/icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap_service.cc @@ -1,86 +1,12 @@ /** - * @file icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap_service.cc - * @brief Wrapper service for `icarusDB::ICARUSChannelMapProvider`. + * @file icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.cc + * @brief Service registration for `icarusDB::ICARUSChannelMap` service. * @author Gianluca Petrillo (petrillo@slac.stanford.edu) */ -#include "icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMapProvider.h" -#include "icaruscode/Decode/ChannelMapping/RunPeriods.h" - -// framework libraries -#include "art/Framework/Services/Registry/ActivityRegistry.h" +#include "icaruscode/Decode/ChannelMapping/Legacy/ICARUSChannelMap.h" #include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" #include "art/Framework/Services/Registry/ServiceDeclarationMacros.h" -#include "art/Framework/Principal/Run.h" -#include "messagefacility/MessageLogger/MessageLogger.h" -#include "fhiclcpp/ParameterSet.h" -#include "cetlib_except/exception.h" - - -// ----------------------------------------------------------------------------- -namespace icarusDB { class ICARUSChannelMap; } -/** - * @brief LArSoft service for ICARUS channel mapping (legacy implementation). - * - * This service provides access to ICARUS channel mapping database, using a - * backend in a _art_ tool chosen by the configuration. - * - * This service implements the generic channel mapping access service provider - * interface `icarusDB::IICARUSChannelMapProvider`. - * To use the channel mapping, include in your code the header of the service - * interface `icarusDB::IICARUSChannelMap`, and access the service provider via: - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} - * icarusDB::IICARUSChannelMapProvider const& channelMapping - * = *lar::providerFrom(); - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * or similar (`lar::providerFrom()` is in `larcore/CoreUtils/ServiceUtils.h`) - * or directly the service via - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} - * icarusDB::IICARUSChannelMapProvider const& channelMapping - * = *art::ServiceHandle(); - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * For details on the interface, see `icarusDB::IICARUSChannelMapProvider`. - * For details on the implementation, see - * `icarusDB::ICARUSChannelMapProvider`. - * - * @note For production and processes that need robustness, using the SQLite - * database and backend (`icarusDB::ICARUSChannelMapSQLite`) is suggested - * instead. That database is local to the process and not subject to - * network interruptions. - * - */ -class icarusDB::ICARUSChannelMap: public ICARUSChannelMapProvider { - - /// Prepares the mapping for the specified run. - void preBeginRun(art::Run const& run); - - public: - - ICARUSChannelMap(const fhicl::ParameterSet& pset, art::ActivityRegistry& reg); - -}; // class icarusDB::ICARUSChannelMap - - -// ----------------------------------------------------------------------------- -// --- Implementation -// ----------------------------------------------------------------------------- -icarusDB::ICARUSChannelMap::ICARUSChannelMap - (const fhicl::ParameterSet& pset, art::ActivityRegistry& reg) - : ICARUSChannelMapProvider(pset) -{ - reg.sPreBeginRun.watch(this, &ICARUSChannelMap::preBeginRun); - forPeriod(RunPeriod::Runs0to2); // prepare for some run, in case anybody asks -} - - -// ----------------------------------------------------------------------------- -void icarusDB::ICARUSChannelMap::preBeginRun(art::Run const& run) { - if (forRun(run.run())) { - mf::LogDebug{ "ICARUSChannelMap" } - << "Loaded mapping for run " << run.run(); - } -} // ----------------------------------------------------------------------------- diff --git a/icaruscode/Decode/DecoderTools/CMakeLists.txt b/icaruscode/Decode/DecoderTools/CMakeLists.txt index 9d58722ca..6edcb5c7f 100644 --- a/icaruscode/Decode/DecoderTools/CMakeLists.txt +++ b/icaruscode/Decode/DecoderTools/CMakeLists.txt @@ -58,16 +58,16 @@ set( TOOL_LIBRARIES Boost::program_options ) -cet_build_plugin(FakeParticle art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TPCDecoderFilter1D art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TPCDecoderFilter2D art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TPCDecoder art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TPCNoiseFilter1D art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TPCNoiseFilterCanny art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TriggerDecoder art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TriggerDecoderV2 art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TriggerDecoderV3 art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(TriggerDecoderDispatcher art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(FakeParticle art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TPCDecoderFilter1D art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TPCDecoderFilter2D art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TPCDecoder art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TPCNoiseFilter1D art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TPCNoiseFilterCanny art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TriggerDecoder art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TriggerDecoderV2 art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TriggerDecoderV3 art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(TriggerDecoderDispatcher art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) diff --git a/icaruscode/Decode/DecoderTools/FakeParticle_tool.cc b/icaruscode/Decode/DecoderTools/FakeParticle_tool.cc index 91a1f10b7..a05e6901a 100644 --- a/icaruscode/Decode/DecoderTools/FakeParticle_tool.cc +++ b/icaruscode/Decode/DecoderTools/FakeParticle_tool.cc @@ -21,7 +21,7 @@ #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" // ICARUS package includes -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "icaruscode/Decode/DecoderTools/IFakeParticle.h" #include "icarus_signal_processing/Filters/ICARUSFFT.h" diff --git a/icaruscode/Filters/CMakeLists.txt b/icaruscode/Filters/CMakeLists.txt index 2cc1cbf31..229479b9c 100644 --- a/icaruscode/Filters/CMakeLists.txt +++ b/icaruscode/Filters/CMakeLists.txt @@ -38,16 +38,16 @@ set( MODULE_LIBRARIES ROOT::GenVector ROOT::Tree ) -cet_build_plugin(FilterNeutrinosActiveVolume art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterNumberTPCHits art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterDataIntegrity art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterOpFlash art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterParticlesActiveVolume art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TriggerTypeFilter art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterCRTPMTMatching art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterDirts art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(SimEnergyDepFakeTriggerFilterICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FilterMCTruthVolume art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(FilterNeutrinosActiveVolume art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterNumberTPCHits art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterDataIntegrity art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterOpFlash art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterParticlesActiveVolume art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TriggerTypeFilter art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterCRTPMTMatching art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterDirts art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(SimEnergyDepFakeTriggerFilterICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FilterMCTruthVolume art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) # install_headers() install_fhicl() diff --git a/icaruscode/Generators/CMakeLists.txt b/icaruscode/Generators/CMakeLists.txt index d3d863b50..54eb31f0e 100644 --- a/icaruscode/Generators/CMakeLists.txt +++ b/icaruscode/Generators/CMakeLists.txt @@ -7,7 +7,7 @@ #include_directories ( . ) cet_build_plugin(HepMCFileGen art::module - LIBRARIES larcorealg::Geometry + LIBRARIES PRIVATE larcorealg::Geometry larcore::Geometry_Geometry_service lardataobj::RecoBase lardataobj::AnalysisBase diff --git a/icaruscode/Geometry/CMakeLists.txt b/icaruscode/Geometry/CMakeLists.txt index 9f0e4a443..f8450cdc4 100644 --- a/icaruscode/Geometry/CMakeLists.txt +++ b/icaruscode/Geometry/CMakeLists.txt @@ -26,6 +26,6 @@ set( TOOL_LIBRARIES ) -cet_build_plugin(AuxDetGeoObjectSorterICARUS art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(GeoObjectSorterPMTasTPC art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(WireReadoutICARUS art::service LIBRARIES ${SERVICE_LIBRARIES}) +cet_build_plugin(AuxDetGeoObjectSorterICARUS art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(GeoObjectSorterPMTasTPC art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(WireReadoutICARUS art::service LIBRARIES PRIVATE ${SERVICE_LIBRARIES}) diff --git a/icaruscode/Overlays/CMakeLists.txt b/icaruscode/Overlays/CMakeLists.txt index f42d8d6b7..ad0f8f88b 100644 --- a/icaruscode/Overlays/CMakeLists.txt +++ b/icaruscode/Overlays/CMakeLists.txt @@ -15,8 +15,7 @@ link_directories( $ENV{LARWIRECELL_LIB} ) cet_build_plugin( SimInfoOverlayFilter art::EDFilter - LIBRARIES - PRIVATE + LIBRARIES PRIVATE larcoreobj::SummaryData lardataobj::Simulation nusimdata::SimulationBase @@ -25,8 +24,7 @@ cet_build_plugin( cet_build_plugin( SubRunPOTInEvent art::EDProducer - LIBRARIES - PRIVATE + LIBRARIES PRIVATE larcoreobj::SummaryData ) diff --git a/icaruscode/PMT/CMakeLists.txt b/icaruscode/PMT/CMakeLists.txt index 4265812a8..95968124f 100644 --- a/icaruscode/PMT/CMakeLists.txt +++ b/icaruscode/PMT/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory(Calibration) # cet_set_compiler_flags(EXTRA_CXX_FLAGS -mavx) cet_build_plugin(SimPMTIcarus art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_Algorithms lardataobj::RawData lardataobj::Simulation @@ -35,7 +35,7 @@ cet_build_plugin(SimPMTIcarus art::module ) cet_build_plugin(OpDetWaveformMetaMaker art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Algorithms lardataalg::DetectorInfo lardataobj::RawData @@ -44,7 +44,7 @@ cet_build_plugin(OpDetWaveformMetaMaker art::module ) cet_build_plugin(PMTWaveformBaselines art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_Algorithms sbnobj::ICARUS_PMT_Data larcore::Geometry_Geometry_service @@ -60,7 +60,7 @@ cet_build_plugin(PMTWaveformBaselines art::module ) cet_build_plugin(PMTWaveformBaselinesFromReadoutConfiguration art::module - LIBRARIES + LIBRARIES PRIVATE sbnobj::ICARUS_PMT_Data sbnobj::Common_PMT_Data larcore::Geometry_Geometry_service @@ -76,7 +76,7 @@ cet_build_plugin(PMTWaveformBaselinesFromReadoutConfiguration art::module ) cet_build_plugin(PMTWaveformBaselinesFromChannelData art::module - LIBRARIES + LIBRARIES PRIVATE icarusalg::PMT_Algorithms sbnobj::ICARUS_PMT_Data sbnobj::Common_PMT_Data @@ -93,29 +93,29 @@ cet_build_plugin(PMTWaveformBaselinesFromChannelData art::module ) cet_build_plugin(AsymGaussPulseFunctionTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_Algorithms ) cet_build_plugin(AsymExpPulseFunctionTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_Algorithms ) cet_build_plugin(SampledWaveformFunctionTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_Algorithms icaruscode_Decode_DecoderTools ) cet_build_plugin(CustomPulseFunctionTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_Algorithms ROOT::Hist ) cet_build_plugin(PMTconstantPedestalGeneratorTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Algorithms lardata::DetectorInfoServices_DetectorClocksServiceStandard_service lardataalg::DetectorInfo @@ -123,7 +123,7 @@ cet_build_plugin(PMTconstantPedestalGeneratorTool art::tool ) cet_build_plugin(PMTgausNoiseGeneratorTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Algorithms lardata::DetectorInfoServices_DetectorClocksServiceStandard_service lardataalg::DetectorInfo @@ -131,7 +131,7 @@ cet_build_plugin(PMTgausNoiseGeneratorTool art::tool ) cet_build_plugin(PMTfastGausNoiseGeneratorTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Algorithms lardata::DetectorInfoServices_DetectorClocksServiceStandard_service lardataalg::DetectorInfo @@ -139,7 +139,7 @@ cet_build_plugin(PMTfastGausNoiseGeneratorTool art::tool ) cet_build_plugin(PMTnoNoiseGeneratorTool art::tool - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Algorithms lardata::DetectorInfoServices_DetectorClocksServiceStandard_service lardataalg::DetectorInfo @@ -147,7 +147,7 @@ cet_build_plugin(PMTnoNoiseGeneratorTool art::tool ) cet_build_plugin(CopyBeamTimePMTwaveforms art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Data icarusalg::Utilities sbnobj::ICARUS_PMT_Data @@ -157,7 +157,7 @@ cet_build_plugin(CopyBeamTimePMTwaveforms art::module ) cet_build_plugin(SimPMTreadout art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Algorithms lardataalg::DetectorInfo lardataobj::RawData @@ -233,15 +233,15 @@ set( MODULE_LIBRARIES ROOT::Tree Boost::system ) -cet_build_plugin(OpHitFinderICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(PMTStartCalibTime art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(PMTcoordinates art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(PhotonPropogationICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TrigInfo art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(wvfAnaicarus art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(OpHitFinderICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(PMTStartCalibTime art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(PMTcoordinates art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(PhotonPropogationICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TrigInfo art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(wvfAnaicarus art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) cet_build_plugin(RequireOnBeamWaveforms art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::IcarusObj icarusalg::Utilities lardata::DetectorInfoServices_DetectorClocksServiceStandard_service @@ -256,7 +256,7 @@ cet_build_plugin(RequireOnBeamWaveforms art::module ) cet_build_plugin(ReassociatePMTbaselines art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::IcarusObj icaruscode::PMT_Algorithms icaruscode::PMT_Data diff --git a/icaruscode/PMT/Calibration/CMakeLists.txt b/icaruscode/PMT/Calibration/CMakeLists.txt index c4317a71e..ae25c5365 100644 --- a/icaruscode/PMT/Calibration/CMakeLists.txt +++ b/icaruscode/PMT/Calibration/CMakeLists.txt @@ -2,11 +2,11 @@ add_subdirectory(CaloTools) add_subdirectory(fcl) cet_build_plugin(PMTLaserCalibration art::module - LIBRARIES - icaruscode_PMT_Algorithms - icaruscode_PMT_Calibration_CaloTools - icaruscode_IcarusObj - lardataobj::RawData + LIBRARIES PRIVATE + icaruscode::PMT_Algorithms + icaruscode::PMT_Calibration_CaloTools + icaruscode::IcarusObj + lardataobj::RawData lardataobj::Simulation lardataobj::RecoBase art::Framework_Core @@ -24,9 +24,9 @@ cet_build_plugin(PMTLaserCalibration art::module ) cet_build_plugin(PMTBackgroundphotonsCalibration art::module - LIBRARIES - icaruscode_PMT_Algorithms - icaruscode_PMT_Calibration_CaloTools + LIBRARIES PRIVATE + icaruscode::PMT_Algorithms + icaruscode::PMT_Calibration_CaloTools lardataobj::RawData lardataobj::Simulation lardataobj::RecoBase @@ -45,13 +45,13 @@ cet_build_plugin(PMTBackgroundphotonsCalibration art::module ) -art_make_exec( NAME +cet_make_exec( NAME fitPulseDistribution SOURCE fitPulseDistribution.cc LIBRARIES - icaruscode_PMT_Algorithms - icaruscode_PMT_Calibration_CaloTools + icaruscode::PMT_Algorithms + icaruscode::PMT_Calibration_CaloTools ) diff --git a/icaruscode/PMT/LibraryMappingTools/CMakeLists.txt b/icaruscode/PMT/LibraryMappingTools/CMakeLists.txt index 7879c95d7..a2ce54504 100644 --- a/icaruscode/PMT/LibraryMappingTools/CMakeLists.txt +++ b/icaruscode/PMT/LibraryMappingTools/CMakeLists.txt @@ -16,7 +16,7 @@ art_make_library( Boost::system ) -cet_build_plugin(ICARUSPhotonMappingTransformations art::tool LIBRARIES +cet_build_plugin(ICARUSPhotonMappingTransformations art::tool LIBRARIES PRIVATE icaruscode::PMT_LibraryMappingTools larsim::PhotonMappingTransformations ) diff --git a/icaruscode/PMT/OpReco/CMakeLists.txt b/icaruscode/PMT/OpReco/CMakeLists.txt index 129cd515f..48e6888f5 100644 --- a/icaruscode/PMT/OpReco/CMakeLists.txt +++ b/icaruscode/PMT/OpReco/CMakeLists.txt @@ -1,5 +1,5 @@ cet_build_plugin(ICARUSOpHitFinder art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode_PMT_OpReco_Algorithms larana::OpticalDetector_OpHitFinder larcore::Geometry_Geometry_service @@ -51,18 +51,18 @@ set( MODULE_LIBRARIES ROOT::Core ROOT::Tree ) -cet_build_plugin(FakeFlash art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FakePhotoS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FullOpHitFinder art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSFlashAssAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSMCOpFlash art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSMCOpHit art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSOpFlashAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSOpHitAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSOpHitTuple art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSParticleAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TPCPMTBarycenterMatchProducer art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSBeamStructureAna art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(FakeFlash art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FakePhotoS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FullOpHitFinder art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSFlashAssAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSMCOpFlash art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSMCOpHit art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSOpFlashAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSOpHitAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSOpHitTuple art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSParticleAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TPCPMTBarycenterMatchProducer art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSBeamStructureAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() diff --git a/icaruscode/PMT/OpReco/FlashFinder/CMakeLists.txt b/icaruscode/PMT/OpReco/FlashFinder/CMakeLists.txt index c2650c8f8..b63f266bf 100644 --- a/icaruscode/PMT/OpReco/FlashFinder/CMakeLists.txt +++ b/icaruscode/PMT/OpReco/FlashFinder/CMakeLists.txt @@ -48,7 +48,7 @@ set( MODULE_LIBRARIES ROOT::Gdml ROOT::Core ) -cet_build_plugin(ICARUSFlashFinder art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSFlashFinder art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() diff --git a/icaruscode/PMT/OpticalTools/CMakeLists.txt b/icaruscode/PMT/OpticalTools/CMakeLists.txt index e9e46f1b3..8e0c78ae3 100644 --- a/icaruscode/PMT/OpticalTools/CMakeLists.txt +++ b/icaruscode/PMT/OpticalTools/CMakeLists.txt @@ -3,6 +3,7 @@ cet_enable_asserts() art_make_library() set( TOOL_LIBRARIES icaruscode::TPC_Utilities_SignalShapingICARUSService_service + larreco::CandidateHitFinderTool larcorealg::Geometry larevt::CalibrationDBI_IOVData larevt::CalibrationDBI_Providers @@ -31,8 +32,8 @@ set( TOOL_LIBRARIES Boost::system CLHEP::Random ) -cet_build_plugin(OpHitFinderStandard art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(OpHitFinder art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(OpHitFinderStandard art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(OpHitFinder art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_headers() install_source() diff --git a/icaruscode/PMT/Trigger/CMakeLists.txt b/icaruscode/PMT/Trigger/CMakeLists.txt index 7c3506cf8..9f7ab2f13 100644 --- a/icaruscode/PMT/Trigger/CMakeLists.txt +++ b/icaruscode/PMT/Trigger/CMakeLists.txt @@ -73,22 +73,22 @@ set( TOOL_LIBRARIES lardataobj::RawData ) -cet_build_plugin(DiscriminatePMTwaveforms art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(DumpTriggerGateData art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(DynamicTriggerGateBuilderTool art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ExtractEnergyDepositionSummary art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(FixedTriggerGateBuilderTool art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(LVDSgates art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(DiscriminatePMTwaveforms art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(DumpTriggerGateData art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(DynamicTriggerGateBuilderTool art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ExtractEnergyDepositionSummary art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(FixedTriggerGateBuilderTool art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(LVDSgates art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) -cet_build_plugin(WriteBeamGateInfo art::module LIBRARIES +cet_build_plugin(WriteBeamGateInfo art::module LIBRARIES PRIVATE lardataobj::Simulation lardata::Utilities larcorealg::headers lardataalg::headers ) -cet_build_plugin(FixBeamGateInfo art::module LIBRARIES +cet_build_plugin(FixBeamGateInfo art::module LIBRARIES PRIVATE lardataobj::Simulation larcorealg::headers larcorealg::CoreUtils @@ -96,7 +96,7 @@ cet_build_plugin(FixBeamGateInfo art::module LIBRARIES ) cet_build_plugin(DiscriminatePMTwaveformsByChannel art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms sbnobj::ICARUS_PMT_Trigger_Data sbnobj::ICARUS_PMT_Data @@ -118,7 +118,7 @@ cet_build_plugin(DiscriminatePMTwaveformsByChannel art::module ) cet_build_plugin(DiscriminatedAdderSignal art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms icaruscode::PMT_Trigger_Utilities icaruscode::PMT_Algorithms @@ -136,7 +136,7 @@ cet_build_plugin(DiscriminatedAdderSignal art::module ) cet_build_plugin(SlidingWindowTrigger art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms sbnobj::ICARUS_PMT_Trigger_Data icaruscode::PMT_Trigger_Utilities @@ -158,7 +158,7 @@ cet_build_plugin(SlidingWindowTrigger art::module ) cet_build_plugin(MajorityTriggerSimulation art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms sbnobj::ICARUS_PMT_Trigger_Data icaruscode::PMT_Trigger_Utilities @@ -175,7 +175,7 @@ cet_build_plugin(MajorityTriggerSimulation art::module ) cet_build_plugin(SlidingWindowTriggerSimulation art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms sbnobj::ICARUS_PMT_Trigger_Data icaruscode::PMT_Trigger_Utilities @@ -197,7 +197,7 @@ cet_build_plugin(SlidingWindowTriggerSimulation art::module ROOT::Core ) -cet_build_plugin(TriggerSimulationOnGates art::module LIBRARIES +cet_build_plugin(TriggerSimulationOnGates art::module LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms icarusalg::Utilities sbnobj::ICARUS_PMT_Trigger_Data @@ -220,7 +220,7 @@ cet_build_plugin(TriggerSimulationOnGates art::module LIBRARIES ) cet_build_plugin(TriggerEfficiencyPlots art::module - LIBRARIES + LIBRARIES PRIVATE icarusalg::Utilities icaruscode::PMT_Trigger_Utilities sbnobj::ICARUS_PMT_Trigger_Data @@ -247,7 +247,7 @@ cet_build_plugin(TriggerEfficiencyPlots art::module ) cet_build_plugin(MakeTriggerSimulationTree art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms icaruscode::PMT_Trigger_Utilities sbnobj::ICARUS_PMT_Trigger_Data @@ -271,7 +271,7 @@ cet_build_plugin(MakeTriggerSimulationTree art::module ROOT::Core ) -cet_build_plugin(TriggerEmulationTree art::module LIBRARIES +cet_build_plugin(TriggerEmulationTree art::module LIBRARIES PRIVATE icaruscode_PMT_Trigger_Algorithms icaruscode_PMT_Trigger_Utilities art_root_io::TFileService_service @@ -294,7 +294,7 @@ foreach(TriggerEfficiencyPlotsModule ) cet_build_plugin(${TriggerEfficiencyPlotsModule} art::module - LIBRARIES + LIBRARIES PRIVATE icaruscode::PMT_Trigger_Algorithms icaruscode::PMT_Trigger icaruscode::PMT_Trigger_Utilities diff --git a/icaruscode/TPC/Calorimetry/CMakeLists.txt b/icaruscode/TPC/Calorimetry/CMakeLists.txt index 45b214a16..fd74eefc6 100644 --- a/icaruscode/TPC/Calorimetry/CMakeLists.txt +++ b/icaruscode/TPC/Calorimetry/CMakeLists.txt @@ -43,16 +43,16 @@ set( TOOL_LIBRARIES wda::wda ) -cet_build_plugin(NormalizeDriftSQLite art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeDrift art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeTPCSQL art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeTPC art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeTPCPerPlaneSQL art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeTPCPerPlane art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeTPCLocal art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeWire art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeYZSQL art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NormalizeYZ art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeDriftSQLite art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeDrift art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeTPCSQL art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeTPC art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeTPCPerPlaneSQL art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeTPCPerPlane art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeTPCLocal art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeWire art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeYZSQL art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NormalizeYZ art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_headers() install_fhicl() diff --git a/icaruscode/TPC/Compression/CMakeLists.txt b/icaruscode/TPC/Compression/CMakeLists.txt index 5a502fd52..22536f8f6 100644 --- a/icaruscode/TPC/Compression/CMakeLists.txt +++ b/icaruscode/TPC/Compression/CMakeLists.txt @@ -27,7 +27,7 @@ set(MODULE_LIBRARIES ${FHICLCPP} ) -cet_build_plugin(ICARUSProduceCompressed art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSProduceCompressed art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) ### These plugins and modules are to be used when producing or validating the reprocessing ### of TPC Fragments with compression and turning them into compressed fragments @@ -69,7 +69,7 @@ cet_build_plugin(ICARUSProduceCompressed art::module LIBRARIES ${MODULE_LIBRARIE # art::Framework_Services_Registry # ) -#cet_build_plugin(ProduceCompressed art::module LIBRARIES ${MODULE_LIBRARIES}) +#cet_build_plugin(ProduceCompressed art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) #simple_plugin(CheckRawDigits "plugin" # ${MODULE_LIBRARIES}) diff --git a/icaruscode/TPC/SPAna/CMakeLists.txt b/icaruscode/TPC/SPAna/CMakeLists.txt index 4bfa8badd..5ffde602c 100644 --- a/icaruscode/TPC/SPAna/CMakeLists.txt +++ b/icaruscode/TPC/SPAna/CMakeLists.txt @@ -1,5 +1,5 @@ cet_build_plugin(SPAna art::module - LIBRARIES + LIBRARIES PRIVATE art::Framework_Core art::Framework_Services_Registry art_root_io::TFileService_service diff --git a/icaruscode/TPC/SignalProcessing/HitFinder/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/HitFinder/CMakeLists.txt index 06e6714aa..bc5f1259f 100644 --- a/icaruscode/TPC/SignalProcessing/HitFinder/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/HitFinder/CMakeLists.txt @@ -42,10 +42,10 @@ set( MODULE_LIBRARIES ROOT::FFTW ) -cet_build_plugin(HitMerger art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(HitSelector art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ICARUSHitFinder art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(HitConverter art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(HitMerger art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(HitSelector art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ICARUSHitFinder art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(HitConverter art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() diff --git a/icaruscode/TPC/SignalProcessing/HitFinder/HitFinderTools/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/HitFinder/HitFinderTools/CMakeLists.txt index 1621536e3..c1028baa1 100644 --- a/icaruscode/TPC/SignalProcessing/HitFinder/HitFinderTools/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/HitFinder/HitFinderTools/CMakeLists.txt @@ -27,8 +27,8 @@ set(hitfinder_tool_lib_list CLHEP::Random ) -cet_build_plugin(CandHitICARUS art::tool LIBRARIES ${hitfinder_tool_lib_list}) -cet_build_plugin(PeakFitterICARUS art::tool LIBRARIES ${hitfinder_tool_lib_list}) +cet_build_plugin(CandHitICARUS art::tool LIBRARIES PRIVATE ${hitfinder_tool_lib_list}) +cet_build_plugin(PeakFitterICARUS art::tool LIBRARIES PRIVATE ${hitfinder_tool_lib_list}) install_headers() diff --git a/icaruscode/TPC/SignalProcessing/RawDigitFilter/Algorithms/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/RawDigitFilter/Algorithms/CMakeLists.txt index 2d6a4cb74..713a5b509 100644 --- a/icaruscode/TPC/SignalProcessing/RawDigitFilter/Algorithms/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/RawDigitFilter/Algorithms/CMakeLists.txt @@ -42,7 +42,7 @@ target_compile_definitions(icaruscode_TPC_SignalProcessing_RawDigitFilter_Algori set( TOOL_LIBRARIES icaruscode_TPC_SignalProcessing_RawDigitFilter_Algorithms - icaruscode_TPC_Utilities_SignalShapingICARUSService_service + icaruscode::TPC_Utilities_SignalShapingICARUSService_service lardataobj::RawData lardataobj::RecoBase lardata::Utilities @@ -69,8 +69,8 @@ set( TOOL_LIBRARIES FFTW3::FFTW3 ) -cet_build_plugin(MorphologicalFilter art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(RawDigitFilterAlg art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(MorphologicalFilter art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(RawDigitFilterAlg art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_headers() diff --git a/icaruscode/TPC/SignalProcessing/RawDigitFilter/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/RawDigitFilter/CMakeLists.txt index 73bf2e552..1f6dbd054 100644 --- a/icaruscode/TPC/SignalProcessing/RawDigitFilter/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/RawDigitFilter/CMakeLists.txt @@ -42,11 +42,11 @@ set( MODULE_LIBRARIES ROOT::Tree FFTW3::FFTW3 ) -cet_build_plugin(RawDigitFilterICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(RawDigitSmoother art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TPCNoiseMC art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(TPCNoise art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(mtRawDigitFilterICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(RawDigitFilterICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(RawDigitSmoother art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TPCNoiseMC art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(TPCNoise art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(mtRawDigitFilterICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/RecoWire/CMakeLists.txt index 3454125fb..12d6e41bc 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/RecoWire/CMakeLists.txt @@ -49,14 +49,14 @@ set( MODULE_LIBRARIES ROOT::FFTW FFTW3::FFTW3 ) -cet_build_plugin(Decon1DROI art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(ROIFinder art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(SimChannelROI art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(RecoWireICARUSRaw art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(RecoWireICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(RecoWireROIICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(RecoWireROI art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(WaveformIntegrity art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(Decon1DROI art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(ROIFinder art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(SimChannelROI art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(RecoWireICARUSRaw art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(RecoWireICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(RecoWireROIICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(RecoWireROI art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(WaveformIntegrity art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() install_fhicl() diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineMostProbAve_tool.cc b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineMostProbAve_tool.cc index d6623dcd9..455241a1a 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineMostProbAve_tool.cc +++ b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineMostProbAve_tool.cc @@ -12,7 +12,7 @@ #include "messagefacility/MessageLogger/MessageLogger.h" #include "cetlib_except/exception.h" #include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom() -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "icarus_signal_processing/WaveformTools.h" #include diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineStandard_tool.cc b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineStandard_tool.cc index c1d88e73e..89b52ce5c 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineStandard_tool.cc +++ b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/BaselineStandard_tool.cc @@ -10,7 +10,7 @@ #include "art_root_io/TFileService.h" #include "messagefacility/MessageLogger/MessageLogger.h" #include "cetlib_except/exception.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom() #include "TH1D.h" diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/CMakeLists.txt index 713e77385..0d0cd9d7d 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/CMakeLists.txt @@ -31,15 +31,15 @@ set( TOOL_LIBRARIES CLHEP::Random FFTW3::FFTW3 ) -cet_build_plugin(BaselineMostProbAve art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(BaselineStandard art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(FullWireDeconvolution art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(NoBaseline art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIDeconvolution art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIFinderDifferential art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIFinderMorphological art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIFinderNOP art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIFinderStandard art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(BaselineMostProbAve art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(BaselineStandard art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(FullWireDeconvolution art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(NoBaseline art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIDeconvolution art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIFinderDifferential art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIFinderMorphological art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIFinderNOP art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIFinderStandard art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_headers() install_source() diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/FullWireDeconvolution_tool.cc b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/FullWireDeconvolution_tool.cc index 8e8c16a74..b909910c4 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/FullWireDeconvolution_tool.cc +++ b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/FullWireDeconvolution_tool.cc @@ -13,7 +13,7 @@ #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "larcore/Geometry/Geometry.h" #include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom() -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "art/Utilities/make_tool.h" #include "icarus_signal_processing/WaveformTools.h" diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIDeconvolution_tool.cc b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIDeconvolution_tool.cc index c59c8e3f6..4ed8595a5 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIDeconvolution_tool.cc +++ b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIDeconvolution_tool.cc @@ -13,7 +13,7 @@ #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "larcore/Geometry/Geometry.h" #include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom() -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/IBaseline.h" #include "icarus_signal_processing/Filters/ICARUSFFT.h" diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIFinderStandard_tool.cc b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIFinderStandard_tool.cc index 8310b22a9..977204847 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIFinderStandard_tool.cc +++ b/icaruscode/TPC/SignalProcessing/RecoWire/DeconTools/ROIFinderStandard_tool.cc @@ -12,7 +12,7 @@ #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "larcore/Geometry/WireReadout.h" #include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom() -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "TH1D.h" diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/ROITools/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/RecoWire/ROITools/CMakeLists.txt index d53a40c89..38c1563a3 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/ROITools/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/RecoWire/ROITools/CMakeLists.txt @@ -35,10 +35,10 @@ set( CLHEP::Random ) -cet_build_plugin(ROICannyEdgeDetection art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIFromDecoder art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIMorphological2D art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ROIWavelets art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(ROICannyEdgeDetection art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIFromDecoder art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIMorphological2D art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ROIWavelets art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_headers() install_source() diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/RecoWireROI_module.cc b/icaruscode/TPC/SignalProcessing/RecoWire/RecoWireROI_module.cc index c7c5670a7..945353489 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/RecoWireROI_module.cc +++ b/icaruscode/TPC/SignalProcessing/RecoWire/RecoWireROI_module.cc @@ -45,7 +45,7 @@ #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "lardata/ArtDataHelper/WireCreator.h" #include "lardata/Utilities/AssociationUtil.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "icarus_signal_processing/Filters/ICARUSFFT.h" #include "larevt/CalibrationDBI/Interface/DetPedestalService.h" diff --git a/icaruscode/TPC/SignalProcessing/RecoWire/SimTestPulse/CMakeLists.txt b/icaruscode/TPC/SignalProcessing/RecoWire/SimTestPulse/CMakeLists.txt index ee18b32b7..8cc7aa064 100644 --- a/icaruscode/TPC/SignalProcessing/RecoWire/SimTestPulse/CMakeLists.txt +++ b/icaruscode/TPC/SignalProcessing/RecoWire/SimTestPulse/CMakeLists.txt @@ -45,9 +45,9 @@ set( MODULE_LIBRARIES ROOT::FFTW ROOT::Tree ) -cet_build_plugin(SimTestPulseAna art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(SimTestPulseWire art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(SimTestPulse art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(SimTestPulseAna art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(SimTestPulseWire art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(SimTestPulse art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_fhicl() diff --git a/icaruscode/TPC/Simulation/DetSim/CMakeLists.txt b/icaruscode/TPC/Simulation/DetSim/CMakeLists.txt index a84322203..d69908e0e 100644 --- a/icaruscode/TPC/Simulation/DetSim/CMakeLists.txt +++ b/icaruscode/TPC/Simulation/DetSim/CMakeLists.txt @@ -38,8 +38,8 @@ set( MODULE_LIBRARIES FFTW3::FFTW3 ) -cet_build_plugin(SimWireICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(SimReadoutBoardICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(SimWireICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(SimReadoutBoardICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) #install_headers() install_fhicl() diff --git a/icaruscode/TPC/Simulation/DetSim/SimReadoutBoardICARUS_module.cc b/icaruscode/TPC/Simulation/DetSim/SimReadoutBoardICARUS_module.cc index 339e08d3f..760e369ed 100644 --- a/icaruscode/TPC/Simulation/DetSim/SimReadoutBoardICARUS_module.cc +++ b/icaruscode/TPC/Simulation/DetSim/SimReadoutBoardICARUS_module.cc @@ -52,7 +52,7 @@ #include "lardata/Utilities/LArFFT.h" #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "lardata/DetectorInfoServices/DetectorClocksService.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "lardataobj/Simulation/sim.h" #include "larevt/CalibrationDBI/Interface/DetPedestalService.h" #include "larevt/CalibrationDBI/Interface/DetPedestalProvider.h" diff --git a/icaruscode/TPC/Simulation/DetSim/SimWireICARUS_module.cc b/icaruscode/TPC/Simulation/DetSim/SimWireICARUS_module.cc index 51fca84ff..41430397e 100644 --- a/icaruscode/TPC/Simulation/DetSim/SimWireICARUS_module.cc +++ b/icaruscode/TPC/Simulation/DetSim/SimWireICARUS_module.cc @@ -52,7 +52,7 @@ #include "lardata/Utilities/LArFFT.h" #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "lardata/DetectorInfoServices/DetectorClocksService.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "lardataobj/Simulation/sim.h" #include "larevt/CalibrationDBI/Interface/DetPedestalService.h" #include "larevt/CalibrationDBI/Interface/DetPedestalProvider.h" diff --git a/icaruscode/TPC/Simulation/DetSim/tools/CMakeLists.txt b/icaruscode/TPC/Simulation/DetSim/tools/CMakeLists.txt index a6db707fe..b28058b0a 100644 --- a/icaruscode/TPC/Simulation/DetSim/tools/CMakeLists.txt +++ b/icaruscode/TPC/Simulation/DetSim/tools/CMakeLists.txt @@ -18,7 +18,7 @@ SBNDataNoiseBoard SBNDataNoise SBNNoise ) - cet_build_plugin( ${TOOL} art::tool LIBRARIES + cet_build_plugin( ${TOOL} art::tool LIBRARIES PRIVATE larcorealg::Geometry larevt::CalibrationDBI_IOVData larevt::CalibrationDBI_Providers larreco::HitFinder lardataobj::RecoBase larcore::Geometry_Geometry_service @@ -38,7 +38,7 @@ SBNNoise set_property(SOURCE "${TOOL}_tool.cc" APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) endforeach() -cet_build_plugin(CoherentNoiseFactor art::service LIBRARIES +cet_build_plugin(CoherentNoiseFactor art::service LIBRARIES PRIVATE larcorealg::Geometry larevt::CalibrationDBI_IOVData larevt::CalibrationDBI_Providers larreco::HitFinder lardataobj::RecoBase larcore::Geometry_Geometry_service diff --git a/icaruscode/TPC/Simulation/DetSim/tools/CoherentNoiseFactor_service.cc b/icaruscode/TPC/Simulation/DetSim/tools/CoherentNoiseFactor_service.cc index 27cd4f214..aa754479b 100644 --- a/icaruscode/TPC/Simulation/DetSim/tools/CoherentNoiseFactor_service.cc +++ b/icaruscode/TPC/Simulation/DetSim/tools/CoherentNoiseFactor_service.cc @@ -1,7 +1,5 @@ /** - * @file icaruscode/Decode/ChannelMapping/ICARUSChannelMap_service.cc - * @brief Wrapper service for `icarusDB::ICARUSChannelMapProvider`. - * @author Gianluca Petrillo (petrillo@slac.stanford.edu) + * @file icaruscode/TPC/Simulation/DetSim/tools/CoherentNoiseFactor_service.cc */ #include "icaruscode/TPC/Simulation/DetSim/tools/CoherentNoiseFactorProvider.h" diff --git a/icaruscode/TPC/Simulation/Overlay/CMakeLists.txt b/icaruscode/TPC/Simulation/Overlay/CMakeLists.txt index 0f8efc22a..2670317ac 100644 --- a/icaruscode/TPC/Simulation/Overlay/CMakeLists.txt +++ b/icaruscode/TPC/Simulation/Overlay/CMakeLists.txt @@ -13,7 +13,7 @@ set( MODULE_LIBRARIES lardataobj::RawData lardataalg::DetectorInfo icarus_signal_processing::icarus_signal_processing - icaruscode_TPC_Utilities_SignalShapingICARUSService_service + icaruscode::TPC_Utilities_SignalShapingICARUSService_service larevt::CalibrationDBI_Providers nurandom::RandomUtils_NuRandomService_service art::Framework_Core @@ -37,7 +37,7 @@ set( MODULE_LIBRARIES FFTW3::FFTW3 ) -cet_build_plugin(OverlayICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(OverlayICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) #install_headers() install_fhicl() diff --git a/icaruscode/TPC/Simulation/Overlay/OverlayICARUS_module.cc b/icaruscode/TPC/Simulation/Overlay/OverlayICARUS_module.cc index d375ba4ac..6f5c19310 100644 --- a/icaruscode/TPC/Simulation/Overlay/OverlayICARUS_module.cc +++ b/icaruscode/TPC/Simulation/Overlay/OverlayICARUS_module.cc @@ -54,7 +54,7 @@ #include "lardata/Utilities/LArFFT.h" #include "lardata/DetectorInfoServices/DetectorPropertiesService.h" #include "lardata/DetectorInfoServices/DetectorClocksService.h" -#include "icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h" +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" #include "lardataobj/Simulation/sim.h" #include "larevt/CalibrationDBI/Interface/DetPedestalService.h" #include "larevt/CalibrationDBI/Interface/DetPedestalProvider.h" diff --git a/icaruscode/TPC/Simulation/Overlay/tools/CMakeLists.txt b/icaruscode/TPC/Simulation/Overlay/tools/CMakeLists.txt index 80933c2b3..b8bb0f1be 100644 --- a/icaruscode/TPC/Simulation/Overlay/tools/CMakeLists.txt +++ b/icaruscode/TPC/Simulation/Overlay/tools/CMakeLists.txt @@ -33,7 +33,7 @@ set( TOOL_LIBRARIES CLHEP::Random Eigen3::Eigen ) -cet_build_plugin(Overlay1D art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE Overlay1D_tool.cc) +cet_build_plugin(Overlay1D art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) set_property(SOURCE Overlay1D_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) install_headers() diff --git a/icaruscode/TPC/Simulation/SpaceChargeServices/CMakeLists.txt b/icaruscode/TPC/Simulation/SpaceChargeServices/CMakeLists.txt index 1e0f9cf28..1c56d1f58 100644 --- a/icaruscode/TPC/Simulation/SpaceChargeServices/CMakeLists.txt +++ b/icaruscode/TPC/Simulation/SpaceChargeServices/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_build_plugin(SpaceChargeServiceICARUS art::service LIBRARIES +cet_build_plugin(SpaceChargeServiceICARUS art::service LIBRARIES PRIVATE icaruscode::TPC_Simulation_SpaceCharge lardataalg::DetectorInfo art::Framework_Core diff --git a/icaruscode/TPC/Tracking/ICARUSPandora/CMakeLists.txt b/icaruscode/TPC/Tracking/ICARUSPandora/CMakeLists.txt index 48ab4da00..c378c08f4 100644 --- a/icaruscode/TPC/Tracking/ICARUSPandora/CMakeLists.txt +++ b/icaruscode/TPC/Tracking/ICARUSPandora/CMakeLists.txt @@ -10,7 +10,7 @@ set( TOOL_LIBRARIES cetlib::cetlib ) -cet_build_plugin(LArPandoraHitCollectionToolICARUS art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(LArPandoraHitCollectionToolICARUS art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_fhicl() install_source() diff --git a/icaruscode/TPC/Tracking/MCS/CMakeLists.txt b/icaruscode/TPC/Tracking/MCS/CMakeLists.txt index 028b04c33..b0364db1e 100644 --- a/icaruscode/TPC/Tracking/MCS/CMakeLists.txt +++ b/icaruscode/TPC/Tracking/MCS/CMakeLists.txt @@ -91,7 +91,7 @@ set( MODULE_LIBRARIES ROOT::Minuit ROOT::Minuit2 ) -cet_build_plugin(MCSFitProducerICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) +cet_build_plugin(MCSFitProducerICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() diff --git a/icaruscode/TPC/Tracking/cluster3D/CMakeLists.txt b/icaruscode/TPC/Tracking/cluster3D/CMakeLists.txt index c96fef3e1..27e03654a 100644 --- a/icaruscode/TPC/Tracking/cluster3D/CMakeLists.txt +++ b/icaruscode/TPC/Tracking/cluster3D/CMakeLists.txt @@ -56,8 +56,8 @@ set( MODULE_LIBRARIES art_root_io::TFileService_service messagefacility::MF_MessageLogger ) -cet_build_plugin(Cluster3DICARUS art::module LIBRARIES ${MODULE_LIBRARIES}) -cet_build_plugin(SnippetHit3DBuilderICARUS art::tool LIBRARIES ${TOOL_LIBRARIES} SOURCE SnippetHit3DBuilderICARUS_tool.cc) +cet_build_plugin(Cluster3DICARUS art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) +cet_build_plugin(SnippetHit3DBuilderICARUS art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) set_property(SOURCE SnippetHit3DBuilderICARUS_tool.cc APPEND PROPERTY COMPILE_DEFINITIONS EIGEN_FFTW_DEFAULT) install_headers() diff --git a/icaruscode/TPC/Utilities/CMakeLists.txt b/icaruscode/TPC/Utilities/CMakeLists.txt index c54120393..4e000de4d 100644 --- a/icaruscode/TPC/Utilities/CMakeLists.txt +++ b/icaruscode/TPC/Utilities/CMakeLists.txt @@ -38,17 +38,21 @@ set(icarus_util_lib_list Boost::filesystem Boost::system CLHEP::Random - larcoreobj::headers + ROOT::Hist + larcoreobj::headers ) art_make_library( LIBRARIES ${icarus_util_lib_list} ) -cet_build_plugin(FileCatalogMetadataICARUS art::service LIBRARIES ${icarus_util_lib_list}) -cet_build_plugin(SignalShapingICARUSService art::service LIBRARIES ${icarus_util_lib_list}) -cet_build_plugin(SIOVChannelStatusICARUSService art::service LIBRARIES ${icarus_util_lib_list}) -cet_build_plugin(TFileMetadataICARUS art::service LIBRARIES ${icarus_util_lib_list}) +cet_build_plugin(FileCatalogMetadataICARUS art::service LIBRARIES PRIVATE ${icarus_util_lib_list}) +cet_build_plugin(SignalShapingICARUSService art::service + LIBRARIES PUBLIC icaruscode::TPC_Utilities # includes the service header + LIBRARIES PRIVATE ${icarus_util_lib_list} + ) +cet_build_plugin(SIOVChannelStatusICARUSService art::service LIBRARIES PRIVATE ${icarus_util_lib_list}) +cet_build_plugin(TFileMetadataICARUS art::service LIBRARIES PRIVATE ${icarus_util_lib_list}) install_headers() diff --git a/icaruscode/TPC/Utilities/SignalShapingICARUSService.cc b/icaruscode/TPC/Utilities/SignalShapingICARUSService.cc new file mode 100644 index 000000000..a6746070a --- /dev/null +++ b/icaruscode/TPC/Utilities/SignalShapingICARUSService.cc @@ -0,0 +1,254 @@ +/////////////////////////////////////////////////////////////////////// +/// +/// \file icaruscode/TPC/Utilities/SignalShapingICARUSService.cc +/// +/// \brief Service to provide ICARUS-specific signal shaping for +/// simulation (convolution) and reconstruction (deconvolution)./Users/Lsrea/newSim/SignalShapingICARUSService.h +/// +/// \author H. Greenlee, major mods by L. Rochester +//////////////////////////////////////////////////////////////////////// + +#include +#include "SignalShapingICARUSService.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "messagefacility/MessageLogger/MessageLogger.h" +#include "art_root_io/TFileService.h" +#include "lardata/DetectorInfoServices/DetectorClocksService.h" + +// LArSoft include +#include "larcore/Geometry/WireReadout.h" +#include "larcorealg/Geometry/TPCGeo.h" +#include "larcorealg/Geometry/PlaneGeo.h" + +#include "art/Utilities/make_tool.h" +#include "tools/IResponse.h" + +#include "tbb/spin_mutex.h" + +#include "TFile.h" + +namespace icarusutil +{ + +tbb::spin_mutex signalShapingSpinMutex; + +//---------------------------------------------------------------------- +// Constructor. +SignalShapingICARUSService::SignalShapingICARUSService(const fhicl::ParameterSet& pset, + art::ActivityRegistry& /* reg */) +: fInit(false) +{ + reconfigure(pset); +} + +//---------------------------------------------------------------------- +// Reconfigure method. +void SignalShapingICARUSService::reconfigure(const fhicl::ParameterSet& pset) +{ + mf::LogInfo("fSignalShapingICARUSService") << " reconfiguring setup " ; + + // If called again, then we need to clear out the existing tools... + fPlaneToResponseMap.clear(); + + // Implement the tools for handling the responses + const fhicl::ParameterSet& responseTools = pset.get("ResponseTools"); + + for(const std::string& responseTool : responseTools.get_pset_names()) + { + const fhicl::ParameterSet& responseToolParamSet = responseTools.get(responseTool); + size_t planeIdx = responseToolParamSet.get("Plane"); + + fPlaneToResponseMap[planeIdx].push_back(art::make_tool(responseToolParamSet)); + } + + fPlaneForNormalization = pset.get( "PlaneForNormalization"); + fPrintResponses = pset.get( "PrintResponses" ); + fDeconNorm = pset.get( "DeconNorm" ); + fInitialFFTSize = pset.get( "InitialFFTSize" ); + fNoiseFactVec = pset.get("NoiseFactVec" ); + fStoreHistograms = pset.get( "StoreHistograms" ); + + fInit = false; + + return; +} + +//---------------------------------------------------------------------- +// Accessor for single-plane signal shaper. +//const SignalShapingICARUS& SignalShapingICARUSService::SignalShaping(size_t channel) const +//{ +// if(!fInit) init(); +// +// art::ServiceHandle geom; +// +// //use channel number to set some useful numbers +// size_t planeIdx = geom->ChannelToWire(channel)[0].Plane; +// +// const SignalShapingICARUS& signalShaping = fPlaneToResponseMap.at(planeIdx).front()->getSignalShapingICARUS(); +// +// return signalShaping; +//} + +const icarus_tool::IResponse& SignalShapingICARUSService::GetResponse(size_t channel) const +{ + if (!fInit) init(); + + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + + //use channel number to set some useful numbers + size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; + + return *fPlaneToResponseMap.at(planeIdx).front(); +} + + +//---------------------------------------------------------------------- +// Initialization method. +// Here we do initialization that can't be done in the constructor. +// All public methods should ensure that this method is called as necessary. +void SignalShapingICARUSService::init() +{ + // First get a lock to make sure we are clear to run + tbb::spin_mutex::scoped_lock lock(signalShapingSpinMutex); + + if(!fInit) + { + // Do ICARUS-specific configuration of SignalShaping by providing + // ICARUS response and filter functions. + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + + auto const samplingRate = sampling_rate(art::ServiceHandle()->DataForJob()); + + // Get the normalization from the field response for the collection plane + double integral = fPlaneToResponseMap.at(fPlaneForNormalization).front().get()->getFieldResponse()->getIntegral(); + double weight = 1. / integral; + + for(size_t planeIdx = 0; planeIdx < wireReadoutAlg.Nplanes(); planeIdx++) + { + fPlaneToResponseMap[planeIdx].front().get()->setResponse(samplingRate, weight); + } + + // Check to see if we want histogram output + if (fStoreHistograms) + { + art::ServiceHandle tfs; + + // Make sure we are at the top level + tfs->file().cd(); + + // Make a directory for these histograms + art::TFileDirectory dir = tfs->mkdir("SignalShaping"); + + // Loop through response tools first + for(const auto& response: fPlaneToResponseMap) response.second.front().get()->outputHistograms(samplingRate, dir); + + } + + fInit = true; + } + + return; +} + +void SignalShapingICARUSService::SetDecon(double const samplingRate, + size_t fftsize, size_t channel) +{ + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + + if (!fInit) init(); + + // Assume we need to reset the kernels + double integral = fPlaneToResponseMap.at(fPlaneForNormalization).front().get()->getFieldResponse()->getIntegral(); + double weight = 1. / integral; + + for(size_t planeIdx = 0; planeIdx < wireReadoutAlg.Nplanes(); planeIdx++) + { + fPlaneToResponseMap.at(planeIdx).front()->setResponse(samplingRate, weight); + } +} + +//-----Give Gain Settings to SimWire----- +double SignalShapingICARUSService::GetASICGain(unsigned int channel) const +{ + static const double fcToElectrons(6241.50975); + + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; + + double gain = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getFCperADCMicroS() * fcToElectrons; + + return gain; +} + +//-----Give Shaping time to SimWire----- +double SignalShapingICARUSService::GetShapingTime(unsigned int planeIdx) const +{ + double shaping_time = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getASICShapingTime(); + + return shaping_time; +} + +double SignalShapingICARUSService::GetRawNoise(unsigned int const channel) const +{ + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; + + double gain = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getFCperADCMicroS(); + double shaping_time = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getASICShapingTime(); + int temp; + + if (std::abs(shaping_time - 0.6)<1e-6){ + temp = 0; + }else if (std::abs(shaping_time - 1.3)<1e-6){ + temp = 1; + }else if (std::abs(shaping_time - 2.0)<1e-6){ + temp = 2; + }else{ + temp = 3; + } + + double rawNoise; + + auto tempNoise = fNoiseFactVec.at(planeIdx); + rawNoise = tempNoise.at(temp); + + rawNoise *= gain/4.7; + return rawNoise; +} + +double SignalShapingICARUSService::GetDeconNoise(unsigned int const channel) const +{ + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; + + double shaping_time = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getASICShapingTime(); + int temp; + + if (std::abs(shaping_time - 0.6)<1e-6){ + temp = 0; + }else if (std::abs(shaping_time - 1.3)<1e-6){ + temp = 1; + }else if (std::abs(shaping_time - 2.0)<1.e-6){ + temp = 2; + }else{ + temp = 3; + } + auto tempNoise = fNoiseFactVec.at(planeIdx); + double deconNoise = tempNoise.at(temp); + + //deconNoise = deconNoise /4096.*2000./4.7 *6.241*1000/fDeconNorm; <== I don't know where these numbers come from... + + return deconNoise; +} + +int SignalShapingICARUSService::ResponseTOffset(unsigned int const channel) const +{ + if (!fInit) init(); + + geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); + + size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; + + return fPlaneToResponseMap.at(planeIdx).front()->getTOffset(); +} +} diff --git a/icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h b/icaruscode/TPC/Utilities/SignalShapingICARUSService.h similarity index 99% rename from icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h rename to icaruscode/TPC/Utilities/SignalShapingICARUSService.h index f49128075..ef31e6a2a 100644 --- a/icaruscode/TPC/Utilities/SignalShapingICARUSService_service.h +++ b/icaruscode/TPC/Utilities/SignalShapingICARUSService.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////// /// -/// \file SignalShapingICARUSService.h +/// \file icaruscode/TPC/Utilities/SignalShapingICARUSService.h /// /// \brief Service to provide ICARUS-specific signal shaping for /// simulation (convolution) and reconstruction (deconvolution)./Users/Lsrea/newSim/SignalShapingICARUSService.h diff --git a/icaruscode/TPC/Utilities/SignalShapingICARUSService_service.cc b/icaruscode/TPC/Utilities/SignalShapingICARUSService_service.cc index 551c30e7a..8a8e004ba 100644 --- a/icaruscode/TPC/Utilities/SignalShapingICARUSService_service.cc +++ b/icaruscode/TPC/Utilities/SignalShapingICARUSService_service.cc @@ -1,266 +1,13 @@ //////////////////////////////////////////////////////////////////////// -/// \file SignalShapingICARUSService_service.cc +/// \file icaruscode/TPC/Utilities/SignalShapingICARUSService_service.cc /// \author H. Greenlee /// Modified by X. Qian 1/6/2015 /// if histogram is used, inialize /// Response_Offset, Response_Sampling, FieldBins from histogram //////////////////////////////////////////////////////////////////////// -#include -#include "SignalShapingICARUSService_service.h" -#include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" -#include "messagefacility/MessageLogger/MessageLogger.h" -#include "cetlib_except/exception.h" -#include "larcore/CoreUtils/ServiceUtil.h" // lar::providerFrom<>() -#include "art_root_io/TFileService.h" -#include "lardata/DetectorInfoServices/DetectorPropertiesService.h" -#include "lardata/DetectorInfoServices/DetectorClocksService.h" -#include "TFile.h" - -// LArSoft include -#include "larcore/Geometry/WireReadout.h" -#include "larcorealg/Geometry/TPCGeo.h" -#include "larcorealg/Geometry/PlaneGeo.h" - -#include "art/Utilities/make_tool.h" -#include "tools/IResponse.h" -#include "tools/IFieldResponse.h" -#include "tools/IElectronicsResponse.h" -#include "tools/IFilter.h" - -#include "tbb/spin_mutex.h" - -#include - -namespace icarusutil -{ - -tbb::spin_mutex signalShapingSpinMutex; - -//---------------------------------------------------------------------- -// Constructor. -SignalShapingICARUSService::SignalShapingICARUSService(const fhicl::ParameterSet& pset, - art::ActivityRegistry& /* reg */) -: fInit(false) -{ - reconfigure(pset); -} - -//---------------------------------------------------------------------- -// Reconfigure method. -void SignalShapingICARUSService::reconfigure(const fhicl::ParameterSet& pset) -{ - mf::LogInfo("fSignalShapingICARUSService") << " reconfiguring setup " ; - - // If called again, then we need to clear out the existing tools... - fPlaneToResponseMap.clear(); - - // Implement the tools for handling the responses - const fhicl::ParameterSet& responseTools = pset.get("ResponseTools"); - - for(const std::string& responseTool : responseTools.get_pset_names()) - { - const fhicl::ParameterSet& responseToolParamSet = responseTools.get(responseTool); - size_t planeIdx = responseToolParamSet.get("Plane"); - - fPlaneToResponseMap[planeIdx].push_back(art::make_tool(responseToolParamSet)); - } - - fPlaneForNormalization = pset.get( "PlaneForNormalization"); - fPrintResponses = pset.get( "PrintResponses" ); - fDeconNorm = pset.get( "DeconNorm" ); - fInitialFFTSize = pset.get( "InitialFFTSize" ); - fNoiseFactVec = pset.get("NoiseFactVec" ); - fStoreHistograms = pset.get( "StoreHistograms" ); - - fInit = false; - - return; -} - -//---------------------------------------------------------------------- -// Accessor for single-plane signal shaper. -//const SignalShapingICARUS& SignalShapingICARUSService::SignalShaping(size_t channel) const -//{ -// if(!fInit) init(); -// -// art::ServiceHandle geom; -// -// //use channel number to set some useful numbers -// size_t planeIdx = geom->ChannelToWire(channel)[0].Plane; -// -// const SignalShapingICARUS& signalShaping = fPlaneToResponseMap.at(planeIdx).front()->getSignalShapingICARUS(); -// -// return signalShaping; -//} - -const icarus_tool::IResponse& SignalShapingICARUSService::GetResponse(size_t channel) const -{ - if (!fInit) init(); - - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - - //use channel number to set some useful numbers - size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; - - return *fPlaneToResponseMap.at(planeIdx).front(); -} - - -//---------------------------------------------------------------------- -// Initialization method. -// Here we do initialization that can't be done in the constructor. -// All public methods should ensure that this method is called as necessary. -void SignalShapingICARUSService::init() -{ - // First get a lock to make sure we are clear to run - tbb::spin_mutex::scoped_lock lock(signalShapingSpinMutex); - - if(!fInit) - { - // Do ICARUS-specific configuration of SignalShaping by providing - // ICARUS response and filter functions. - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - - auto const samplingRate = sampling_rate(art::ServiceHandle()->DataForJob()); +#include "icaruscode/TPC/Utilities/SignalShapingICARUSService.h" - // Get the normalization from the field response for the collection plane - double integral = fPlaneToResponseMap.at(fPlaneForNormalization).front().get()->getFieldResponse()->getIntegral(); - double weight = 1. / integral; - - for(size_t planeIdx = 0; planeIdx < wireReadoutAlg.Nplanes(); planeIdx++) - { - fPlaneToResponseMap[planeIdx].front().get()->setResponse(samplingRate, weight); - } - - // Check to see if we want histogram output - if (fStoreHistograms) - { - art::ServiceHandle tfs; - - // Make sure we are at the top level - tfs->file().cd(); - - // Make a directory for these histograms - art::TFileDirectory dir = tfs->mkdir("SignalShaping"); - - // Loop through response tools first - for(const auto& response: fPlaneToResponseMap) response.second.front().get()->outputHistograms(samplingRate, dir); - - } - - fInit = true; - } - - return; -} - -void SignalShapingICARUSService::SetDecon(double const samplingRate, - size_t fftsize, size_t channel) -{ - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - - if (!fInit) init(); - - // Assume we need to reset the kernels - double integral = fPlaneToResponseMap.at(fPlaneForNormalization).front().get()->getFieldResponse()->getIntegral(); - double weight = 1. / integral; - - for(size_t planeIdx = 0; planeIdx < wireReadoutAlg.Nplanes(); planeIdx++) - { - fPlaneToResponseMap.at(planeIdx).front()->setResponse(samplingRate, weight); - } -} - -//-----Give Gain Settings to SimWire----- -double SignalShapingICARUSService::GetASICGain(unsigned int channel) const -{ - static const double fcToElectrons(6241.50975); - - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; - - double gain = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getFCperADCMicroS() * fcToElectrons; - - return gain; -} - -//-----Give Shaping time to SimWire----- -double SignalShapingICARUSService::GetShapingTime(unsigned int planeIdx) const -{ - double shaping_time = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getASICShapingTime(); - - return shaping_time; -} - -double SignalShapingICARUSService::GetRawNoise(unsigned int const channel) const -{ - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; - - double gain = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getFCperADCMicroS(); - double shaping_time = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getASICShapingTime(); - int temp; - - if (std::abs(shaping_time - 0.6)<1e-6){ - temp = 0; - }else if (std::abs(shaping_time - 1.3)<1e-6){ - temp = 1; - }else if (std::abs(shaping_time - 2.0)<1e-6){ - temp = 2; - }else{ - temp = 3; - } - - double rawNoise; - - auto tempNoise = fNoiseFactVec.at(planeIdx); - rawNoise = tempNoise.at(temp); - - rawNoise *= gain/4.7; - return rawNoise; -} - -double SignalShapingICARUSService::GetDeconNoise(unsigned int const channel) const -{ - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; - - double shaping_time = fPlaneToResponseMap.at(planeIdx).front()->getElectronicsResponse()->getASICShapingTime(); - int temp; - - if (std::abs(shaping_time - 0.6)<1e-6){ - temp = 0; - }else if (std::abs(shaping_time - 1.3)<1e-6){ - temp = 1; - }else if (std::abs(shaping_time - 2.0)<1.e-6){ - temp = 2; - }else{ - temp = 3; - } - auto tempNoise = fNoiseFactVec.at(planeIdx); - double deconNoise = tempNoise.at(temp); - - //deconNoise = deconNoise /4096.*2000./4.7 *6.241*1000/fDeconNorm; <== I don't know where these numbers come from... - - return deconNoise; -} - -int SignalShapingICARUSService::ResponseTOffset(unsigned int const channel) const -{ - if (!fInit) init(); - - geo::WireReadoutGeom const& wireReadoutAlg = art::ServiceHandle{}->Get(); - - size_t planeIdx = wireReadoutAlg.ChannelToWire(channel)[0].Plane; - - return fPlaneToResponseMap.at(planeIdx).front()->getTOffset(); -} -} +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" -namespace icarusutil { - - DEFINE_ART_SERVICE(SignalShapingICARUSService) - -} +DEFINE_ART_SERVICE(icarusutil::SignalShapingICARUSService) diff --git a/icaruscode/TPC/Utilities/tools/CMakeLists.txt b/icaruscode/TPC/Utilities/tools/CMakeLists.txt index 0e403467c..aad5ce058 100644 --- a/icaruscode/TPC/Utilities/tools/CMakeLists.txt +++ b/icaruscode/TPC/Utilities/tools/CMakeLists.txt @@ -1,7 +1,7 @@ cet_enable_asserts() -art_make_library() +cet_make_library(INTERFACE HEADERS_TARGET_ONLY) set( TOOL_LIBRARIES larcorealg::Geometry larevt::CalibrationDBI_IOVData @@ -32,11 +32,11 @@ set( TOOL_LIBRARIES CLHEP::Random ) -cet_build_plugin(ElectronicsResponseBesselApprox art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(ElectronicsResponse art::tool LIBRARIES LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(FieldResponse art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(Filter art::tool LIBRARIES ${TOOL_LIBRARIES}) -cet_build_plugin(Response art::tool LIBRARIES ${TOOL_LIBRARIES}) +cet_build_plugin(ElectronicsResponseBesselApprox art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(ElectronicsResponse art::tool LIBRARIES PRIVATE LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(FieldResponse art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(Filter art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) +cet_build_plugin(Response art::tool LIBRARIES PRIVATE ${TOOL_LIBRARIES}) install_headers() diff --git a/icaruscode/Timing/CMakeLists.txt b/icaruscode/Timing/CMakeLists.txt index 85fc1cc05..4c7820b6a 100644 --- a/icaruscode/Timing/CMakeLists.txt +++ b/icaruscode/Timing/CMakeLists.txt @@ -1,28 +1,28 @@ cet_enable_asserts() -set( MODULE_LIBRARIES +set(MODULE_LIBRARIES lardataobj::RecoBase - sbnobj::Common_Trigger + sbnobj::Common_Trigger larcore::Geometry_Geometry_service lardata::DetectorClocksService - art_root_io::TFileService_service + art_root_io::TFileService_service art_root_io::tfile_support lardataobj::RawData ROOT::Tree ) -set( LIB_LIBRARIES +set(LIB_LIBRARIES art::Framework_Services_Registry messagefacility::MF_MessageLogger lardataobj::RecoBase lardata::Utilities - icaruscode_IcarusObj + icaruscode::IcarusObj sbnobj::Common_PMT_Data - larevt::CalibrationDBI_IOVData - larevt::CalibrationDBI_Providers + larevt::CalibrationDBI_IOVData + larevt::CalibrationDBI_Providers ) -set( SERVICE_LIBRARIES - icaruscode_Timing - icaruscode_IcarusObj +set(SERVICE_LIBRARIES + icaruscode::Timing + icaruscode::IcarusObj larcore::Geometry_Geometry_service lardata::DetectorClocksService ) @@ -31,11 +31,11 @@ file(GLOB lib_srcs *.cxx) art_make_library( SOURCE ${lib_srcs} LIBRARIES PUBLIC ${LIB_LIBRARIES}) -cet_build_plugin( OpHitTimingCorrection art::module LIBRARIES PUBLIC ${MODULE_LIBRARIES}) +cet_build_plugin( OpHitTimingCorrection art::module LIBRARIES PRIVATE ${MODULE_LIBRARIES}) -cet_build_plugin( PMTTimingCorrectionService art::service LIBRARIES PUBLIC ${SERVICE_LIBRARIES}) +cet_build_plugin( PMTTimingCorrectionService art::service LIBRARIES PRIVATE ${SERVICE_LIBRARIES}) -cet_build_plugin( PMTBeamSignalsExtractor art::producer LIBRARIES PUBLIC ${MODULE_LIBRARIES}) +cet_build_plugin( PMTBeamSignalsExtractor art::Producer LIBRARIES PRIVATE ${MODULE_LIBRARIES}) install_headers() install_fhicl() diff --git a/icaruscode/Utilities/CMakeLists.txt b/icaruscode/Utilities/CMakeLists.txt index 4d9a3e172..59282af85 100644 --- a/icaruscode/Utilities/CMakeLists.txt +++ b/icaruscode/Utilities/CMakeLists.txt @@ -15,7 +15,7 @@ art_make_library( sbnobj::Common_CRT ) -cet_build_plugin(SaveConfigurationIntoTFile art::module LIBRARIES +cet_build_plugin(SaveConfigurationIntoTFile art::module LIBRARIES PRIVATE art_root_io::TFileService_service art_root_io::tfile_support art::Framework_Services_Registry @@ -30,13 +30,15 @@ cet_build_plugin(SaveConfigurationIntoTFile art::module LIBRARIES ) -cet_build_plugin(DuplicateEventTracker art::service LIBRARIES +# NOTE: DuplicateEventTracker exposes an interface, +# but PRIVATE linking makes that inaccessible to modules. +cet_build_plugin(DuplicateEventTracker art::service LIBRARIES PRIVATE icaruscode::Utilities art::Framework_Principal messagefacility::MF_MessageLogger ) -cet_build_plugin(DumpCRTPMTMatching art::module LIBRARIES +cet_build_plugin(DumpCRTPMTMatching art::module LIBRARIES PRIVATE icaruscode::Utilities icaruscode::IcarusObj sbnobj::Common_CRT