Merge pull request #41233 from dinyar/add-twoloose-showers-to-l1tntuples

Add "one loose" showers from EMTF and "two loose showers in different sectors" from uGMT to L1Tntuples
cms-sw · Mar 31, 2023 · 038c4e5 · 038c4e5
2 parents d097c9c + 7eef0aa
commit 038c4e5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/L1Trigger/L1TMuon/plugins/L1TMuonShowerProducer.cc b/L1Trigger/L1TMuon/plugins/L1TMuonShowerProducer.cc
@@ -82,7 +82,7 @@ void L1TMuonShowerProducer::produce(edm::Event& iEvent, const edm::EventSetup& i
       if (shower.isOneTightInTime()) {
         isOneTightInTime = true;
       }
-      // two loos in different sectors
+      // two loose in different sectors
       if (shower.isOneLooseInTime()) {
         if (foundOneLoose) {
           isTwoLooseDifferentSectorsInTime = true;

diff --git a/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeDataFormat.h b/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeDataFormat.h
@@ -131,6 +131,7 @@ namespace L1Analysis {
       muonShowerOneNominal.clear();
       muonShowerOneTight.clear();
       muonShowerTwoLoose.clear();
+      muonShowerTwoLooseDiffSectors.clear();
 
       nSums = 0;
       sumType.clear();
@@ -224,6 +225,7 @@ namespace L1Analysis {
     std::vector<short int> muonShowerOneNominal;
     std::vector<short int> muonShowerOneTight;
     std::vector<short int> muonShowerTwoLoose;
+    std::vector<short int> muonShowerTwoLooseDiffSectors;
 
     unsigned short int nSums;
     std::vector<short int> sumType;

diff --git a/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeTfMuonShowerDataFormat.h b/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeTfMuonShowerDataFormat.h
@@ -15,6 +15,7 @@ namespace L1Analysis {
       tfMuonShowerBx.clear();
       tfMuonShowerOneNominal.clear();
       tfMuonShowerOneTight.clear();
+      tfMuonShowerOneLoose.clear();
       tfMuonShowerTwoLoose.clear();
       tfMuonShowerEndcap.clear();
       tfMuonShowerSector.clear();
@@ -24,6 +25,7 @@ namespace L1Analysis {
     std::vector<short int> tfMuonShowerBx;
     std::vector<short int> tfMuonShowerOneNominal;
     std::vector<short int> tfMuonShowerOneTight;
+    std::vector<short int> tfMuonShowerOneLoose;
     std::vector<short int> tfMuonShowerTwoLoose;
     std::vector<short int> tfMuonShowerEndcap;
     std::vector<short int> tfMuonShowerSector;

diff --git a/L1Trigger/L1TNtuples/src/L1AnalysisL1Upgrade.cc b/L1Trigger/L1TNtuples/src/L1AnalysisL1Upgrade.cc
@@ -133,6 +133,7 @@ void L1Analysis::L1AnalysisL1Upgrade::SetMuonShower(const l1t::MuonShowerBxColle
         l1upgrade_.muonShowerOneNominal.push_back(it->isOneNominalInTime());
         l1upgrade_.muonShowerOneTight.push_back(it->isOneTightInTime());
         l1upgrade_.muonShowerTwoLoose.push_back(it->isTwoLooseInTime());
+        l1upgrade_.muonShowerTwoLooseDiffSectors.push_back(it->isTwoLooseDiffSectorsInTime());
         l1upgrade_.nMuonShowers++;
       }
     }

diff --git a/L1Trigger/L1TNtuples/src/L1AnalysisL1UpgradeTfMuonShower.cc b/L1Trigger/L1TNtuples/src/L1AnalysisL1UpgradeTfMuonShower.cc
@@ -16,6 +16,7 @@ void L1Analysis::L1AnalysisL1UpgradeTfMuonShower::SetTfMuonShower(const l1t::Reg
         l1upgradetfmuonshower_.tfMuonShowerSector.push_back(it->processor() + 1);
         l1upgradetfmuonshower_.tfMuonShowerOneNominal.push_back(it->isOneNominalInTime());
         l1upgradetfmuonshower_.tfMuonShowerOneTight.push_back(it->isOneTightInTime());
+        l1upgradetfmuonshower_.tfMuonShowerOneLoose.push_back(it->isOneLooseInTime());
         l1upgradetfmuonshower_.tfMuonShowerTwoLoose.push_back(it->isTwoLooseInTime());
         l1upgradetfmuonshower_.nTfMuonShowers++;
       }