Merge branch 'master' into dl210316rc

cms-sw · Apr 19, 2021 · c75d0d0 · c75d0d0
2 parents e1fda72 + 07a5e6a
commit c75d0d0
Show file tree

Hide file tree

Showing 167 changed files with 5,413 additions and 3,997 deletions.
diff --git a/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml b/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
@@ -19,7 +19,6 @@
 <library file="LaserOpticalPhysics.cc">
   <use name="Alignment/LaserAlignmentSimulation"/>
   <use name="SimG4Core/Physics"/>
-  <use name="SimG4Core/PhysicsLists"/>
   <use name="geant4core"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CUDADataFormats/HGCal/BuildFile.xml b/CUDADataFormats/HGCal/BuildFile.xml
@@ -1,6 +1,6 @@
-<use name="FWCore/Utilities"/>
-<use name="Geometry/HGCalGeometry"/>
-<use name="HeterogeneousCore/CUDACore"/>
+<use name="CUDADataFormats/Common"/>
+<use name="DataFormats/Common"/>
+<use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="cuda"/>
 
 <export>

diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
@@ -35,3 +35,26 @@
   <use name="TrackingTools/TrajectoryState"/>
   <flags EDM_PLUGIN="1"/>
 </library>
+
+<library file="NearbyPixelClustersProducer.cc" name="NearbyPixelClustersProducer">
+  <use name="TrackingTools/PatternTools"/>
+  <use name="RecoLocalTracker/Records"/>
+  <use name="RecoTracker/MeasurementDet"/>
+  <use name="TrackingTools/TrackFitters"/>
+  <flags EDM_PLUGIN="1"/>
+</library>
+
+<library file="NearbyPixelClustersAnalyzer.cc" name="NearbyPixelClustersAnalyzer">
+  <use name="TrackingTools/PatternTools"/>
+  <use name="RecoLocalTracker/Records"/>
+  <use name="RecoTracker/MeasurementDet"/>
+  <use name="TrackingTools/TrackFitters"/>
+  <use name="CondFormats/SiPixelObjects"/>
+  <use name="CalibTracker/SiPixelESProducers"/>
+  <flags EDM_PLUGIN="1"/>
+</library>
+
+<library file="TrackDistanceValueMapProducer.cc" name="TrackDistanceValueMapProducer">
+  <use name="DataFormats/TrackReco"/>
+  <flags EDM_PLUGIN="1"/>
+</library>