From ba608edc97dba50f3067947bf1d052d706b23385 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 17:44:17 +0200
Subject: [PATCH] 'CMakeLists.txt' (EvgenJobTransforms-01-02-57)
* add randomSeed to METADATA
* tag as EvgenJobTransforms-01-02-57
2016-03-01 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Adding a dummy __init__.py file to python/, as the CMake
build doesn't generate such a file automatically.
* Tagging as EvgenJobTransforms-01-02-56
2016-01-22 E. M. Lobodzinska <ewelina@mail.desy.de>
* add local area to the DTAPATH
* tag as EvgenJobTransforms-01-02-55
---
Generators/EvgenJobTransforms/CMakeLists.txt | 20 +++++++++++++++++++
.../EvgenJobTransforms/python/__init__.py | 6 ++++++
.../EvgenJobTransforms/scripts/Generate_tf.py | 2 ++
.../share/skeleton.GENtoEVGEN.py | 8 +++++++-
4 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 Generators/EvgenJobTransforms/CMakeLists.txt
create mode 100644 Generators/EvgenJobTransforms/python/__init__.py
diff --git a/Generators/EvgenJobTransforms/CMakeLists.txt b/Generators/EvgenJobTransforms/CMakeLists.txt
new file mode 100644
index 00000000000..5d827a4b36b
--- /dev/null
+++ b/Generators/EvgenJobTransforms/CMakeLists.txt
@@ -0,0 +1,20 @@
+################################################################################
+# Package: EvgenJobTransforms
+################################################################################
+
+# Declare the package name:
+atlas_subdir( EvgenJobTransforms )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Tools/PyJobTransforms
+ PRIVATE
+ TestPolicy )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( test/test_*.py )
+atlas_install_runtime( scripts/*.py )
+atlas_install_runtime( test/EvgenJobTransforms_TestConfiguration.xml )
+
diff --git a/Generators/EvgenJobTransforms/python/__init__.py b/Generators/EvgenJobTransforms/python/__init__.py
new file mode 100644
index 00000000000..fc6ab9d6551
--- /dev/null
+++ b/Generators/EvgenJobTransforms/python/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+# $Id: __init__.py 727129 2016-03-01 16:42:41Z krasznaa $
+#
+# Dummy file needed in order to use the other files from this directory.
+#
diff --git a/Generators/EvgenJobTransforms/scripts/Generate_tf.py b/Generators/EvgenJobTransforms/scripts/Generate_tf.py
index 0706302022e..5c8d5fe8354 100755
--- a/Generators/EvgenJobTransforms/scripts/Generate_tf.py
+++ b/Generators/EvgenJobTransforms/scripts/Generate_tf.py
@@ -56,6 +56,7 @@ class EvgenExecutor(athenaExecutor):
shutil.rmtree(proxypath)
os.mkdir(proxypath)
os.environ['LOCAL_INSTALL_DIR'] = (os.environ['JOBOPTSEARCHPATH']).split(":")[0]
+ os.environ['LOCAL_DATA_DIR'] = (os.environ['DATAPATH']).split(":")[0]
dirlist = get_immediate_subdirectories(targetbasepath)
subdirlist=dirlist;
@@ -84,6 +85,7 @@ class EvgenExecutor(athenaExecutor):
os.environ["DATAPATH"] =os.path.join(targetbasepath, d)+":"+os.environ["DATAPATH"]
os.environ["JOBOPTSEARCHPATH"] = os.environ['LOCAL_INSTALL_DIR']+":"+os.environ["JOBOPTSEARCHPATH"]
+ os.environ["DATAPATH"] = os.environ['LOCAL_DATA_DIR']+":"+os.environ["DATAPATH"]
## Handle locating of evgen job options / fragments, either from a tarball or CVMFS
diff --git a/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py b/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py
index 14eb6a613e0..4b35440558f 100644
--- a/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py
+++ b/Generators/EvgenJobTransforms/share/skeleton.GENtoEVGEN.py
@@ -372,6 +372,7 @@ svcMgr.TagInfoMgr.ExtraTagValuePairs += ["evgenProcess", evgenConfig.process]
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["evgenTune", evgenConfig.tune]
if hasattr( evgenConfig, "hardPDF" ) : svcMgr.TagInfoMgr.ExtraTagValuePairs += ["hardPDF", evgenConfig.hardPDF]
if hasattr( evgenConfig, "softPDF" ) : svcMgr.TagInfoMgr.ExtraTagValuePairs += ["softPDF", evgenConfig.softPDF]
+if hasattr( runArgs, "randomSeed") : svcMgr.TagInfoMgr.ExtraTagValuePairs += ["randomSeed", str(runArgs.randomSeed)]
## Handle beam info
svcMgr.TagInfoMgr.ExtraTagValuePairs += ["beam_energy", str(int(runArgs.ecmEnergy*Units.GeV/2.0))]
@@ -538,12 +539,17 @@ if _checkattr("hardPDF"):
if _checkattr("softPDF"):
print "MetaData: %s = %s" % ("softPDF", evgenConfig.softPDF)
if _checkattr("keywords"):
- print "MetaData: %s = %s" % ("keywords", ", ".join(evgenConfig.keywords).lower())
+ print "MetaData: %s = %s" % ("keywords", ", ".join(evgenConfig.keywords).lower())
if _checkattr("specialConfig"):
print "MetaData: %s = %s" % ("specialConfig", evgenConfig.specialConfig)
# TODO: Require that a contact / JO author is always set
if _checkattr("contact"):
print "MetaData: %s = %s" % ("contactPhysicist", ", ".join(evgenConfig.contact))
+#if _checkattr( "randomSeed") :
+print "MetaData: %s = %s" % ("randomSeed", str(runArgs.randomSeed))
+
+
+
# Output list of generator filters used
filterNames = [alg.getType() for alg in acas.iter_algseq(filtSeq)]
--
GitLab