Merge branch 'master' into fix-py3-test-condTestRegression

cms-sw · Oct 15, 2019 · 6258436 · 6258436
2 parents 106a404 + e497640
commit 6258436
Show file tree

Hide file tree

Showing 254 changed files with 2,534 additions and 3,149 deletions.
diff --git a/Alignment/APEEstimation/BuildFile.xml b/Alignment/APEEstimation/BuildFile.xml
@@ -23,7 +23,6 @@
 <use name="TrackingTools/TrajectoryState"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/Alignment"/>
 <use name="RecoLocalTracker/SiStripClusterizer"/>
 <use name="RecoLocalTracker/SiStripRecHitConverter"/>

diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc
@@ -72,7 +72,7 @@
 //added by Ajay 6Nov 2014
 //.......................
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 

diff --git a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
@@ -91,7 +91,6 @@
   <use   name="DataFormats/CSCRecHit"/>
   <use   name="DataFormats/DTRecHit"/>
   <use   name="DataFormats/TrackingRecHit"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
   <use   name="Geometry/DTGeometry"/>
   <use   name="Geometry/CSCGeometry"/>
   <use   name="Geometry/CommonDetUnit"/>
@@ -104,7 +103,6 @@
 
 <library   name="AlignmentStats" file="AlignmentStats.cc">
   <use   name="FWCore/Utilities"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
   <use   name="Geometry/Records"/>
   <use   name="Alignment/CommonAlignment"/>
   <use   name="Alignment/TrackerAlignment"/>

diff --git a/Alignment/CommonAlignmentProducer/BuildFile.xml b/Alignment/CommonAlignmentProducer/BuildFile.xml
@@ -28,7 +28,6 @@
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="DataFormats/Alignment"/>
 <use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="rootcore"/>
 <use   name="root"/>
 <export>

diff --git a/Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/helper.py b/Alignment/MillePedeAlignmentAlgorithm/python/alignmentsetup/helper.py
@@ -11,7 +11,7 @@ def checked_out_MPS():
     git_initialized = False
     try:
         with open(checked_out_packages, "r") as f:
-            packages = ("/Alignment/", "/Alignment/MillePedeAlignmentAlgorithm/")
+            packages = ("/Alignment/", "/Alignment/MillePedeAlignmentAlgorithm/","/*/")
             for line in f:
                 if line.strip() in packages:
                     checked_out = True

diff --git a/Alignment/OfflineValidation/plugins/OverlapValidation.cc b/Alignment/OfflineValidation/plugins/OverlapValidation.cc
@@ -40,8 +40,8 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"

diff --git a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
@@ -3,7 +3,7 @@
 #include "CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 

diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelDetInfoFileWriter.cc
@@ -13,7 +13,7 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 
 using namespace cms;
 using namespace std;

diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelGenErrorDBObjectESProducer.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelGenErrorDBObjectESProducer.cc
@@ -16,9 +16,8 @@
 //
 
 #include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/ESProductTag.h"
 #include "FWCore/Utilities/interface/do_nothing_deleter.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
 
@@ -33,49 +32,54 @@ using namespace edm;
 class SiPixelGenErrorDBObjectESProducer : public edm::ESProducer {
 public:
   SiPixelGenErrorDBObjectESProducer(const edm::ParameterSet& iConfig);
-  ~SiPixelGenErrorDBObjectESProducer() override;
   std::shared_ptr<const SiPixelGenErrorDBObject> produce(const SiPixelGenErrorDBObjectESProducerRcd&);
+
+private:
+  edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magfieldToken_;
+  edm::ESGetToken<SiPixelGenErrorDBObject, SiPixelGenErrorDBObjectRcd> genErrorToken_;
 };
 
 SiPixelGenErrorDBObjectESProducer::SiPixelGenErrorDBObjectESProducer(const edm::ParameterSet& iConfig) {
-  setWhatProduced(this);
+  setWhatProduced(this)
+      .setMayConsume(
+          genErrorToken_,
+          [](const auto& get, edm::ESTransientHandle<MagneticField> iMagfield) {
+            const GlobalPoint center(0.0, 0.0, 0.0);
+            const float theMagField = iMagfield->inTesla(center).mag();
+            if (theMagField >= -0.1 && theMagField < 1.0)
+              return get("", "0T");
+            else if (theMagField >= 1.0 && theMagField < 2.5)
+              return get("", "2T");
+            else if (theMagField >= 2.5 && theMagField < 3.25)
+              return get("", "3T");
+            else if (theMagField >= 3.25 && theMagField < 3.65)
+              return get("", "35T");
+            else if (theMagField >= 3.9 && theMagField < 4.1)
+              return get("", "4T");
+            else {
+              if (theMagField >= 4.1 || theMagField < -0.1)
+                edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixelGenError")
+                    << "Magnetic field is " << theMagField;
+              //return get("", "3.8T");
+              return get("", "");
+            }
+          },
+          edm::ESProductTag<MagneticField, IdealMagneticFieldRecord>("", ""))
+      .setConsumes(magfieldToken_);
 }
 
