Skip to content
Snippets Groups Projects
Commit c222f9d8 authored by Zoltan Mathe's avatar Zoltan Mathe
Browse files

Merge branch 'fixForHistoMerge' into 'master'

Fix for HistoMerging productions

See merge request !399
parents 07cf1f7f dd56e86c
No related branches found
No related tags found
No related merge requests found
......@@ -168,7 +168,7 @@ class ProductionRequest( object ):
value = p.sub('', value)
if parameter == 'SystemConfig' and value is not None and re.search( 'slc5', value):
p = re.compile(r'\$\w+/Persistency/Compression-[A-Z]{4}-[1-9].py;?')
p = re.compile(r'\$\w+/Persistency/Compression-[A-Z]{4}-[1-9].py;?')
if p.search(stepsListDictItem['OptionFiles']):
stepsListDictItem['OptionFiles'] = p.sub('', stepsListDictItem['OptionFiles'])
......
......@@ -431,7 +431,7 @@ class ModuleBase( object ):
stepOutTypes.append( ft.lower() )
# corrections for Merge productions
if self.jobType.lower() == 'merge':
if self.jobType.lower() in ('merge', 'histomerge'):
if len(stepOutTypes) == 1 and stepOutTypes[0] in [hts.lower() for hts in histoTypes] + ['root']:
# If it is root/histo/ntuple merging job, we treat it almost as a stripping job
pass
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment