Merge branch 'cherry-pick-cf907e42 [formerly 072c5f029b]-master' into 'master'

Merge branch 'reco-tf-overlay' into '21.0'

See merge request !2762

Former-commit-id: 863c79fd

Event/EventOverlay/EventOverlayJobTransforms/python/overlayTransformUtils.py

@@ -193,10 +193,16 @@ def addOverlayHITARMakerSubstep(executorSet):
     executorSet.add(BSJobSplitterExecutor(name = 'HITARMaker', skeletonFile = 'EventOverlayJobTransforms/skeleton.HITARMaker_tf.py', substep='HITARMaker',
                                           inData = ['TXT_EVENTID'], outData = ['TAR_CONFIG']))
 
-def addOverlay_PoolSubstep(executorSet):
-    executorSet.add(athenaExecutor(name = 'OverlayPool', skeletonFile = 'EventOverlayJobTransforms/skeleton.OverlayPool_tf.py',
-                                   substep = 'overlayPOOL', tryDropAndReload = False, perfMonFile = 'ntuple.pmon.gz',
-                                   inData = ['HITS', 'RDO_BKG'], outData = ['RDO', 'RDO_SGNL']))
+def addOverlay_PoolSubstep(executorSet, inRecoChain = False):
+    executor = athenaExecutor(name = 'OverlayPool', skeletonFile = 'EventOverlayJobTransforms/skeleton.OverlayPool_tf.py',
+                              substep = 'overlayPOOL', tryDropAndReload = False, perfMonFile = 'ntuple.pmon.gz',
+                              inData = [('HITS', 'RDO_BKG')], outData = ['RDO', 'RDO_SGNL'])
+
+    if inRecoChain:
+        executor.inData = []
+        executor.outData = []
+ 
+    executorSet.add(executor)
 
 def addOverlay_BSSubstep(executorSet):
     executorSet.add(athenaExecutor(name = 'OverlayBS', skeletonFile = 'EventOverlayJobTransforms/skeleton.OverlayBS_tf.py',
@@ -213,9 +219,9 @@ def appendOverlayBSFilterSubstep(trf):
     addOverlayBSFilterSubstep(executor)
     trf.appendToExecutorSet(executor)
 
-def appendOverlay_PoolSubstep(trf):
+def appendOverlay_PoolSubstep(trf, inRecoChain = False):
     executor = set()
-    addOverlay_PoolSubstep(executor)
+    addOverlay_PoolSubstep(executor, inRecoChain)
     trf.appendToExecutorSet(executor)
 
 def appendOverlay_BSSubstep(trf):

Reconstruction/RecJobTransforms/scripts/Reco_tf.py

@@ -80,6 +80,16 @@ def getTransform(RAWtoALL=False):
     except ImportError, e:
         msg.warning('Failed to import digitisation arguments ({0}). Digitisation substep will not be available.'.format(e))
         
+    # Again, protect core functionality from too tight a dependence on EventOverlay
+    try:
+        from EventOverlayJobTransforms.overlayTrfArgs import addOverlayTrfArgs, addOverlayPoolTrfArgs
+        from EventOverlayJobTransforms.overlayTransformUtils import appendOverlay_PoolSubstep
+        addOverlayTrfArgs(trf.parser)
+        addOverlayPoolTrfArgs(trf.parser)
+        appendOverlay_PoolSubstep(trf, True)
+    except ImportError, e:
+        msg.warning('Failed to import overlay arguments ({0}). Event overlay substep will not be available.'.format(e))
+    
     # Again, protect core functionality from too tight a dependence on PATJobTransforms
     try:
         from PATJobTransforms.PATTransformUtils import addPhysValidationFiles, addValidationArguments, appendPhysValidationSubstep

Tools/PyJobTransforms/python/trfArgClasses.py

@@ -2057,11 +2057,14 @@ class argSubstepSteering(argSubstep):
     # usecases of steering. 
     # "no" - a convenience null option for production managers, does nothing
     # "doRDO_TRIG" - run split trigger for Reco_tf and friends
+    # "doOverlay" - run event overlay on premixed RDOs instead of standard HITtoRDO digitization
     # "afterburn" - run the B decay afterburner for event generation
     # "doRAWtoALL" - produce all DESDs and AODs directly from bytestream
     steeringAlises = {
                       'no': {},
                       'doRDO_TRIG': {'RAWtoESD': [('in', '-', 'RDO'), ('in', '+', 'RDO_TRIG'), ('in', '-', 'BS')]},
+                      'doOverlay': {'HITtoRDO': [('in', '-', 'HITS'), ('out', '-', 'RDO'), ('out', '-', 'RDO_FILT')],
+                                    'OverlayPool': [('in', '+', ('HITS', 'RDO_BKG')), ('out', '+', 'RDO')]},
                       'afterburn': {'generate': [('out', '-', 'EVNT')]},
                       'doRAWtoALL': {'RAWtoALL': [('in', '+', 'BS'), ('in', '+', 'RDO'), ('in', '+', 'RDO_FTK'),
                                                   ('in', '+', 'DRAW_ZMUMU'), ('in', '+', 'DRAW_ZEE'), ('in', '+', 'DRAW_EMU'), ('in', '+', 'DRAW_RPVLL'),