Merge pull request cms-sw#168 from thomreis/l1t-muon-CMSSW_8_0_0_pre6…

…_L1Upgrade-ntuple-muon-additions Add TF muon index variable to upgrade muon ntuple
swang373 · Feb 29, 2016 · 5bb064b · 5bb064b
2 parents f3caf65 + a00d9e7
commit 5bb064b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeDataFormat.h b/L1Trigger/L1TNtuples/interface/L1AnalysisL1UpgradeDataFormat.h
@@ -73,6 +73,7 @@ namespace L1Analysis
       muonChg.clear();
       muonIso.clear();
       muonQual.clear();
+      muonTfMuonIdx.clear();
       muonBx.clear();
 
       nSums = 0;
@@ -124,6 +125,7 @@ namespace L1Analysis
     std::vector<short int>      muonChg;
     std::vector<unsigned short int> muonIso;
     std::vector<unsigned short int> muonQual;
+    std::vector<unsigned short int> muonTfMuonIdx;
     std::vector<short int>      muonBx;
 
 

diff --git a/L1Trigger/L1TNtuples/src/L1AnalysisL1Upgrade.cc b/L1Trigger/L1TNtuples/src/L1AnalysisL1Upgrade.cc
@@ -79,9 +79,10 @@ void L1Analysis::L1AnalysisL1Upgrade::SetMuon(const edm::Handle<l1t::MuonBxColle
 	l1upgrade_.muonIEt .push_back(it->hwPt());
 	l1upgrade_.muonIEta.push_back(it->hwEta());
 	l1upgrade_.muonIPhi.push_back(it->hwPhi());
-	l1upgrade_.muonChg.push_back(0); //it->charge());
+	l1upgrade_.muonChg.push_back(it->charge());
 	l1upgrade_.muonIso.push_back(it->hwIso());
 	l1upgrade_.muonQual.push_back(it->hwQual());
+	l1upgrade_.muonTfMuonIdx.push_back(it->tfMuonIndex());
 	l1upgrade_.muonBx .push_back(ibx);
 	l1upgrade_.nMuons++;
       }