Forward port of Hcal pre-mixing from PR4325

[civanch]

This is forward port by hand of PR 4325, which cannot be merged due to random number thread safity modifications in 7_1_X.

This PR fix pre-mixing for Hcal.

For some reason its peak up PR 4306, which is being validated and is OK but should not go together.

[cmsbuild]

A new Pull Request was created by @civanch (Vladimir Ivantchenko) for CMSSW_7_1_X.

Forward port of Hcal pre-mixing from PR4325

It involves the following packages:

EventFilter/HcalRawToDigi
IOMC/EventVertexGenerators
SimCalorimetry/HcalSimAlgos
SimCalorimetry/HcalSimProducers
SimCalorimetry/HcalTestBeam
SimG4Core/Generators
SimGeneral/DataMixingModule

@civanch, @nclopezo, @mdhildreth, @cmsbuild, @StoyanStoynev, @slava77, @Degano can you please review it and eventually sign? Thanks.
@wmtan this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[civanch]

+1

[cmsbuild]

+1
Tested at: a99af8e
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4379/1754/summary.html

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4379/1754/summary.html

[StoyanStoynev]

working on it

[StoyanStoynev]

@civanch , which PR changed this in 70X? Is this supposed to work with any data ("old", "new"), could you please explain the intended change 0x3FF -> 0x7FF?

[davidlange6]

The PR was 4325. Its a bug fix.

On Jun 26, 2014, at 9:26 AM, StoyanStoynev notifications@github.com
wrote:

In EventFilter/HcalRawToDigi/src/HcalHTRData.cc:

@@ -248,7 +248,7 @@ void HcalHTRData::pack(unsigned char* daq_lengths, unsigned short* daq_samples,
for (ichan=0; ichan<24; ichan++) {
unsigned short chanid=((ichan%3)+((ichan/3)<<2))<<11;
for (isample=0; isample<daq_lengths[ichan] && isample<MAXIMUM_SAMPLES_PER_CHANNEL; isample++) {

•  unsigned short basedata=daq_samples[ichan*MAXIMUM_SAMPLES_PER_CHANNEL+isample]&0x3FF;
  

•  unsigned short basedata=daq_samples[ichan*MAXIMUM_SAMPLES_PER_CHANNEL+isample]&0x7FF;
  

@civanch , which PR changed this in 70X? Is this supposed to work with any data ("old", "new"), could you please explain the intended change 0x3FF -> 0x7FF?

—
Reply to this email directly or view it on GitHub.

[StoyanStoynev]

+1
OK, I may as well read the Title first next time before posting...
It is a forward-port of approved bug-fixes and Jenkins comparisons are OK (most of the code changes are in SIM/GEN files). There are many warnings in the unit tests but not related to this PR.
For the record: this PR is very much related to #4325 (70X) and #4387 (72X) but not identical. In fact there is an error produced in the unit tests for 72X (to comment there). No jenkins were run for the 70X PR and it was merged by-passing sign-offs.

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_1_X IBs unless changes (tests are also fine). @nclopezo, @ktf can you please take care of it?

[civanch]

#4387 is integrated into 7_2_X