Merge pull request #15330 from barvic/csc_unpacker_fix_for_mapping_in…

…consistencies_81X 81X - Added CSC Unpacker check for FED/DDU<->chamber mapping inconsistencies
cms-sw · Aug 2, 2016 · 42d8f51 · 42d8f51
2 parents 8a6ab01 + 88d4f1e
commit 42d8f51
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc b/EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc
@@ -61,6 +61,8 @@
 #include "EventFilter/CSCRawToDigi/interface/CSCDCCExaminer.h"
 #include "CondFormats/CSCObjects/interface/CSCCrateMap.h"
 #include "CondFormats/DataRecord/interface/CSCCrateMapRcd.h"
+#include "CondFormats/CSCObjects/interface/CSCChamberMap.h"
+#include "CondFormats/DataRecord/interface/CSCChamberMapRcd.h"
 #include <EventFilter/CSCRawToDigi/interface/CSCMonitorInterface.h>
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -178,6 +180,10 @@ void CSCDCCUnpacker::produce(edm::Event & e, const edm::EventSetup& c)
   c.get<CSCCrateMapRcd>().get(hcrate);
   const CSCCrateMap* pcrate = hcrate.product();
 
+  // Need access to CSCChamberMap for chamber<->FED/DDU mapping consistency checks 
+  edm::ESHandle<CSCChamberMap> cscmap;
+  c.get<CSCChamberMapRcd>().get(cscmap);
+  const CSCChamberMap* cscmapping = cscmap.product();
 
   if (printEventNumber) ++numOfEvents;
 
@@ -208,6 +214,12 @@ void CSCDCCUnpacker::produce(edm::Event & e, const edm::EventSetup& c)
   // then examinerMask for CSC level errors will be used during unpacking of each CSC block
   unsigned long dccBinCheckMask = 0x06080016;
 
+  // Post-LS1 FED/DDU ID mapping fix 
+  const unsigned postLS1_map [] =  { 841, 842, 843, 844, 845, 846, 847, 848, 849,
+                                     831, 832, 833, 834, 835, 836, 837, 838, 839,
+                                     861, 862, 863, 864, 865, 866, 867, 868, 869,
+                                     851, 852, 853, 854, 855, 856, 857, 858, 859 };
+
 
   // For new CSC readout layout, which wont include DCCs need to loop over DDU FED IDs. DCC IDs are included for backward compatibility with old data
   std::vector<unsigned int> cscFEDids;
@@ -425,8 +437,23 @@ void CSCDCCUnpacker::produce(edm::Event & e, const edm::EventSetup& c)
                           continue; // to next iteration of iCSC loop
                         }
 
-
-			// std::cout << "crate = " << vmecrate << "; dmb = " << dmb << " format version = " << cscData[iCSC].getFormatVersion() << std::endl; 
+
+                      /// For Post-LS1 readout only. Check Chamber->FED/DDU mapping consistency.
+                      /// Skip chambers (special case of data corruption), which report wrong ID and pose as different chamber 
+                      if (isDDU_FED)
+                        {
+                          unsigned int dduid = cscmapping->ddu(layer);
+                          if ((dduid>=1) && (dduid <= 36)) dduid = postLS1_map[dduid-1]; // Fix for Post-LS1 FED/DDU IDs mappings
+                          // std::cout << "CSC " << layer << " -> " << id << ":" << dduid << ":" << vmecrate << ":" << dmb ;
+                          if (id != dduid )
+                            {
+                              LogTrace ("CSCDDUUnpacker|CSCRawToDigi") << " CSC->FED/DDU mapping inconsistency!!! ";
+                              LogTrace ("CSCDCCUnpacker|CSCRawToDigi")
+                                << "readout FED/DDU ID=" << id << " expected ID=" << dduid
+                                << ", skipping chamber " << layer << " vme= " << vmecrate << " dmb= " << dmb;
+                              continue;
+                            }
+                        } 
 
                       /// check alct data integrity
                       int nalct = cscData[iCSC].dmbHeader()->nalct();

diff --git a/EventFilter/CSCRawToDigi/src/CSCDCCEventData.cc b/EventFilter/CSCRawToDigi/src/CSCDCCEventData.cc
@@ -89,7 +89,8 @@ void CSCDCCEventData::unpack_data(unsigned short *buf, CSCDCCExaminer* examiner)
   if (debug) LogTrace ("CSCDCCEventData|CSCRawToDigi") <<"decoding DCC trailer";
   memcpy(&theDCCTrailer, buf, theDCCTrailer.sizeInWords()*2);
   if (debug) LogTrace("CSCDCCEventData|CSCRawToDigi") << "checking DDU Trailer" << theDCCTrailer.check(); 
-  buf += theDCCTrailer.sizeInWords();
+
+  // buf += theDCCTrailer.sizeInWords(); /* =VB= Commented out to please static analyzer */ 
 
   //std::cout << " DCC Size: " << std::dec << theSizeInWords << std::endl;
   //std::cout << "LastBuf: "  << std::hex << inputBuf[theSizeInWords-4] << std::endl;

diff --git a/EventFilter/CSCRawToDigi/src/CSCTMBBlockedCFEB.cc b/EventFilter/CSCRawToDigi/src/CSCTMBBlockedCFEB.cc
@@ -51,7 +51,7 @@ std::vector< std::vector<int> > CSCTMBBlockedCFEB::getSingleCFEBList(int CFEBn)
         {
           CFEBnData.push_back(getData()[i] & 0xFFF);
         }
-      idCFEB = -1;
+      // idCFEB = -1; /* =VB= Commented out to please static analyzer */
     }
 
   std::vector<int> Layer0, Layer1, Layer2, Layer3, Layer4, Layer5;