Skip to content

Commit b865af0

Browse files
fjnicolasfjnicolas
authored
Merge pull request #425 from SBNSoftware/feature/fnicolas_tpc1d
Rename Calibration directory to TPC1DSignalProcessing
2 parents fc94af2 + cc1d91b commit b865af0

14 files changed

Lines changed: 70 additions & 67 deletions

‎sbndcode/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
add_subdirectory(JobConfigurations)
33
add_subdirectory(LArSoftConfigurations)
44
add_subdirectory(Utilities)
5+
add_subdirectory(Calibration)
56
add_subdirectory(Geometry)
67
add_subdirectory(LArG4)
7-
add_subdirectory(Calibration)
8+
add_subdirectory(TPC1DSignalProcessing)
89
add_subdirectory(CRT)
910
add_subdirectory(DetectorSim)
1011
add_subdirectory(MCTruthExtractor)

‎sbndcode/Calibration/CMakeLists.txt‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,2 @@
1-
add_subdirectory(tools)
21

3-
set (MODULE_LIBRARIES
4-
larcore::Geometry_Geometry_service
5-
lardata::Utilities
6-
lardata::ArtDataHelper
7-
lardataobj::RawData
8-
lardataobj::RecoBase
9-
larevt::CalibrationDBI_Providers
10-
sbndcode_Utilities_SignalShapingServiceSBND_service
11-
art::Framework_Core
12-
art::Framework_Principal
13-
art::Framework_Services_Registry
14-
art_root_io::tfile_support ROOT::Core
15-
art_root_io::TFileService_service
16-
art::Utilities
17-
canvas::canvas
18-
messagefacility::MF_MessageLogger
19-
ROOT::Core
20-
ROOT::Tree
21-
fhiclcpp::fhiclcpp
22-
cetlib::cetlib
23-
cetlib_except::cetlib_except
24-
ROOT::Geom
25-
ROOT::XMLIO
26-
ROOT::Gdml
27-
)
28-
set (TOOL_LIBRARIES
29-
larcore::Geometry_Geometry_service
30-
lardata::Utilities
31-
lardata::ArtDataHelper
32-
lardataobj::RawData
33-
lardataobj::RecoBase
34-
sbndcode::Utilities_SignalShapingServiceSBND_service
35-
art::Framework_Core
36-
art::Framework_Principal
37-
art::Framework_Services_Registry
38-
art_root_io::tfile_support ROOT::Core
39-
art_root_io::TFileService_service
40-
art::Utilities
41-
canvas::canvas
42-
messagefacility::MF_MessageLogger
43-
ROOT::Core
44-
fhiclcpp::fhiclcpp
45-
cetlib::cetlib
46-
cetlib_except::cetlib_except
47-
ROOT::Geom
48-
ROOT::XMLIO
49-
ROOT::Gdml
50-
)
512

52-
53-
54-
55-
56-
cet_build_plugin(CalWireSBND art::module SOURCE CalWireSBND_module.cc LIBRARIES ${MODULE_LIBRARIES})
57-
58-
cet_build_plugin(HitEfficiencyAna art::module SOURCE HitEfficiencyAna_module.cc LIBRARIES ${MODULE_LIBRARIES})
59-
60-
cet_build_plugin(ROIFinderStandardSBND art::tool SOURCE ROIFinderStandardSBND_tool.cc LIBRARIES ${TOOL_LIBRARIES})
61-
62-
install_headers()
63-
install_fhicl()
64-
install_source()