-SiPixelGenErrorDBObjectESProducer::~SiPixelGenErrorDBObjectESProducer() {}
-
 std::shared_ptr<const SiPixelGenErrorDBObject> SiPixelGenErrorDBObjectESProducer::produce(
     const SiPixelGenErrorDBObjectESProducerRcd& iRecord) {
-  ESHandle<MagneticField> magfield;
-  iRecord.getRecord<IdealMagneticFieldRecord>().get(magfield);
-
-  GlobalPoint center(0.0, 0.0, 0.0);
-  float theMagField = magfield.product()->inTesla(center).mag();
-
-  std::string label = "";
+  const GlobalPoint center(0.0, 0.0, 0.0);
+  const float theMagField = iRecord.get(magfieldToken_).inTesla(center).mag();
 
-  if (theMagField >= -0.1 && theMagField < 1.0)
-    label = "0T";
-  else if (theMagField >= 1.0 && theMagField < 2.5)
-    label = "2T";
-  else if (theMagField >= 2.5 && theMagField < 3.25)
-    label = "3T";
-  else if (theMagField >= 3.25 && theMagField < 3.65)
-    label = "35T";
-  else if (theMagField >= 3.9 && theMagField < 4.1)
-    label = "4T";
-  else {
-    //label = "3.8T";
-    if (theMagField >= 4.1 || theMagField < -0.1)
-      edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixelGenError") << "Magnetic field is " << theMagField;
-  }
-  ESHandle<SiPixelGenErrorDBObject> dbobject;
-  iRecord.getRecord<SiPixelGenErrorDBObjectRcd>().get(label, dbobject);
+  const auto& dbobject = iRecord.get(genErrorToken_);
 
-  if (std::fabs(theMagField - dbobject->sVector()[22]) > 0.1)
+  if (std::fabs(theMagField - dbobject.sVector()[22]) > 0.1)
     edm::LogWarning("UnexpectedMagneticFieldUsingNonIdealPixelGenError")
-        << "Magnetic field is " << theMagField << " GenError Magnetic field is " << dbobject->sVector()[22];
+        << "Magnetic field is " << theMagField << " GenError Magnetic field is " << dbobject.sVector()[22];
 
-  return std::shared_ptr<const SiPixelGenErrorDBObject>(&(*dbobject), edm::do_nothing_deleter());
+  return std::shared_ptr<const SiPixelGenErrorDBObject>(&dbobject, edm::do_nothing_deleter());
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiPixelGenErrorDBObjectESProducer);
diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelTemplateDBObjectESProducer.cc
@@ -18,8 +18,8 @@
 #include <memory>
 
 #include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/ESProductTag.h"
 #include "FWCore/Utilities/interface/do_nothing_deleter.h"
 
 #include "FWCore/Framework/interface/ModuleFactory.h"
@@ -33,49 +33,54 @@ using namespace edm;
 class SiPixelTemplateDBObjectESProducer : public edm::ESProducer {
 public:
   SiPixelTemplateDBObjectESProducer(const edm::ParameterSet& iConfig);
-  ~SiPixelTemplateDBObjectESProducer() override;
   std::shared_ptr<const SiPixelTemplateDBObject> produce(const SiPixelTemplateDBObjectESProducerRcd&);
+
+private:
+  edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magfieldToken_;
+  edm::ESGetToken<SiPixelTemplateDBObject, SiPixelTemplateDBObjectRcd> templateToken_;
 };
 
 SiPixelTemplateDBObjectESProducer::SiPixelTemplateDBObjectESProducer(const edm::ParameterSet& iConfig) {
-  setWhatProduced(this);
+  setWhatProduced(this)
+      .setMayConsume(
+          templateToken_,
+          [](const auto& get, edm::ESTransientHandle<MagneticField> iMagfield) {
+            const GlobalPoint center(0.0, 0.0, 0.0);
+            const float theMagField = iMagfield->inTesla(center).mag();
+            if (theMagField >= -0.1 && theMagField < 1.0)
+              return get("", "0T");
+            else if (theMagField >= 1.0 && theMagField < 2.5)
+              return get("", "2T");
+            else if (theMagField >= 2.5 && theMagField < 3.25)
+              return get("", "3T");
+            else if (theMagField >= 3.25 && theMagField < 3.65)
+              return get("", "35T");
+            else if (theMagField >= 3.9 && theMagField < 4.1)
+              return get("", "4T");
+            else {
+              if (theMagField >= 4.1 || theMagField < -0.1)
+                edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixelTemplate")
+                    << "Magnetic field is " << theMagField;
+              //return get("", "3.8T");
+              return get("", "");
+            }
+          },
+          edm::ESProductTag<MagneticField, IdealMagneticFieldRecord>("", ""))
+      .setConsumes(magfieldToken_);
 }
 
