Introduced @baty's changes into the FEDBuffer and Components of the S…

…iStrip unpacker
cms-sw · Nov 11, 2015 · ad3da7b · ad3da7b
1 parent 10ca840
commit ad3da7b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 15 deletions.
diff --git a/DataFormats/SiStripCommon/interface/ConstantsForHardwareSystems.h b/DataFormats/SiStripCommon/interface/ConstantsForHardwareSystems.h
@@ -132,7 +132,6 @@ namespace sistrip {
                         FED_VIRGIN_RAW = 2, 
                         FED_PROC_RAW = 6, 
                         FED_ZERO_SUPPR = 10,
-                        //FED_ZERO_SUPPR_CMO = 4,
                         FED_ZERO_SUPPR_LITE = 3,
                         FED_ZERO_SUPPR_LITE_CMO = 4,
                         FED_ZERO_SUPPR_LITE8_TT = 12,

diff --git a/EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h b/EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h
@@ -79,7 +79,7 @@ namespace sistrip {
       uint16_t payloadLength_;
       uint8_t validChannels_;
       bool fePresent_[FEUNITS_PER_FED];
-      bool legacyUnpacker_;
+      bool legacyUnpacker_=false;
     };
 
   //class for unpacking data from ZS FED channels

diff --git a/EventFilter/SiStripRawToDigi/interface/SiStripFEDBufferComponents.h b/EventFilter/SiStripRawToDigi/interface/SiStripFEDBufferComponents.h
@@ -150,7 +150,6 @@ namespace sistrip {
   //convert name of an element of enum to enum value (useful for getting values from config)
   FEDBufferFormat fedBufferFormatFromString(const std::string& bufferFormatString);
   FEDHeaderType fedHeaderTypeFromString(const std::string& headerTypeString);
-  //FEDLegacyReadoutMode fedLegacyReadoutModeFromString(const std::string& readoutModeString); //FIXME to be introduced
   FEDReadoutMode fedReadoutModeFromString(const std::string& readoutModeString);
   FEDDAQEventType fedDAQEventTypeFromString(const std::string& daqEventTypeString);
 
@@ -1486,20 +1485,18 @@ namespace sistrip {
         case READOUT_MODE_PROC_RAW:
           return PACKET_CODE_PROC_RAW;
         case READOUT_MODE_ZERO_SUPPRESSED:
-        //case READOUT_MODE_ZERO_SUPPRESSED_CMOVERRIDE:
           return PACKET_CODE_ZERO_SUPPRESSED;
         case READOUT_MODE_ZERO_SUPPRESSED_LITE10:
         case READOUT_MODE_ZERO_SUPPRESSED_LITE10_CMOVERRIDE:
           return PACKET_CODE_ZERO_SUPPRESSED_LITE10;
-        case READOUT_MODE_ZERO_SUPPRESSED_LITE8:
-        case READOUT_MODE_ZERO_SUPPRESSED_LITE8_CMOVERRIDE:
-          return PACKET_CODE_ZERO_SUPPRESSED_LITE8;
         case READOUT_MODE_ZERO_SUPPRESSED_LITE8_BOTBOT:
         case READOUT_MODE_ZERO_SUPPRESSED_LITE8_BOTBOT_CMOVERRIDE:
           return PACKET_CODE_ZERO_SUPPRESSED_LITE8_BOTBOT;
         case READOUT_MODE_ZERO_SUPPRESSED_LITE8_TOPBOT:
         case READOUT_MODE_ZERO_SUPPRESSED_LITE8_TOPBOT_CMOVERRIDE:
           return PACKET_CODE_ZERO_SUPPRESSED_LITE8_TOPBOT;
+        case READOUT_MODE_ZERO_SUPPRESSED_LITE8:
+        case READOUT_MODE_ZERO_SUPPRESSED_LITE8_CMOVERRIDE:
         case READOUT_MODE_PREMIX_RAW:
         case READOUT_MODE_SPY:
         case READOUT_MODE_INVALID:

diff --git a/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.cc b/EventFilter/SiStripRawToDigi/plugins/SiStripDigiToRawModule.cc
@@ -36,7 +36,6 @@ namespace sistrip {
     switch(mode_) {
     case READOUT_MODE_ZERO_SUPPRESSED:                         rawdigi_ = false; break;
     case READOUT_MODE_ZERO_SUPPRESSED_FAKE:                    rawdigi_ = false; break;
-  //case READOUT_MODE_ZERO_SUPPRESSED_CMOVERRIDE:              rawdigi_ = false; break;
     case READOUT_MODE_ZERO_SUPPRESSED_LITE10:                  rawdigi_ = false; break;
     case READOUT_MODE_ZERO_SUPPRESSED_LITE10_CMOVERRIDE:       rawdigi_ = false; break;
     case READOUT_MODE_ZERO_SUPPRESSED_LITE8:                   rawdigi_ = false; break;

diff --git a/EventFilter/SiStripRawToDigi/plugins/SiStripRawToDigiUnpacker.cc b/EventFilter/SiStripRawToDigi/plugins/SiStripRawToDigiUnpacker.cc
@@ -274,8 +274,7 @@ namespace sistrip {
 	uint16_t ipair = ( useFedKey_ || (!legacy_ && mode == sistrip::READOUT_MODE_SCOPE) || (legacy_ && lmode == sistrip::READOUT_MODE_LEGACY_SCOPE) ) ? 0 : iconn->apvPairNumber();
 
 	if ((!legacy_ && (mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED || mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_FAKE))
-         || (legacy_ && (lmode == sistrip::READOUT_MODE_LEGACY_ZERO_SUPPRESSED_REAL || lmode == sistrip::READOUT_MODE_LEGACY_ZERO_SUPPRESSED_FAKE))
-       /*|| mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_CMOVERRIDE*/) { 
+         || (legacy_ && (lmode == sistrip::READOUT_MODE_LEGACY_ZERO_SUPPRESSED_REAL || lmode == sistrip::READOUT_MODE_LEGACY_ZERO_SUPPRESSED_FAKE)) ) {
 
 	  Registry regItem(key, 0, zs_work_digis_.size(), 0);
 

diff --git a/EventFilter/SiStripRawToDigi/src/SiStripFEDBuffer.cc b/EventFilter/SiStripRawToDigi/src/SiStripFEDBuffer.cc
@@ -74,14 +74,12 @@ namespace sistrip {
     uint16_t minLength;
     switch (readoutMode()) {
     case READOUT_MODE_ZERO_SUPPRESSED:
+    case READOUT_MODE_ZERO_SUPPRESSED_FAKE:
       minLength = 7;
       break;
     case READOUT_MODE_PREMIX_RAW:
       minLength = 2;
       break;
-    /*case READOUT_MODE_ZERO_SUPPRESSED_CMOVERRIDE:
-      minLength = 7;
-      break;*/
     case READOUT_MODE_ZERO_SUPPRESSED_LITE10:
     case READOUT_MODE_ZERO_SUPPRESSED_LITE10_CMOVERRIDE:
     case READOUT_MODE_ZERO_SUPPRESSED_LITE8:

diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/ClustersFromRawProducer.cc b/RecoLocalTracker/SiStripClusterizer/plugins/ClustersFromRawProducer.cc
@@ -359,8 +359,6 @@ try {
 
       try {
         // create unpacker
-        //sistrip::FEDZSChannelUnpacker unpacker = static_cast<sistrip::FEDZSChannelUnpacker>(
-        //  sistrip::FEDBSChannelUnpacker::zeroSuppressedLiteModeUnpacker(buffer->channel(fedCh), 8));
         sistrip::FEDZSChannelUnpacker unpacker = sistrip::FEDZSChannelUnpacker::zeroSuppressedLiteModeUnpacker(buffer->channel(fedCh));
 
         // unpack