‎sbndcode/TPC1DSignalProcessing/CMakeLists.txt‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
add_subdirectory(tools)
2+
3+
set (MODULE_LIBRARIES
4+
larcore::Geometry_Geometry_service
5+
lardata::Utilities
6+
lardata::ArtDataHelper
7+
lardataobj::RawData
8+
lardataobj::RecoBase
9+
larevt::CalibrationDBI_Providers
10+
sbndcode_Utilities_SignalShapingServiceSBND_service
11+
art::Framework_Core
12+
art::Framework_Principal
13+
art::Framework_Services_Registry
14+
art_root_io::tfile_support ROOT::Core
15+
art_root_io::TFileService_service
16+
art::Utilities
17+
canvas::canvas
18+
messagefacility::MF_MessageLogger
19+
ROOT::Core
20+
ROOT::Tree
21+
fhiclcpp::fhiclcpp
22+
cetlib::cetlib
23+
cetlib_except::cetlib_except
24+
ROOT::Geom
25+
ROOT::XMLIO
26+
ROOT::Gdml
27+
)
28+
set (TOOL_LIBRARIES
29+
larcore::Geometry_Geometry_service
30+
lardata::Utilities
31+
lardata::ArtDataHelper
32+
lardataobj::RawData
33+
lardataobj::RecoBase
34+
sbndcode::Utilities_SignalShapingServiceSBND_service
35+
art::Framework_Core
36+
art::Framework_Principal
37+
art::Framework_Services_Registry
38+
art_root_io::tfile_support ROOT::Core
39+
art_root_io::TFileService_service
40+
art::Utilities
41+
canvas::canvas
42+
messagefacility::MF_MessageLogger
43+
ROOT::Core
44+
fhiclcpp::fhiclcpp
45+
cetlib::cetlib
46+
cetlib_except::cetlib_except
47+
ROOT::Geom
48+
ROOT::XMLIO
49+
ROOT::Gdml
50+
)
51+
52+
53+
54+
55+
56+
cet_build_plugin(CalWireSBND art::module SOURCE CalWireSBND_module.cc LIBRARIES ${MODULE_LIBRARIES})
57+
58+
cet_build_plugin(HitEfficiencyAna art::module SOURCE HitEfficiencyAna_module.cc LIBRARIES ${MODULE_LIBRARIES})
59+
60+
cet_build_plugin(ROIFinderStandardSBND art::tool SOURCE ROIFinderStandardSBND_tool.cc LIBRARIES ${TOOL_LIBRARIES})
61+
62+
install_headers()
63+
install_fhicl()
64+
install_source()

sbndcode/Calibration/CalWireSBND_module.cc renamed to sbndcode/TPC1DSignalProcessing/CalWireSBND_module.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "lardata/ArtDataHelper/WireCreator.h"
3131

3232
#include "sbndcode/Utilities/SignalShapingServiceSBND.h"
33-
#include "sbndcode/Calibration/IROIFinder.h"
33+
#include "sbndcode/TPC1DSignalProcessing/IROIFinder.h"
3434
#include "larcore/Geometry/Geometry.h"
3535
//#include "Filters/ChannelFilter.h"
3636

sbndcode/Calibration/HitEfficiencyAna_module.cc renamed to sbndcode/TPC1DSignalProcessing/HitEfficiencyAna_module.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "fhiclcpp/ParameterSet.h"
4444
#include "cetlib_except/exception.h"
4545
#include "nusimdata/SimulationBase/MCParticle.h"
46-
#include "sbndcode/Calibration/tools/IHitEfficiencyHistogramTool.h"
46+
#include "sbndcode/TPC1DSignalProcessing/tools/IHitEfficiencyHistogramTool.h"
4747
#include "TTree.h"
4848
// C++ Includes
4949
#include <map>

sbndcode/Calibration/IROIFinder.h renamed to sbndcode/TPC1DSignalProcessing/IROIFinder.h

File renamed without changes.

sbndcode/Calibration/ROIFinderStandardSBND_tool.cc renamed to sbndcode/TPC1DSignalProcessing/ROIFinderStandardSBND_tool.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/// Ported from ICARUS to SBND by A. Scarff
55
////////////////////////////////////////////////////////////////////////
66
#include <cmath>
7-
#include "sbndcode/Calibration/IROIFinder.h"
7+
#include "sbndcode/TPC1DSignalProcessing/IROIFinder.h"
88
#include "art/Utilities/ToolMacros.h"
99
#include "art_root_io/TFileService.h"
1010
#include "messagefacility/MessageLogger/MessageLogger.h"

sbndcode/Calibration/analysis_sbnd.fcl renamed to sbndcode/TPC1DSignalProcessing/analysis_sbnd.fcl

File renamed without changes.

sbndcode/Calibration/caldata_sbnd.fcl renamed to sbndcode/TPC1DSignalProcessing/caldata_sbnd.fcl

File renamed without changes.

sbndcode/Calibration/roitools_sbnd.fcl renamed to sbndcode/TPC1DSignalProcessing/roitools_sbnd.fcl

File renamed without changes.

0 commit comments

Comments
 (0)