Move commons.h to DataFormats/HGCalReco to break cyclic dep

cms-sw · Jun 12, 2024 · 416f488 · 416f488
1 parent 23d93b4
commit 416f488
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/DataFormats/HGCalReco/interface/TICLCandidate.h b/DataFormats/HGCalReco/interface/TICLCandidate.h
@@ -7,7 +7,7 @@
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "commons.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/RecoHGCal/TICL/interface/commons.h → DataFormats/HGCalReco/interface/commons.h b/RecoHGCal/TICL/interface/commons.h → DataFormats/HGCalReco/interface/commons.h
diff --git a/RecoHGCal/TICL/interface/PatternRecognitionAlgoBase.h b/RecoHGCal/TICL/interface/PatternRecognitionAlgoBase.h
@@ -13,7 +13,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "RecoHGCal/TICL/interface/GlobalCache.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
 

diff --git a/RecoHGCal/TICL/interface/TICLInterpretationAlgoBase.h b/RecoHGCal/TICL/interface/TICLInterpretationAlgoBase.h
@@ -19,7 +19,7 @@
 #include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h"
 #include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h"
 #include "RecoHGCal/TICL/interface/GlobalCache.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
 #include "CommonTools/RecoAlgos/interface/MultiVectorManager.h"

diff --git a/RecoHGCal/TICL/interface/TracksterLinkingAlgoBase.h b/RecoHGCal/TICL/interface/TracksterLinkingAlgoBase.h
@@ -16,7 +16,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "RecoHGCal/TICL/interface/GlobalCache.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
 #include "CommonTools/RecoAlgos/interface/MultiVectorManager.h"

diff --git a/RecoHGCal/TICL/plugins/LinkingAlgoByDirectionGeometric.h b/RecoHGCal/TICL/plugins/LinkingAlgoByDirectionGeometric.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <array>
 #include "RecoHGCal/TICL/plugins/LinkingAlgoBase.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/RecoHGCal/TICL/plugins/SimTrackstersProducer.cc b/RecoHGCal/TICL/plugins/SimTrackstersProducer.cc
@@ -39,7 +39,7 @@
 
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 
 #include "TrackstersPCA.h"
 #include <vector>

diff --git a/RecoHGCal/TICL/plugins/TICLDumper.cc b/RecoHGCal/TICL/plugins/TICLDumper.cc
@@ -52,7 +52,7 @@
 #include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h"
 
 #include "SimDataFormats/Associations/interface/TracksterToSimTracksterHitLCAssociator.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 
 // TFileService
 #include "FWCore/ServiceRegistry/interface/Service.h"

diff --git a/Validation/HGCalValidation/src/TICLCandidateValidator.cc b/Validation/HGCalValidation/src/TICLCandidateValidator.cc
@@ -3,7 +3,7 @@
 #include <sstream>
 
 #include "Validation/HGCalValidation/interface/TICLCandidateValidator.h"
-#include "RecoHGCal/TICL/interface/commons.h"
+#include "DataFormats/HGCalReco/interface/commons.h"
 
 TICLCandidateValidator::TICLCandidateValidator(
     edm::EDGetTokenT<std::vector<TICLCandidate>> ticlCandidates,