remove enums. put everything in vectors

cms-l1t-offline · Nov 4, 2021 · aefeb23 · aefeb23
1 parent d4ee5ee
commit aefeb23
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 38 deletions.
diff --git a/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeDataFormat.h b/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeDataFormat.h
@@ -43,13 +43,6 @@ namespace L1Analysis {
     kAsymHtHF
   };
 
-  enum MuonShowerType {
-    kInvalid = 0,
-    kOneNominal,
-    kOneTight,
-    kTwoLoose
-  };
-
   struct L1AnalysisL1UpgradeDataFormat {
     L1AnalysisL1UpgradeDataFormat() { Reset(); };
     ~L1AnalysisL1UpgradeDataFormat(){};
@@ -134,7 +127,9 @@ namespace L1Analysis {
 
       nMuonShowers = 0;
       muonShowerBx.clear();
-      muonShowerType.clear();
+      muonShowerOneNominal.clear();
+      muonShowerOneTight.clear();
+      muonShowerTwoLoose.clear();
 
       nSums = 0;
       sumType.clear();
@@ -224,7 +219,9 @@ namespace L1Analysis {
 
     unsigned short int nMuonShowers;
     std::vector<short int> muonShowerBx;
-    std::vector<short int> muonShowerType;
+    std::vector<short int> muonShowerOneNominal;
+    std::vector<short int> muonShowerOneTight;
+    std::vector<short int> muonShowerTwoLoose;
 
     unsigned short int nSums;
     std::vector<short int> sumType;

diff --git a/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeTfMuonShowerDataFormat.h b/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeTfMuonShowerDataFormat.h
@@ -8,25 +8,26 @@ namespace L1Analysis {
 
   struct L1AnalysisL1UpgradeTfMuonShowerDataFormat {
 
-    enum TfMuonShowerType {
-      kInvalid = 0,
-      kOneNominal,
-      kOneTight,
-      kTwoLoose
-    };
-
     L1AnalysisL1UpgradeTfMuonShowerDataFormat() { Reset(); };
     ~L1AnalysisL1UpgradeTfMuonShowerDataFormat(){};
 
     void Reset() {
       nTfMuonShowers = 0;
       tfMuonShowerBx.clear();
-      tfMuonShowerType.clear();
+      tfMuonShowerOneNominal.clear();
+      tfMuonShowerOneTight.clear();
+      tfMuonShowerTwoLoose.clear();
+      tfMuonShowerEndcap.clear();
+      tfMuonShowerSector.clear();
     }
 
     unsigned short int nTfMuonShowers;
     std::vector<short int> tfMuonShowerBx;
-    std::vector<short int> tfMuonShowerType;
+    std::vector<short int> tfMuonShowerOneNominal;
+    std::vector<short int> tfMuonShowerOneTight;
+    std::vector<short int> tfMuonShowerTwoLoose;
+    std::vector<short int> tfMuonShowerEndcap;
+    std::vector<short int> tfMuonShowerSector;
   };
 }  // namespace L1Analysis
 #endif
diff --git a/L1Trigger/L1TNtuples/src/L1AnalysisL1Upgrade.cc b/L1Trigger/L1TNtuples/src/L1AnalysisL1Upgrade.cc
@@ -128,16 +128,9 @@ void L1Analysis::L1AnalysisL1Upgrade::SetMuonShower(const edm::Handle<l1t::MuonS
          it++) {
       if (it->isValid()) {
         l1upgrade_.muonShowerBx.push_back(ibx);
-        int type;
-        if (it->isOneNominalInTime())
-          type = kOneNominal;
-        else if (it->isOneTightInTime())
-          type = kOneTight;
-        else if (it->isTwoLooseInTime())
-          type = kTwoLoose;
-        else
-          type = kInvalid;
-        l1upgrade_.muonShowerType.push_back(type);
+        l1upgrade_.muonShowerOneNominal.push_back(it->isOneNominalInTime());
+        l1upgrade_.muonShowerOneTight.push_back(it->isOneTightInTime());
+        l1upgrade_.muonShowerTwoLoose.push_back(it->isTwoLooseInTime());
         l1upgrade_.nMuonShowers++;
       }
     }

diff --git a/L1Trigger/L1TNtuples/src/L1AnalysisL1UpgradeTfMuonShower.cc b/L1Trigger/L1TNtuples/src/L1AnalysisL1UpgradeTfMuonShower.cc
@@ -12,16 +12,11 @@ void L1Analysis::L1AnalysisL1UpgradeTfMuonShower::SetTfMuonShower(const l1t::Reg
          ++it) {
       if (it->isValid()) {
         l1upgradetfmuonshower_.tfMuonShowerBx.push_back(ibx);
-        int type;
-        if (it->isOneNominalInTime())
-          type = L1AnalysisL1UpgradeTfMuonShowerDataFormat::kOneNominal;
-        else if (it->isOneTightInTime())
-          type = L1AnalysisL1UpgradeTfMuonShowerDataFormat::kOneTight;
-        else if (it->isTwoLooseInTime())
-          type = L1AnalysisL1UpgradeTfMuonShowerDataFormat::kTwoLoose;
-        else
-          type = L1AnalysisL1UpgradeTfMuonShowerDataFormat::kInvalid;
-        l1upgradetfmuonshower_.tfMuonShowerType.push_back(type);
+        l1upgradetfmuonshower_.tfMuonShowerEndcap.push_back(it->endcap());
+        l1upgradetfmuonshower_.tfMuonShowerSector.push_back(it->sector());
+        l1upgradetfmuonshower_.tfMuonShowerOneNominal.push_back(it->isOneNominalInTime());
+        l1upgradetfmuonshower_.tfMuonShowerOneTight.push_back(it->isOneTightInTime());
+        l1upgradetfmuonshower_.tfMuonShowerTwoLoose.push_back(it->isTwoLooseInTime());
         l1upgradetfmuonshower_.nTfMuonShowers++;
       }
     }