Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix circular dependency between RecoEgamma and RecoEcal #33653

Merged
merged 1 commit into from May 12, 2021
Merged

Fix circular dependency between RecoEgamma and RecoEcal #33653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
#include "RecoEgamma/EgammaTools/interface/EgammaLocalCovParamDefaults.h"
#include "RecoEcal/EgammaCoreTools/interface/EgammaLocalCovParamDefaults.h"
#include <optional>

class CaloTopology;
Expand Down
2 changes: 1 addition & 1 deletion RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@
#include "Geometry/EcalAlgo/interface/EcalBarrelGeometry.h"
#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
#include "RecoEgamma/EgammaTools/interface/EgammaLocalCovParamDefaults.h"
#include "RecoEcal/EgammaCoreTools/interface/EgammaLocalCovParamDefaults.h"

class DetId;
class CaloTopology;
Expand Down
4 changes: 2 additions & 2 deletions ...s/interface/EgammaLocalCovParamDefaults.h → ...s/interface/EgammaLocalCovParamDefaults.h
View file
Open in desktop
@@ -1,5 +1,5 @@
#ifndef RecoEgamma_EgammaTools_interface_EgammaLocalCovParamDefaults_h
#define RecoEgamma_EgammaTools_interface_EgammaLocalCovParamDefaults_h
#ifndef RecoEcal_EgammaCoreTools_interface_EgammaLocalCovParamDefaults_h
#define RecoEcal_EgammaCoreTools_interface_EgammaLocalCovParamDefaults_h

struct EgammaLocalCovParamDefaults {
static constexpr float kRelEnCut = 4.7;
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
#include "RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h"
#include "RecoEgamma/EgammaElectronAlgos/interface/ecalClusterEnergyUncertaintyElectronSpecific.h"
#include "CommonTools/Egamma/interface/ConversionTools.h"
#include "RecoEgamma/EgammaTools/interface/EgammaLocalCovParamDefaults.h"
#include "RecoEcal/EgammaCoreTools/interface/EgammaLocalCovParamDefaults.h"

#include <Math/Point3D.h>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaElectronProducers/plugins/GsfElectronProducer.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
#include "RecoEgamma/EgammaElectronAlgos/interface/EgAmbiguityTools.h"
#include "RecoEgamma/EgammaElectronAlgos/interface/ElectronUtilities.h"
#include "RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h"
#include "RecoEgamma/EgammaTools/interface/EgammaLocalCovParamDefaults.h"
#include "RecoEcal/EgammaCoreTools/interface/EgammaLocalCovParamDefaults.h"

using namespace reco;

Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTClusterShapeProducer.cc
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
#include "RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "RecoEgamma/EgammaTools/interface/EgammaLocalCovParamDefaults.h"
#include "RecoEcal/EgammaCoreTools/interface/EgammaLocalCovParamDefaults.h"

class EgammaHLTClusterShapeProducer : public edm::global::EDProducer<> {
public:
Expand Down
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
#include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgoRcd.h"
#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
#include "RecoEgamma/EgammaTools/interface/EgammaLocalCovParamDefaults.h"
#include "RecoEcal/EgammaCoreTools/interface/EgammaLocalCovParamDefaults.h"

class GEDPhotonProducer : public edm::stream::EDProducer<> {
public:
Expand Down