diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py index 96e385c08bac9418d7268e86840eb847d10d0cc9..5f4b9012beafe55879313ec940ffcc1a9134f614 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py +++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py @@ -200,7 +200,7 @@ class TrigInDetCpuCostStep(RefComparisonStep): ''' Execute TIDAcpucost for expert-monitoring.root files. ''' - def __init__(self, name='TrigInDetCpuCost'): + def __init__(self, name='TrigInDetCpuCost', ftf_times=True): super(TrigInDetCpuCostStep, self).__init__(name) self.input_file = 'expert-monitoring.root' ## self.ref_file = 'expert-monitoring.root' #### need to add reference file here @@ -209,6 +209,10 @@ class TrigInDetCpuCostStep(RefComparisonStep): self.auto_report_result = True self.required = True self.executable = 'TIDAcpucost' + + if ftf_times: + self.args += ' -d TrigFastTrackFinder_' + self.output_dir = 'times-FTF' def configure(self, test): #self.args += self.input_file+' '+self.ref_file+' '+' -o '+self.output_dir diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py index b50f16ebca31d0108578c0025b366484ee318dc5..18ac10bd76f191bece3b7293b3933fd5a3cbabc6 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py @@ -125,12 +125,10 @@ comp9.test='ttbar' test.check_steps.append(comp9) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py index 1e681c56d102aa66a5bfe7336c7998f5cb5e4821..5b1a2c7fcd2af8d3c7a84d804a05f33006d7970b 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py @@ -125,12 +125,10 @@ comp9.test='ttbar' test.check_steps.append(comp9) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py index fb63e129a14a6ec8a52a39cfa57c0b363c0d2d37..a80b3ee89ca39ff024a94aa6d31a75cd5781291f 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py @@ -125,14 +125,11 @@ comp9.test='ttbar' test.check_steps.append(comp9) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) - import sys sys.exit(test.run()) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py index c7a3332193e6163b29166b5c83264f3fb38aa192..88b45da85e321b97538201a8c9741f530d21b231 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py @@ -125,14 +125,11 @@ comp9.test='ttbar' test.check_steps.append(comp9) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) - import sys sys.exit(test.run()) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py index 836728c553d079fc37b8e507cfb93be873634c5b..54e6890a8d471bf524d559cc14718ec4bc0fcf30 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py @@ -95,14 +95,11 @@ test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) - import sys sys.exit(test.run()) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py index b5db71c7748dee6a2ed5b8d4046051c82e197d32..9d8f6ee811d4c338c3236430ff5c5388c39f6201 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py @@ -88,14 +88,11 @@ test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) - import sys sys.exit(test.run()) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py index 30139a1d3610c454094b67f60d8b58f74bc3e84a..d99fe66de791f559447add974b10d4a294ff9839 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py @@ -91,12 +91,10 @@ comp2.flag = 'EFele' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py index 433e2a6938fe707a056ad3a142634e2f050f1cac..ecdc64439e886a81dae5d6273eb44f6e29acba20 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py @@ -91,12 +91,10 @@ comp2.flag = 'EFele' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py index 8526344197bdb56ce01e866d47c75ff6dd8d2f88..8781ebf562d3f3108603a3a4f7f083a12a181e0e 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py @@ -91,12 +91,10 @@ comp2.flag = 'EFele' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py index 3a133ef7b1363412a6f9f354d2058acfacd14992..a683d28e50468e325880faa4a40bb07e36d45415 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py @@ -91,12 +91,10 @@ comp2.flag = 'EFele' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py index 37ff4ce403ecda415b356e17d1902ca7157651f9..1f3f2170673496221ff75239a4b9b507e7f85465 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py @@ -91,12 +91,10 @@ comp2.flag = 'EFele' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py index 07e6aa2ca83d9fc8f293dce0cc96ca43206467ef..b2672c06049565ef6480c5083cff0870240e3bdd 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py @@ -91,12 +91,10 @@ comp2.flag = 'EFele' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py index 1df228546ed801d99f0cf090c9139b9d409e7cbf..140121ab15cb1984df580f0e7f22aeaaec930144 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py @@ -84,12 +84,10 @@ comp2.flag = 'EFmuon' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py index d733f1d48d800b70d253c0694bc417608e2cc83e..3ee5c8fff60872dbc4962230047b45cc3740d230 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py @@ -91,12 +91,10 @@ comp2.flag = 'EFmuon' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py index 1c7e381f6335ca2fc1c903e0fc6e7133b3c3b850..23f6716ea8edb8ad1cac7dff5ee035d8d2579a5c 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py @@ -91,12 +91,10 @@ comp2.flag = 'EFmuon' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py index aa41998c35445dc6441c2ad21fa2f37f7a69cfbb..3a51f6db8c76ca927c320ce41f119cda1f2f7fe0 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py @@ -91,12 +91,10 @@ comp2.flag = 'EFmuon' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py index 65160fcad99212ed3264227fe4b3e769072905e8..0a054bb18b49ba04c6d517ca07a124a9e26fb086 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py @@ -60,14 +60,11 @@ comp2.flag = 'EFmuon' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) - import sys sys.exit(test.run()) diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py index 1552c73203ab76e4437bd517da9496e0ab368b6d..b551354a4c6a763e3c76eb883f89399669914c51 100755 --- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py +++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py @@ -85,12 +85,10 @@ comp2.flag = 'EFtau' test.check_steps.append(comp2) # CPU cost steps -cpucost=TrigInDetCpuCostStep('CpuCostStep1') +cpucost=TrigInDetCpuCostStep('CpuCostStep1', ftf_times=False) test.check_steps.append(cpucost) - + cpucost2=TrigInDetCpuCostStep('CpuCostStep2') -cpucost2.args += ' -d TrigFastTrackFinder_' -cpucost2.output_dir = 'times-FTF' test.check_steps.append(cpucost2) import sys