diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
index bf77821f961351db26498619eb55f7b069f938bc..83543fecf5bec8b2da71c62a926244605fd9fa97 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
@@ -7,24 +7,24 @@ testChains = {
#ifndef VTXANALYSIS
- "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
- "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
- "HLT_mu6_ivarmedium_L1MU6:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
- "HLT_mu6_ivarmedium_L1MU6:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
+ "HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
+ "HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
+ "HLT_mu6_ivarmedium_L1MU5VF:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
+ "HLT_mu6_ivarmedium_L1MU5VF:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
- "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
- "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
- "HLT_mu26_ivarmedium_L1MU20:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
- "HLT_mu26_ivarmedium_L1MU20:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
- "HLT_mu28_ivarmedium_L1MU20:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
- "HLT_mu28_ivarmedium_L1MU20:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
- "HLT_mu26_ivarperf_L1MU20:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
- "HLT_mu26_ivarperf_L1MU20:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
+ "HLT_mu24_idperf_L1MU14FCH:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon",
+ "HLT_mu24_idperf_L1MU14FCH:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
+ "HLT_mu26_ivarmedium_L1MU14FCH:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
+ "HLT_mu26_ivarmedium_L1MU14FCH:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
+ "HLT_mu28_ivarmedium_L1MU14FCH:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
+ "HLT_mu28_ivarmedium_L1MU14FCH:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
+ "HLT_mu26_ivarperf_L1MU14FCH:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso",
+ "HLT_mu26_ivarperf_L1MU14FCH:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso",
- "HLT_mu24_LRT_idperf_L1MU20:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
- "HLT_mu6_LRT_idperf_L1MU6:HLT_IDTrack_MuonLRT_IDTrig:HLT_Roi_L2SAMuon_LRT",
- "HLT_mu6_LRT_idperf_L1MU6:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
- "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
+ "HLT_mu24_LRT_idperf_L1MU14FCH:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
+ "HLT_mu6_LRT_idperf_L1MU5VF:HLT_IDTrack_MuonLRT_IDTrig:HLT_Roi_L2SAMuon_LRT",
+ "HLT_mu6_LRT_idperf_L1MU5VF:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT",
+ "HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon",
@@ -61,8 +61,8 @@ testChains = {
"HLT_unconvtrk0_fslrt_L1All:HLT_IDTrack_FS_FTF;DTE",
"HLT_unconvtrk0_fslrt_L1All:HLT_IDTrack_FSLRT_IDTrig;DTE",
- "HLT_2mu4_bBmumux_BsmumuPhi_L12MU4:HLT_IDTrack_Bmumux_FTF",
- "HLT_2mu4_bBmumux_BsmumuPhi_L12MU4:HLT_IDTrack_Bmumux_IDTrig",
+ "HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V:HLT_IDTrack_Bmumux_FTF",
+ "HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V:HLT_IDTrack_Bmumux_IDTrig",
#endif
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index f9c3bba04f9cbba609d015d1a9c01c6441d71e25..2d66016e46f3c3df40523807a0801b1cc218f683 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -77,17 +77,17 @@ class TrigInDetReco(ExecStep):
flags = ''
for i in self.slices:
if (i=='L2muonLRT') :
- chains += "'HLT_mu24_LRT_idperf_L1MU20',"
- chains += "'HLT_mu6_LRT_idperf_L1MU6',"
- chains += "'HLT_mu6_idperf_L1MU6',"
+ chains += "'HLT_mu24_LRT_idperf_L1MU14FCH',"
+ chains += "'HLT_mu6_LRT_idperf_L1MU5VF',"
+ chains += "'HLT_mu6_idperf_L1MU5VF',"
flags += 'doMuonSlice=True;'
if (i=='FSLRT') :
chains += "'HLT_unconvtrk0_fslrt_L1All',"
flags += 'doUnconventionalTrackingSlice=True;'
if (i=='muon') :
- chains += "'HLT_mu6_idperf_L1MU6',"
- chains += "'HLT_mu24_idperf_L1MU20',"
- chains += "'HLT_mu26_ivarperf_L1MU20',"
+ chains += "'HLT_mu6_idperf_L1MU5VF',"
+ chains += "'HLT_mu24_idperf_L1MU14FCH',"
+ chains += "'HLT_mu26_ivarperf_L1MU14FCH',"
flags += 'doMuonSlice=True;'
if (i=='L2electronLRT') :
chains += "'HLT_e5_idperf_loose_lrtloose_L1EM3',"
@@ -122,11 +122,11 @@ class TrigInDetReco(ExecStep):
chains += "'HLT_mb_sptrk_L1RD0_FILLED',"
flags += "doMinBiasSlice=True;setMenu='LS2_v1';"
if (i=='cosmic') :
- chains += "'HLT_mu4_cosmic_L1MU4'"
+ chains += "'HLT_mu4_cosmic_L1MU3V'"
flags += "doMuonSlice=True;doCosmics=True;setMenu='Cosmic_run3_v1';"
if (i=='bphys') :
- chains += "'HLT_mu6_idperf_L1MU6',"
- chains += "'HLT_2mu4_bBmumux_BsmumuPhi_L12MU4',"
+ chains += "'HLT_mu6_idperf_L1MU5VF',"
+ chains += "'HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V',"
flags += 'doMuonSlice=True;doBphysicsSlice=True;'
if ( flags=='' ) :
print( "ERROR: no chains configured" )
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
index beb40ea60a213509e98e79eb1288a12f0fe75afc..7b6bdd72eb51c61fe709df6b37fa32986296db35 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
@@ -18,11 +18,29 @@ algseq = CfgMgr.AthSequencer("AthAlgSeq") #gets the main AthSeque
#only specifying here so that has the standard 'TrigDecisionTool' name
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-ToolSvc += CfgMgr.Trig__TrigDecisionTool("TrigDecisionTool")
+### old TDT configuration - LEAVE THIS HERE FOR TH TIME BEING
+### this will be removed once we kow that the nightly tests are
+### all working again...
+### from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
+### ToolSvc += CfgMgr.Trig__TrigDecisionTool("TrigDecisionTool")
+
+### from TrigEDMConfig.TriggerEDM import EDMLibraries
+### ToolSvc.TrigDecisionTool.Navigation.Dlls = EDMLibraries
+
+### from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
+### myAlg.TrigDecisionTool = conf2toConfigurable(tdtAcc.getPrimary())
+
+from AthenaCommon.Configurable import Configurable
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from AthenaConfiguration.ComponentAccumulator import appendCAtoAthena
+from TrigDecisionTool.TrigDecisionToolConfig import getTrigDecisionTool
+Configurable.configurableRun3Behavior+=1
+tdtAcc = getTrigDecisionTool(ConfigFlags)
+Configurable.configurableRun3Behavior-=1
+appendCAtoAthena( tdtAcc )
+
+
-from TrigEDMConfig.TriggerEDM import EDMLibraries
-ToolSvc.TrigDecisionTool.Navigation.Dlls = EDMLibraries
from AthenaCommon.AppMgr import topSequence
@@ -32,11 +50,11 @@ from TrigConfxAOD.TrigConfxAODConf import TrigConf__xAODConfigTool
cfgtool = TrigConf__xAODConfigTool('xAODConfigTool')
ToolSvc += cfgtool
-tdt = Trig__TrigDecisionTool('TrigDecisionTool')
-tdt.ConfigTool = cfgtool
-tdt.NavigationFormat = "TrigComposite"
+## tdt = Trig__TrigDecisionTool('TrigDecisionTool')
+## tdt.ConfigTool = cfgtool
+## tdt.NavigationFormat = "TrigComposite"
-tdt.Navigation.Dlls = [e for e in EDMLibraries if 'TPCnv' not in e]
+## tdt.Navigation.Dlls = [e for e in EDMLibraries if 'TPCnv' not in e]
jps.AthenaCommonFlags.FilesInput = FilesInput
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
index 932670d8ca211ecee083d4e29c01c8d85e0035df..33c1ab48b303f4474d70b40392f257212cc5bfca 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/comparitor.json
@@ -1,21 +1,21 @@
{
"EFmuonLRT":{
- "chains" : "HLT_mu6_LRT_idperf_L1MU6:HLT_IDTrack_MuonLRT_IDTrig:HLT_Roi_L2SAMuon_LRT HLT_mu6_LRT_idperf_L1MU6:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT HLT_mu6_idperf_L1MU6:HLT_IDTrack_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon"
+ "chains" : "HLT_mu6_LRT_idperf_L1MU5VF:HLT_IDTrack_MuonLRT_IDTrig:HLT_Roi_L2SAMuon_LRT HLT_mu6_LRT_idperf_L1MU5VF:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon"
},
"L2muonLRT":{
- "chains" : "HLT_mu24_LRT_idperf_L1MU20:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon"
+ "chains" : "HLT_mu24_LRT_idperf_L1MU14FCH:HLT_IDTrack_MuonLRT_FTF:HLT_Roi_L2SAMuon_LRT HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon"
},
"L2muon":{
- "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu26_ivarperf_L1MU20:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso"
+ "chains" : "HLT_mu24_idperf_L1MU14FCH:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu26_ivarperf_L1MU14FCH:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso"
},
"EFmuon":{
- "chains" : "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon HLT_mu26_ivarperf_L1MU20:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso"
+ "chains" : "HLT_mu24_idperf_L1MU14FCH:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu24_idperf_L1MU14FCH:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon HLT_mu26_ivarperf_L1MU14FCH:HLT_IDTrack_MuonIso_IDTrig:HLT_Roi_MuonIso"
},
"L2muonLowpt":{
- "chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu6_ivarmedium_L1MU6:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso"
+ "chains" : "HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu6_ivarmedium_L1MU5VF:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso"
},
"EFmuonLowpt":{
- "chains" : "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon HLT_mu6_ivarmedium_L1MU6:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso"
+ "chains" : "HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon HLT_mu6_idperf_L1MU5VF:HLT_IDTrack_Muon_IDTrig:HLT_Roi_L2SAMuon HLT_mu6_ivarmedium_L1MU5VF:HLT_IDTrack_MuonIso_FTF:HLT_Roi_MuonIso"
},
"L2electronLRT":{
"chains" : "HLT_e5_idperf_loose_lrtloose_L1EM3:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT HLT_e26_idperf_loose_lrtloose_L1EM22VHI:HLT_IDTrack_ElecLRT_FTF:HLT_Roi_FastElectron_LRT"
@@ -72,10 +72,10 @@
"chains" : "HLT_unconvtrk0_fslrt_L1All:HLT_IDTrack_FSLRT_FTF_DTE HLT_unconvtrk0_fslrt_L1All:HLT_IDTrack_FSLRT_IDTrig_DTE"
},
"L2bphys":{
- "chains" : "HLT_2mu4_bBmumux_BsmumuPhi_L12MU4:HLT_IDTrack_Bmumux_FTF"
+ "chains" : "HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V:HLT_IDTrack_Bmumux_FTF"
},
"EFbphys":{
- "chains" : "HLT_2mu4_bBmumux_BsmumuPhi_L12MU4:HLT_IDTrack_Bmumux_FTF HLT_2mu4_bBmumux_BsmumuPhi_L12MU4:HLT_IDTrack_Bmumux_IDTrig"
+ "chains" : "HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V:HLT_IDTrack_Bmumux_FTF HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V:HLT_IDTrack_Bmumux_IDTrig"
},
"L2electronTnP":{
"chains" : "HLT_e26_lhtight_ivarloose_e5_lhvloose_idperf_probe_L1EM22VHI:HLT_IDTrack_Electron_FTF:HLT_Roi_FastElectron:1"
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_lowpt_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_lowpt_pu55.py
new file mode 100755
index 0000000000000000000000000000000000000000..f133b4357669f005723e46aa9d8a76b1a8c1408c
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_lowpt_pu55.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+# art-description: art job for bjet_lowpt_pu55
+# art-type: grid
+# art-include: master/Athena
+# art-input-nfiles: 3
+# art-athena-mt: 4
+# art-memory: 4096
+# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+Slices = ['bjet']
+Events = 4000
+Threads = 8
+Slots = 8
+Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
+Release = "current"
+
+preinclude_file = "RDOtoRDOTrigger:TrigInDetValidation/TIDAbjetpt_preinclude.py"
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2bjet", "L2bjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2bjetoffline", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "EFbjet", "EFbjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFbjetoffline", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
+
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py
new file mode 100755
index 0000000000000000000000000000000000000000..0159288edb359afc48c5b00db248dbceb6a2f448
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu55.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+# art-description: art job for bjet_pu55
+# art-type: grid
+# art-include: master/Athena
+# art-input-nfiles: 3
+# art-athena-mt: 4
+# art-memory: 4096
+# art-html: https://idtrigger-val.web.cern.ch/idtrigger-val/TIDAWeb/TIDAart/?jobdir=
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+Slices = ['bjet']
+Events = 4000
+Threads = 8
+Slots = 8
+Input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
+Release = "current"
+
+Jobs = [ ( "Truth", " TIDAdata-run3.dat -o data-hists.root" ),
+ ( "Offline", " TIDAdata-run3-offline.dat -r Offline -o data-hists-offline.root" ) ]
+
+Comp = [ ( "L2bjet", "L2bjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTL2-plots " ),
+ ( "L2bjetoffline", "L2bjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTL2-plots-offline " ),
+ ( "EFbjet", "EFbjet", "data-hists.root", " -c TIDAhisto-panel.dat -d HLTEF-plots " ),
+ ( "EFbjetoffline", "EFbjet", "data-hists-offline.root", " -c TIDAhisto-panel.dat -d HLTEF-plots-offline " ) ]
+
+
+from AthenaCommon.Include import include
+include("TrigInDetValidation/TrigInDetValidation_Base.py")
+