Hardware compatible changes and output ordering fix

Hardware compatible changes

Author: Chriisbrown

DataFormats/L1TParticleFlow/interface/jets.h

@@ -14,7 +14,7 @@ namespace l1ct {
   // all possible tag categories (can be extended for new / separate taggers)
   class JetTagClass {
   public:
-    enum JetTagClassValue : uint8_t { uds, g, b, c, tau_p, tau_n, e, mu };
+    enum JetTagClassValue : uint8_t { b, c, uds, g, tau_p, tau_n, mu, e };
     JetTagClass() = default;
     JetTagClass(JetTagClassValue aJetTagClassValue) : value_(aJetTagClassValue) {}
     JetTagClass(std::string aJetTagClassValueString) {
@@ -35,24 +35,29 @@ namespace l1ct {
 
   };  // JetTagClass
 
-  struct Jet {
-    pt_t hwPt;
-    glbeta_t hwEta;
-    glbphi_t hwPhi;
-    z0_t hwZ0;
-
+  // Define a separate class/struct for jet tag handling
+  struct JetTagClassHandler {
     static const unsigned NTagFields = 8;
-    jet_tag_score_t hwTagScores[NTagFields];
-
     static const JetTagClass tagClassesDefault_[NTagFields];
+
     JetTagClass tagClassesArray[NTagFields];
 
-    Jet() {
+    JetTagClassHandler() {
       // Copy the default values to the array
       for (unsigned i = 0; i < NTagFields; i++) {
         tagClassesArray[i] = tagClassesDefault_[i];
       }
     }
+  };
+
+  struct Jet {
+    pt_t hwPt;
+    glbeta_t hwEta;
+    glbphi_t hwPhi;
+    z0_t hwZ0;
+
+    static const unsigned NTagFields = 8;
+    jet_tag_score_t hwTagScores[NTagFields];
 
     inline bool operator==(const Jet &other) const {
       bool eq = hwPt == other.hwPt && hwEta == other.hwEta && hwPhi == other.hwPhi && hwZ0 == other.hwZ0;

DataFormats/L1TParticleFlow/src/jets.cpp

@@ -1,20 +1,20 @@
 #include "DataFormats/L1TParticleFlow/interface/jets.h"
 
 const std::unordered_map<std::string, l1ct::JetTagClass::JetTagClassValue> l1ct::JetTagClass::labels_ = {
-    {"uds", l1ct::JetTagClass::JetTagClassValue::uds},
-    {"g", l1ct::JetTagClass::JetTagClassValue::g},
     {"b", l1ct::JetTagClass::JetTagClassValue::b},
     {"c", l1ct::JetTagClass::JetTagClassValue::c},
+    {"uds", l1ct::JetTagClass::JetTagClassValue::uds},
+    {"g", l1ct::JetTagClass::JetTagClassValue::g},
     {"tau_p", l1ct::JetTagClass::JetTagClassValue::tau_p},
     {"tau_n", l1ct::JetTagClass::JetTagClassValue::tau_n},
-    {"e", l1ct::JetTagClass::JetTagClassValue::e},
-    {"mu", l1ct::JetTagClass::JetTagClassValue::mu}};
+    {"mu", l1ct::JetTagClass::JetTagClassValue::mu},
+    {"e", l1ct::JetTagClass::JetTagClassValue::e}};
 
-const l1ct::JetTagClass l1ct::Jet::tagClassesDefault_[NTagFields] = {l1ct::JetTagClass("uds"),
-                                                                     l1ct::JetTagClass("g"),
-                                                                     l1ct::JetTagClass("b"),
-                                                                     l1ct::JetTagClass("c"),
-                                                                     l1ct::JetTagClass("tau_p"),
-                                                                     l1ct::JetTagClass("tau_n"),
-                                                                     l1ct::JetTagClass("e"),
-                                                                     l1ct::JetTagClass("mu")};
+const l1ct::JetTagClass l1ct::JetTagClassHandler::tagClassesDefault_[NTagFields] = {l1ct::JetTagClass("b"),
+                                                                                    l1ct::JetTagClass("c"),
+                                                                                    l1ct::JetTagClass("uds"),
+                                                                                    l1ct::JetTagClass("g"),
+                                                                                    l1ct::JetTagClass("tau_p"),
+                                                                                    l1ct::JetTagClass("tau_n"),
+                                                                                    l1ct::JetTagClass("mu"),
+                                                                                    l1ct::JetTagClass("e")};

L1Trigger/Phase2L1ParticleFlow/plugins/L1TSC4NGJetProducer.cc

@@ -115,7 +115,7 @@ void L1TSC4NGJetProducer::fillDescriptions(edm::ConfigurationDescriptions& descr
   desc.add<int>("nParticles", 16);
   desc.add<double>("minPt", 10);
   desc.add<double>("maxEta", 2.4);
-  desc.add<std::vector<std::string>>("classes", {"uds", "g", "b", "c", "tau_p", "tau_n", "e", "mu"});
+  desc.add<std::vector<std::string>>("classes", {"b", "c", "uds", "g", "tau_p", "tau_n", "mu", "e"});
   descriptions.add("l1tSC4NGJetProducer", desc);
 }
 

L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py

@@ -43,8 +43,8 @@
     skipEvents = cms.untracked.uint32(0),
 )
 
-process.load('Configuration.Geometry.GeometryExtendedRun4D88Reco_cff')
-process.load('Configuration.Geometry.GeometryExtendedRun4D88_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
+process.load('Configuration.Geometry.GeometryExtendedRun4D110_cff')
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cff') # needed to read HCal TPs
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')