Fixed the compilation error reported by @VinInn

cms-sw · Nov 12, 2015 · 63eeca4 · 63eeca4
1 parent 5a0d081
commit 63eeca4
Showing 1 changed file with 2 additions and 21 deletions.
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/ClustersFromRawProducer.cc b/RecoLocalTracker/SiStripClusterizer/plugins/ClustersFromRawProducer.cc
@@ -346,7 +346,7 @@ try { // edmNew::CapacityExaustedException
     const sistrip::FEDReadoutMode mode = buffer->readoutMode();
 
 
-    if likely(mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE10 ) { 
+    if likely(mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE10 || mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE8) { 
 
 	try {
 	  // create unpacker
@@ -370,28 +370,9 @@ try { // edmNew::CapacityExaustedException
 	  }                                               
 	  continue;
 	}
-    } else if likely(mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_LITE8 ) {
-
-      try {
-        // create unpacker
-        sistrip::FEDZSChannelUnpacker unpacker = sistrip::FEDZSChannelUnpacker::zeroSuppressedLiteModeUnpacker(buffer->channel(fedCh));
-
-        // unpack
-        clusterizer.addFed(unpacker,ipair,record);
-      } catch (edmNew::CapacityExaustedException) {
-        throw;
-      } catch (const cms::Exception& e) {
-          if (edm::isDebugEnabled()) {
-            std::ostringstream ss;
-            ss << "Unordered clusters for channel " << fedCh << " on FED " << fedId << ": " << e.what();
-            edm::LogWarning(sistrip::mlRawToCluster_) << ss.str();
-          }
-          continue;
-        }
-
     } else {
 
-      if (mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED or mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_FAKE ) { 
+      if (mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED || mode == sistrip::READOUT_MODE_ZERO_SUPPRESSED_FAKE ) { 
 	try {
 	  // create unpacker
 	  sistrip::FEDZSChannelUnpacker unpacker = sistrip::FEDZSChannelUnpacker::zeroSuppressedModeUnpacker(buffer->channel(fedCh));