Skip to content
Snippets Groups Projects
Commit 4d77a0fb authored by Pedro Teixeira-Dias's avatar Pedro Teixeira-Dias
Browse files

Merge branch 'ftkTransformFixATR-16883' into '21.0-TrigMC'

add asetup geometeryVersion and conditionsTag as setable parameters of FTK transforms

See merge request !4188

Former-commit-id: 33fa9d31
parents 9aacab58 74f92198
No related merge requests found
......@@ -3,8 +3,16 @@
import PyJobTransforms.trfExceptions as trfExceptions
import PyJobTransforms.trfArgClasses as trfArgClasses
def addTrigFTKAthenaOptions(parser):
parser.defineArgGroup('Athena', 'General Athena Options')
parser.add_argument('--asetup', group='Athena', type=trfArgClasses.argFactory(trfArgClasses.argSubstep, runarg=False), nargs='+', metavar='substep:ASETUP',
help='asetup command string to be run before this substep is executed')
return None
def addTrigFTKSimOptions(parser,nsubregions=4):
parser.defineArgGroup('TrigFTKSim', 'Fast tracker simulation generic options')
parser.add_argument('--NBanks', type=trfArgClasses.argFactory(trfArgClasses.argInt, runarg=True),
help='Number of pattern banks', group='TrigFTKSim')
# Here we set a default value as the merger wants this explicitly
......
......@@ -18,7 +18,7 @@ msg.info('logging set in %s' % sys.argv[0])
from PyJobTransforms.trfExitCodes import trfExit
from PyJobTransforms.transform import transform
from PyJobTransforms.trfExe import athenaExecutor
from PyJobTransforms.trfArgs import addAthenaArguments
from PyJobTransforms.trfArgs import addDetectorArguments
from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
import PyJobTransforms.trfExceptions as trfExceptions
......@@ -127,7 +127,8 @@ def getTransform():
'subregions merge and final merge.'.format(
ntowers, subregions))
#addAthenaArguments(trf.parser)
addTrigFTKAthenaOptions(trf.parser)
addDetectorArguments(trf.parser)
addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
addTrigFTKSimMergeOptions(trf.parser);
addTrigFTKSimTFOptions(trf.parser)
......
......@@ -18,7 +18,7 @@ msg.info('logging set in %s' % sys.argv[0])
from PyJobTransforms.trfExitCodes import trfExit
from PyJobTransforms.transform import transform
from PyJobTransforms.trfExe import athenaExecutor
from PyJobTransforms.trfArgs import addAthenaArguments
from PyJobTransforms.trfArgs import addDetectorArguments
from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
import PyJobTransforms.trfExceptions as trfExceptions
......@@ -141,7 +141,8 @@ def getTransform():
'subregions merge and final merge.'.format(
ntowers, subregions))
#addAthenaArguments(trf.parser)
addTrigFTKAthenaOptions(trf.parser)
addDetectorArguments(trf.parser)
addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
addTrigFTKSimMergeOptions(trf.parser);
addTrigFTKSimTFOptions(trf.parser)
......
......@@ -18,7 +18,8 @@ msg.info('logging set in %s' % sys.argv[0])
from PyJobTransforms.trfExitCodes import trfExit
from PyJobTransforms.transform import transform
from PyJobTransforms.trfExe import athenaExecutor
from PyJobTransforms.trfArgs import addAthenaArguments
from PyJobTransforms.trfArgs import addDetectorArguments
from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
import PyJobTransforms.trfExceptions as trfExceptions
......@@ -127,7 +128,8 @@ def getTransform():
'subregions merge and final merge.'.format(
ntowers, subregions))
#addAthenaArguments(trf.parser)
addTrigFTKAthenaOptions(trf.parser)
addDetectorArguments(trf.parser)
addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
addTrigFTKSimMergeOptions(trf.parser);
addTrigFTKSimTFOptions(trf.parser)
......
......@@ -18,8 +18,8 @@ msg.info('logging set in %s' % sys.argv[0])
from PyJobTransforms.trfExitCodes import trfExit
from PyJobTransforms.transform import transform
from PyJobTransforms.trfExe import athenaExecutor
from PyJobTransforms.trfArgs import addAthenaArguments
from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
from PyJobTransforms.trfArgs import addDetectorArguments
import PyJobTransforms.trfExceptions as trfExceptions
import PyJobTransforms.trfArgClasses as trfArgClasses
......@@ -150,12 +150,14 @@ def getTransform():
'subregions merge and final merge.'.format(
ntowers, subregions))
#addAthenaArguments(trf.parser)
addTrigFTKAthenaOptions(trf.parser)
addDetectorArguments(trf.parser)
addTrigFTKSimOptions(trf.parser, nsubregions=subregions)
addTrigFTKSimMergeOptions(trf.parser);
addTrigFTKSimTFOptions(trf.parser)
addTrigFTKSimRFOptions(trf.parser)
addFTKSimulationArgs(trf.parser)
return trf
......
......@@ -39,12 +39,15 @@ if hasattr(runArgs, "skipEvents"):
elif hasattr(runArgs, "firstEvent"):
athenaCommonFlags.SkipEvents.set_Value_and_Lock(runArgs.firstEvent)
from AthenaCommon.GlobalFlags import jobproperties
from AthenaCommon.GlobalFlags import globalflags
globalflags.InputFormat="bytestream"
from AthenaCommon.GlobalFlags import jobproperties
###jobproperties.Global.ConditionsTag.set_Value_and_Lock ('CONDBR2-BLKPA-2015-11')
###jobproperties.Global.DetDescrVersion.set_Value_and_Lock("ATLAS-R2-2015-03-01-00")
if hasattr(runArgs,"geometryVersion"):
globalflags.DetDescrVersion.set_Value_and_Lock(runArgs.geometryVersion)
if hasattr(runArgs,"conditionsTag"):
globalflags.ConditionsTag.set_Value_and_Lock(runArgs.conditionsTag)
inputNTUP_FTKFile = runArgs.inputNTUP_FTKFile
from TrigFTK_RawDataAlgs.TrigFTK_RawDataAlgsConf import FTK_RDO_CreatorAlgo
......@@ -84,7 +87,6 @@ jobproperties.LArRODFlags.doLArFebErrorSummary.set_Value_and_Lock(False)
# main jobOption
include ("RecExCommon/RecExCommon_topOptions.py")
StreamBSFileOutput.ItemList = ["FTK_RawTrackContainer#*"]
# Merge with original bytestream
......
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