GEMDigiToRawModule - always make AMCs

Author: jshlee

CondFormats/GEMObjects/interface/GEMROMapping.h

@@ -7,7 +7,7 @@
 class GEMROMapping {
 public:
   struct chamEC {
-    unsigned int fedId;
+    int fedId;
     uint8_t amcNum;
     uint8_t gebId;
     bool operator<(const chamEC& r) const {

CondFormats/GEMObjects/interface/GEMeMap.h

@@ -19,7 +19,7 @@ class GEMeMap {
   void convertDummy(GEMROMapping& romap);
 
   struct GEMChamberMap {
-    std::vector<unsigned int> fedId;
+    std::vector<int> fedId;
     std::vector<uint8_t> amcNum;
     std::vector<uint8_t> gebId;
     std::vector<int> gemNum;
@@ -59,9 +59,11 @@ class GEMeMap {
   static const int vfatVerV3_ = 3;       // VFAT v3
   static const int vfatTypeV3_ = 11;     // VFAT v3
   static const int chipIdMask_ = 0xfff;  // chipId mask for 12 bits
+  static const int maxAMCs_ = 15;        // 4 bits for AMC no.
   static const int maxGEBs_ = 32;        // 5 bits for GEB id
-  static const int maxAMCs_ = 16;        // 4 bits for AMC no.
-  static const int maxVFatGE0_ = 12;     // vFat per eta partition, not known yet for ME0
+  static const int maxGEB0_ = 30;        // Not known yet for ME0
+  static const int maxGEB1_ = 12;        // 12 for GE11
+  static const int maxVFatGE0_  = 3;     // vFat per eta partition, not known yet for ME0
   static const int maxVFatGE11_ = 3;     // vFat per eta partition in GE11
   static const int maxVFatGE21_ = 6;     // vFat per eta partition in GE21
   static const int maxChan_ = 128;       // channels per vFat

DataFormats/GEMDigi/interface/AMCdata.h

@@ -92,7 +92,7 @@ namespace gem {
     uint8_t amcNum() const { return AMCheader1{amch1_}.AMCnum; }
 
     uint16_t boardId() const { return AMCheader2{amch2_}.boardID; }
-    uint16_t orbitNum() const { return AMCheader2{amch2_}.orbitNum; }
+    int16_t orbitNum() const { return AMCheader2{amch2_}.orbitNum; }
     uint8_t param3() const { return AMCheader2{amch2_}.param3; }
     uint8_t param2() const { return AMCheader2{amch2_}.param2; }
     uint8_t param1() const { return AMCheader2{amch2_}.param1; }

EventFilter/GEMRawToDigi/plugins/GEMDigiToRawModule.cc

@@ -123,7 +123,7 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
     }
   }
 
-  for (unsigned int fedId = FEDNumbering::MINGEMFEDID; fedId <= FEDNumbering::MAXME0FEDID; ++fedId) {
+  for (int fedId = FEDNumbering::MINGEMFEDID; fedId <= FEDNumbering::MAXME0FEDID; ++fedId) {
     uint32_t amc13EvtLength = 0;
     std::unique_ptr<AMC13Event> amc13Event = std::make_unique<AMC13Event>();
 
@@ -146,7 +146,7 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
           uint16_t vfatId = vfat_ec.vfatAdd;
 
           for (auto const& gemBx : gemBxMap) {
-            int bc = amcData->bx() + gemBx.first;
+            int bc = BX_id + gemBx.first;
 
             bool hasDigi = false;
             uint64_t lsData = 0;  ///<channels from 1to64
@@ -188,24 +188,22 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
 
         }  // end of vfats in GEB
 
-        if (!gebData->vFATs()->empty()) {
+         if (!gebData->vFATs()->empty()) {
           amcSize += 2;
           gebData->setChamberHeader(gebData->vFATs()->size() * 3, gebId);
           gebData->setChamberTrailer(LV1_id, BX_id, gebData->vFATs()->size() * 3);
           amcData->addGEB(*gebData);
-        }
+          }
       }  // end of GEB loop
 
-      if (!amcData->gebs()->empty()) {
-        amcSize += 5;
-        amcData->setAMCheader1(amcSize, BX_id, LV1_id, amcNum);
-        amcData->setAMCheader2(amcNum, OrN, 1);
-        amcData->setGEMeventHeader(amcData->gebs()->size(), 0);
-        amc13Event->addAMCpayload(*amcData);
-        // AMC header in AMC13Event
-        amc13Event->addAMCheader(amcSize, 0, amcNum, 0);
-        amc13EvtLength += amcSize + 1;  // AMC data size + AMC header size
-      }
+      amcSize += 5;
+      amcData->setAMCheader1(amcSize, BX_id, LV1_id, amcNum);
+      amcData->setAMCheader2(amcNum, OrN, 1);
+      amcData->setGEMeventHeader(amcData->gebs()->size(), 0);
+      amc13Event->addAMCpayload(*amcData);
+      // AMC header in AMC13Event
+      amc13Event->addAMCheader(amcSize, 0, amcNum, 0);
+      amc13EvtLength += amcSize + 1;  // AMC data size + AMC header size
 
     }  // end of AMC loop
 
@@ -218,9 +216,9 @@ void GEMDigiToRawModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
       amc13Event->setAMC13Trailer(BX_id, LV1_id, BX_id);
       //CDF trailer
       uint32_t EvtLength = amc13EvtLength + 4;  // 2 header and 2 trailer
-
       amc13Event->setCDFTrailer(EvtLength);
-      amc13Events.emplace_back(std::move(amc13Event));
+      
+      amc13Events.emplace_back(std::move(amc13Event));      
     }  // finished making amc13Event data
   }    // end of FED loop
 

EventFilter/GEMRawToDigi/plugins/GEMRawToDigiModule.cc

@@ -111,7 +111,7 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
 
   auto gemROMap = runCache(iEvent.getRun().index());
 
-  for (unsigned int fedId = FEDNumbering::MINGEMFEDID; fedId <= FEDNumbering::MAXGEMFEDID; ++fedId) {
+  for (int fedId = FEDNumbering::MINGEMFEDID; fedId <= FEDNumbering::MAXGEMFEDID; ++fedId) {
     const FEDRawData& fedData = fed_buffers->FEDData(fedId);
 
     int nWords = fedData.size() / sizeof(uint64_t);
@@ -122,7 +122,7 @@ void GEMRawToDigiModule::produce(edm::StreamID iID, edm::Event& iEvent, edm::Eve
 
     // trailer checks
     FEDTrailer trailer(fedData.data() + fedData.size() - FEDTrailer::length);
-
+    
     bool failTrailerCheck = false, failTrailerMatch = false;
     if (!trailer.check() || (trailer.fragmentLength() * sizeof(uint64_t) != fedData.size())) {
       failTrailerCheck = true;

EventFilter/GEMRawToDigi/src/GEMRawToDigi.cc

@@ -3,7 +3,8 @@
  */
 #include "EventFilter/GEMRawToDigi/interface/GEMRawToDigi.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-
+// temp
+#include <iostream>
 using namespace gem;
 
 std::unique_ptr<AMC13Event> GEMRawToDigi::convertWordToAMC13Event(const uint64_t* word) {