From 1118b0008a957a2d0bba99e30d3c9e5db3da165a Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Tue, 29 Nov 2016 22:37:11 +0100
Subject: [PATCH] share/AllDet_detDescr.py - patch for CMake-built
AthSimulationBase releases. ATLASSIM-3068. Tagging ISF_Config-00-04-00-02
(ISF_Config-00-04-00-02)
2016-11-29 John Chapman <John.Chapman@cern.ch>
* share/AllDet_detDescr.py - patch for CMake-built
AthSimulationBase releases. ATLASSIM-3068
* tagging ISF_Config-00-04-00-02
2016-11-29 John Chapman <John.Chapman@cern.ch>
* Merging in changes from ISF_Config-00-03-01-branch.
* python/ISF_MainConfig.py - Remove obsolete property
'ValidationOutput' from ISF SimKernel configuration. Required for
tags ISF_Algorithms-00-03-07+. ATLASSIM-2993
* tagging ISF_Config-00-04-00-01
2016-06-20 John Chapman <John.Chapman@cern.ch>
* share/ISF_ConfigJobInclude.py: updates to fix
specialConfiguration metadata reading. ATLASSIM-2889
* Requires ISF_Example-00-03-00 or later.
* tagging ISF_Config-00-04-00
---
.../ISF/ISF_Config/python/ISF_Geant4CommonConfig.py | 2 --
Simulation/ISF/ISF_Config/share/AllDet_detDescr.py | 2 +-
.../ISF/ISF_Config/share/ISF_ConfigJobInclude.py | 10 ++++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
delete mode 100644 Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py
diff --git a/Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py b/Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py
deleted file mode 100644
index 74583d364ec..00000000000
--- a/Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
diff --git a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
index bf5a91d0b16..d71f105d5d7 100644
--- a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
+++ b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
@@ -17,7 +17,7 @@ if DetFlags.detdescr.any_on():
protectedInclude("InDetBeamSpotService/BeamCondSvc.py" )
import os
- if "AthSimulationBase" not in os.environ.get("CMTEXTRATAGS",""):
+ if "AthSimulationBase" not in os.environ.get("CMTEXTRATAGS","") and os.environ.get("AthSimulationBase_DIR", None) is None:
if DetFlags.detdescr.LAr_on():
protectedInclude( "LArDetDescr/LArDetDescr_joboptions.py" )
diff --git a/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py b/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
index 6dc8fa3a19f..b402fa35b87 100644
--- a/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
+++ b/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
@@ -53,6 +53,11 @@ if globalflags.DetDescrVersion() not in simFlags.SimLayout.get_Value():
simFlags.load_atlas_flags()
simFlags.EventFilter.set_Off()
+# --- Read in special simulation job option fragments based on
+# --- metadata passed by the evgen stage (move earlier?)
+from ISF_Example.ISF_Metadata import checkForSpecialConfigurationMetadata
+checkForSpecialConfigurationMetadata()
+
#--------------------------------------------------------------
# Job setup
#--------------------------------------------------------------
@@ -85,7 +90,6 @@ theApp.AuditServices = True
# --- Display detailed size and timing statistics for writing and reading
ServiceMgr.AthenaPoolCnvSvc.UseDetailChronoStat = True
-
#--------------------------------------------------------------
# ISF input
#--------------------------------------------------------------
@@ -160,7 +164,9 @@ simFlags.RandomSeedList.printSeeds()
# Setup the ISF Output
#--------------------------------------------------------------
from ISF_Example.ISF_Output import ISF_HITSStream
-
+from ISF_Example.ISF_Metadata import createSimulationParametersMetadata, configureRunNumberOverrides
+createSimulationParametersMetadata()
+configureRunNumberOverrides()
#--------------------------------------------------------------
# Post kernel configuration
#--------------------------------------------------------------
--
GitLab