Skip to content

Commit dfd0d1d

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#33784 from perrotta/includeTheCorrectHeader
Include the updated header from Geometry/Records instead of the obsolete one
2 parents 5d0f11b + 464b604 commit dfd0d1d

File tree

95 files changed

+1894
-1935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1894
-1935
lines changed

‎Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#include "Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h"
2-
//#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
32
#include "DataFormats/EgammaCandidates/interface/Photon.h"
43
#include "FWCore/MessageLogger/interface/MessageLogger.h"
54

65
#include "DataFormats/EgammaReco/interface/BasicCluster.h"
76
#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
8-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
97
#include "FWCore/Framework/interface/ESHandle.h"
8+
#include "FWCore/Framework/interface/MakerMacros.h"
109

1110
//#define ALLrecHits
1211
//#define DEBUG

‎Calibration/EcalAlCaRecoProducers/plugins/AlCaECALRecHitReducer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,14 @@
2929
#include "FWCore/Framework/interface/global/EDProducer.h"
3030

3131
#include "FWCore/Framework/interface/Event.h"
32-
#include "FWCore/Framework/interface/MakerMacros.h"
3332
#include "FWCore/Utilities/interface/InputTag.h"
3433
#include "FWCore/Utilities/interface/ESGetToken.h"
3534
#include "FWCore/ParameterSet/interface/ParameterSet.h"
3635

3736
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
3837
#include "DataFormats/DetId/interface/DetId.h"
3938
#include "Geometry/CaloTopology/interface/CaloTopology.h"
40-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
39+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
4140

4241
#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
4342
#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"

‎Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "DataFormats/CaloRecHit/interface/CaloRecHit.h"
4444
#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
4545
// Geometry
46-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
46+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
4747
#include "Geometry/EcalMapping/interface/EcalMappingRcd.h"
4848
#include "Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h"
4949
#include "Geometry/Records/interface/CaloGeometryRecord.h"

‎Calibration/EcalCalibAlgos/interface/ElectronCalibrationUniv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "FWCore/ParameterSet/interface/ParameterSet.h"
3131

3232
// Geometry
33-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
33+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
3434
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
3535
#include "Geometry/CaloTopology/interface/CaloTopology.h"
3636
#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"

‎Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
4545
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
4646
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
47-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
47+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
4848
#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
4949
#include "Geometry/CaloTopology/interface/HcalTopology.h"
5050
#include "Geometry/CaloTopology/interface/CaloTopology.h"

‎Calibration/HcalAlCaRecoProducers/src/AlCaIsoTracksProducer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
6262
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
6363
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
64-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
64+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
6565
#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
6666
#include "Geometry/CaloTopology/interface/HcalTopology.h"
6767
#include "Geometry/CaloTopology/interface/CaloTopology.h"

‎Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
5959
#include "Geometry/Records/interface/CaloGeometryRecord.h"
6060
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
61-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
61+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
6262
#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
6363
#include "Geometry/CaloTopology/interface/HcalTopology.h"
6464
#include "Geometry/CaloTopology/interface/CaloTopology.h"

‎Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonHighEtaAnalyzer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
6363
#include "Geometry/Records/interface/CaloGeometryRecord.h"
6464
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
65-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
65+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
6666
#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
6767
#include "Geometry/CaloTopology/interface/HcalTopology.h"
6868
#include "Geometry/CaloTopology/interface/CaloTopology.h"

‎Calibration/HcalCalibAlgos/plugins/HcalIsoTrkAnalyzer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
7878
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
7979
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
80-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
80+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
8181
#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
8282
#include "Geometry/CaloTopology/interface/HcalTopology.h"
8383
#include "Geometry/CaloTopology/interface/CaloTopology.h"

‎Calibration/HcalCalibAlgos/plugins/ValidIsoTrkCalib.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ See the twiki page for details:
4242
#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
4343
#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
4444
#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
45-
#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
45+
#include "Geometry/Records/interface/CaloTopologyRecord.h"
4646
#include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
4747
#include "Geometry/CommonDetUnit/interface/GeomDet.h"
4848
#include "CondFormats/HcalObjects/interface/HcalRespCorrs.h"

0 commit comments

Comments
 (0)