diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat index 647b7c9e1142b9216bd7be09d91c5ffa4cf9be69..31425586116440db11265b9a157fe5edbfe0d6a7 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat +++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat @@ -7,8 +7,10 @@ testChains = { "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF", + "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuon", "HLT_mu6_idperf_L1MU6:HLT_IDTrack_Muon_IDTrig", "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF", + "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF:HLT_Roi_L2SAMuonforEF", "HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig", "HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF", @@ -28,4 +30,6 @@ testChains = { "HLT_IDTrack_FS_FTF", + "HLT_mb_sptrk_L1RD0_FILLED:HLT_IDTrack_MinBias_FTF", + }; diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py index 294b24e82c6a2b463a97d45be1f56dc7b46bae73..8ec0cae595bfa88973a2b9d46f7c29d95f42b4e6 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py +++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py @@ -78,6 +78,9 @@ class TrigInDetReco(ExecStep): if (i=='beamspot') : chains += "'HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15','HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15'," flags += 'doBeamspotSlice=True;' + if (i=='minbias') : + chains += "'HLT_mb_sptrk_L1RD0_FILLED'," + flags += 'doMinBiasSlice=True;' chains += ']' self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains @@ -194,6 +197,12 @@ class TrigInDetCompStep(RefComparisonStep): self.output_dir = 'HLTL2-plots' if (self.test=='ttbar'): self.output_dir = self.output_dir+'-FS' + elif (self.flag == 'L2mb'): + self.chains = 'HLT_mb_sptrk_L1RD0_FILLED:HLT_IDTrack_MinBias_FTF' + self.output_dir = 'HLTL2-plots' + elif (self.flag == 'EFmb'): + self.chains = 'HLT_mb_sptrk_L1RD0_FILLED:HLT_IDTrack_MinBias_IDTrig' + self.output_dir = 'HLTEF-plots' else: print('Unknown flag for comparitor step ', self.flag) diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py index 668c0213b7ad742df4c4cb664c59494e8b40451f..079dc2b6407b6e33327be67571a8c0b311c427e1 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py +++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py @@ -175,6 +175,8 @@ if ( True ) : "HLT_tau.*_idperf.*:HLT_IDTrack_Tau_IDTrig:roi=HLT_TAURoI", "HLT_tau.*_idperf.*:HLT_IDTrack_Tau_IDTrig:roi=HLT_Roi_TauIso", + "HLT_mb.*:HLT_IDTrack_Minbias_FTF", + ] diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py new file mode 100755 index 0000000000000000000000000000000000000000..bd6b1b07470ce0c382acb3bc1210956de67277f0 --- /dev/null +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python + +# art-description: art job for minbias +# art-type: grid +# art-include: master/Athena +# art-athena-mt: 4 +# art-memory: 4096 +# 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 + + +from TrigValTools.TrigValSteering import Test, CheckSteps +from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep + +import sys,getopt + +try: + opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"]) +except getopt.GetoptError: + print("Usage: ") + print("-l(--local) run locally with input file from art eos grid-input") + print("-x don't run athena or post post-processing, only plotting") + print("-p run post-processing, even if -x is set") + + +local=False +exclude=False +postproc=False +for opt,arg in opts: + if opt in ("-l", "--local"): + local=True + if opt=="-x": + exclude=True + if opt=="-p": + postproc=True + + +rdo2aod = TrigInDetReco() +rdo2aod.slices = ['minbias'] +rdo2aod.max_events = 8000 +rdo2aod.threads = 1 # TODO: change to 4 +rdo2aod.concurrent_events = 1 # TODO: change to 4 +rdo2aod.perfmon = False +rdo2aod.timeout = 18*3600 +rdo2aod.input = 'minbias' # defined in TrigValTools/share/TrigValInputs.json + + +test = Test.Test() +test.art_type = 'grid' +if (not exclude): + test.exec_steps = [rdo2aod] + test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple + test.check_steps = CheckSteps.default_check_steps(test) + + +# Run Tidardict +if ((not exclude) or postproc ): + rdict = TrigInDetdictStep() + rdict.args='TIDAdata-run3.dat -f data-hists.root -b Test_bin.dat ' + test.check_steps.append(rdict) + + +# Now the comparitor steps +comp=TrigInDetCompStep('Comp_L2mb') +comp.flag = 'L2mb' +test.check_steps.append(comp) + +comp2=TrigInDetCompStep('Comp_EFmb') +comp2.flag = 'EFmb' +test.check_steps.append(comp2) + +# CPU cost steps +cpucost=TrigInDetCpuCostStep('CpuCostStep1') +test.check_steps.append(cpucost) + +cpucost2=TrigInDetCpuCostStep('CpuCostStep2') +cpucost2.args += ' -p FastTrack' +cpucost2.output_dir = 'times-FTF' +test.check_steps.append(cpucost2) + +import sys +sys.exit(test.run())