Skip to content
Snippets Groups Projects
Commit e88435ac authored by James Beacham's avatar James Beacham
Browse files

Merge branch 'OverlayMetaData_21.0' into '21.0'

Run-dependent MC Overlay and for the IOVMetaDataContainers written out to the RDO file

See merge request atlas/athena!14376

Former-commit-id: c57ae18704f0bb46097bba256cf6f6d8290ad87c
parents f5616a97 b249c150
No related branches found
No related tags found
58 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!45045WIP: Include another condition for hit merging in FCS_StepInfoSD.cxx,!45043Merge branch 'Update-DAOD_IDNCB' into '21.2',!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!42171Add LAr cell DQ plots to UPC stream,!40342WIP: ATR-22546 - add missing trigger to MC16a,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!37483Fix in monitoring of Pixel FE errors,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!3473421.0 fix dq servers,!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!3288421.0 salva s8,!3217421.9 - Bug fix for test stream creation in RD53BEncodingTool,!3135321.3,!3134821.9 README Update,!31345Add HEC sampling fractions macros,!31136added also PUsub for LargeR jets,!31123WIP: Master ttmdev,!3036121.9 fixing bug with layer indices in PixelRDOAnalysis,!29617IDPerfmonZmumu updates,!29454Idpvm 21.0 fix typo in trackselection config,!29085TRT modification for fractional charged particles,!28623Overlay as part of FastChain transform in 21.3,!28497ART tests - fixing the bugs,!27668Massimos 21.3 bis78,!27254WIP: Exclusive jets request -- Fix ExclusiveJets algo / ATR-17320,!26790Fixes for Simulation ART jobs (ATLASSIM-4309),!26747Update frozen shower generation scripts and code to be compatible with recent developments,!26592Master upload 2018 global monitoring scripts p2,!2618221.0 z counting,!25405Add new ART test: test_physics_pp_v8_chainorder_build.sh,!2420321.3 l1 muon 00 - new MuCTPI_RDO.h,!24037Make DCS Calculator dependent on sqlalchemy; fix python code quality issues,!23377WIP pixel ID scheme for ITk,!23330Inner Detector create misalignments: radial distortions,!2325521.0 z counting,!22695Master salva id perf mon,!2230421.0-ART_test-InDetPhysValMonitoring,!22214add an utility function to TrigT1TGCRecRoiSvc for storing ROI position and the eta/phi size,!22172changes related to 1-3 points in ATR-19579,!22124Changes related to ticket 19579,!22118Remove cabling information for new thresholds,!21684WIP: test push into tdaq-htt,!2153821.0-ART_test-InDetPhysValMonitoring,!21325Tilecal new laser unpack 2019 02 19,!21304WIP: Fix ATR-19377 L1Topo vbs alg,!2117721.3 po bugfixes,!21039Merging in features for HTT Bank Generation,!20518Mydev
......@@ -69,32 +69,6 @@ rec.projectName = 'IS_SIMULATION'
DataInputCollections=runArgs.inputRDO_BKGFile
athenaCommonFlags.PoolRDOInput=runArgs.inputRDO_BKGFile
import MagFieldServices.SetupField
from IOVDbSvc.CondDB import conddb
if hasattr(runArgs, 'conditionsTag') and runArgs.conditionsTag!='NONE' and runArgs.conditionsTag!='':
globalflags.ConditionsTag=runArgs.conditionsTag
if len(globalflags.ConditionsTag())!=0:
conddb.setGlobalTag(globalflags.ConditionsTag())
# LVL1 Trigger Menu
if hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE":
# LVL1 Trigger Menu
# PJB 9/2/2009 Setup the new triggerConfig flags here
from TriggerJobOpts.TriggerFlags import TriggerFlags
triggerArg = runArgs.triggerConfig
#if not prefixed with LVL1: add it here
Args = triggerArg.split(":")
if Args[0] != "LVL1":
TriggerFlags.triggerConfig ="LVL1:"+triggerArg
else:
TriggerFlags.triggerConfig =triggerArg
overlaylog.info( 'triggerConfig argument is: %s ', TriggerFlags.triggerConfig.get_Value() )
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter("HIT2RDO")
print "================ DetFlags ================ "
if 'DetFlags' in dir():
overlaylog.warning("DetFlags already defined! This means DetFlags should have been fully configured already..")
......@@ -120,6 +94,40 @@ DetFlags.Print()
globalflags.DataSource.set_Value_and_Lock('geant4')
#--------------------------------------------------------------
# Read Simulation MetaData (unless override flag set to True)
#--------------------------------------------------------------
if 'ALL' in digitizationFlags.overrideMetadata.get_Value():
overlaylog.info("Skipping input file MetaData check.")
else :
from EventOverlayJobTransforms.OverlayPoolReadMetaData import readInputFileMetadata
readInputFileMetadata()
import MagFieldServices.SetupField
from IOVDbSvc.CondDB import conddb
if hasattr(runArgs, 'conditionsTag') and runArgs.conditionsTag!='NONE' and runArgs.conditionsTag!='':
globalflags.ConditionsTag=runArgs.conditionsTag
if len(globalflags.ConditionsTag())!=0:
conddb.setGlobalTag(globalflags.ConditionsTag())
# LVL1 Trigger Menu
if hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig!="NONE":
# LVL1 Trigger Menu
# PJB 9/2/2009 Setup the new triggerConfig flags here
from TriggerJobOpts.TriggerFlags import TriggerFlags
triggerArg = runArgs.triggerConfig
#if not prefixed with LVL1: add it here
Args = triggerArg.split(":")
if Args[0] != "LVL1":
TriggerFlags.triggerConfig ="LVL1:"+triggerArg
else:
TriggerFlags.triggerConfig =triggerArg
overlaylog.info( 'triggerConfig argument is: %s ', TriggerFlags.triggerConfig.get_Value() )
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter("HIT2RDO")
print "================ Start ================= "
from AthenaCommon.AlgSequence import AlgSequence
......@@ -144,6 +152,8 @@ if hasattr( runArgs, 'maxEvents'):
include ( "EventOverlayJobTransforms/ConfiguredOverlay_jobOptions.py" )
include("Digitization/RunNumberOverride.py")
if DetFlags.overlay.Truth_on():
include ( "EventOverlayJobTransforms/TruthOverlay_jobOptions.py" )
......@@ -196,5 +206,15 @@ if hasattr(runArgs, "postExec") and runArgs.postExec != 'NONE':
for cmd in runArgs.postExec:
exec(cmd)
from AthenaCommon.AppMgr import ServiceMgr
#Patch /TagInfo metadata container
from OverlayCommonAlgs.OverlayFlags import overlayFlags
for key in overlayFlags.extraTagInfoPairs.get_Value().keys():
ServiceMgr.TagInfoMgr.ExtraTagValuePairs += [str(key), str(overlayFlags.extraTagInfoPairs.get_Value()[key])]
if hasattr(runArgs, 'AMITag'):
if runArgs.AMITag != "NONE":
ServiceMgr.TagInfoMgr.ExtraTagValuePairs += ["AMITag", runArgs.AMITag]
#print "OverlayPool_tf.py: at the end. job=\n", job
print "\nOverlayPool_tf.py: at the end. ServiceMgr=\n", ServiceMgr
......@@ -57,6 +57,13 @@ class outputStore(JobProperty):
allowedTypes=['str']
StoredValue = 'StoreGateSvc'
class extraTagInfoPairs(JobProperty):
""" workaround to correctly populate the /TagInfo metadata container
"""
statusOn=False
allowedTypes=['dict']
StoredValue=dict()
## Definition and registration of the simulation flag container
class Overlay_Flags(JobPropertyContainer):
......
......@@ -7,7 +7,7 @@ from AthenaCommon.AppMgr import ServiceMgr
if digitizationFlags.dataRunNumber.get_Value():
if digitizationFlags.dataRunNumber.get_Value() < 0:
raise SystemExit("Given a negative Run Number - please use a real run number from data.")
logDigitization_flags.info( 'Overriding run number to be: %s ', digitizationFlags.dataRunNumber.get_Value() )
print 'Overriding run number to be: %s ', digitizationFlags.dataRunNumber.get_Value()
myRunNumber = digitizationFlags.dataRunNumber.get_Value()
myFirstLB = 1
myInitialTimeStamp = 1
......
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