Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34902 from makortel/esconsumesMixing
Migrate BMixingModule and EcalShapeBase-derived classes to esConsumes
- Loading branch information
Showing
32 changed files
with
147 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,24 @@ | ||
#ifndef EcalSimAlgos_APDShape_h | ||
#define EcalSimAlgos_APDShape_h | ||
|
||
#include "FWCore/Framework/interface/ConsumesCollector.h" | ||
#include "SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h" | ||
|
||
class APDShape : public EcalShapeBase { | ||
public: | ||
APDShape(bool useDB) : EcalShapeBase(useDB) { | ||
if (!useDB) | ||
buildMe(); | ||
} // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available | ||
// APDShape():EcalShapeBase(false){;} | ||
// useDB = false | ||
APDShape() : EcalShapeBase(false) { buildMe(); } | ||
// useDB = true, buildMe is executed when setEventSetup and DB conditions are available | ||
APDShape(edm::ConsumesCollector iC) : EcalShapeBase(true), espsToken_(iC.esConsumes()) {} | ||
|
||
protected: | ||
void fillShape(float& time_interval, | ||
double& m_thresh, | ||
EcalShapeBase::DVec& aVec, | ||
const edm::EventSetup* es) const override; | ||
|
||
private: | ||
edm::ESGetToken<EcalSimPulseShape, EcalSimPulseShapeRcd> espsToken_; | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,24 @@ | ||
#ifndef EcalSimAlgos_EBShape_h | ||
#define EcalSimAlgos_EBShape_h | ||
|
||
#include "FWCore/Framework/interface/ConsumesCollector.h" | ||
#include "SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h" | ||
|
||
class EBShape : public EcalShapeBase { | ||
public: | ||
EBShape(bool useDB) : EcalShapeBase(useDB) { | ||
if (!useDB) | ||
buildMe(); | ||
} // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available | ||
//EBShape():EcalShapeBase(false){;} | ||
// useDB = false | ||
EBShape() : EcalShapeBase(false) { buildMe(); } | ||
// useDB = true, buildMe is executed when setEventSetup and DB conditions are available | ||
EBShape(edm::ConsumesCollector iC) : EcalShapeBase(true), espsToken_(iC.esConsumes()) {} | ||
|
||
protected: | ||
void fillShape(float& time_interval, | ||
double& m_thresh, | ||
EcalShapeBase::DVec& aVec, | ||
const edm::EventSetup* es) const override; | ||
|
||
private: | ||
edm::ESGetToken<EcalSimPulseShape, EcalSimPulseShapeRcd> espsToken_; | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,24 @@ | ||
#ifndef EcalSimAlgos_EEShape_h | ||
#define EcalSimAlgos_EEShape_h | ||
|
||
#include "FWCore/Framework/interface/ConsumesCollector.h" | ||
#include "SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h" | ||
|
||
class EEShape : public EcalShapeBase { | ||
public: | ||
EEShape(bool useDB) : EcalShapeBase(useDB) { | ||
if (!useDB) | ||
buildMe(); | ||
} // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available} | ||
// EEShape():EcalShapeBase(false){;} | ||
// useDB = false | ||
EEShape() : EcalShapeBase(false) { buildMe(); } | ||
// useDB = true, buildMe is executed when setEventSetup and DB conditions are available | ||
EEShape(edm::ConsumesCollector iC) : EcalShapeBase(true), espsToken_(iC.esConsumes()) {} | ||
|
||
protected: | ||
void fillShape(float& time_interval, | ||
double& m_thresh, | ||
EcalShapeBase::DVec& aVec, | ||
const edm::EventSetup* es) const override; | ||
|
||
private: | ||
edm::ESGetToken<EcalSimPulseShape, EcalSimPulseShapeRcd> espsToken_; | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.