Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 46361
b: "refs/heads/CMSSW_7_1_X"
c: c588afd
h: "refs/heads/CMSSW_7_1_X"
i:
  46359: 32b275f
v: v3
  • Loading branch information
Tim Cox committed Jun 23, 2008
1 parent 6ff0ab4 commit 602bdd5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
refs/heads/gh-pages: ac155dadd83efa75cad55c0508a57a2b9dd3d66c
"refs/heads/CMSSW_7_1_X": 1546e6c673333f2fa3a11acc0438b3a80963ca2a
"refs/heads/CMSSW_7_1_X": c588afd3ceb7fa77a0b95e0b92bed360ff22ac03
9 changes: 5 additions & 4 deletions trunk/EventFilter/CSCRawToDigi/interface/CSCCFEBTimeSlice.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();}
Expand Down Expand Up @@ -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;
};

Expand Down

0 comments on commit 602bdd5

Please sign in to comment.