From 9481db8ea2b53e83ecf6957eaa72ce65da5c25b1 Mon Sep 17 00:00:00 2001
From: Vakhtang Tsulaia <Vakhtang.Tsulaia@cern.ch>
Date: Wed, 21 Jan 2015 02:28:06 +0100
Subject: [PATCH] Merging changes from AthenaCommon-03-00-00-03 to the trunk
(AthenaCommon-03-02-02)
* Merging changes from AthenaCommon-03-00-00-03 to the trunk
* Tagging AthenaCommon-03-02-02
2014-12-12 will butinger <will@cern.ch>
* python/AlgSequence.py: removed surplus yield statement
---
Control/AthenaCommon/python/AlgSequence.py | 1 -
Control/AthenaCommon/python/AthenaCommonFlags.py | 8 ++++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Control/AthenaCommon/python/AlgSequence.py b/Control/AthenaCommon/python/AlgSequence.py
index ac52f548a80..694f67c72fe 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 16fa0f8a135..95d73b58dfa 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
--
GitLab