Merge pull request #2383 from gartung/EventFilter-CSCRawToDigi-static…

…s-work Misc fixes -- change static to static std::atomic<> for debug and firmwareVersion that...
cms-sw · Feb 12, 2014 · b87e53e · b87e53e
2 parents 6d49765 + e66a1ff
commit b87e53e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/EventFilter/CSCRawToDigi/interface/CSCALCTHeader.h b/EventFilter/CSCRawToDigi/interface/CSCALCTHeader.h
@@ -7,6 +7,7 @@
 #include <bitset>
 #include <vector>
 #include <iosfwd>
+#include <atomic>
 #include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCALCTHeader2006.h"
@@ -144,8 +145,8 @@ class CSCALCTHeader {
   //maximum header size is 116 words
   unsigned short int theOriginalBuffer[116];
 
-  static bool debug;
-  static unsigned short int firmwareVersion;
+  static std::atomic<bool> debug;
+  static std::atomic<unsigned short int> firmwareVersion;
 
   ///size of the 2007 header in words
   unsigned short int sizeInWords2007_, bxn0, bxn1;

diff --git a/EventFilter/CSCRawToDigi/src/CSCALCTHeader.cc b/EventFilter/CSCRawToDigi/src/CSCALCTHeader.cc
@@ -4,9 +4,10 @@
 #include "EventFilter/CSCRawToDigi/src/bitset_append.h"
 #include "EventFilter/CSCRawToDigi/src/cscPackerCompare.h"
 #include <iomanip>
+#include <atomic>
 
-bool CSCALCTHeader::debug=false;
-short unsigned int CSCALCTHeader::firmwareVersion=2007; 
+std::atomic<bool> CSCALCTHeader::debug{false};
+std::atomic<short unsigned int> CSCALCTHeader::firmwareVersion{2007}; 
 
 CSCALCTHeader::CSCALCTHeader(int chamberType)
 : header2006(chamberType),

diff --git a/EventFilter/CSCRawToDigi/src/CSCCFEBTimeSlice.cc b/EventFilter/CSCRawToDigi/src/CSCCFEBTimeSlice.cc
@@ -5,10 +5,10 @@
 
 // a Gray code is An ordering of 2n binary numbers such that
 // only one bit changes from one entry to the next
-unsigned layerGrayCode[] = {3,1,5,6,4,2};
-unsigned layerInverseGrayCode[] = {1,5,0,4,2,3};
-unsigned channelGrayCode[] = {0,1,3,2, 6,7,5,4, 12,13,15,14, 10,11,9,8};
-unsigned channelInverseGrayCode[] = {0,1,3,2, 7,6,4,5, 15,14,12,13, 8,9,11,10};
+const unsigned layerGrayCode[] = {3,1,5,6,4,2};
+const unsigned layerInverseGrayCode[] = {1,5,0,4,2,3};
+const unsigned channelGrayCode[] = {0,1,3,2, 6,7,5,4, 12,13,15,14, 10,11,9,8};
+const unsigned channelInverseGrayCode[] = {0,1,3,2, 7,6,4,5, 15,14,12,13, 8,9,11,10};
 
 CSCCFEBTimeSlice::CSCCFEBTimeSlice() 
 {