Skip to content

Commit 9147359

Browse files
Fixed CAFMaker/RecoUtils dependencies
The dependencies in there are now optimal. Changes were needed in dependent code with missing inclusions that were covered by RecoUtils. The changes to this other code are minimal rather than optimal.
1 parent 68f6c1d commit 9147359

7 files changed

Lines changed: 28 additions & 29 deletions

File tree

‎sbncode/CAFMaker/RecoUtils/CMakeLists.txt‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
art_make_library( LIBRARY_NAME caf_RecoUtils
33
SOURCE RecoUtils.cc
44
LIBRARIES
5-
sbnanaobj::StandardRecord
6-
art::Framework_Core
5+
PRIVATE
76
art::Framework_Services_Registry
8-
art::Framework_Principal
9-
art::Persistency_Common
10-
art::Utilities canvas::canvas
11-
cetlib::cetlib cetlib_except::cetlib_except
127
larsim::MCCheater_BackTrackerService_service
138
larsim::MCCheater_ParticleInventoryService_service
14-
larcorealg::Geometry
15-
sbnanaobj::StandardRecord
9+
PUBLIC
10+
lardataalg::DetectorInfo
11+
lardataobj::RecoBase
12+
canvas::canvas
1613
)
1714
install_headers()

‎sbncode/CAFMaker/RecoUtils/RecoUtils.cc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
#include "RecoUtils.h"
22

3+
// framework
4+
#include "art/Framework/Services/Registry/ServiceHandle.h"
5+
6+
// LArSoft
7+
#include "larsim/MCCheater/BackTrackerService.h"
8+
#include "larsim/MCCheater/ParticleInventoryService.h"
9+
10+
// C++
11+
#include <map>
12+
13+
314
std::vector<std::pair<int, float>> CAFRecoUtils::AllTrueParticleIDEnergyMatches(const detinfo::DetectorClocksData &clockData, const std::vector<art::Ptr<recob::Hit> >& hits, bool rollup_unsaved_ids) {
415
art::ServiceHandle<cheat::BackTrackerService> bt_serv;
516
std::map<int, float> trackIDToEDepMap;

‎sbncode/CAFMaker/RecoUtils/RecoUtils.h‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,14 @@
1010
///////////////////////////////////////////////
1111

1212
// framework
13-
#include "art/Framework/Principal/Event.h"
14-
#include "fhiclcpp/ParameterSet.h"
15-
#include "art/Framework/Principal/Handle.h"
16-
#include "art/Framework/Services/Registry/ServiceHandle.h"
1713
#include "canvas/Persistency/Common/Ptr.h"
18-
#include "canvas/Persistency/Common/PtrVector.h"
19-
#include "canvas/Persistency/Common/FindManyP.h"
2014

2115
// LArSoft
22-
#include "nusimdata/SimulationBase/MCParticle.h"
23-
#include "nusimdata/SimulationBase/MCTruth.h"
16+
#include "lardataalg/DetectorInfo/DetectorClocksData.h"
2417
#include "lardataobj/RecoBase/Hit.h"
25-
#include "lardataobj/RecoBase/Track.h"
26-
#include "lardataobj/RecoBase/Shower.h"
27-
//#include "lardataobj/AnalysisBase/MVAPIDResult.h"
28-
//#include "lardataobj/AnalysisBase/ParticleID.h"
29-
#include "larsim/MCCheater/BackTrackerService.h"
30-
#include "larsim/MCCheater/ParticleInventoryService.h"
31-
#include "larcore/Geometry/Geometry.h"
32-
33-
// c++
34-
#include <vector>
35-
#include <map>
3618

37-
// ROOT
38-
#include "TTree.h"
19+
// C++
20+
#include <vector>
3921

4022
namespace CAFRecoUtils{
4123

‎sbncode/TPCReco/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cet_build_plugin(NuVertexChargeTree art::module
1717
art::Utilities canvas::canvas
1818
cetlib::cetlib cetlib_except::cetlib_except
1919
ROOT::X3d
20+
ROOT::Tree
2021
messagefacility::MF_MessageLogger
2122
lardata::DetectorInfoServices_DetectorClocksServiceStandard_service
2223
sbnobj::Common_Reco

‎sbncode/TPCReco/CalorimetryAnalysis/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cet_build_plugin( CalorimetryAnalysis art::module
1616
caf_RecoUtils
1717
larreco::RecoAlg
1818
lardataobj::AnalysisBase
19+
lardataobj::Simulation
1920
lardataobj::RecoBase
2021
larcorealg::Geometry
2122
larcore::Geometry_Geometry_service

‎sbncode/TPCReco/CalorimetryAnalysis/CalorimetryAnalysis_module.cc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33

44
#include <iostream>
55
#include <map>
6+
#include <array>
7+
#include <vector>
68

79
#include "TDatabasePDG.h"
810
#include "TParticlePDG.h"
11+
#include "TTree.h"
912
#include "art/Framework/Core/EDAnalyzer.h"
1013
#include "canvas/Utilities/InputTag.h"
1114
#include "fhiclcpp/ParameterSet.h"
@@ -30,13 +33,15 @@
3033

3134
#include "larreco/RecoAlg/TrackMomentumCalculator.h"
3235

36+
#include "lardataobj/Simulation/SimChannel.h"
3337
#include "lardataobj/RecoBase/PFParticle.h"
3438
#include "lardataobj/RecoBase/Shower.h"
3539
#include "lardataobj/RecoBase/Slice.h"
3640
#include "lardataobj/RecoBase/Track.h"
3741
#include "lardataobj/RecoBase/Wire.h"
3842
#include "lardataobj/RecoBase/Hit.h"
3943
#include "lardataobj/RecoBase/Cluster.h"
44+
#include "lardataobj/RecoBase/SpacePoint.h"
4045
#include "lardataobj/AnalysisBase/Calorimetry.h"
4146
#include "lardataobj/AnalysisBase/ParticleID.h"
4247
#include "lardataobj/AnalysisBase/T0.h"
@@ -56,6 +61,7 @@
5661
#include "lardataalg/DetectorInfo/DetectorPropertiesStandard.h"
5762
#include "lardata/DetectorInfoServices/DetectorPropertiesService.h"
5863
#include "lardata/DetectorInfoServices/DetectorClocksService.h"
64+
#include "larsim/MCCheater/BackTrackerService.h"
5965

6066
// #include "larpandora/LArPandoraInterface/LArPandoraHelper.h"
6167

‎sbncode/TPCReco/NuVertexChargeTree_module.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "messagefacility/MessageLogger/MessageLogger.h"
1515

1616
#include "art_root_io/TFileService.h"
17+
#include "TTree.h"
1718

1819
#include "sbncode/CAFMaker/RecoUtils/RecoUtils.h"
1920
#include "lardataobj/RecoBase/Hit.h"

0 commit comments

Comments
 (0)