Skip to content
Snippets Groups Projects
Commit 59733379 authored by Iain Bertram's avatar Iain Bertram Committed by Graeme Stewart
Browse files

Added 20.7.X.Y-VAL set of reference files as these differ from 20.7.X Tagging... 

Added 20.7.X.Y-VAL set of reference files as these differ from 20.7.X Tagging DigitizationTests-01-01-72 (DigitizationTests-01-01-72)

    * Added 20.7.X.Y-VAL set of reference files as these differ from 20.7.X
    * Tagging DigitizationTests-01-01-72

2016-06-27 Iain Bertram <iain.bertram@cern.ch>
    * Removed LVL1 tests.
    * [ATLASSIM-2901]
    * Tagging DigitizationTests-01-01-71


Former-commit-id: e974774ebee97312783e512aec29cfcdb6dbd295
parent 3d4c1e0d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Simulation/Tests/DigitizationTests/scripts/DigitizationCheckReferenceLocation.sh
+ 4
− 2
View file @ 59733379
#!/bin/sh
export DigitizationTestsVersion="dev"
if [[ $ATLAS_RELEASE_BASE == *"20.7"* ]]; then
if [[ $ATLAS_RELEASE_BASE == *"20.7.X.Y-VAL"* ]]; then
DigitizationTestsVersion="20.7.X.Y-VAL"
elif [[ $ATLAS_RELEASE_BASE == *"20.7"* ]]; then
DigitizationTestsVersion="20.7.X"
elif [[ $ATLAS_RELEASE_BASE == *"20.20"* ]]; then
elif [[ $ATLAS_RELEASE_BASE == *"20.20"* ]]; then
DigitizationTestsVersion="20.20.X"
elif [[ $ATLAS_RELEASE_BASE == *"mig7"* ]]; then
DigitizationTestsVersion="20.3"
......
Simulation/Tests/DigitizationTests/test/DigitizationTests_TestConfiguration.xml
+ 1
− 108
View file @ 59733379
......@@ -482,114 +482,7 @@
</sequential>
</chain>
<chain>
<chainName>RegressionTest_mc15_ttbar_LVL1_on</chainName>
<abortOnError />
<sequential>
<chainElement>
<jobTransform userJobId="mc15_ttbar_LVL1_on">
<jobTransformJobName>DigitizationRTT_JobTransforms</jobTransformJobName>
<jobTransformCmd>DigitizationTestsCompFile='mc15_ttbar_LVL1_on.RDO.pool.root';source DigitizationCheckReferenceLocation.sh;echo ${DigitizationTestsCompFile}; echo ${DigitizationTestsVersion}; xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigitizationTestsCompFile DiffPool_Comp.pool.root; Digi_tf.py --inputHITSFile root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._001041.pool.root.1 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --maxEvents 25 --skipEvents 0 --digiSeedOffset1 11 --digiSeedOffset2 22 --geometryVersion ATLAS-R2-2015-03-01-00 --conditionsTag default:OFLCOND-RUN12-SDR-25 --DataRunNumber=222500 --triggerConfig HITtoRDO=default --postInclude=default:PyJobTransforms/UseFrontier.py
</jobTransformCmd>
<group>DigitizationTests_JobTransforms</group>
<queue>medium</queue>
<test>
<modulename>FlexibleDiffPoolFilesRunner</modulename>
<testname>FlexibleDiffPoolFilesRunner</testname>
<arg>
<argname>platformDependent</argname>
<argvalue>True</argvalue>
</arg>
<arg>
<argname>doDetailedChecks</argname>
<argvalue>True</argvalue>
</arg>
<arg>
<argname>fileName</argname>
<argvalue>mc15_2015_ttbar.RDO.pool.root</argvalue>
</arg>
<arg>
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_ttbar_LVL1_on.RDO.pool.root--></argvalue>
</arg>
<keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
<chainElement>
<jobTransform userJobId="mc15_ttbar_LVL1_on_Reg">
<doc>Regression test between releases</doc>
<jobTransformJobName>mc15_ttbar_LVL1_on_Reg</jobTransformJobName>
<jobTransformCmd>sim_reg_test.py mc15_ttbar_LVL1_on mc15_2015_ttbar.RDO.pool.root RDO.pool</jobTransformCmd>
<group>DigitizationTests:DigitizationRegressionTests</group>
<queue>short</queue>
</jobTransform>
</chainElement>
</sequential>
</chain>
<chain>
<chainName>RegressionTest_mc15_ttbar_LVL1_on_25ns_pileup</chainName>
<abortOnError />
<sequential>
<chainElement>
<jobTransform userJobId="mc15_ttbar_LVL1_on_25ns_pileup">
<jobTransformJobName>DigitizationRTT_JobTransforms</jobTransformJobName>
<jobTransformCmd>
DigitizationTestsCompFile='mc15_ttbar_LVL1_on_50ns_pileup.RDO.pool.root';source DigitizationCheckReferenceLocation.sh;echo ${DigitizationTestsCompFile}; echo ${DigitizationTestsVersion}; xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigitizationTestsCompFile DiffPool_Comp.pool.root; xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._001041.pool.root.1 HITS.04919495._001041.pool.root.1; LowPtMinbiasHitsFile="/eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/mc15_valid.361034.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3581_s2578_s2169_tid05098374_00/"; for file in `eos ls $LowPtMinbiasHitsFile`; do xrdcp root://eosatlas/$LowPtMinbiasHitsFile/$file $file ; done; HighPtMinbiasHitsFile="/eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/mc15a/mc15_valid.361035.Pythia8EvtGen_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3581_s2578_s2169_tid05098387_00/"; for file in `eos ls $HighPtMinbiasHitsFile | grep 00067`; do xrdcp root://eosatlas/$HighPtMinbiasHitsFile/$file $file ;done; Digi_tf.py --inputHITSFile HITS.04919495.*.pool.root.? --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 --inputHighPtMinbiasHitsFile HITS.05098387.*.pool.root.? --inputLowPtMinbiasHitsFile HITS.05098374.*.pool.root.? --jobNumber 1 --maxEvents 25 --numberOfCavernBkg 0 --numberOfHighPtMinBias 0.12268057 --numberOfLowPtMinBias 39.8773194 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:from AthenaCommon.CfgGetter import getPublicTool;getPublicTool("MergeMcEventCollTool").OnlySaveSignalTruth=True;ToolSvc.LArAutoCorrTotalToolDefault.deltaBunch=1' --postInclude 'default:PyJobTransforms/UseFrontier.py' --pileupFinalBunch 6 --preExec 'all:from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True)' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInclude.PileUpBunchTrainsMC15_2015_25ns_Config1.py,RunDependentSimData/configLumi_run222525_v1.py' --triggerConfig HITtoRDO=default --skipEvents 0
</jobTransformCmd>
<group>DigitizationTests_JobTransforms</group>
<queue>medium</queue>
<test>
<modulename>FlexibleDiffPoolFilesRunner</modulename>
<testname>FlexibleDiffPoolFilesRunner</testname>
<arg>
<argname>platformDependent</argname>
<argvalue>True</argvalue>
</arg>
<arg>
<argname>doDetailedChecks</argname>
<argvalue>True</argvalue>
</arg>
<arg>
<argname>fileName</argname>
<argvalue>mc15_2015_ttbar.RDO.pool.root</argvalue>
</arg>
<arg>
<argname>refFileName</argname>
<argvalue>DiffPool_Comp.pool.root <!--root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/digitization/RTT/ReferenceFiles/dev/CMTCONFIG/mc15_ttbar_LVL1_on_25ns_pileup.RDO.pool.root--></argvalue>
</arg>
<keepFilePattern>mc15_2015_ttbar.RDO.pool.root_DiffPool_Comp.pool.root.diffPool</keepFilePattern>
</test>
</jobTransform>
</chainElement>
<chainElement>
<jobTransform userJobId="mc15_ttbar_LVL1_on_Reg_25ns_pileup">
<doc>Regression test between releases</doc>
<jobTransformJobName>mc15_ttbar_LVL1_on_Reg</jobTransformJobName>
<jobTransformCmd>sim_reg_test.py mc15_ttbar_LVL1_on_25ns_pileup mc15_2015_ttbar.RDO.pool.root RDO.pool</jobTransformCmd>
<group>DigitizationTests:DigitizationRegressionTests</group>
<queue>short</queue>
</jobTransform>
</chainElement>
</sequential>
</chain>
<!-- DETAILED TEST JOBS -->
<!-- ATHENA JOBS -->
......
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