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

Reduced radom number calls in the runSimple Method of HGCDigitizerBase for Potential Speedup. #27980

Merged
merged 7 commits into from
Sep 24, 2019
Merged

Reduced radom number calls in the runSimple Method of HGCDigitizerBase for Potential Speedup. #27980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
333b0b2
monday_new_1
adas1994 Sep 11, 2019
632427d
tue_new_1
adas1994 Sep 11, 2019
835b9f1
friday1_EventwiseRandom
adas1994 Sep 13, 2019
a999665
sat_1
adas1994 Sep 14, 2019
1d73f98
monday1_revised
adas1994 Sep 16, 2019
befd79c
wed_1
adas1994 Sep 18, 2019
f4638e6
PythonConfigurableRandNoiseMethod
adas1994 Sep 18, 2019
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
14 changes: 14 additions & 0 deletions SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ class HGCDigitizerBase {
@short CTOR
*/
HGCDigitizerBase(const edm::ParameterSet& ps);
/**
@short Gaussian Noise Generation Member Function
*/
void GenerateGaussianNoise(CLHEP::HepRandomEngine* engine, const double NoiseMean, const double NoiseStd);
/**
@short steer digitization mode
*/
Expand Down Expand Up @@ -150,6 +154,16 @@ class HGCDigitizerBase {

//if set to true, threshold will be computed based on the expected meap peak/2
bool thresholdFollowsMIP_;

// New NoiseArray Parameters

const double NoiseMean_, NoiseStd_;
static const size_t NoiseArrayLength_ = 200000;
static const size_t samplesize_ = 15;
std::array<std::array<double, samplesize_>, NoiseArrayLength_> GaussianNoiseArray_;
bool RandNoiseGenerationFlag_;
// A parameter configurable from python configuration to decide which noise generation model to use
bool NoiseGeneration_Method_;
};

#endif
2 changes: 1 addition & 1 deletion SimCalorimetry/HGCalSimProducers/interface/HGCFEElectronics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "CLHEP/Random/RandGauss.h"
#include "CLHEP/Random/RandGaussQ.h"

#include "CLHEP/Random/RandFlat.h"
#include "SimCalorimetry/HGCalSimProducers/interface/HGCDigitizerTypes.h"

/**
Expand Down
4 changes: 4 additions & 0 deletions SimCalorimetry/HGCalSimProducers/python/hgcalDigitizer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
accumulatorType = cms.string("HGCDigiProducer"),
hitCollection = cms.string("HGCHitsEE"),
digiCollection = cms.string("HGCDigisEE"),
NoiseGeneration_Method = cms.bool(True),
maxSimHitsAccTime = cms.uint32(100),
bxTime = cms.double(25),
eVPerEleHolePair = cms.double(eV_per_eh_pair),
Expand Down Expand Up @@ -135,6 +136,7 @@
accumulatorType = cms.string("HGCDigiProducer"),
hitCollection = cms.string("HGCHitsHEfront"),
digiCollection = cms.string("HGCDigisHEfront"),
NoiseGeneration_Method = cms.bool(True),
maxSimHitsAccTime = cms.uint32(100),
bxTime = cms.double(25),
tofDelay = cms.double(5),
Expand Down Expand Up @@ -203,6 +205,7 @@
accumulatorType = cms.string("HGCDigiProducer"),
hitCollection = cms.string("HcalHits"),
digiCollection = cms.string("HGCDigisHEback"),
NoiseGeneration_Method = cms.bool(True),
maxSimHitsAccTime = cms.uint32(100),
bxTime = cms.double(25),
tofDelay = cms.double(1),
Expand Down Expand Up @@ -246,6 +249,7 @@
accumulatorType = cms.string("HGCDigiProducer"),
hitCollection = cms.string("HFNoseHits"),
digiCollection = cms.string("HFNoseDigis"),
NoiseGeneration_Method = cms.bool(True),
maxSimHitsAccTime = cms.uint32(100),
bxTime = cms.double(25),
eVPerEleHolePair = cms.double(eV_per_eh_pair),
Expand Down
40 changes: 35 additions & 5 deletions SimCalorimetry/HGCalSimProducers/src/HGCDigitizerBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ using namespace hgc_digi;
using namespace hgc_digi_utils;

template <class DFr>
HGCDigitizerBase<DFr>::HGCDigitizerBase(const edm::ParameterSet& ps) : scaleByDose_(false) {
HGCDigitizerBase<DFr>::HGCDigitizerBase(const edm::ParameterSet& ps)
: scaleByDose_(false), NoiseMean_(0.0), NoiseStd_(1.0) {
bxTime_ = ps.getParameter<double>("bxTime");
myCfg_ = ps.getParameter<edm::ParameterSet>("digiCfg");
NoiseGeneration_Method_ = ps.getParameter<bool>("NoiseGeneration_Method");
doTimeSamples_ = myCfg_.getParameter<bool>("doTimeSamples");
thresholdFollowsMIP_ = myCfg_.getParameter<bool>("thresholdFollowsMIP");

if (myCfg_.exists("keV2fC"))
keV2fC_ = myCfg_.getParameter<double>("keV2fC");
else
Expand Down Expand Up @@ -51,6 +52,18 @@ HGCDigitizerBase<DFr>::HGCDigitizerBase(const edm::ParameterSet& ps) : scaleByDo
edm::ParameterSet feCfg = myCfg_.getParameter<edm::ParameterSet>("feCfg");
myFEelectronics_ = std::unique_ptr<HGCFEElectronics<DFr>>(new HGCFEElectronics<DFr>(feCfg));
myFEelectronics_->SetNoiseValues(noise_fC_);
RandNoiseGenerationFlag_ = 0;
}

template <class DFr>
void HGCDigitizerBase<DFr>::GenerateGaussianNoise(CLHEP::HepRandomEngine* engine,
const double NoiseMean,
const double NoiseStd) {
for (size_t i = 0; i < NoiseArrayLength_; i++) {
for (size_t j = 0; j < samplesize_; j++) {
GaussianNoiseArray_[i][j] = CLHEP::RandGaussQ::shoot(engine, NoiseMean, NoiseStd);
}
}
}

template <class DFr>
Expand All @@ -62,6 +75,12 @@ void HGCDigitizerBase<DFr>::run(std::unique_ptr<HGCDigitizerBase::DColl>& digiCo
CLHEP::HepRandomEngine* engine) {
if (scaleByDose_)
scal_.setGeometry(theGeom);
if (NoiseGeneration_Method_ == true) {
if (RandNoiseGenerationFlag_ == false) {
GenerateGaussianNoise(engine, NoiseMean_, NoiseStd_);
RandNoiseGenerationFlag_ = true;
}
}
if (digitizationType == 0)
runSimple(digiColl, simData, theGeom, validIds, engine);
else
Expand All @@ -80,14 +99,20 @@ void HGCDigitizerBase<DFr>::runSimple(std::unique_ptr<HGCDigitizerBase::DColl>&
HGCCellInfo zeroData;
zeroData.hit_info[0].fill(0.f); //accumulated energy
zeroData.hit_info[1].fill(0.f); //time-of-flight

std::array<double, samplesize_> cellNoiseArray;
for (size_t i = 0; i < samplesize_; i++)
cellNoiseArray[i] = 0.0;
for (const auto& id : validIds) {
chargeColl.fill(0.f);
toa.fill(0.f);
HGCSimHitDataAccumulator::iterator it = simData.find(id);
HGCCellInfo& cell = (simData.end() == it ? zeroData : it->second);
addCellMetadata(cell, theGeom, id);
if (NoiseGeneration_Method_ == true) {
size_t hash_index = (CLHEP::RandFlat::shootInt(engine, (NoiseArrayLength_ - 1)) + id) % NoiseArrayLength_;

cellNoiseArray = GaussianNoiseArray_[hash_index];
}
//set the noise,cce, LSB and threshold to be used
float cce(1.f), noiseWidth(0.f), lsbADC(-1.f), maxADC(-1.f);
uint32_t thrADC(std::floor(myFEelectronics_->getTargetMipValue() / 2));
Expand Down Expand Up @@ -122,7 +147,11 @@ void HGCDigitizerBase<DFr>::runSimple(std::unique_ptr<HGCDigitizerBase::DColl>&
toa[i] = cell.hit_info[1][i] / rawCharge;

//final charge estimation
float noise = CLHEP::RandGaussQ::shoot(engine, 0.0, noiseWidth);
float noise;
if (NoiseGeneration_Method_ == true)
noise = (float)cellNoiseArray[i] * noiseWidth;
else
noise = CLHEP::RandGaussQ::shoot(engine, cellNoiseArray[i], noiseWidth);
float totalCharge(rawCharge * cce + noise);
if (totalCharge < 0.f)
totalCharge = 0.f;
Expand All @@ -131,7 +160,8 @@ void HGCDigitizerBase<DFr>::runSimple(std::unique_ptr<HGCDigitizerBase::DColl>&

//run the shaper to create a new data frame
DFr rawDataFrame(id);
myFEelectronics_->runShaper(rawDataFrame, chargeColl, toa, engine, thrADC, lsbADC, maxADC, cell.thickness);
int thickness = cell.thickness > 0 ? cell.thickness : 1;
myFEelectronics_->runShaper(rawDataFrame, chargeColl, toa, engine, thrADC, lsbADC, maxADC, thickness);

//update the output according to the final shape
updateOutput(coll, rawDataFrame);
Expand Down