-SiPixelTemplateDBObjectESProducer::~SiPixelTemplateDBObjectESProducer() {}
-
 std::shared_ptr<const SiPixelTemplateDBObject> SiPixelTemplateDBObjectESProducer::produce(
     const SiPixelTemplateDBObjectESProducerRcd& iRecord) {
-  ESHandle<MagneticField> magfield;
-  iRecord.getRecord<IdealMagneticFieldRecord>().get(magfield);
-
-  GlobalPoint center(0.0, 0.0, 0.0);
-  float theMagField = magfield.product()->inTesla(center).mag();
-
-  std::string label = "";
+  const GlobalPoint center(0.0, 0.0, 0.0);
+  const float theMagField = iRecord.get(magfieldToken_).inTesla(center).mag();
 
-  if (theMagField >= -0.1 && theMagField < 1.0)
-    label = "0T";
-  else if (theMagField >= 1.0 && theMagField < 2.5)
-    label = "2T";
-  else if (theMagField >= 2.5 && theMagField < 3.25)
-    label = "3T";
-  else if (theMagField >= 3.25 && theMagField < 3.65)
-    label = "35T";
-  else if (theMagField >= 3.9 && theMagField < 4.1)
-    label = "4T";
-  else {
-    //label = "3.8T";
-    if (theMagField >= 4.1 || theMagField < -0.1)
-      edm::LogWarning("UnexpectedMagneticFieldUsingDefaultPixelTemplate") << "Magnetic field is " << theMagField;
-  }
-  ESHandle<SiPixelTemplateDBObject> dbobject;
-  iRecord.getRecord<SiPixelTemplateDBObjectRcd>().get(label, dbobject);
+  const auto& dbobject = iRecord.get(templateToken_);
 
-  if (std::fabs(theMagField - dbobject->sVector()[22]) > 0.1)
+  if (std::fabs(theMagField - dbobject.sVector()[22]) > 0.1)
     edm::LogWarning("UnexpectedMagneticFieldUsingNonIdealPixelTemplate")
-        << "Magnetic field is " << theMagField << " Template Magnetic field is " << dbobject->sVector()[22];
+        << "Magnetic field is " << theMagField << " Template Magnetic field is " << dbobject.sVector()[22];
 
-  return std::shared_ptr<const SiPixelTemplateDBObject>(&(*dbobject), edm::do_nothing_deleter());
+  return std::shared_ptr<const SiPixelTemplateDBObject>(&dbobject, edm::do_nothing_deleter());
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(SiPixelTemplateDBObjectESProducer);
diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
@@ -2,7 +2,7 @@
 
 #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 namespace cms {

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
@@ -2,7 +2,7 @@
 
 #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 namespace cms {

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
@@ -2,7 +2,7 @@
 
 #include "CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 namespace cms {

diff --git a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
@@ -37,14 +37,14 @@
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
 
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"

diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.h
@@ -24,7 +24,7 @@
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include <Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h>
+#include <Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h>
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include <TROOT.h>

diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc
@@ -21,7 +21,7 @@
 // Pixel geometry and cabling map
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"

diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc
@@ -34,7 +34,7 @@
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 // EDProducer related dataformat
 #include "DQM/SiPixelPhase1Common/interface/SiPixelCoordinates.h"

diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h b/CalibTracker/SiPixelTools/plugins/SiPixelErrorsDigisToCalibDigis.h
@@ -36,8 +36,8 @@ Description: Create monitorElements for the Errors in created in the reduction o
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"

diff --git a/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc b/CalibTracker/SiPixelTools/src/SiPixelOfflineCalibAnalysisBase.cc
@@ -19,8 +19,8 @@
 
 #include "CalibTracker/SiPixelTools/interface/SiPixelOfflineCalibAnalysisBase.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"

diff --git a/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h b/CalibTracker/SiStripChannelGain/interface/SiStripGainsPCLWorker.h
@@ -54,7 +54,7 @@
 #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"

diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainCosmicCalculator.cc
@@ -19,8 +19,8 @@
 #include "CLHEP/Random/RandGauss.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"

diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromCalibTree.cc
@@ -26,7 +26,7 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"