From 602bdd5a0cb17fc860ea313fb74e156fb348db6b Mon Sep 17 00:00:00 2001 From: Tim Cox Date: Mon, 23 Jun 2008 13:04:15 +0000 Subject: [PATCH] --- yaml --- r: 46361 b: "refs/heads/CMSSW_7_1_X" c: c588afd3ceb7fa77a0b95e0b92bed360ff22ac03 h: "refs/heads/CMSSW_7_1_X" i: 46359: 32b275faf5c4e8c4b4aa9c84e660015dc058cb33 v: v3 --- [refs] | 2 +- .../CSCRawToDigi/interface/CSCCFEBTimeSlice.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c660c7e41c799..82051fa9b84ea 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c -"refs/heads/CMSSW_7_1_X": 1546e6c673333f2fa3a11acc0438b3a80963ca2a +"refs/heads/CMSSW_7_1_X": c588afd3ceb7fa77a0b95e0b92bed360ff22ac03 diff --git a/trunk/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h b/trunk/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h index c9599a52e6a95..4baeb1e2b34ad 100644 --- a/trunk/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h +++ b/trunk/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h @@ -57,7 +57,7 @@ class CSCCFEBTimeSlice { CSCCFEBTimeSlice() : dummy(0x7fff) { bzero(this, 99*2); } - // + /// input from 0 to 95 CSCCFEBDataWord * timeSample(int index) const { return (CSCCFEBDataWord *)(theSamples+index); @@ -75,6 +75,8 @@ class CSCCFEBTimeSlice { void setControllerWord(const CSCCFEBSCAControllerWord & controllerWord); + /// Old CFEB format: dummy word 100 should be 0x7FFF + /// New CFEB format: the sum of word 97 and 100 should be 0x7FFF (word 100 is inverted word 97) bool check() const {return ((dummy == 0x7FFF)||((dummy+crc)== 0x7FFF));} bool checkCRC() const {return crc==calcCRC();} @@ -112,14 +114,13 @@ class CSCCFEBTimeSlice { unsigned blank_space_1 : 4; - ///Word 99 + /// WORD 99 unsigned buffer_warning : 1; unsigned buffer_count : 5; unsigned L1A_number :6; unsigned blank_space_3 : 4; - /// word 100 is a dummy: 0x7FFF in old format - /// in new format it is or-ed with 97 to be 0x7FFF + /// WORD 100 unsigned dummy : 16; };