Skip to content
Snippets Groups Projects
Commit 88a8a624 authored by Marko Petric's avatar Marko Petric
Browse files

Merge branch 'v10r1-fixes20' into 'master'

correctly adding FileUsage module

See merge request lhcb-dirac/LHCbDIRAC!970

(cherry picked from commit 5ce305e8)

2b2d70ef correctly adding FileUsage module
parent b19751a3
No related branches found
No related tags found
No related merge requests found
......@@ -166,7 +166,7 @@ class Production(object):
#############################################################################
def addApplicationStep(self, stepDict, inputData=None, modulesList=None):
def addApplicationStep(self, stepDict, inputData=None, modulesList=None, extraModulesList=None):
"""Adds an application step to the workflow.
stepDict contains everything that is in the step, for this production, e.g.::
......@@ -257,6 +257,8 @@ class Production(object):
gaudiPath = 'Productions/GaudiStep_Modules'
modulesList = self.opsHelper.getValue(gaudiPath, ['GaudiApplication', 'AnalyseXMLSummary',
'ErrorLogging', 'BookkeepingReport', 'StepAccounting'])
if extraModulesList:
modulesList += extraModulesList
# pName, pType, pValue, pDesc
parametersList = [['inputData', 'string', '', 'StepInputData'],
......
......@@ -97,6 +97,7 @@ class ProductionRequest(object):
self.modulesList = None # Usually:
# ['GaudiApplication', 'AnalyseXMLSummary',
# 'ErrorLogging', 'BookkeepingReport', 'StepAccounting' ]
self.extraModulesList = None
# parameters of each production (the length of each list has to be the same as the number of productions
self.events = []
......@@ -817,13 +818,15 @@ class ProductionRequest(object):
# Adding the application steps
firstStep = stepsInProd.pop(0)
stepName = prod.addApplicationStep(stepDict=firstStep,
modulesList=self.modulesList)
modulesList=self.modulesList,
extraModulesList=self.extraModulesList)
prod.gaudiSteps.append(stepName)
for step in stepsInProd:
stepName = prod.addApplicationStep(stepDict=step,
inputData='previousStep',
modulesList=self.modulesList)
modulesList=self.modulesList,
extraModulesList=self.extraModulesList)
prod.gaudiSteps.append(stepName)
# Adding the finalization step
......
......@@ -181,7 +181,7 @@ if validationFlag:
pr.outConfigName = 'validation'
if enablePopularityReport:
pr.modulesList.append('FileUsage')
pr.extraModulesList = ['FileUsage']
inputDataList = []
if not pr.publishFlag:
......
......@@ -254,7 +254,7 @@ if validationFlag:
pr.outConfigName = 'validation'
if enablePopularityReport:
pr.modulesList.append('FileUsage')
pr.extraModulesList = ['FileUsage']
inputDataList = []
if not pr.publishFlag:
......
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