Commit ac28b5e0 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master-ATR20899' into 'master'

Fix ATR-20899

Closes ATR-20899

See merge request !30487
parents 75d4df85 64517e59
......@@ -69,7 +69,25 @@ StatusCode JetCalibrationTool::initialize() {
// Initialise ReadHandle(s)
ATH_CHECK( m_rhkEvtInfo.initialize() );
ATH_CHECK( m_rhkPV.initialize() );
if(m_rhkPV.empty()) {
// No PV key: -- check if it is required
if(m_doResidual) {
// May require modification in case of residual that does not require NPV
ATH_MSG_ERROR("Residual calibration requested but no primary vertex container specified!");
return StatusCode::FAILURE;
} else if(m_doGSC) {
if(m_jetAlgo.find("PFlow")!=std::string::npos) {
ATH_MSG_ERROR("GSC calibration for PFlow requested but no primary vertex container specified!");
return StatusCode::FAILURE;
} else if((m_gscDepth!="Tile0" && m_gscDepth!="EM3")) {
ATH_MSG_ERROR("GSC calibration with tracks requested but no primary vertex container specified!");
return StatusCode::FAILURE;
}
}
} else {
// Received a PV key, declare the data dependency
ATH_CHECK( m_rhkPV.initialize() );
}
return StatusCode::SUCCESS;
}
......
......@@ -118,7 +118,10 @@ def getJetCalibTool(jetcollection, context, data_type, calibseq = "", rhoname =
# We should revert this later on, set up now for validation purposes
if context == "T0":
_data_type = "data"
return defineJetCalibTool(jetcollection, _configfile, calibarea, _calibseq, _data_type, rhoname, pvname, gscdepth)
_pvname = ""
if "Residual" in calibseq or "GSC" in calibseq and gscdepth!="EM3":
_pvname = pvname
return defineJetCalibTool(jetcollection, _configfile, calibarea, _calibseq, _data_type, rhoname, _pvname, gscdepth)
except KeyError as e:
jetcaliblog.error("Context '{0}' not found for jet collection '{1}'".format(context,jetcollection))
jetcaliblog.error("Options are '{0}".format(','.join(jetcontexts.keys())))
......
......@@ -110,8 +110,8 @@ TrigSignatureMoniMT INFO HLT_j45_L1J15
TrigSignatureMoniMT INFO HLT_j45_L1J15 decisions 18 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 20 20 18 0 0 0 0 18
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 decisions 18 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 19 19 16 0 0 0 0 16
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 decisions 16 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 19 19 15 0 0 0 0 15
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 decisions 15 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J1520 20 11 0 0 0 0 11
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 decisions 11 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J1520 20 11 0 0 0 0 11
......@@ -124,8 +124,8 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 18 48 48 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J2019 19 18 18 18 0 0 18
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 decisions 18 48 48 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J2019 19 16 0 0 0 0 16
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 decisions 16 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J2019 19 15 0 0 0 0 15
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 decisions 15 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J1520 20 18 0 0 0 0 18
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 decisions 18 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J2019 19 15 0 0 0 0 15
......@@ -150,8 +150,8 @@ TrigSignatureMoniMT INFO HLT_j85_L1J20
TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 13 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 19 19 13 0 0 0 0 13
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 decisions 13 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 19 19 10 0 0 0 0 10
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 decisions 10 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 19 19 8 0 0 0 0 8
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 decisions 8 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 10 10 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 10 10 10 5 3 0 0 3
......
......@@ -116,18 +116,20 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
("a10","subjes"): ("TrigUngroomed","JetArea_EtaJES"),
("a10t","jes"): ("TrigTrimmed","EtaJES_JMS"),
}[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])]
pvname = ""
gscDepth = "EM3"
if "gsc" in jetRecoDict["jetCalib"]:
gscDepth = "trackWIDTH"
pvname = "HLT_EFHistoPrmVtx"
elif jetRecoDict["dataType"]=="pf":
calibContext,calibSeq = {
("a4","subjes"): ("TrigLS2","JetArea_EtaJES_GSC"),
("a4","subjesIS"): ("TrigLS2","JetArea_EtaJES_GSC_Insitu"),
("a4","subjesgscIS"): ("TrigLS2","JetArea_EtaJES_GSC_Insitu"),
("a4","subresjesgscIS"): ("TrigLS2","JetArea_Residual_EtaJES_GSC_Insitu"),
}[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])]
gscDepth = "auto"
if "gsc" in jetRecoDict["jetCalib"]:
gscDepth = "trackWIDTH"
pvname = "HLT_EFHistoPrmVtx"
gscDepth = "auto"
calibContext = "TrigLS2"
calibSeq = "JetArea_Residual_EtaJES_GSC"
if jetRecoDict["jetCalib"].endswith("IS"):
calibSeq += "_Insitu"
pvname = "HLT_EFHistoPrmVtx"
calibSpec = ":".join( [calibContext, dataSource, calibSeq, rhoKey, pvname, gscDepth] )
from .TriggerJetMods import ConstitFourMom_copy
......
Markdown is supported
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