Skip to content
Snippets Groups Projects
Commit f8575c70 authored by Robert Harrington's avatar Robert Harrington Committed by Graeme Stewart
Browse files

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
parent 57c02951
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Tools/FullChainTransforms/cmt/requirements
+ 0
− 15
View file @ f8575c70
...@@ -10,18 +10,3 @@ use SimuJobTransforms SimuJobTransforms-* Simulation ...@@ -10,18 +10,3 @@ use SimuJobTransforms SimuJobTransforms-* Simulation
apply_pattern declare_python_modules files="*.py" apply_pattern declare_python_modules files="*.py"
apply_pattern declare_job_transforms tfs='*.py' jo='*.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 "
Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py
+ 12
− 0
View file @ f8575c70
...@@ -185,6 +185,12 @@ else: ...@@ -185,6 +185,12 @@ else:
include("ISF_Config/ISF_ConfigJobInclude.py") 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 ## Add AMITag MetaData to TagInfoMgr
if hasattr(runArgs, 'AMITag'): if hasattr(runArgs, 'AMITag'):
if runArgs.AMITag != "NONE": if runArgs.AMITag != "NONE":
...@@ -304,6 +310,12 @@ if hasattr(runArgs,"conditionsTag"): ...@@ -304,6 +310,12 @@ if hasattr(runArgs,"conditionsTag"):
### Avoid meta data reading ### Avoid meta data reading
digitizationFlags.overrideMetadata=['ALL'] 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 # Pileup configuration - removed as pileup will be handled on-the-fly
#-------------------------------------------------------------- #--------------------------------------------------------------
......
Tools/FullChainTransforms/test/FullChainTransforms_TestConfiguration.xml deleted 100644 → 0
+ 0
− 59
View file @ 57c02951
<?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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment