Merge pull request #11705 from lihux25/fix_HF_dup_chns_75X

Fix the duplicated HF channels
cms-sw · Oct 12, 2015 · b955f7a · b955f7a
2 parents 0b1bdaa + a96d553
commit b955f7a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/EventFilter/HcalRawToDigi/plugins/HcalRawToDigi.cc b/EventFilter/HcalRawToDigi/plugins/HcalRawToDigi.cc
@@ -9,6 +9,7 @@ using namespace std;
 #include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>
+#include <unordered_set>
 
 HcalRawToDigi::HcalRawToDigi(edm::ParameterSet const& conf):
   unpacker_(conf.getUntrackedParameter<int>("HcalFirstFED",int(FEDNumbering::MINHCALFEDID)),conf.getParameter<int>("firstSample"),conf.getParameter<int>("lastSample")),
@@ -175,6 +176,14 @@ void HcalRawToDigi::produce(edm::Event& e, const edm::EventSetup& es)
 
   stats_.n++;
 
+  // check HF duplication
+  std::unordered_set<uint32_t> cacheForHFdup;
+  unsigned int cntHFdup = 0;
+  for( auto & hf_digi : hf ){
+     if( ! cacheForHFdup.insert(hf_digi.id().rawId()).second ) cntHFdup++;
+  }
+  if( cntHFdup ) edm::LogError("HcalRawToDigi") << "Duplicated HF digis found for "<<cntHFdup<<" times"<<std::endl;
+
   // Step B: encapsulate vectors in actual collections
   std::auto_ptr<HBHEDigiCollection> hbhe_prod(new HBHEDigiCollection()); 
   std::auto_ptr<HFDigiCollection> hf_prod(new HFDigiCollection());
@@ -187,7 +196,7 @@ void HcalRawToDigi::produce(edm::Event& e, const edm::EventSetup& es)
   std::auto_ptr<QIE10DigiCollection> qie10_prod(colls.qie10);
 
   hbhe_prod->swap_contents(hbhe);
-  hf_prod->swap_contents(hf);
+  if( !cntHFdup ) hf_prod->swap_contents(hf);
   ho_prod->swap_contents(ho);
   htp_prod->swap_contents(htp);
   hotp_prod->swap_contents(hotp);