Skip to content
Snippets Groups Projects
Commit 12aef363 authored by Nils Erik Krumnack's avatar Nils Erik Krumnack
Browse files

Merge branch '21.2-TGEC-mapKeys-260922' into '21.2' 

TrigGlobalEfficiencyCorrection update data for suggestElectronMapKeys()

See merge request atlas/athena!57045
parents 8cec8809 036d73cb
No related branches found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/data/MapKeys.cfg
+ 43
− 2
View file @ 12aef363
......@@ -47,8 +47,7 @@
###
2015 e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose 2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose MULTI_L_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_e26_lhmedium_nod0_L1EM22VHI_2017_e26_lhmedium_nod0 SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2017_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0
2015 e7_lhmedium 2015_e7_lhmedium MULTI_L_2015_e7_lhmedium_2016_e7_lhmedium_nod0_2017_e7_lhmedium_nod0
2015 e17_lhloose 2015_e17_lhloose MULTI_L_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_e17_lhloose_nod0
TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_e24_lhvloose_nod0_L1EM20VH
2015 e17_lhloose 2015_e17_lhloose MULTI_L_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_e17_lhloose_nod0 TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_e24_lhvloose_nod0_L1EM20VH
2015 e12_lhloose MULTI_L_2015_e12_lhloose_2016_e12_lhloose_nod0_2017_e12_lhloose_nod0
2015 e12_lhloose_L1EM10VH 2015_e12_lhloose_L1EM10VH DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_e24_lhvloose_nod0_L1EM20VH
2015 e9_lhloose 2015_e9_lhloose TRI_E_2015_e9_lhloose_2016_e9_lhloose_nod0_2017_e12_lhvloose_nod0_L1EM10VH
......@@ -99,3 +98,45 @@ TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_e24_lhvloose_nod0_L1EM20VH
2018 e17_lhvloose_nod0_L1EM15VHI 2018_e17_lhvloose_nod0_L1EM15VHI DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e17_lhvloose_nod0_L1EM15VHI
2018 e24_lhvloose_nod0_L1EM20VH 2018_e24_lhvloose_nod0_L1EM20VH DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH
2018 e12_lhvloose_nod0_L1EM10VH 2018_e12_lhvloose_nod0_L1EM10VH TRI_E_2015_e9_lhloose_2016_e9_lhloose_nod0_2017_2018_e12_lhvloose_nod0_L1EM10VH
###
[VERSION] 2015_2018/rel21.2/Precision_Summer2020_v1
###
2015 e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2018_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2017_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 MULTI_L_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_e26_lhmedium_nod0_L1EM22VHI_2017_2018_e26_lhmedium_nod0
2015 e20_lhmedium 2015_e20_lhmedium EGAMMA_2015_e20_lhmedium_2016_e20_lhmedium_nod0_2017_2018_e24_lhmedium_nod0_L1EM20VH
2015 e17_lhmedium_nod0_L1EM15HI 2015_e17_lhmedium_nod0_L1EM15HI E_TAU_2015_2016_e17_lhmedium_nod0_L1EM15HI_2017_2018_e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI
2015 e9_lhloose TRI_E_2015_e9_lhloose_2016_e9_lhloose_nod0_2017_2018_e12_lhvloose_nod0_L1EM10VH 2015_e9_lhloose
2015 e17_lhloose TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH MULTI_L_2015_e17_lhloose_2016_2018_e17_lhloose_nod0 2015_e17_lhloose
2015 e7_lhmedium MULTI_L_2015_e7_lhmedium_2016_2018_e7_lhmedium_nod0 2015_e7_lhmedium
2015 e12_lhloose MULTI_L_2015_e12_lhloose_2016_2018_e12_lhloose_nod0
2015 e12_lhloose_L1EM10VH DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e17_lhvloose_nod0_L1EM15VHI 2015_e12_lhloose_L1EM10VH DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH
2016 e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2018_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 2016_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2017_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0
2016 e20_lhmedium_nod0 2016_e20_lhmedium_nod0 EGAMMA_2015_e20_lhmedium_2016_e20_lhmedium_nod0_2017_2018_e24_lhmedium_nod0_L1EM20VH
2016 e17_lhmedium_nod0_L1EM15HI 2016_e17_lhmedium_nod0_L1EM15HI E_TAU_2015_2016_e17_lhmedium_nod0_L1EM15HI_2017_2018_e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI
2016 e9_lhloose_nod0 TRI_E_2015_e9_lhloose_2016_e9_lhloose_nod0_2017_2018_e12_lhvloose_nod0_L1EM10VH 2016_e9_lhloose_nod0
2016 e17_lhloose_nod0 TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH MULTI_L_2015_e17_lhloose_2016_2018_e17_lhloose_nod0 2016_e17_lhloose_nod0
2016 e7_lhmedium_nod0 MULTI_L_2015_e7_lhmedium_2016_2018_e7_lhmedium_nod0 2016_e7_lhmedium_nod0
2016 e26_lhmedium_nod0_L1EM22VHI MULTI_L_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_e26_lhmedium_nod0_L1EM22VHI_2017_2018_e26_lhmedium_nod0 2016_e26_lhmedium_nod0_L1EM22VHI
2016 e12_lhloose_nod0 MULTI_L_2015_e12_lhloose_2016_2018_e12_lhloose_nod0 2016_e12_lhloose_nod0
2016 e17_lhvloose_nod0 DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e17_lhvloose_nod0_L1EM15VHI 2016_e17_lhvloose_nod0 DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH
2017 e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2018_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 2017_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2017_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0
2017 e24_lhmedium_nod0_L1EM20VH 2017_e24_lhmedium_nod0_L1EM20VH EGAMMA_2015_e20_lhmedium_2016_e20_lhmedium_nod0_2017_2018_e24_lhmedium_nod0_L1EM20VH
2017 e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI 2017_e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI E_TAU_2015_2016_e17_lhmedium_nod0_L1EM15HI_2017_2018_e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI
2017 e12_lhvloose_nod0_L1EM10VH TRI_E_2015_e9_lhloose_2016_e9_lhloose_nod0_2017_2018_e12_lhvloose_nod0_L1EM10VH 2017_e12_lhvloose_nod0_L1EM10VH
2017 e24_lhvloose_nod0_L1EM20VH TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH 2017_e24_lhvloose_nod0_L1EM20VH DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH
2017 e7_lhmedium_nod0 MULTI_L_2015_e7_lhmedium_2016_2018_e7_lhmedium_nod0 2017_e7_lhmedium_nod0
2017 e26_lhmedium_nod0 MULTI_L_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_e26_lhmedium_nod0_L1EM22VHI_2017_2018_e26_lhmedium_nod0 2017_e26_lhmedium_nod0
2017 e17_lhloose_nod0 MULTI_L_2015_e17_lhloose_2016_2018_e17_lhloose_nod0 2017_e17_lhloose_nod0
2017 e12_lhloose_nod0 MULTI_L_2015_e12_lhloose_2016_2018_e12_lhloose_nod0 2017_e12_lhloose_nod0
2017 e17_lhvloose_nod0_L1EM15VHI DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e17_lhvloose_nod0_L1EM15VHI 2017_e17_lhvloose_nod0_L1EM15VHI
2018 e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_2018_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0 2018_e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0
2018 e24_lhmedium_nod0_L1EM20VH 2018_e24_lhmedium_nod0_L1EM20VH EGAMMA_2015_e20_lhmedium_2016_e20_lhmedium_nod0_2017_2018_e24_lhmedium_nod0_L1EM20VH
2018 e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI 2018_e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI E_TAU_2015_2016_e17_lhmedium_nod0_L1EM15HI_2017_2018_e17_lhmedium_nod0_AND_e17_lhvloose_nod0_L1EM15VHI
2018 e12_lhvloose_nod0_L1EM10VH TRI_E_2015_e9_lhloose_2016_e9_lhloose_nod0_2017_2018_e12_lhvloose_nod0_L1EM10VH 2018_e12_lhvloose_nod0_L1EM10VH
2018 e24_lhvloose_nod0_L1EM20VH TRI_E_2015_e17_lhloose_2016_e17_lhloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH 2018_e24_lhvloose_nod0_L1EM20VH DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e24_lhvloose_nod0_L1EM20VH
2018 e7_lhmedium_nod0 MULTI_L_2015_e7_lhmedium_2016_2018_e7_lhmedium_nod0 2018_e7_lhmedium_nod0
2018 e26_lhmedium_nod0 MULTI_L_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose_2016_e26_lhmedium_nod0_L1EM22VHI_2017_2018_e26_lhmedium_nod0 2018_e26_lhmedium_nod0
2018 e17_lhloose_nod0 MULTI_L_2015_e17_lhloose_2016_2018_e17_lhloose_nod0 2018_e17_lhloose_nod0
2018 e12_lhloose_nod0 MULTI_L_2015_e12_lhloose_2016_2018_e12_lhloose_nod0 2018_e12_lhloose_nod0
2018 e17_lhvloose_nod0_L1EM15VHI DI_E_2015_e12_lhloose_L1EM10VH_2016_e17_lhvloose_nod0_2017_2018_e17_lhvloose_nod0_L1EM15VHI 2018_e17_lhvloose_nod0_L1EM15VHI
Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/examples/TrigGlobEffCorrExample4.cxx
+ 2
− 2
View file @ 12aef363
......@@ -83,7 +83,7 @@ int main(int argc, char* argv[])
return 1;
}
cc = TrigGlobalEfficiencyCorrectionTool::suggestElectronMapKeys(triggerCombination, "2015_2017/rel21.2/Consolidation_September2018_v1", legsPerKey);
cc = TrigGlobalEfficiencyCorrectionTool::suggestElectronMapKeys(triggerCombination, "2015_2018/rel21.2/Precision_Summer2020_v1", legsPerKey);
if(cc == CP::CorrectionCode::Ok)
{
if(!quiet)
......@@ -116,7 +116,7 @@ int main(int argc, char* argv[])
for(int j=0;j<2;++j) /// one tool instance for efficiencies, another for scale factors
{
auto t = electronToolsFactory.emplace(electronToolsFactory.end(), "AsgElectronEfficiencyCorrectionTool/ElTrigEff_"+std::to_string(nTools++));
t->setProperty("MapFilePath", "ElectronEfficiencyCorrection/2015_2017/rel21.2/Consolidation_September2018_v1/map3.txt").ignore();
t->setProperty("MapFilePath", "ElectronEfficiencyCorrection/2015_2018/rel21.2/Precision_Summer2020_v1/map4.txt").ignore();
t->setProperty("TriggerKey", (j? trigKey : "Eff_"+trigKey)).ignore();
t->setProperty("IdKey","Tight").ignore();
t->setProperty("IsoKey","FCTight").ignore();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment