Skip to content

Commit 9a2ea43

Browse files
asanchezcastilloasanchezcastillo
committed
Include fcl and locate in calibration folder
1 parent b04ca7e commit 9a2ea43

10 files changed

Lines changed: 15 additions & 14 deletions

‎sbndcode/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,3 @@ add_subdirectory(ChannelMaps)
4545

4646
# for CVN
4747
add_subdirectory(SBNDCVN)
48-
49-
# for Calibration database
50-
add_subdirectory(DatabaseInterface)

‎sbndcode/Calibration/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
add_subdirectory(OpReco)
22
add_subdirectory(CRT)
33
add_subdirectory(DQM)
4+
add_subdirectory(PDSDatabaseInterface)

sbndcode/DatabaseInterface/CMakeLists.txt renamed to sbndcode/Calibration/PDSDatabaseInterface/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
cet_enable_asserts()
22

33
set( MODULE_LIBRARIES
4-
art_root_io::TFileService_service
5-
art_root_io::tfile_support
4+
art_root_io::TFileService_service
5+
art_root_io::tfile_support
66
)
77
set( LIB_LIBRARIES
88
art::Framework_Services_Registry
99
messagefacility::MF_MessageLogger
1010
lardata::Utilities
11-
larevt::CalibrationDBI_IOVData
12-
larevt::CalibrationDBI_Providers
11+
larevt::CalibrationDBI_IOVData
12+
larevt::CalibrationDBI_Providers
1313
)
1414
set( SERVICE_LIBRARIES
15-
sbndcode_DatabaseInterface
15+
sbndcode_Calibration_PDSDatabaseInterface
16+
larcore::Geometry_Geometry_service
17+
lardata::DetectorClocksService
1618
)
1719

1820
file(GLOB lib_srcs *.cxx)

sbndcode/DatabaseInterface/IPMTCalibrationDatabaseService.h renamed to sbndcode/Calibration/PDSDatabaseInterface/IPMTCalibrationDatabaseService.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define SBNDCCODE_DATABASEINTERFACE_IPMTCALIBRATIONDATABASESERVICE_H
1010

1111
// ICARUS libraries
12-
#include "sbndcode/DatabaseInterface/PMTCalibrationDatabase.h"
12+
#include "sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h"
1313

1414
// LArSoft libraries
1515
#include "larcore/CoreUtils/ServiceProviderWrappers.h"

sbndcode/DatabaseInterface/PMTCalibrationDatabase.h renamed to sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h

File renamed without changes.

sbndcode/DatabaseInterface/PMTCalibrationDatabaseProvider.cxx renamed to sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "messagefacility/MessageLogger/MessageLogger.h"
1212

1313
// Local
14-
#include "sbndcode/DatabaseInterface/PMTCalibrationDatabase.h"
15-
#include "sbndcode/DatabaseInterface/PMTCalibrationDatabaseProvider.h"
14+
#include "sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h"
15+
#include "sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.h"
1616

1717
// Database interface helpers
1818
#include "larevt/CalibrationDBI/IOVData/TimeStampDecoder.h"

sbndcode/DatabaseInterface/PMTCalibrationDatabaseProvider.h renamed to sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "fhiclcpp/ParameterSet.h"
1919

2020
// Local
21-
#include "sbndcode/DatabaseInterface/PMTCalibrationDatabase.h"
21+
#include "sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabase.h"
2222

2323
// C/C++ standard libraries
2424
#include <string>

sbndcode/DatabaseInterface/PMTCalibrationDatabaseService_service.cc renamed to sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseService_service.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55
// Ported to SBND by Alejandro Sanchez-Castillo, Jan. 2025
66

7-
#include "sbndcode/DatabaseInterface/IPMTCalibrationDatabaseService.h"
8-
#include "sbndcode/DatabaseInterface/PMTCalibrationDatabaseProvider.h"
7+
#include "sbndcode/Calibration/PDSDatabaseInterface/IPMTCalibrationDatabaseService.h"
8+
#include "sbndcode/Calibration/PDSDatabaseInterface/PMTCalibrationDatabaseProvider.h"
99

1010
// framework libraries
1111
#include "art/Framework/Principal/Run.h"

sbndcode/DatabaseInterface/database_config.fcl renamed to sbndcode/Calibration/PDSDatabaseInterface/pmtcalibrationdatabase_sbnd.fcl

File renamed without changes.

‎sbndcode/LArSoftConfigurations/services_sbnd.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "database_sbnd.fcl"
4646
#include "sam_sbnd.fcl"
4747
#include "spacecharge_sbnd.fcl"
48+
#include "pmtcalibrationdatabase_sbnd.fcl"
4849

4950
BEGIN_PROLOG
5051

0 commit comments

Comments
 (0)