Skip to content

Commit

Permalink
Renamed CaloTowerFwd.h to CaloTowerDefs.h
Browse files Browse the repository at this point in the history
Because CaloTowerFwd.h is not really forward declaring anything, we
rename it to CaloTowerDefs.h to better represent it's purpose.
  • Loading branch information
Teemperor committed Jun 6, 2017
1 parent 579e75b commit 5a6e0ab
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/plugins/EopTreeWriter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"

#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/src/EwkMuLumiMonitorDQM.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
#include "DataFormats/MuonReco/interface/Muon.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DQMServices/Core/interface/DQMEDAnalyzer.h"

namespace trigger {
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/Trigger/interface/EgHLTOffHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/BeamSpot/interface/BeamSpot.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "DataFormats/VertexReco/interface/VertexFwd.h"

Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/Trigger/src/HLTTauRefProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
//CaloTower includes
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "Math/GenVector/VectorUtil.h"

using namespace edm;
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/CaloTowers/interface/CaloTowerCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
#define DATAFORMATS_CALOTOWERS_CALOTOWERCOLLECTION_H 1

#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"

#endif
2 changes: 1 addition & 1 deletion DataFormats/RecoCandidate/interface/RecoCandidate.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"

namespace reco {

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/interface/FWCaloDataProxyBuilderBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "Rtypes.h"
#include "Fireworks/Core/interface/FWProxyBuilderBase.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"

// forward declarations
class TEveCaloData;
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWCaloTowerProxyBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "Fireworks/Calo/interface/FWCaloDataHistProxyBuilder.h"
#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"


class FWHistSliceSelector;
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Calo/plugins/FWCaloTowerSliceSelector.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "Fireworks/Core/interface/FWModelChangeManager.h"
#include "Fireworks/Core/interface/FWEventItem.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"


FWCaloTowerSliceSelector::FWCaloTowerSliceSelector(TH2F* h, const FWEventItem* i):
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/JetMET/interface/HLTCaloTowerHtMhtProducer.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "DataFormats/METReco/interface/MET.h"
#include "DataFormats/METReco/interface/METFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"

namespace edm {
class ConfigurationDescriptions;
Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/special/src/HLTCaloTowerFilter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "DataFormats/Common/interface/Handle.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h"
#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
#include "HLTrigger/HLTcore/interface/HLTFilter.h"
Expand Down
2 changes: 1 addition & 1 deletion HeavyIonsAnalysis/Configuration/macros/fwliteExample.C
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "DataFormats/FWLite/interface/ChainEvent.h"
#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
#include "DataFormats/TrackReco/interface/Track.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"

namespace edm {
class ConfigurationDescriptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"

#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"

#include "TrackingTools/PatternTools/interface/Trajectory.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoJets/JetAlgorithms/interface/CATopJetAlgorithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "DataFormats/Candidate/interface/Candidate.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/JetReco/interface/CaloJet.h"
#include "DataFormats/JetReco/interface/CaloJetCollection.h"
#include "DataFormats/JetReco/interface/BasicJet.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoJets/JetAnalyzers/src/JetToDigiDump.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//in CaloJet: #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
// just for the CaloTowerPtr declaration:
// in CaloTowerCollection: #include "DataFormats/CaloTowers/interface/CaloTower.h"
// in CaloTowerCollection: #include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
// in CaloTowerCollection: #include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/DetId/interface/DetId.h"
#include "DataFormats/HcalDetId/interface/HcalDetId.h"
#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoMET/METAlgorithms/interface/GlobalHaloAlgo.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "Geometry/CSCGeometry/interface/CSCLayer.h"
#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDetId.h"
#include "DataFormats/CaloTowers/interface/CaloTowerFwd.h"
#include "DataFormats/CaloTowers/interface/CaloTowerDefs.h"
#include "DataFormats/CaloTowers/interface/CaloTower.h"

#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
Expand Down

0 comments on commit 5a6e0ab

Please sign in to comment.