cms-sw/cmssw — pull request #5408 by matz-e (2014-09-18 11:45:41+00:00)
Title: Fix setting the # of presamples for HcalUpgradeDataFrame.

The constructor `HcalUpgradeDataFrame::HcalUpgradeDataFrame(HcalDetId id, int capId, int samples, int presamples) ` will use an uninitialized (random) value of `presamples_` to bit-or the passed `presamples` parameter. This will yield unexpected values for `presamples`, which fail an assert in the HCAL trigger primitive chain [starting here](https://github.com/cms-sw/cmssw/blob/CMSSW_6_2_X_SLHC/SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc#L203).

Remove the bit-wise or to have well-behaved data frames.