Commit 119085c5 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'ci' into 'master'

Fix preprocessor directives don't get files for the configuration jobs

See merge request !44514
parents e99a4f28 bdca9ea1
......@@ -3,7 +3,7 @@
pT = 400;
#else
pT = 1000;
endif
#endif
eta = 2.5;
#if defined(LARGED0)
......@@ -39,7 +39,7 @@ Rmatch = 0.05;
/// only 10.5 mm with respect to the primary vertex
a0v = 10.5;
z0v = 300.5;
#ndif
#endif
#endif
// VertexSelection = 0;
......
......@@ -24,7 +24,7 @@ class TrigInDetReco(ExecStep):
def __init__(self, name='TrigInDetReco', postinclude_file='', preinclude_file='' ):
ExecStep.__init__(self, name)
## super(TrigInDetReco, self).__init__(name)
## super(TrigInDetReco, self).__init__(name)
self.type = 'Reco_tf'
self.max_events=-1
self.required = True
......@@ -107,7 +107,7 @@ class TrigInDetReco(ExecStep):
chains += "'HLT_tau25_idperf_tracktwoMVA_L1TAU12IM',"
flags += 'doTauSlice=True;'
if (i=='bjet') :
# chains += "'HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20',"
# chains += "'HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20',"
chains += "'HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20',"
flags += 'doBjetSlice=True;'
if ( i=='fsjet' or i=='fs' or i=='jet' ) :
......@@ -207,37 +207,39 @@ class TrigInDetRdictStep(Step):
'''
Execute TIDArdict for TrkNtuple files.
'''
def __init__(self, name='TrigInDetdict', args=None, testbin='Test_bin.dat'):
def __init__(self, name='TrigInDetdict', args=None, testbin='Test_bin.dat', config=False ):
super(TrigInDetRdictStep, self).__init__(name)
self.args=args + " -b " + testbin + " "
self.auto_report_result = True
self.required = True
self.executable = 'TIDArdict'
self.timeout = 10*60
self.config = config
def configure(self, test):
os.system( 'get_files -data TIDAbeam.dat &> /dev/null' )
os.system( 'get_files -data Test_bin.dat &> /dev/null' )
os.system( 'get_files -data Test_bin_larged0.dat &> /dev/null' )
os.system( 'get_files -data Test_bin_lrt.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-chains-run3.dat &> /dev/null' )
os.system( 'get_files -data TIDAhisto-panel.dat &> /dev/null' )
os.system( 'get_files -data TIDAhisto-panel-vtx.dat &> /dev/null' )
os.system( 'get_files -data TIDAhistos-vtx.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-larged0.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-larged0-el.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-lrt.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-minbias.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-minbias-offline.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata_cuts.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-vtxtrack.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-larged0.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-larged0-el.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-lrt.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-vtx.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata_cuts-offline.dat &> /dev/null' )
if not self.config :
os.system( 'get_files -data TIDAbeam.dat &> /dev/null' )
os.system( 'get_files -data Test_bin.dat &> /dev/null' )
os.system( 'get_files -data Test_bin_larged0.dat &> /dev/null' )
os.system( 'get_files -data Test_bin_lrt.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-chains-run3.dat &> /dev/null' )
os.system( 'get_files -data TIDAhisto-panel.dat &> /dev/null' )
os.system( 'get_files -data TIDAhisto-panel-vtx.dat &> /dev/null' )
os.system( 'get_files -data TIDAhistos-vtx.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-larged0.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-larged0-el.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-lrt.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-minbias.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-minbias-offline.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata_cuts.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-vtxtrack.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-larged0.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-larged0-el.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-lrt.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata-run3-offline-vtx.dat &> /dev/null' )
os.system( 'get_files -data TIDAdata_cuts-offline.dat &> /dev/null' )
super(TrigInDetRdictStep, self).configure(test)
......
......@@ -13,7 +13,7 @@ from TrigValTools.TrigValSteering import Test, CheckSteps
from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigCostStep, TrigInDetRdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
import sys,getopt
import os,sys,getopt
try:
opts, args = getopt.getopt(sys.argv[1:],"lcxptmn:",["local","config"])
......@@ -58,6 +58,11 @@ for opt,arg in opts:
if opt=="-t":
dry_run=True
vdry_run = os.environ.get('TRIGVALSTEERING_DRY_RUN')
if vdry_run == '1':
dry_run=True
if 'postinclude_file' in dir() :
if 'preinclude_file' in dir() :
......@@ -134,9 +139,9 @@ if (not exclude):
if ((not exclude) or postproc ):
for job in Jobs :
if len(job) >= 3:
rdict = TrigInDetRdictStep( name=job[0], args=job[1], testbin=job[2] )
rdict = TrigInDetRdictStep( name=job[0], args=job[1], testbin=job[2], config=(testconfig or dry_run) )
else:
rdict = TrigInDetRdictStep( name=job[0], args=job[1] )
rdict = TrigInDetRdictStep( name=job[0], args=job[1], config=(testconfig or dry_run) )
print( "\n\033[0;32m TIDArdict "+job[1]+" \033[0m" )
test.check_steps.append(rdict)
......
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