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

Add possibility for partial ECAL digitization (towards working HGCAL) #11915

Merged
merged 4 commits into from
Oct 19, 2015
Merged

Add possibility for partial ECAL digitization (towards working HGCAL) #11915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2233d7b
Add in options to turn off EB/EE/ES in ECAL digitizer, default all on
lgray Oct 14, 2015
080b39c
move flags such that they are only in the digitizer
lgray Oct 15, 2015
32e11a1
clean up clang errors/warnings in EcalDigiProducer
lgray Oct 15, 2015
08e0e13
silence clang warnings in EBHitResponce
lgray Oct 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,27 @@ class EBHitResponse : public EcalHitResponse

virtual void add( const PCaloHit& hit, CLHEP::HepRandomEngine* ) override;

virtual void initializeHits() ;
virtual void initializeHits() override;

virtual void finalizeHits() ;
virtual void finalizeHits() override;

virtual void run( MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* ) override;

virtual unsigned int samplesSize() const ;
virtual unsigned int samplesSize() const override;

virtual EcalSamples* operator[]( unsigned int i ) ;
virtual EcalSamples* operator[]( unsigned int i ) override;

virtual const EcalSamples* operator[]( unsigned int i ) const ;
virtual const EcalSamples* operator[]( unsigned int i ) const override;

protected:

virtual unsigned int samplesSizeAll() const ;
virtual unsigned int samplesSizeAll() const override;

virtual EcalSamples* vSamAll( unsigned int i ) ;
virtual EcalSamples* vSamAll( unsigned int i ) override;

virtual const EcalSamples* vSamAll( unsigned int i ) const ;
virtual const EcalSamples* vSamAll( unsigned int i ) const override;

virtual EcalSamples* vSam( unsigned int i ) ;
virtual EcalSamples* vSam( unsigned int i ) override ;

void putAPDSignal( const DetId& detId, double npe, double time ) ;

Expand Down
48 changes: 25 additions & 23 deletions SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ class EcalDigiProducer : public DigiAccumulatorMixMod {
EcalDigiProducer( const edm::ParameterSet& params , edm::ConsumesCollector& iC);
virtual ~EcalDigiProducer();

virtual void initializeEvent(edm::Event const& e, edm::EventSetup const& c);
virtual void accumulate(edm::Event const& e, edm::EventSetup const& c);
virtual void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
virtual void accumulate(edm::Event const& e, edm::EventSetup const& c) override;
virtual void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
virtual void finalizeEvent(edm::Event& e, edm::EventSetup const& c);
virtual void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) override;

void setEBNoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator);
Expand Down Expand Up @@ -109,44 +109,46 @@ class EcalDigiProducer : public DigiAccumulatorMixMod {

const unsigned int m_readoutFrameSize ;
protected:
const EcalSimParameterMap* m_ParameterMap ;
std::unique_ptr<const EcalSimParameterMap> m_ParameterMap ;
private:
const std::string m_apdDigiTag ;
const APDSimParameters* m_apdParameters ;
std::unique_ptr<const APDSimParameters> m_apdParameters ;

EBHitResponse* m_APDResponse ;
std::unique_ptr<EBHitResponse> m_APDResponse ;
protected:
EBHitResponse* m_EBResponse ;
EEHitResponse* m_EEResponse ;
std::unique_ptr<EBHitResponse> m_EBResponse ;
std::unique_ptr<EEHitResponse> m_EEResponse ;
private:
ESHitResponse* m_ESResponse ;
CaloHitResponse* m_ESOldResponse ;
std::unique_ptr<ESHitResponse> m_ESResponse ;
std::unique_ptr<CaloHitResponse> m_ESOldResponse ;

const bool m_addESNoise ;
const bool m_PreMix1 ;
const bool m_PreMix2 ;

const bool m_doFastES ;

ESElectronicsSim* m_ESElectronicsSim ;
ESOldDigitizer* m_ESOldDigitizer ;
ESElectronicsSimFast* m_ESElectronicsSimFast ;
ESDigitizer* m_ESDigitizer ;
const bool m_doEB, m_doEE, m_doES;

EBDigitizer* m_APDDigitizer ;
EBDigitizer* m_BarrelDigitizer ;
EEDigitizer* m_EndcapDigitizer ;
std::unique_ptr<ESElectronicsSim> m_ESElectronicsSim ;
std::unique_ptr<ESOldDigitizer> m_ESOldDigitizer ;
std::unique_ptr<ESElectronicsSimFast> m_ESElectronicsSimFast ;
std::unique_ptr<ESDigitizer> m_ESDigitizer ;

EcalElectronicsSim* m_ElectronicsSim ;
EcalCoder* m_Coder ;
std::unique_ptr<EBDigitizer> m_APDDigitizer ;
std::unique_ptr<EBDigitizer> m_BarrelDigitizer ;
std::unique_ptr<EEDigitizer> m_EndcapDigitizer ;

EcalElectronicsSim* m_APDElectronicsSim ;
EcalCoder* m_APDCoder ;
std::unique_ptr<EcalElectronicsSim> m_ElectronicsSim ;
std::unique_ptr<EcalCoder> m_Coder ;

std::unique_ptr<EcalElectronicsSim> m_APDElectronicsSim ;
std::unique_ptr<EcalCoder> m_APDCoder ;

const CaloGeometry* m_Geometry ;

CorrelatedNoisifier<EcalCorrMatrix>* m_EBCorrNoise[3] ;
CorrelatedNoisifier<EcalCorrMatrix>* m_EECorrNoise[3] ;
std::array< std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> >, 3 > m_EBCorrNoise ;
std::array< std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> >, 3 > m_EECorrNoise ;

std::vector<CLHEP::HepRandomEngine*> randomEngines_;
};
Expand Down
Loading