Update apQual to apQualFlag as requested by GT

cms-sw · Mar 20, 2024 · 5d04900 · 5d04900
1 parent 84cc3df
commit 5d04900
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/DataFormats/L1TMuonPhase2/interface/SAMuon.h b/DataFormats/L1TMuonPhase2/interface/SAMuon.h
@@ -45,7 +45,7 @@ namespace l1t {
     const Phase2L1GMT::z0_sa_t apZ0() const { return Phase2L1GMT::z0_sa_t(hwZ0()); };
     const Phase2L1GMT::d0_sa_t apD0() const { return Phase2L1GMT::d0_sa_t(hwD0()); };
     const Phase2L1GMT::q_sa_t apCharge() const { return Phase2L1GMT::q_sa_t(hwCharge()); };
-    const Phase2L1GMT::qual_sa_t apQual() const { return Phase2L1GMT::qual_sa_t(hwQual()); };
+    const Phase2L1GMT::qual_sa_t apQualFlag() const { return Phase2L1GMT::qual_sa_t(hwQual()); };
 
     // For HLT
     const double phZ0() const { return Phase2L1GMT::LSBSAz0 * hwZ0(); }

diff --git a/DataFormats/L1TMuonPhase2/interface/TrackerMuon.h b/DataFormats/L1TMuonPhase2/interface/TrackerMuon.h
@@ -54,10 +54,7 @@ namespace l1t {
     const Phase2L1GMT::z0_gt_t apZ0() const { return Phase2L1GMT::z0_gt_t(hwZ0()); };
     const Phase2L1GMT::d0_gt_t apD0() const { return Phase2L1GMT::d0_gt_t(hwD0()); };
     const Phase2L1GMT::q_gt_t apCharge() const { return Phase2L1GMT::q_gt_t(hwCharge()); };
-    const Phase2L1GMT::qual_gt_t apQual() const { return Phase2L1GMT::qual_gt_t(hwQual()); };
-    const Phase2L1GMT::qualsc_gt_t apQualSC() const {
-      return Phase2L1GMT::qualsc_gt_t(hwQual() | (hwCharge() << Phase2L1GMT::BITSGTQUAL));
-    };
+    const Phase2L1GMT::qual_gt_t apQualFlag() const { return Phase2L1GMT::qual_gt_t(hwQual()); };
     const Phase2L1GMT::iso_gt_t apIso() const { return Phase2L1GMT::iso_gt_t(hwIsoSumAp()); };
     const Phase2L1GMT::beta_gt_t apBeta() const { return Phase2L1GMT::beta_gt_t(hwBeta()); };
 

diff --git a/L1Trigger/Phase2L1GT/plugins/L1GTProducer.cc b/L1Trigger/Phase2L1GT/plugins/L1GTProducer.cc
@@ -219,7 +219,7 @@ namespace l1t {
       gtObj.hwPhi_ = obj.apPhi().to_int();
       gtObj.hwEta_ = obj.apEta().to_int();
       gtObj.hwZ0_ = hwZ0;
-      gtObj.hwQual_ = obj.apQual().to_int();
+      gtObj.hwQual_ = obj.apQualFlag().to_int();
       gtObj.hwCharge_ = obj.apCharge().to_int();
       gtObj.hwD0_ = obj.apD0().to_int();
       gtObj.objectType_ = P2GTCandidate::GMTSaPromptMuons;
@@ -245,7 +245,7 @@ namespace l1t {
       gtObj.hwPhi_ = obj.apPhi().to_int();
       gtObj.hwEta_ = obj.apEta().to_int();
       gtObj.hwZ0_ = hwZ0;
-      gtObj.hwQual_ = obj.apQual().to_int();
+      gtObj.hwQual_ = obj.apQualFlag().to_int();
       gtObj.hwCharge_ = obj.apCharge().to_int();
       gtObj.hwD0_ = obj.apD0().to_int();
       gtObj.objectType_ = P2GTCandidate::GMTSaDisplacedMuons;
@@ -272,7 +272,7 @@ namespace l1t {
       gtObj.hwEta_ = obj.apEta().to_int();
       gtObj.hwZ0_ = hwZ0;
       gtObj.hwIso_ = obj.apIso().to_int();
-      gtObj.hwQual_ = obj.apQual().to_int();
+      gtObj.hwQual_ = obj.apQualFlag().to_int();
       gtObj.hwCharge_ = obj.apCharge().to_int();
       gtObj.hwD0_ = obj.apD0().to_int();
       gtObj.hwBeta_ = obj.apBeta().to_int();