diff --git a/Control/AthenaCommon/python/AlgSequence.py b/Control/AthenaCommon/python/AlgSequence.py index ac52f548a803bd0a95d59a5871b41ea6058df18f..694f67c72fe42a791a063507f8df5815fc02a835 100755 --- a/Control/AthenaCommon/python/AlgSequence.py +++ b/Control/AthenaCommon/python/AlgSequence.py @@ -200,7 +200,6 @@ def iter_algseq(seq): def _iter_algseq(seq): yield seq for c in seq.getChildren(): - yield c for sub in _iter_algseq(c): yield sub return _iter_algseq(seq) diff --git a/Control/AthenaCommon/python/AthenaCommonFlags.py b/Control/AthenaCommon/python/AthenaCommonFlags.py index 16fa0f8a13508898b852efb68103e17b9cd4aa27..95d73b58dfa7cac9891999e1305a4c3288132b34 100755 --- a/Control/AthenaCommon/python/AthenaCommonFlags.py +++ b/Control/AthenaCommon/python/AthenaCommonFlags.py @@ -161,6 +161,13 @@ class PoolInputQuery(JobProperty): allowedTypes = ['str'] StoredValue = "" +class DoFullChain(JobProperty): + """ If True does full chain: simulation + digitisation + reconstruction + """ + statusOn=True + allowedTypes=['bool'] + StoredValue=False + class AllowIgnoreExistingDataObject(JobProperty): """Allow an algorithm to ignore wether an input object is available or not. """ @@ -275,6 +282,7 @@ jobproperties.AthenaCommonFlags.add_JobProperty(AllowIgnoreConfigError) jobproperties.AthenaCommonFlags.add_JobProperty(isOnline) jobproperties.AthenaCommonFlags.add_JobProperty(isOnlineStateless) jobproperties.AthenaCommonFlags.add_JobProperty(RuntimeStrictness) +jobproperties.AthenaCommonFlags.add_JobProperty(DoFullChain) ##----------------------------------------------------------------------------- ## 5th step