Merge pull request #20300 from kpedro88/Phase1-HE27

fix QIE11 capid accessor
cms-sw · Aug 30, 2017 · 96b44b2 · 96b44b2
2 parents a0c2d51 + e650cab
commit 96b44b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/DataFormats/HcalDigi/interface/QIE11DataFrame.h b/DataFormats/HcalDigi/interface/QIE11DataFrame.h
@@ -30,7 +30,7 @@ class QIE11DataFrame {
     int adc() const { return frame_[i_]&MASK_ADC; }
     int tdc() const { return (frame_[i_]>>OFFSET_TDC)&MASK_TDC; }
     bool soi() const { return frame_[i_]&MASK_SOI; }
-    int capid() const { return ((((frame_[0]>>OFFSET_CAPID)&MASK_CAPID)+i_)&MASK_CAPID); }
+    int capid() const { return ((((frame_[0]>>OFFSET_CAPID)&MASK_CAPID)+i_-HEADER_WORDS)&MASK_CAPID); }
   private:
     const edm::DataFrame& frame_;
     edm::DataFrame::size_type i_;