Merge branch 'master-digitizationtests-ant' into 'master'

Added inlude flags to art tests so they only run in certain branches (ATLASSIM-3607)

See merge request atlas/athena!9927

Former-commit-id: 92c108cb

Simulation/Tests/DigitizationTests/scripts/DigitizationCheckReferenceLocation.sh

-#!/bin/sh 
+#!/bin/sh
 
 export DigitizationTestsVersion="dev"
 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.9"* ]]; then
+    DigitizationTestsVersion="20.9"
 elif [[ $ATLAS_RELEASE_BASE == *"20.20"* ]]; then
     DigitizationTestsVersion="20.20.X"
 elif [[ $ATLAS_RELEASE_BASE == *"mig7"* ]]; then
@@ -16,5 +18,3 @@ elif [[ $ATLAS_RELEASE_BASE == *"20.1"* ]]; then
 elif [[ $ATLAS_RELEASE_BASE == *"21.0"* ]]; then
     DigitizationTestsVersion="21.0.X"
 fi
-
-

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2010_ttbar_no_pileup.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2010 geometry and conditions, without pile-up
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2010_ttbar_no_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2011_ttbar_no_pileup.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2011 geometry and conditions, without pile-up
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2011_ttbar_no_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2012_ttbar_no_pileup.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2012 geometry and conditions, without pile-up
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2012_ttbar_no_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_cosmics.sh

 #!/bin/sh
 #
 # art-description: Run digitization of a cosmics sample produced with MC15 using 2015 geometry and conditions
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2015_cosmics.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_nu_25ns_premixing.sh

 #!/bin/sh
 #
 # art-description: Run pile-up premixing with a MC15 nu sample with 2015 geometry and conditions, 25ns pile-up
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2015_nu_25ns_premixing.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_algs_pileup.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2015 geometry and conditions, 25ns pile-up and using digitizationFlags.doXingByXingPileUp=False
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2015_ttbar_25ns_algs_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2015 geometry and conditions, 25ns pile-up and using digitizationFlags.doXingByXingPileUp=True
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2015_ttbar_25ns_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_25ns_pileup_noNoise.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2015 geometry and conditions, 25ns pile-up, switching off noise and using digitizationFlags.doXingByXingPileUp=True
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2015_ttbar_25ns_pileup_noNoise.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_50ns_pileup.sh

 #!/bin/sh
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2015 geometry and conditions, 50ns pile-up and using digitizationFlags.doXingByXingPileUp=True
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # art-type: grid
 # art-output: mc15_2015_ttbar_50ns_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup.sh

@@ -2,6 +2,10 @@
 #
 # art-description: Run digitization of an MC15 ttbar sample with 2015 geometry and conditions, without pile-up
 # art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
 # the name below is needed because of the environment variable (marks storing in tar file).
 # art-output: mc15_2015_ttbar_no_pileup.RDO.pool.root
 

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16a_ttbar.sh

+#!/bin/sh
+#
+# art-description: Run digitization of an MC16a ttbar sample with 2016a geometry and conditions, 25ns pile-up
+# art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
+# art-output: mc16a_ttbar.RDO.pool.root
+
+DigiOutFileName="mc16a_ttbar.RDO.pool.root"
+
+HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
+LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
+
+
+Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 --conditionsTag default:OFLCOND-MC16-SDR-16 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion default:ATLAS-R2-2016-01-00-01 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} --jobNumber 1 --maxEvents 25 --numberOfCavernBkg 0 --numberOfHighPtMinBias 0.116075313 --numberOfLowPtMinBias 44.3839246425 --outputRDOFile ${DigiOutFileName} --digiSteeringConf "StandardSignalOnlyTruth" --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' '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_run284500_mc16a.py' --skipEvents 0
+echo  "art-result: $? Digi_tf.py"
+
+
+# get reference directory
+source DigitizationCheckReferenceLocation.sh
+echo "Reference set being used: " ${DigitizationTestsVersion}
+
+art-diff.py ./$DigiOutFileName   /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName
+echo  "art-result: $? diff-pool"
+
+
+
+art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root
+echo  "art-result: $? diff-root"
+
+checkFile ./$DigiOutFileName
+echo "art-result: $? checkFile"
+
+
+ArtPackage=$1
+ArtJobName=$2
+
+
+art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
+echo  "art-result: $? art-compare"

Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc16d_ttbar.sh

+#!/bin/sh
+#
+# art-description: Run digitization of an mc16d ttbar sample with 2016d geometry and conditions, 25ns pile-up
+# art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
+# art-output: mc16d_ttbar.RDO.pool.root
+
+DigiOutFileName="mc16d_ttbar.RDO.pool.root"
+
+
+
+
+HighPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/*"
+LowPtMinbiasHitsFiles="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/*"
+
+
+
+#--digiSteeringConf "StandardSignalOnlyTruth"
+
+Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 --conditionsTag default:OFLCOND-MC16-SDR-20 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion default:ATLAS-R2-2016-01-00-01 --inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} --inputLowPtMinbiasHitsFile ${LowPtMinbiasHitsFiles} --jobNumber 1 --maxEvents 25 --numberOfCavernBkg 0 --numberOfHighPtMinBias 0.2099789464 --numberOfLowPtMinBias 80.290021063135 --outputRDOFile ${DigiOutFileName} --digiSteeringConf "StandardSignalOnlyTruth" --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' '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); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configLumi_run300000_mc16d.py' --skipEvents 0
+
+
+echo  "art-result: $? Digi_tf.py"
+
+
+# get reference directory
+source DigitizationCheckReferenceLocation.sh
+echo "Reference set being used: " ${DigitizationTestsVersion}
+
+# Do reference comparisons
+art-diff.py ./$DigiOutFileName   /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName
+echo  "art-result: $? diff-pool"
+#
+#
+#
+art-diff.py ./$DigiOutFileName /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/ReferenceFiles/$DigitizationTestsVersion/$CMTCONFIG/$DigiOutFileName --diff-type=diff-root
+echo  "art-result: $? diff-root"
+#
+checkFile ./$DigiOutFileName
+echo "art-result: $? checkFile"
+#
+#
+ArtPackage=$1
+ArtJobName=$2
+#
+#
+art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
+echo  "art-result: $? art-compare"