Merge pull request #14526 from kpedro88/Phase2-WF4

Fix setting the # of presamples for HcalUpgradeDataFrame.
cms-sw · May 17, 2016 · cd46192 · cd46192
2 parents 3db91ed + f85f8ce
commit cd46192
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/DataFormats/HcalDigi/src/HcalUpgradeDataFrame.cc b/DataFormats/HcalDigi/src/HcalUpgradeDataFrame.cc
@@ -32,9 +32,9 @@ void HcalUpgradeDataFrame::setSize(int size) {
 }
 
 void HcalUpgradeDataFrame::setPresamples(int presamples) {
-  if (presamples>MAXSAMPLES) presamples_|=MAXSAMPLES&0xF;
+  if (presamples>MAXSAMPLES) presamples_=MAXSAMPLES&0xF;
   else if (presamples<=0) presamples_=0;
-  else presamples_|=presamples&0xF;
+  else presamples_=presamples&0xF;
 }
 
 void HcalUpgradeDataFrame::setReadoutIds(const HcalElectronicsId& eid) {