From 6e540ef2ed3ba1f1a9b3586ccb1648f9cf00ee07 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tamara.vazquez.schroeder@cern.ch>
Date: Wed, 21 Feb 2018 17:16:48 +0000
Subject: [PATCH] Merge branch 'HijingEventParsFix_ATLASSIM-3588_21.0' into
'21.0'
Look for StreamHITS in the Streams AlgSequence rather than topSequence
See merge request atlas/athena!9074
(cherry picked from commit 40c80827c1340094a1433f2c25bb6f42caeb9785)
535e9d5c Look for StreamHITS in the Streams AlgSequence rather than topSequence
---
.../share/LUT_mc12.root | Bin
.../share/postInclude.AF2FilterHitItems.py | 2 +-
.../share/heavyIons/postInclude.HijingPars.py | 4 +++-
.../share/GeantFollowingMS_jobOptions.py | 2 +-
.../share/GeantFollowing_jobOptions.py | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
mode change 100755 => 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100755
new mode 100644
diff --git a/Simulation/FastShower/FastCaloSimHit/share/postInclude.AF2FilterHitItems.py b/Simulation/FastShower/FastCaloSimHit/share/postInclude.AF2FilterHitItems.py
index 5bb0b5f0800..c0f5e50504d 100644
--- a/Simulation/FastShower/FastCaloSimHit/share/postInclude.AF2FilterHitItems.py
+++ b/Simulation/FastShower/FastCaloSimHit/share/postInclude.AF2FilterHitItems.py
@@ -1,6 +1,6 @@
from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
+job = AlgSequence("Streams")
if hasattr(job, 'StreamHITS'):
job.StreamHITS.ItemList += ["LArHitContainer#*"]
diff --git a/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py b/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py
index 5d910db3b87..1bbfad8d37e 100644
--- a/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py
+++ b/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py
@@ -37,7 +37,9 @@ else:
## configure Athena for POOL persistency
streamAlgs = ['StreamHITS','StreamRDO','StreamESD','StreamAOD']
+streamSeq = AlgSequence("Streams")
for stream in streamAlgs:
- outStream = getattr(topSequence, stream, None)
+ outStream = getattr(streamSeq, stream, None)
if outStream is not None:
outStream.ItemList += [ "HijingEventParams#Hijing_event_params" ]
+
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py
index 0afd2a48d98..768921e05d6 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py
+++ b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowingMS_jobOptions.py
@@ -357,7 +357,7 @@ topSeq += getAlgorithm("BeamEffectsAlg", tryDefaultConfigurable=True)
## Populate alg sequence
topSeq += getAlgorithm("G4AtlasAlg",tryDefaultConfigurable=True)
-#ServiceMgr.AthenaOutputStream.StreamHITS.ItemList = ['EventInfo#*']
+#AlgSequence("Streams").StreamHITS.ItemList = ['EventInfo#*']
from AthenaCommon.AppMgr import AppMgr
AppMgr.EvtMax = myMaxEvent
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py
index 22b83e80b37..fe4884761c2 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py
+++ b/Tracking/TrkG4Components/TrkG4UserActions/share/GeantFollowing_jobOptions.py
@@ -353,7 +353,7 @@ topSeq += getAlgorithm("BeamEffectsAlg", tryDefaultConfigurable=True)
## Populate alg sequence
topSeq += getAlgorithm("G4AtlasAlg",tryDefaultConfigurable=True)
-#ServiceMgr.AthenaOutputStream.StreamHITS.ItemList = ['EventInfo#*']
+#AlgSequence("Streams").StreamHITS.ItemList = ['EventInfo#*']
ToolSvc.MuonTrackingGeometryBuilder.BlendInertMaterial = False
TestSTEP_Propagator.Straggling = False
--
GitLab