clean BuildFiles up to DataFormats

cms-sw · Aug 18, 2020 · 693915e · 693915e
1 parent 56dcfc5
commit 693915e
Show file tree

Hide file tree

Showing 42 changed files with 19 additions and 174 deletions.
diff --git a/CommonTools/CandAlgos/BuildFile.xml b/CommonTools/CandAlgos/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/PatCandidates"/>
+<use name="CommonTools/CandUtils"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CommonTools/CandAlgos/interface/CandCombiner.h b/CommonTools/CandAlgos/interface/CandCombiner.h
@@ -26,6 +26,7 @@
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/transform.h"
+#include "CommonTools/CandUtils/interface/AddFourMomenta.h"
 #include <string>
 #include <vector>
 #include <algorithm>

diff --git a/CommonTools/CandAlgos/plugins/BuildFile.xml b/CommonTools/CandAlgos/plugins/BuildFile.xml
@@ -8,5 +8,4 @@
   <use name="CommonTools/UtilAlgos"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/CandAlgos"/>
-  <use name="CommonTools/CandUtils"/>
 </library>
diff --git a/CommonTools/ParticleFlow/plugins/BuildFile.xml b/CommonTools/ParticleFlow/plugins/BuildFile.xml
@@ -11,7 +11,6 @@
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="JetMETCorrections/Objects"/>
   <use name="JetMETCorrections/JetCorrector"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/ParticleFlow"/>

diff --git a/CommonTools/ParticleFlow/test/BuildFile.xml b/CommonTools/ParticleFlow/test/BuildFile.xml
@@ -1,9 +1,9 @@
 <library name="CommonToolsParticleFlowTest" file="PFIsoReaderDemo.cc">
+  <use name="CommonTools/UtilAlgos"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/EgammaCandidates"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="PhysicsTools/UtilAlgos"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CommonTools/PileupAlgos/plugins/BuildFile.xml b/CommonTools/PileupAlgos/plugins/BuildFile.xml
@@ -2,13 +2,9 @@
 </export>
 <library name="CommonToolsPileupAlgos_plugins" file="*.cc">
   <use name="DataFormats/ParticleFlowCandidate"/>
-  <use name="DataFormats/JetReco"/>
+  <use name="DataFormats/PatCandidates"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="JetMETCorrections/Objects"/>
-  <use name="CommonTools/Utils"/>
-  <use name="CommonTools/ParticleFlow"/>
   <use name="CommonTools/PileupAlgos"/>
   <use name="fastjet"/>
   <use name="fastjet-contrib"/>

diff --git a/CommonTools/RecoAlgos/BuildFile.xml b/CommonTools/RecoAlgos/BuildFile.xml
@@ -12,6 +12,7 @@
 <use name="DataFormats/VertexReco"/>
 <use name="TrackingTools/IPTools"/>
 <use name="TrackingTools/TransientTrack"/>
+<use name="Geometry/TrackerGeometryBuilder">
 <use name="fastjet"/>
 <export>
   <lib name="1"/>

diff --git a/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h b/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h
@@ -21,13 +21,13 @@
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include <Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h>
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
-#include <DataFormats/GeometrySurface/interface/Surface.h>
-#include <DataFormats/GeometrySurface/interface/GloballyPositioned.h>
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
+#include "DataFormats/GeometrySurface/interface/Surface.h"
+#include "DataFormats/GeometrySurface/interface/GloballyPositioned.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 

diff --git a/CommonTools/RecoAlgos/plugins/BuildFile.xml b/CommonTools/RecoAlgos/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <export>
 </export>
 <library name="CommonToolsRecoAlgos_plugins" file="*.cc">
-  <use name="MagneticField/Engine"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
   <use name="DataFormats/RecoCandidate"/>
@@ -14,12 +13,8 @@
   <use name="DataFormats/PatCandidates"/>
   <use name="DataFormats/HcalRecHit"/>
   <use name="SimDataFormats/TrackingAnalysis"/>
-  <use name="TrackingTools/PatternTools"/>
   <use name="TrackingTools/Records"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/RecoAlgos"/>
-  <use name="MagneticField/Records"/>
-  <use name="Geometry/Records"/>
-  <use name="Geometry/TrackerGeometryBuilder"/>
   <use name="JetMETCorrections/JetCorrector"/>
 </library>
diff --git a/CommonTools/TriggerUtils/plugins/BuildFile.xml b/CommonTools/TriggerUtils/plugins/BuildFile.xml
@@ -1,10 +1,5 @@
 <library file="*.cc" name="CommonToolsTriggerUtilsPlugins">
-  <use name="CondFormats/DataRecord"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/Scalers"/>
-  <use name="DataFormats/L1GlobalTrigger"/>
   <use name="FWCore/Framework"/>
-  <use name="L1Trigger/GlobalTriggerAnalyzer"/>
   <use name="HLTrigger/HLTcore"/>
   <use name="CommonTools/TriggerUtils"/>
   <flags EDM_PLUGIN="1"/>

diff --git a/CommonTools/Utils/test/BuildFile.xml b/CommonTools/Utils/test/BuildFile.xml
@@ -4,8 +4,6 @@
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/Candidate"/>
   <use name="DataFormats/PatCandidates"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/SiStripCluster"/>
   <use name="CommonTools/Utils"/>
   <use name="cppunit"/>
   <use name="rootmath"/>
@@ -22,8 +20,6 @@
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/Candidate"/>
   <use name="DataFormats/PatCandidates"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/SiStripCluster"/>
   <use name="CommonTools/Utils"/>
   <use name="cppunit"/>
 </bin>

diff --git a/CondCore/AlignmentPlugins/plugins/BuildFile.xml b/CondCore/AlignmentPlugins/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
 <library file="TrackerAlignmentErrorExtended_PayloadInspector.cc" name="TrackerAlignmentErrorExtended_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/Alignment"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -11,7 +10,6 @@
 <library file="TrackerAlignment_PayloadInspector.cc" name="TrackerAlignment_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/Alignment"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="Alignment/CommonAlignment"/>
@@ -21,7 +19,6 @@
 <library file="TrackerSurfaceDeformations_PayloadInspector.cc" name="TrackerSurfaceDeformations_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/Alignment"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="Alignment/CommonAlignment"/>

diff --git a/CondCore/BeamSpotPlugins/plugins/BuildFile.xml b/CondCore/BeamSpotPlugins/plugins/BuildFile.xml
@@ -1,13 +1,11 @@
 <library file="BeamSpot_PayloadInspector.cc" name="BeamSpot_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="boost_python"/>
 </library>
 
 <library file="BeamSpotOnline_PayloadInspector.cc" name="BeamSpotOnline_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="boost_python"/>
 </library>
diff --git a/CondCore/DBOutputService/test/BuildFile.xml b/CondCore/DBOutputService/test/BuildFile.xml
@@ -38,6 +38,5 @@
 </library>
 
 <library file="stubs/writeInt.cc" name="writeInt">
-  <use name="CondFormats/Common"/>
   <flags EDM_PLUGIN="1"/>
 </library>