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.
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
Reduced radom number calls in the runSimple Method of HGCDigitizerBase for Potential Speedup. #27980
Reduced radom number calls in the runSimple Method of HGCDigitizerBase for Potential Speedup. #27980
Changes from 2 commits
333b0b2
632427d
835b9f1
a999665
1d73f98
befd79c
f4638e6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,6 +66,7 @@ | |
accumulatorType = cms.string("HGCDigiProducer"), | ||
hitCollection = cms.string("HGCHitsEE"), | ||
digiCollection = cms.string("HGCDigisEE"), | ||
seedOffset = cms.uint32(9182), | ||
maxSimHitsAccTime = cms.uint32(100), | ||
bxTime = cms.double(25), | ||
eVPerEleHolePair = cms.double(eV_per_eh_pair), | ||
|
@@ -135,6 +136,7 @@ | |
accumulatorType = cms.string("HGCDigiProducer"), | ||
hitCollection = cms.string("HGCHitsHEfront"), | ||
digiCollection = cms.string("HGCDigisHEfront"), | ||
seedOffset = cms.uint32(8273), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since these parameters are no longer used, they can be deleted |
||
maxSimHitsAccTime = cms.uint32(100), | ||
bxTime = cms.double(25), | ||
tofDelay = cms.double(5), | ||
|
@@ -203,6 +205,7 @@ | |
accumulatorType = cms.string("HGCDigiProducer"), | ||
hitCollection = cms.string("HcalHits"), | ||
digiCollection = cms.string("HGCDigisHEback"), | ||
seedOffset = cms.uint32(7364), | ||
maxSimHitsAccTime = cms.uint32(100), | ||
bxTime = cms.double(25), | ||
tofDelay = cms.double(1), | ||
|
@@ -246,6 +249,7 @@ | |
accumulatorType = cms.string("HGCDigiProducer"), | ||
hitCollection = cms.string("HFNoseHits"), | ||
digiCollection = cms.string("HFNoseDigis"), | ||
seedOffset = cms.uint32(5647), | ||
maxSimHitsAccTime = cms.uint32(100), | ||
bxTime = cms.double(25), | ||
eVPerEleHolePair = cms.double(eV_per_eh_pair), | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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"); | ||
SeedOffset_ = ps.getParameter<unsigned int>("seedOffset"), | ||
doTimeSamples_ = myCfg_.getParameter<bool>("doTimeSamples"); | ||
thresholdFollowsMIP_ = myCfg_.getParameter<bool>("thresholdFollowsMIP"); | ||
|
||
if (myCfg_.exists("keV2fC")) | ||
keV2fC_ = myCfg_.getParameter<double>("keV2fC"); | ||
else | ||
|
@@ -51,6 +52,19 @@ 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_); | ||
GenerateGaussianNoise(NoiseMean_, NoiseStd_); | ||
} | ||
|
||
template <class DFr> | ||
void HGCDigitizerBase<DFr>::GenerateGaussianNoise(const double NoiseMean, const double NoiseStd) { | ||
unsigned int seed = 123456; | ||
seed = seed + SeedOffset_; | ||
TRandom trandom(seed); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @adas1994 why not using the framework service based on the defined engine, i.e. move here There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ( @fabiocos )We were trying to see, if we can get to make HGCal simulate similar noise using random numbers from a much smaller pool of Gaussian random numbers and not generating a whole bunch of them for every channel for every event. Consider this, at the end of the day, it is all just a bunch of Normal/Gaussian random numbers. And we are not generating billions of them so that they could cause problem due to its limited period. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @adas1994 that has nothing to do with which pRNG should be used. Similar comments had been made on previous versions of this PR. Please use the CMSSW random number service exclusively. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kpedro88 @fabiocos The problem is that what needs to happen is that the noise collection needs to be generated in the constructor, before there are any streams to refer to. Here, the noise itself is generated with a fixed seed, so it is completely reproducible. The random number service is used later to choose noise values from this fixed array, so that is thread safe. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @mdhildreth I imagine that what you need here is to have a predefined noise collection before the first event noise is produced, which does not necessarily mean within the constructor. I understand the rationale behind this strategy, but I also see risks:
Provided this is really the way you want to go I can imagine a strategy to initialise the noise array within There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @fabiocos The idea is to make the library big enough so that it doesn't matter. It's just generating low-level single-channel noise, over millions of channels, using a gaussian distribution. We should make it big enough so it can't be seen in physics validation plots, of course. In terms of the random seed variation: it doesn't matter if this is randomized if the collection is big enough. Each event gets an appropriate random entry into the library in a thread-safe way. This should be sufficient. We can look at runSimple to see if this is a better way. Thanks. |
||
for (size_t i = 0; i < NoiseArrayLength_; i++) { | ||
for (size_t j = 0; j < samplesize_; j++) { | ||
GaussianNoiseArray_[i][j] = trandom.Gaus(NoiseMean, NoiseStd); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. in principle there is also the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
} | ||
} | ||
} | ||
|
||
template <class DFr> | ||
|
@@ -87,7 +101,8 @@ void HGCDigitizerBase<DFr>::runSimple(std::unique_ptr<HGCDigitizerBase::DColl>& | |
HGCSimHitDataAccumulator::iterator it = simData.find(id); | ||
HGCCellInfo& cell = (simData.end() == it ? zeroData : it->second); | ||
addCellMetadata(cell, theGeom, id); | ||
|
||
size_t hash_index = (CLHEP::RandFlat::shootInt(engine, (NoiseArrayLength_ - 1)) + id) % NoiseArrayLength_; | ||
auto 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)); | ||
|
@@ -122,7 +137,7 @@ 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 = (float)cellNoiseArray[i] * noiseWidth; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it might be worth putting a switch here to go back to the old behavior, in case someone wants to run a test in the future. |
||
float totalCharge(rawCharge * cce + noise); | ||
if (totalCharge < 0.f) | ||
totalCharge = 0.f; | ||
|
@@ -131,7 +146,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); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adas1994 why aren't you using the framework random number generator service?