Skip to content
Snippets Groups Projects
Commit 269cfb60 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'fc-fix-30sep' into 'master'

Fixes for the differences between CA vs old style tests

See merge request atlas/athena!46839
parents c2c9b4f0 43a37684
No related branches found
No related tags found
No related merge requests found
......@@ -24,7 +24,7 @@ FastChain_tf.py \
--skipEvents 0 \
--geometryVersion default:ATLAS-R2-2016-01-00-01 \
--conditionsTag default:OFLCOND-MC16-SDR-16 \
--preSimExec 'from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags;TrkDetFlags.TRT_BuildStrawLayers=True;from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.experimentalDigi=["NewMerge"]' \
--preSimExec 'from AthenaCommon.DetFlags import DetFlags;DetFlags.simulate.BCM_setOff();from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags;TrkDetFlags.TRT_BuildStrawLayers=True;from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.experimentalDigi=["NewMerge"]' \
--postInclude='PyJobTransforms/UseFrontier.py' \
--DataRunNumber '284500' \
--inputHighPtMinbiasHitsFile ${HighPtMinbiasHitsFiles} \
......@@ -33,6 +33,8 @@ FastChain_tf.py \
--numberOfHighPtMinBias '0.116075313' \
--numberOfLowPtMinBias '44.3839246425' \
--numberOfCavernBkg 0 \
--bunchSpacing 25 \
--physicsList 'FTFP_BERT_ATL' \
--imf False
cg=$?
echo "art-result: $cg SimDigi_CG"
......@@ -60,6 +62,8 @@ FastChain_tf.py \
--numberOfHighPtMinBias '0.116075313' \
--numberOfLowPtMinBias '44.3839246425' \
--numberOfCavernBkg 0 \
--bunchSpacing 25 \
--physicsList 'FTFP_BERT_ATL' \
--imf False
ca=$?
echo "art-result: $ca SimDigi_CA"
......
......@@ -94,6 +94,11 @@ def fromRunArgs(runArgs):
from Digitization.DigitizationConfigFlags import pileupRunArgsToFlags
pileupRunArgsToFlags(runArgs, ConfigFlags)
# Setup pile-up profile
if ConfigFlags.Digitization.PileUp:
from Digitization.PileUpUtils import setupPileUpProfile
setupPileUpProfile(ConfigFlags)
ConfigFlags.Sim.DoFullChain = True
# FastChain Flags
from AthenaConfiguration.Enums import ProductionStep
......@@ -115,10 +120,6 @@ def fromRunArgs(runArgs):
from BeamEffects.BeamEffectsAlgConfig import BeamEffectsAlgCfg
cfg.merge(BeamEffectsAlgCfg(ConfigFlags))
from ISF_Algorithms.CollectionMergerConfig import ISFCollectionMergerCfg
algo = ISFCollectionMergerCfg(ConfigFlags)
cfg.addEventAlgo(algo)
from ISF_Config.ISF_MainConfigNew import ISF_KernelCfg
cfg.merge(ISF_KernelCfg(ConfigFlags))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment