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

Merge branch 'my21.2-2018-12-21' into '21.2' 

SUSYTools: Update to autoconfigPRWTool

See merge request atlas/athena!20094
parents cb243e32 24b9a010
No related branches found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx
+ 54
− 10
View file @ b6712870
......@@ -123,6 +123,9 @@ SUSYObjDef_xAOD::SUSYObjDef_xAOD( const std::string& name )
m_doPhiReso(true),
m_autoconfigPRW(false),
m_autoconfigPRWPath(""),
m_autoconfigPRWCombinedmode(false),
m_autoconfigPRWRPVmode(false),
m_autoconfigPRWHFFilter(""),
m_mcCampaign(""),
m_prwDataSF(-99.),
m_prwDataSF_UP(-99.),
......@@ -514,6 +517,9 @@ SUSYObjDef_xAOD::SUSYObjDef_xAOD( const std::string& name )
//PRW
declareProperty( "AutoconfigurePRWTool", m_autoconfigPRW );
declareProperty( "AutoconfigurePRWToolPath", m_autoconfigPRWPath );
declareProperty( "AutoconfigurePRWToolCombinedmode", m_autoconfigPRWCombinedmode );
declareProperty( "AutoconfigurePRWToolRPVmode", m_autoconfigPRWRPVmode );
declareProperty( "AutoconfigurePRWToolHFFilter", m_autoconfigPRWHFFilter );
declareProperty( "mcCampaign", m_mcCampaign );
declareProperty( "PRWConfigFiles", m_prwConfFiles );
declareProperty( "PRWLumiCalcFiles", m_prwLcalcFiles );
......@@ -797,10 +803,10 @@ StatusCode SUSYObjDef_xAOD::initialize() {
// autoconfigure PRW tool if m_autoconfigPRW==true
if (m_autoconfigPRWPath == "dev/PileupReweighting/share/")
ATH_CHECK( autoconfigurePileupRWTool() );
ATH_CHECK( autoconfigurePileupRWTool(m_autoconfigPRWPath, true, m_autoconfigPRWCombinedmode, m_autoconfigPRWRPVmode, m_autoconfigPRWHFFilter) );
else
// need to set a full path if you don't use the one in CVMFS
ATH_CHECK( autoconfigurePileupRWTool(m_autoconfigPRWPath, false) );
ATH_CHECK( autoconfigurePileupRWTool(m_autoconfigPRWPath, false, m_autoconfigPRWCombinedmode, m_autoconfigPRWRPVmode, m_autoconfigPRWHFFilter) );
ATH_CHECK( this->SUSYToolsInit() );
......@@ -812,9 +818,10 @@ StatusCode SUSYObjDef_xAOD::initialize() {
return StatusCode::SUCCESS;
}
StatusCode SUSYObjDef_xAOD::autoconfigurePileupRWTool(const std::string& PRWfilesDir, bool usePathResolver) {
StatusCode SUSYObjDef_xAOD::autoconfigurePileupRWTool(const std::string& PRWfilesDir, bool usePathResolver, bool RPVLLmode, bool Combinedmode, const std::string & HFFilter) {
std::string prwConfigFile("");
if ( !isData() && m_autoconfigPRW ) {
prwConfigFile = usePathResolver ? PathResolverFindCalibDirectory(PRWfilesDir) : PRWfilesDir;
......@@ -830,9 +837,12 @@ StatusCode SUSYObjDef_xAOD::autoconfigurePileupRWTool(const std::string& PRWfile
fmd->value(xAOD::FileMetaData::mcProcID, dsid);
fmd->value(xAOD::FileMetaData::amiTag, amiTag);
if ( amiTag.find("r9364")!=string::npos ) mcCampaignMD = "mc16a";
else if ( amiTag.find("r11036")!=string::npos ) mcCampaignMD = "mc16a";
else if ( amiTag.find("r9781")!=string::npos ) mcCampaignMD = "mc16c";
else if ( amiTag.find("r10201")!=string::npos ) mcCampaignMD = "mc16d";
else if ( amiTag.find("r11037")!=string::npos ) mcCampaignMD = "mc16d";
else if ( amiTag.find("r10724")!=string::npos ) mcCampaignMD = "mc16e";
else if ( amiTag.find("r11038")!=string::npos ) mcCampaignMD = "mc16e";
else {
ATH_MSG_ERROR( "autoconfigurePileupRWTool(): unrecognized xAOD::FileMetaData::amiTag, \'" << amiTag << "'. Please check your input sample");
return StatusCode::FAILURE;
......@@ -866,6 +876,44 @@ StatusCode SUSYObjDef_xAOD::autoconfigurePileupRWTool(const std::string& PRWfile
// Retrieve the input file
int DSID_INT = (int) dsid;
prwConfigFile += "DSID" + std::to_string(DSID_INT/1000) + "xxx/pileup_" + mcCampaignMD + "_dsid" + std::to_string(DSID_INT) + "_" + simType + ".root";
if (RPVLLmode) prwConfigFile = TString(prwConfigFile).ReplaceAll(".root","_rpvll.root").Data();
// Patch for MC16e Znunu metadata bug (2018.12.21)
if (!HFFilter.empty() && mcCampaignMD == "mc16e" && dsid>=366001 && dsid<= 366008) {
ATH_MSG_WARNING ("Samples metadata for Znunu samples is corrupted! Remapping to grab the correct RPW file. Only MC16e is supported for now.");
if (HFFilter == "BFilter") {
prwConfigFile = TString(prwConfigFile).ReplaceAll(std::to_string(DSID_INT),std::to_string(DSID_INT+9)).Data();
} else if (HFFilter == "CFilterBVeto") {
prwConfigFile = TString(prwConfigFile).ReplaceAll(std::to_string(DSID_INT),std::to_string(DSID_INT+18)).Data();
} else if (HFFilter == "CVetoBVeto") {
prwConfigFile = TString(prwConfigFile).ReplaceAll(std::to_string(DSID_INT),std::to_string(DSID_INT+27)).Data();
} else {
ATH_MSG_ERROR ("Heavy flavor filter naming is wrong and cannot re-map dsid! SHould be BFilter, CFilterBVeto, or CVetoBVeto.");
return StatusCode::FAILURE;
}
}
m_prwConfFiles.clear();
// Combined mode can be only used when running with full data with the same MC samples
if (Combinedmode) {
prwConfigFile = TString(prwConfigFile).ReplaceAll(mcCampaignMD,"mc16a").Data();
m_prwConfFiles.push_back( prwConfigFile );
prwConfigFile = TString(prwConfigFile).ReplaceAll("mc16a","mc16d").Data();
m_prwConfFiles.push_back( prwConfigFile );
prwConfigFile = TString(prwConfigFile).ReplaceAll("mc16d","mc16e").Data();
m_prwConfFiles.push_back( prwConfigFile );
m_prwConfFiles.push_back( PathResolverFindCalibFile(m_prwActualMu2017File) );
m_prwConfFiles.push_back( PathResolverFindCalibFile(m_prwActualMu2018File) );
} else {
m_prwConfFiles.push_back( prwConfigFile );
if ( mcCampaignMD == "mc16c" || mcCampaignMD == "mc16d") {
m_prwConfFiles.push_back( PathResolverFindCalibFile(m_prwActualMu2017File) );
} else if (mcCampaignMD == "mc16e") {
m_prwConfFiles.push_back( PathResolverFindCalibFile(m_prwActualMu2018File) );
}
}
TFile testF(prwConfigFile.data(),"read");
if(testF.IsZombie()) {
ATH_MSG_WARNING( "autoconfigurePileupRWTool(): file not found -> " << prwConfigFile.data() );
......@@ -881,13 +929,6 @@ StatusCode SUSYObjDef_xAOD::autoconfigurePileupRWTool(const std::string& PRWfile
return StatusCode::FAILURE;
}
}
m_prwConfFiles.clear();
m_prwConfFiles.push_back( prwConfigFile );
if ( mcCampaignMD == "mc16c" || mcCampaignMD == "mc16d") {
m_prwConfFiles.push_back( PathResolverFindCalibFile(m_prwActualMu2017File) );
} else if (mcCampaignMD == "mc16e") {
m_prwConfFiles.push_back( PathResolverFindCalibFile(m_prwActualMu2018File) );
}
ATH_MSG_INFO( "autoconfigurePileupRWTool(): configuring PRW tool using " << prwConfigFile.data() );
}
......@@ -1304,6 +1345,9 @@ StatusCode SUSYObjDef_xAOD::readConfig()
configFromFile(m_prwDataSF_DW, "PRW.DataSF_DW", rEnv, 1./1.07); // mc16 uncertainty? defaulting to the value in PRWtool
configFromFile(m_runDepPrescaleWeightPRW, "PRW.UseRunDependentPrescaleWeight", rEnv, false); // If set to true, the prescale weight is the luminosity-average prescale over the lumiblocks in the unprescaled lumicalc file in the PRW tool.
configFromFile(m_autoconfigPRWPath, "PRW.autoconfigPRWPath", rEnv, "dev/PileupReweighting/share/");
configFromFile(m_autoconfigPRWCombinedmode, "PRW.autoconfigPRWCombinedmode", rEnv, false);
configFromFile(m_autoconfigPRWRPVmode, "PRW.autoconfigPRWRPVmode", rEnv, false);
configFromFile(m_autoconfigPRWHFFilter, "PRW.autoconfigPRWHFFilter", rEnv, "None");
//
configFromFile(m_strictConfigCheck, "StrictConfigCheck", rEnv, false);
......
PhysicsAnalysis/SUSYPhys/SUSYTools/SUSYTools/SUSYObjDef_xAOD.h
+ 4
− 1
View file @ b6712870
......@@ -423,7 +423,7 @@ namespace ST {
protected:
// autoconfiguration of pileup-reweighting tool
StatusCode autoconfigurePileupRWTool(const std::string& PRWfilesDir = "dev/PileupReweighting/share/", bool usePathResolver = true);
StatusCode autoconfigurePileupRWTool(const std::string& PRWfilesDir = "dev/PileupReweighting/share/", bool usePathResolver = true, bool RPVLLmode = false, bool Combinedmode = false, const std::string & HFFilter = "");
StatusCode readConfig() override final;
StatusCode validConfig(bool strict = false) const;
......@@ -508,6 +508,9 @@ namespace ST {
bool m_autoconfigPRW;
std::string m_autoconfigPRWPath;
bool m_autoconfigPRWCombinedmode;
bool m_autoconfigPRWRPVmode;
std::string m_autoconfigPRWHFFilter;
std::string m_mcCampaign;
std::vector<std::string> m_prwConfFiles;
......
PhysicsAnalysis/SUSYPhys/SUSYTools/data/SUSYTools_Default.conf
+ 2
− 0
View file @ b6712870
......@@ -131,5 +131,7 @@ Ele.TriggerSFStringSingle: SINGLE_E_2015_e24_lhmedium_L1EM20VH_OR_e60_lhmedium_O
# actual Mu files have to be set in SUSYTools
PRW.ActualMu2017File: GoodRunsLists/data17_13TeV/20180619/physics_25ns_Triggerno17e33prim.actualMu.OflLumi-13TeV-010.root
PRW.ActualMu2018File: GoodRunsLists/data18_13TeV/20181111/purw.actualMu.root
# default to None but do set to BFilter (366010-366017), CFilterBVeto (366019-366026), or CVetoBVeto (366028-366035) to remap MC16e Znunu dsid
PRW.autoconfigPRWHFFilter: None
#
StrictConfigCheck: true
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