diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py
index f73c7900bd855d638df8249e6b0c671d10977300..2a2ccb1447908b9b77a35807b56bcdd49ea3ad23 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py
@@ -4,29 +4,36 @@
# Used for combination MC, collisions or cosmics
-#General trigger chains
+#General trigger chains - default values
-monitoring_bjet = ["HLT_j35_boffperf_split", "HLT_j55_boffperf", "HLT_j55_boffperf_split", "HLT_j320_boffperf", "HLT_j320_boffperf_split", "HLT_j225_gsc360_boffperf_split"]
+monitoring_bjet = ["E_HLT_j35_boffperf_split", "E_HLT_j55_boffperf", "S_HLT_j55_boffperf_split", "E_HLT_j320_boffperf", "S_HLT_j320_boffperf_split",
+ "S_HLT_j225_gsc360_boffperf_split"]
-monitoring_mujet = ["HLT_mu4_j55_bperf_split_dr05_dz02", "HLT_mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15", "HLT_mu6_j110_bperf_split_dr05_dz02"]
+monitoring_mujet = ["S_HLT_mu4_j55_bperf_split_dr05_dz02", "E_HLT_mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15", "E_HLT_mu6_j110_bperf_split_dr05_dz02"]
-# triggers in pp collisions
+# triggers in pp collisions - used for q431 test
-monitoring_bjet_pp = ["HLT_j35_boffperf_split", "HLT_j55_boffperf", "HLT_j55_boffperf_split", "HLT_j320_boffperf", "HLT_j320_boffperf_split", "HLT_j225_gsc360_boffperf_split"]
+monitoring_bjet_pp = ["E_HLT_j35_boffperf_split", "E_HLT_j55_boffperf", "S_HLT_j55_boffperf_split", "E_HLT_j320_boffperf", "S_HLT_j320_boffperf_split",
+ "S_HLT_j225_gsc360_boffperf_split"]
-monitoring_mujet_pp = ["HLT_mu4_j55_bperf_split_dr05_dz02", "HLT_mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15", "HLT_mu6_j110_bperf_split_dr05_dz02"]
+monitoring_mujet_pp = ["S_HLT_mu4_j55_bperf_split_dr05_dz02", "E_HLT_mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15", "E_HLT_mu6_j110_bperf_split_dr05_dz02"]
################################
# cosmics triggers
-monitoring_bjet_cosmic = ["HLT_j0_perf_bperf_L1RD0_EMPTY", "HLT_j0_perf_bperf_L1J12_EMPTY", "HLT_j0_perf_bperf_L1MU10"]
+monitoring_bjet_cosmic = ["S_HLT_j0_perf_bperf_L1RD0_EMPTY", "S_HLT_j0_perf_bperf_L1J12_EMPTY", "S_HLT_j0_perf_bperf_L1MU10"]
-# triggers for HI runs
+# triggers for HI runs - used for q314 test
-monitoring_mujet_hi = ["HLT_mu4_j20_ion_dr05", "HLT_mu4_j60_ion_dr05", "HLT_mu6_j30_ion_dr05"]
+monitoring_bjet_hi = ["E_HLT_j40_boffperf_split", "S_HLT_j60_boffperf_split", "S_HLT_j100_boffperf_split"]
-# Used for MC
+monitoring_mujet_hi = ["E_HLT_mu4_j20_ion_dr05", "S_HLT_mu4_j60_ion_dr05", "S_HLT_mu6_j30_ion_dr05"]
-monitoring_bjet_validation = ["HLT_j55_bperf"]
+# Triggers for MC - used for q221 test
+
+monitoring_bjet_validation = ["E_HLT_j35_boffperf_split", "E_HLT_j55_boffperf", "S_HLT_j55_boffperf_split", "E_HLT_j320_boffperf", "S_HLT_j320_boffperf_split",
+ "S_HLT_j225_gsc360_boffperf_split"]
+
+monitoring_mujet_validation = ["S_HLT_mu4_j55_bperf_split_dr05_dz02", "E_HLT_mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15", "E_HLT_mu6_j110_bperf_split_dr05_dz02"]
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
index 2d97805f5bb7da0528b360d651ada2554959ea75..b989bf95127d08c3210572c381ce9fe54a14f445 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
@@ -133,24 +133,40 @@ StatusCode HLTBjetMonTool::init() {
for (int i =0; i<size_TriggerChainBjet; i++){
chainName = m_TriggerChainBjet.at(i);
ATH_MSG_DEBUG(" Chain number: " << i << " Bjet Chain Name: " << chainName );
+ // Investigate by the 1st character which folder should be assigned
+ if (chainName.substr(0,1) == "E") {
+ m_TriggerChainBjet.at(i) = chainName.substr (2);
+ chainName = m_TriggerChainBjet.at(i);
+ m_Chain2Dir[chainName] = "Expert";
+ } else if (chainName.substr(0,1) == "S") {
+ m_TriggerChainBjet.at(i) = chainName.substr (2);
+ chainName = m_TriggerChainBjet.at(i);
+ m_Chain2Dir[chainName] = "Shifter";
+ } else {
+ ATH_MSG_INFO(" Chain number: " << i << " Bjet Chain Name: " << chainName << " is not assigned to Expert or Shifter folders !!" );
+ return StatusCode::FAILURE;
+ } // else
+ ATH_MSG_DEBUG(" Chain number: " << i << " Bjet Chain Name: " << chainName );
}
for (int i =0; i<size_TriggerChainMujet; i++){
chainName = m_TriggerChainMujet.at(i);
- ATH_MSG_DEBUG(" Chain number: " << i << " MuJet Chain Name: " << chainName );
+ ATH_MSG_DEBUG(" Chain number: " << i << " Mujet Chain Name: " << chainName );
+ // Investigate by the 1st character which folder should be assigned
+ if (chainName.substr(0,1) == "E") {
+ m_TriggerChainMujet.at(i) = chainName.substr (2);
+ chainName = m_TriggerChainMujet.at(i);
+ m_Chain2Dir[chainName] = "Expert";
+ } else if (chainName.substr(0,1) == "S") {
+ m_TriggerChainMujet.at(i) = chainName.substr (2);
+ chainName = m_TriggerChainMujet.at(i);
+ m_Chain2Dir[chainName] = "Shifter";
+ } else {
+ ATH_MSG_INFO(" Chain number: " << i << " Mujet Chain Name: " << chainName << " is not assigned to Expert or Shifter folders !!" );
+ return StatusCode::FAILURE;
+ } // else
+ ATH_MSG_DEBUG(" Chain number: " << i << " Mujet Chain Name: " << chainName );
}
- // Set manually which triggers should be in which folder
-
- m_Chain2Dir["HLT_j35_boffperf_split"] = "Expert";
- m_Chain2Dir["HLT_j55_boffperf"] = "Expert";
- m_Chain2Dir["HLT_j55_boffperf_split"] = "Shifter";
- m_Chain2Dir["HLT_j320_boffperf"] = "Expert";
- m_Chain2Dir["HLT_j320_boffperf_split"] = "Shifter";
- m_Chain2Dir["HLT_j225_gsc360_boffperf_split"] = "Shifter";
- m_Chain2Dir["HLT_mu4_j55_bperf_split_dr05_dz02"] = "Shifter";
- m_Chain2Dir["HLT_mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15"] = "Expert";
- m_Chain2Dir["HLT_mu6_j110_bperf_split_dr05_dz02"] = "Expert";
-
// Check if folder assignment is made for all chains - if not stop the program
// Regroup chain names with identical histograms
@@ -160,8 +176,6 @@ StatusCode HLTBjetMonTool::init() {
it++;
}
std::map<std::string,std::string>::iterator p;
- // for (int i =0; i<size_TriggerChainBjet; i++){
- // chainName = m_TriggerChainBjet.at(i);
for (const auto & chainName:m_TriggerChainBjet){ // Shaun Roe 21/9/16
p = m_Chain2Dir.find(chainName);
if ( p != m_Chain2Dir.end() ) {
@@ -184,8 +198,6 @@ StatusCode HLTBjetMonTool::init() {
if (folderName == "Expert") m_Expert_jUnSplit.push_back(chainName);
}
} //i Bjet
- // for (int i =0; i<size_TriggerChainMujet; i++){
- // chainName = m_TriggerChainMujet.at(i);
for (const auto & chainName:m_TriggerChainMujet){ // Shaun Roe 21/9/16
p = m_Chain2Dir.find(chainName);
if ( p != m_Chain2Dir.end() ) {
@@ -305,7 +317,7 @@ StatusCode HLTBjetMonTool::book(){
addHistogram(new TH2F(("trkEtaPhi_"+m_Shifter_jSplit.at(i)).c_str(),"Phi vs Eta of tracks", 20, -5., 5., 20, -3.1416, 3.1416));
// Jets
addHistogram(new TH1F(("nJet_"+m_Shifter_jSplit.at(i)).c_str(),"Number of jets", 40, 0., 40.));
- addHistogram(new TH1F(("jetPt_"+m_Shifter_jSplit.at(i)).c_str(),"Pt of jets", 100, 0., 250.));
+ addHistogram(new TH1F(("jetPt_"+m_Shifter_jSplit.at(i)).c_str(),"Pt of jets", 100, 0., 750.));
addHistogram(new TH2F(("jetEtaPhi_"+m_Shifter_jSplit.at(i)).c_str(),"Phi vs Eta of jets", 20, -5., 5., 20, -3.1416, 3.1416));
// B-jets
addHistogram(new TH1F(("IP3D_pu_tr_"+m_Shifter_jSplit.at(i)).c_str(),"IP3D_pu probability distribution", 200, 0., 1.));
@@ -350,7 +362,7 @@ StatusCode HLTBjetMonTool::book(){
addHistogram(new TH2F(("trkEtaPhi_"+m_Shifter_jUnSplit.at(i)).c_str(),"Phi vs Eta of tracks", 20, -5., 5., 20, -3.1416, 3.1416));
// Jets
addHistogram(new TH1F(("nJet_"+m_Shifter_jUnSplit.at(i)).c_str(),"Number of jets", 40, 0., 40.));
- addHistogram(new TH1F(("jetPt_"+m_Shifter_jUnSplit.at(i)).c_str(),"Pt of jets", 100, 0., 250.));
+ addHistogram(new TH1F(("jetPt_"+m_Shifter_jUnSplit.at(i)).c_str(),"Pt of jets", 100, 0., 750.));
addHistogram(new TH2F(("jetEtaPhi_"+m_Shifter_jUnSplit.at(i)).c_str(),"Phi vs Eta of jets", 20, -5., 5., 20, -3.1416, 3.1416));
// B-jets
addHistogram(new TH1F(("IP3D_pu_tr_"+m_Shifter_jUnSplit.at(i)).c_str(),"IP3D_pu probability distribution", 200, 0., 1.));
@@ -376,7 +388,7 @@ StatusCode HLTBjetMonTool::book(){
ATH_MSG_INFO(" in HLTBjetMonTool::book added directory HLT/BjetMon/Shifter/" << m_Shifter_mujet.at(i) << " run: " << run << " " << ManagedMonitorToolBase::ATTRIB_MANAGED );
// Jets
addHistogram(new TH1F(("nJet_"+m_Shifter_mujet.at(i)).c_str(),"Number of jets", 40, 0., 40.));
- addHistogram(new TH1F(("jetPt_"+m_Shifter_mujet.at(i)).c_str(),"Pt of jets", 100, 0., 250.));
+ addHistogram(new TH1F(("jetPt_"+m_Shifter_mujet.at(i)).c_str(),"Pt of jets", 100, 0., 750.));
addHistogram(new TH2F(("jetEtaPhi_"+m_Shifter_mujet.at(i)).c_str(),"Phi vs Eta of jets", 20, -5., 5., 20, -3.1416, 3.1416));
// Muons
addHistogram(new TH1F(("nMuon_"+m_Shifter_mujet.at(i)).c_str(),"Number of muons", 20, 0., 20.));
@@ -419,7 +431,7 @@ StatusCode HLTBjetMonTool::book(){
addHistogram(new TH2F(("trkEtaPhi_"+m_Expert_jSplit.at(i)).c_str(),"Phi vs Eta of tracks", 20, -5., 5., 20, -3.1416, 3.1416));
// Jets
addHistogram(new TH1F(("nJet_"+m_Expert_jSplit.at(i)).c_str(),"Number of jets", 40, 0., 40.));
- addHistogram(new TH1F(("jetPt_"+m_Expert_jSplit.at(i)).c_str(),"Pt of jets", 100, 0., 250.));
+ addHistogram(new TH1F(("jetPt_"+m_Expert_jSplit.at(i)).c_str(),"Pt of jets", 100, 0., 750.));
addHistogram(new TH2F(("jetEtaPhi_"+m_Expert_jSplit.at(i)).c_str(),"Phi vs Eta of jets", 20, -5., 5., 20, -3.1416, 3.1416));
// B-jets
addHistogram(new TH1F(("IP3D_pu_tr_"+m_Expert_jSplit.at(i)).c_str(),"IP3D_pu probability distribution", 200, 0., 1.));
@@ -462,7 +474,7 @@ StatusCode HLTBjetMonTool::book(){
addHistogram(new TH2F(("trkEtaPhi_"+m_Expert_jUnSplit.at(i)).c_str(),"Phi vs Eta of tracks", 20, -5., 5., 20, -3.1416, 3.1416));
// Jets
addHistogram(new TH1F(("nJet_"+m_Expert_jUnSplit.at(i)).c_str(),"Number of jets", 40, 0., 40.));
- addHistogram(new TH1F(("jetPt_"+m_Expert_jUnSplit.at(i)).c_str(),"Pt of jets", 100, 0., 250.));
+ addHistogram(new TH1F(("jetPt_"+m_Expert_jUnSplit.at(i)).c_str(),"Pt of jets", 100, 0., 750.));
addHistogram(new TH2F(("jetEtaPhi_"+m_Expert_jUnSplit.at(i)).c_str(),"Phi vs Eta of jets", 20, -5., 5., 20, -3.1416, 3.1416));
// B-jets
addHistogram(new TH1F(("IP3D_pu_tr_"+m_Expert_jUnSplit.at(i)).c_str(),"IP3D_pu probability distribution", 200, 0., 1.));
@@ -489,7 +501,7 @@ StatusCode HLTBjetMonTool::book(){
ATH_MSG_INFO(" in HLTBjetMonTool::book added directory HLT/BjetMon/Expert/" << m_Expert_mujet.at(i) << " run: " << run << " " << ManagedMonitorToolBase::ATTRIB_MANAGED );
// Jets
addHistogram(new TH1F(("nJet_"+m_Expert_mujet.at(i)).c_str(),"Number of jets", 40, 0., 40.));
- addHistogram(new TH1F(("jetPt_"+m_Expert_mujet.at(i)).c_str(),"Pt of jets", 100, 0., 250.));
+ addHistogram(new TH1F(("jetPt_"+m_Expert_mujet.at(i)).c_str(),"Pt of jets", 100, 0., 750.));
addHistogram(new TH2F(("jetEtaPhi_"+m_Expert_mujet.at(i)).c_str(),"Phi vs Eta of jets", 20, -5., 5., 20, -3.1416, 3.1416));
// Muons
addHistogram(new TH1F(("nMuon_"+m_Expert_mujet.at(i)).c_str(),"Number of muons", 20, 0., 20.));
@@ -609,8 +621,6 @@ StatusCode HLTBjetMonTool::book(){
// unsigned int ichain = 0;
// Loop on trigger items
- // for (unsigned int ichain = 0; ichain < FiredChainNames.size(); ichain++) {
- // std::string trigItem = FiredChainNames.at(ichain);
for (const auto & trigItem:FiredChainNames){ // Shaun Roe 21/9/16
// Set directory name (Expert or Shifter)
std::map<std::string,std::string>::iterator p;