From f8575c70b07c59c804ca6b2484686a25f4740262 Mon Sep 17 00:00:00 2001
From: Robert Harrington <robert.duane.harrington.jr@cern.ch>
Date: Mon, 22 Jun 2015 12:26:04 +0200
Subject: [PATCH] modified skeleton.EVGENtoRDO.py for pileup
 (FullChainTransforms-00-01-04)

	* share/skeleton.EVGENtoRDO.py
	- added configuration of PileUpToolsAlg depending on digiSteeringConf
	* tag FullChainTransforms-00-01-04

2015-04-28 Graeme Stewart <graeme.andrew.stewart@cern.ch>
	* cmt/requirements
	- Remove tests
	* test/FullChainTransforms_TestConfiguration.xml
	- Delete (move substep integration test to PyJobTransforms)
    * Tag FullChainTransforms-00-01-03

2015-04-23 Richard Hawkings <richard.hawkings@cern.ch>
    * Tag FullChainTransforms-00-01-02
	* share/skeleton.EVGENtoRDO.py - add include of
	FastChainPileup/FastPileupSimConfig.py if inline pileup being used
---
 Tools/FullChainTransforms/cmt/requirements    | 15 -----
 .../share/skeleton.EVGENtoRDO.py              | 12 ++++
 .../FullChainTransforms_TestConfiguration.xml | 59 -------------------
 3 files changed, 12 insertions(+), 74 deletions(-)
 delete mode 100644 Tools/FullChainTransforms/test/FullChainTransforms_TestConfiguration.xml

diff --git a/Tools/FullChainTransforms/cmt/requirements b/Tools/FullChainTransforms/cmt/requirements
index d6abcc64810..6f52a7a3f4b 100644
--- a/Tools/FullChainTransforms/cmt/requirements
+++ b/Tools/FullChainTransforms/cmt/requirements
@@ -10,18 +10,3 @@ use SimuJobTransforms SimuJobTransforms-* Simulation
 apply_pattern declare_python_modules files="*.py"
 
 apply_pattern declare_job_transforms tfs='*.py' jo='*.py'
-
-macro FullChainTransforms_TestConfiguration "../test/FullChainTransforms_TestConfiguration.xml"
-
-#apply_pattern generic_declare_for_link kind=json files="../share/$(package)Signatures.json" prefix=share/JobTransforms
-
-apply_pattern declare_runtime_extras extras="../test/FullChainTransforms_TestConfiguration.xml"
-
-# Make trf prodsys signatures (Under consideration...)
-#private
-#action makeTrfSignatures "makeTrfSignatures.py --output ../share/$(package)Signatures.json"
-#macro_append makeTrfSignatures_dependencies " install_tfs_jop "
-#macro_append makeTrfSignatures_dependencies " install_python_modules "
-#macro_append all_dependencies " makeTrfSignatures "
-#macro_append install_pickle_dependencies " makeTrfSignatures "
-#macro_append check_install_json_dependencies " makeTrfSignatures "
diff --git a/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py b/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
index 5ebf4887422..940f5923f42 100644
--- a/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
+++ b/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
@@ -185,6 +185,12 @@ else:
 
 include("ISF_Config/ISF_ConfigJobInclude.py")
 
+## check to see if  pileup emulation is being used, if so do post-ISF-config
+## actions to enable simulation of pileup collection
+if 'AthSequencer/EvgenGenSeq' in topSeq.getSequence():
+    fast_chain_log.info("Pileup emulation enabled - setup GenEventStackFiller")
+    include("FastChainPileup/FastPileupSimConfig.py")
+
 ## Add AMITag MetaData to TagInfoMgr
 if hasattr(runArgs, 'AMITag'):
     if runArgs.AMITag != "NONE":
@@ -304,6 +310,12 @@ if hasattr(runArgs,"conditionsTag"):
 ### Avoid meta data reading
 digitizationFlags.overrideMetadata=['ALL']
 
+if hasattr(runArgs,"digiSteeringConf"):
+    if not (digitizationFlags.digiSteeringConf.get_Value()==runArgs.digiSteeringConf+"PileUpToolsAlg"):
+        digilog.info( "Changing digitizationFlags.digiSteeringConf from %s to %s", digitizationFlags.digiSteeringConf.get_Value(),runArgs.digiSteeringConf)
+        digitizationFlags.digiSteeringConf=runArgs.digiSteeringConf+"PileUpToolsAlg"
+        PileUpConfigOverride=True
+
 #--------------------------------------------------------------
 # Pileup configuration - removed as pileup will be handled on-the-fly
 #--------------------------------------------------------------
diff --git a/Tools/FullChainTransforms/test/FullChainTransforms_TestConfiguration.xml b/Tools/FullChainTransforms/test/FullChainTransforms_TestConfiguration.xml
deleted file mode 100644
index fba01b8e483..00000000000
--- a/Tools/FullChainTransforms/test/FullChainTransforms_TestConfiguration.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE unifiedTestConfiguration SYSTEM "http://www.hep.ucl.ac.uk/atlas/AtlasTesting/DTD/unifiedTestConfiguration.dtd">
-
-<unifiedTestConfiguration>
-   <atn>
-  
-  </atn>
-  
-  <rtt xmlns="http://www.hep.ucl.ac.uk/atlas/AtlasTesting/rtt">
-    
-    <rttContactPerson>Graeme Stewart</rttContactPerson>
-    <mailto>atlas-comp-transforms-dev@cern.ch@cern.ch</mailto>
-    
-    <jobList>
-      
-      <classification>
-        <displayClass>OfflineValidation</displayClass>
-        <displayProcess>Transforms</displayProcess>
-        <displayComponent>FullChain</displayComponent>
-      </classification>
-      
-        <jobTransform userJobId="FullChainBasicTest">
-          <doc>Test basic full chain runs correctly</doc>
-          <jobTransformJobName>FullChain_tf</jobTransformJobName>
-          <jobTransformCmd>
-            TransformTestRunner.py test_FullChain_tf.py
-          </jobTransformCmd>
-          <group>FullChainTransforms:TransformFCTests</group>
-          <queue>medium</queue>
-        </jobTransform>
-
-    </jobList>
-    
-	<jobGroups>
-		<jobGroup name="TransformFCTests" parent="RTT:Athena">
-			<!-- Keep substep logs and the JSON job report -->
-			<keepFilePattern>jobReport.json</keepFilePattern>
-			<keepFilePattern>log.*</keepFilePattern>
-			<!-- Suppress the test which checks for *.pool.root files -->
-            <testToRemove>
-	   	  	  	<jobGroupName>RTT:Top</jobGroupName>
-   			  	<testidentifier>CheckFileRunner0</testidentifier> 
-		    </testToRemove>
-		    <!-- Supress the test which checks for WARN lines in the logs -->
-            <testToRemove>
-	   		  	<jobGroupName>RTT:Athena</jobGroupName>
-   			  	<testidentifier>Athena_FileGrepper1</testidentifier> 
-		    </testToRemove>
-          	<!-- Reco often produces suprious "ERROR" messages that the RTT test is too sensitive to -->
-          	<testToRemove>
-	   		  	<jobGroupName>RTT:Athena</jobGroupName>
-   			  	<testidentifier>Athena_FileGrepper</testidentifier> 
-		  	</testToRemove>
-		</jobGroup>
-	</jobGroups>
-    
-  </rtt>
-  
-</unifiedTestConfiguration>
\ No newline at end of file
-- 
GitLab