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

Merge branch 'TemplateFix' into 'devel'

Fix the visibility flag dictionary for MC template

See merge request !348
parents d9dbc56b f23fce1d
No related branches found
No related tags found
No related merge requests found
......@@ -111,7 +111,7 @@ targets = '{{Target#PROD-1:MC: Target for MC (e.g. Tier2, ALL, LCG.CERN.cern#Tie
MCPriority = '{{MCPriority#PROD-1:MC: Production priority#0}}'
MCmulticoreFlag = '{{MCMulticoreFLag#PROD-1: multicore flag#True}}'
simulationCompressionLvl = '{{simulationCompressionLvl#PROD-1: Compression level#Compression-ZLIB-1}}'
simulationOutputVisFlag = '{{simulationOutputVisFlag#PROD-1: Dictionary (one flag per step) #{"1":"N"}}}'
simulationOutputVisFlag = ast.literal_eval( '{{simulationOutputVisFlag#PROD-1: Simulation visibility flag dictionary (one flag per step {"step":"Y|N"}) # {} }}' )
try:
simulationOutputVisFlagSpecial = ast.literal_eval( '{{simulationOutputVisFlagSpecial#PROD-1: Special Visibility flag of output files (a dictionary {"step n":{("FType":flag)}} )#}}' )
except SyntaxError:
......@@ -124,7 +124,7 @@ selectionCPU = '{{selectionCPU#PROD-2:Selection: Max CPU time in secs#100000}}'
removeInputSelection = '{{removeInputSelection#PROD-2:Selection: remove inputs#True}}'
selmulticoreFlag = '{{selMulticoreFLag#PROD-2:Selection: multicore flag#True}}'
selectionCompressionLvl = '{{selectionCompressionLvl#PROD-2:Selection: Compression level#Compression-ZLIB-1}}'
selectionOutputVisFlag = '{{selectionOutputVisFlag#PROD-2: Dictionary {"step n": Y|N})#}}'
selectionOutputVisFlag = ast.literal_eval( '{{selectionOutputVisFlag#PROD-2: Selection visibility flag dictionary ({"step n": "Y|N"})# {} }}' )
try:
selectionOutputVisFlagSpecial = ast.literal_eval( '{{selectionOutputVisFlagSpecial#PROD-2: Special Visibility flag of output files (a dictionary {"step n":{"FType":flag}} )#}}' )
except SyntaxError:
......@@ -138,7 +138,7 @@ removeInputMerge = '{{removeInputMerge#PROD-3:Merging: remove inputs#True}}'
mergemulticoreFlag = '{{mergeMulticoreFLag#PROD-3:Merging: multicore flag#True}}'
mergeCompressionLvl = '{{mergeCompressionLvl#PROD-3:Merging: Compression level#Compression-LZMA-4}}'
mergeOutputVisFlag = '{{mergeOutputVisFlag#PROD-3: Dictionary {"step n": Y|N}#}}'
mergeOutputVisFlag = ast.literal_eval( '{{mergeOutputVisFlag#PROD-3: Merge visibility flag dictionary ({"step":"Y|N"}) # {} }}')
try:
mergeOutputVisFlagSpecial = ast.literal_eval( '{{mergeOutputVisFlagSpecial#PROD-3: Special Visibility flag of output files (a dictionary {"step n":{"FType":flag}} )#}}' )
except SyntaxError:
......@@ -209,7 +209,7 @@ elif w1:
pr.outputVisFlag = [simulationOutputVisFlag]
pr.specialOutputVisFlag = [simulationOutputVisFlagSpecial]
pr.resolveSteps()
#pr.resolveSteps()
elif w2:
pr.prodsTypeList = ['MCSimulation', 'MCReconstruction']
......@@ -234,13 +234,19 @@ elif w2:
simulationOutputVisFlag = fillVisList(simulationOutputVisFlag, pr.stepsInProds[0])
selectionOutputVisFlag = fillVisList(selectionOutputVisFlag, pr.stepsInProds[2])
pr.compressionLvl[0] = modifyCompression(simulationOutputVisFlag, simulationOutputVisFlagSpecial, pr.compressionLvl[0])
pr.compressionLvl[1] = modifyCompression(selectionOutputVisFlag, selectionOutputVisFlagSpecial, pr.compressionLvl[1])
temp1 = simulationOutputVisFlag
temp1.update(selectionOutputVisFlag)
temp2 = simulationOutputVisFlagSpecial
temp2.update(selectionOutputVisFlagSpecial)
pr.compressionLvl = modifyCompression(temp1, temp2, pr.compressionLvl)
#pr.compressionLvl[0] = modifyCompression(simulationOutputVisFlag, simulationOutputVisFlagSpecial, pr.compressionLvl[0])
#pr.compressionLvl[1] = modifyCompression(selectionOutputVisFlag, selectionOutputVisFlagSpecial, pr.compressionLvl[1])
pr.outputVisFlag = [simulationOutputVisFlag, selectionOutputVisFlag]
pr.specialOutputVisFlag = [simulationOutputVisFlagSpecial, selectionOutputVisFlagSpecial]
pr.resolveSteps()
#pr.resolveSteps()
elif w3:
pr.prodsTypeList = ['MCSimulation', 'MCReconstruction', 'MCMerge']
......@@ -266,9 +272,17 @@ elif w3:
selectionOutputVisFlag = fillVisList(selectionOutputVisFlag, pr.stepsInProds[1])
mergeOutputVisFlag = fillVisList(mergeOutputVisFlag, pr.stepsInProds[2])
pr.compressionLvl[0] = modifyCompression(simulationOutputVisFlag, simulationOutputVisFlagSpecial, pr.compressionLvl[0])
pr.compressionLvl[1] = modifyCompression(selectionOutputVisFlag, selectionOutputVisFlagSpecial, pr.compressionLvl[1])
pr.compressionLvl[2] = modifyCompression(mergeOutputVisFlag, mergeOutputVisFlagSpecial, pr.compressionLvl[2])
temp1 = simulationOutputVisFlag
temp1.update(selectionOutputVisFlag)
temp1.update(mergeOutputVisFlag)
temp2 = simulationOutputVisFlagSpecial
temp1.update(selectionOutputVisFlagSpecial)
temp1.update(mergeOutputVisFlagSpecial)
pr.compressionLvl = modifyCompression(temp1, temp2, pr.compressionLvl)
#pr.compressionLvl[0] = modifyCompression(simulationOutputVisFlag, simulationOutputVisFlagSpecial, pr.compressionLvl[0])
#pr.compressionLvl[1] = modifyCompression(selectionOutputVisFlag, selectionOutputVisFlagSpecial, pr.compressionLvl[1])
#pr.compressionLvl[2] = modifyCompression(mergeOutputVisFlag, mergeOutputVisFlagSpecial, pr.compressionLvl[2])
pr.outputVisFlag = [simulationOutputVisFlag, selectionOutputVisFlag, mergeOutputVisFlag]
pr.specialOutputVisFlag = [simulationOutputVisFlagSpecial, selectionOutputVisFlagSpecial, mergeOutputVisFlagSpecial]
......
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