Merge branch 'Overlay_tf_TTL1_master' into 'master'

Add creation of TTL1 Containers to Overlay_tf.py

See merge request !26819

Event/EventOverlay/EventOverlayJobTransforms/share/Level1Overlay_jobOptions.py

@@ -30,16 +30,24 @@ if DetFlags.overlay.LVL1_on():
         job.LArTTL1Maker.PileUp = True
         # If we are doing MC overlay
         if not overlayFlags.isDataOverlay():
-            job.LArTTL1Maker.EmTTL1ContainerName = overlayFlags.evtStore() + "+LArTTL1EM"
-            job.LArTTL1Maker.HadTTL1ContainerName = overlayFlags.evtStore() + "+LArTTL1HAD"
-    
+            if overlayFlags.isOverlayMT():
+                job.LArTTL1Maker.EmTTL1ContainerName = overlayFlags.sigPrefix() + "LArTTL1EM"
+                job.LArTTL1Maker.HadTTL1ContainerName = overlayFlags.sigPrefix() + "LArTTL1HAD"
+            else:
+                job.LArTTL1Maker.EmTTL1ContainerName = overlayFlags.evtStore() + "+LArTTL1EM"
+                job.LArTTL1Maker.HadTTL1ContainerName = overlayFlags.evtStore() + "+LArTTL1HAD"
+
     if DetFlags.simulateLVL1.Tile_on():
         include( "TileSimAlgs/TileTTL1_jobOptions.py" )
 
         # If we are doing MC overlay
         if not overlayFlags.isDataOverlay():
-            job.TileHitToTTL1.TileTTL1Container = overlayFlags.evtStore() + '+TileTTL1Cnt'
-            job.TileHitToTTL1.TileMBTSTTL1Container = overlayFlags.evtStore() + '+TileTTL1MBTS'
+            if overlayFlags.isOverlayMT():
+                job.TileHitToTTL1.TileTTL1Container = overlayFlags.sigPrefix() + 'TileTTL1Cnt'
+                job.TileHitToTTL1.TileMBTSTTL1Container = overlayFlags.sigPrefix() + 'TileTTL1MBTS'
+            else:
+                job.TileHitToTTL1.TileTTL1Container = overlayFlags.evtStore() + '+TileTTL1Cnt'
+                job.TileHitToTTL1.TileMBTSTTL1Container = overlayFlags.evtStore() + '+TileTTL1MBTS'
 
         include( "TileSimAlgs/TileMuonReceiver_jobOptions.py" )
 

Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.Overlay_tf.py

@@ -102,6 +102,14 @@ else:
     DetFlags.bpipe_setOff()
     DetFlags.FTK_setOff()
 
+    if hasattr(runArgs, "triggerConfig") and runArgs.triggerConfig == "NONE":
+        DetFlags.LVL1_setOff()
+    else:
+        DetFlags.LVL1_setOn()
+
+    DetFlags.digitize.LVL1_setOff()
+
+
 # TODO: need to do it better
 #DetFlags.makeRIO.all_setOff() ## Currently has to be on otherwise InDetTRTStrawStatusSummarySvc is not created
 DetFlags.pileup.all_setOff()
@@ -137,7 +145,21 @@ if hasattr(runArgs, 'conditionsTag') and runArgs.conditionsTag not in ['', 'NONE
         conddb.setGlobalTag(globalflags.ConditionsTag())
 
 
-# TODO: setup LVL1 Trigger Menu
+# 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")
 
 
 #-------------------------
@@ -166,6 +188,9 @@ if DetFlags.overlay.LAr_on() or DetFlags.overlay.Tile_on():
 if DetFlags.overlay.CSC_on() or DetFlags.overlay.MDT_on() or DetFlags.overlay.RPC_on() or DetFlags.overlay.TGC_on() or DetFlags.overlay.sTGC_on() or DetFlags.overlay.Micromegas_on():
     include ( "EventOverlayJobTransforms/MuonOverlay_jobOptions.py" )
 
+if DetFlags.overlay.LVL1_on():
+   include ( "EventOverlayJobTransforms/Level1Overlay_jobOptions.py" )
+
 # save the overlay output
 include("EventOverlayJobTransforms/OverlayOutput_jobOptions.py")
 
@@ -189,7 +214,7 @@ digitizationFlags.rndmSeedList.printSeeds()
 # Logging
 #-------------------------
 ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.Format = "% F%45W%S%7W%R%T %0W%M"
+ServiceMgr.MessageSvc.Format = "% F%45W%S%5W%e%s%7W%R%T %0W%M"
 
 # Post-include
 if hasattr(runArgs, "postInclude"):

Simulation/Tests/OverlayTests/test/test_MCOverlay_ttbar_Old_vs_New.sh

+#!/bin/sh
+
+# art-description: MC+MC Overlay with MT support, sequential running
+# art-type: grid
+# art-include: master/Athena
+
+# art-output: *.root
+# art-output: log.*
+# art-output: mem.summary.*
+# art-output: mem.full.*
+# art-output: runargs.*
+
+Overlay_tf.py \
+--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
+--inputRDO_BKGFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/PileupPremixing/22.0/v1/RDO.merged-pileup-MT.100events.pool.root \
+--outputRDOFile MC_plus_MC.NEW.RDO.pool.root \
+--maxEvents 10 --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
+--conditionsTag OFLCOND-MC16-SDR-20 \
+--geometryVersion ATLAS-R2-2016-01-00-01 \
+--preExec '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);' \
+--imf False
+
+rc=$?
+echo "art-result: $rc overlay_tf"
+
+OverlayPool_tf.py \
+--inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1 \
+--inputRDO_BKGFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/PileupPremixing/22.0/v1/RDO.merged-pileup.100events.pool.root \
+--outputRDOFile MC_plus_MC.OLD.RDO.pool.root \
+--maxEvents 10 --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
+--conditionsTag OFLCOND-MC16-SDR-20 \
+--geometryVersion ATLAS-R2-2016-01-00-01 \
+--preExec '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);' \
+--imf False
+
+rc2=$?
+echo "art-result: $rc2 overlaypool_tf"
+
+
+rc3=-9999
+if [ $rc2 -eq 0 ]
+then
+    acmd.py diff-root MC_plus_MC.OLD.RDO.pool.root MC_plus_MC.NEW.RDO.pool.root --mode=semi-detailed
+    rc3=$?
+fi
+echo "art-result: $rc3 comparison"

Trigger/TrigT1/TrigT1CaloSim/python/OverlayTTL1Config.py

@@ -4,21 +4,31 @@ from AthenaCommon import CfgMgr
 
 def getTTL1Overlay(name="OverlayTTL1", **kwargs):
     from OverlayCommonAlgs.OverlayFlags import overlayFlags
-
-    kwargs.setdefault("BkgEmTTL1Key", overlayFlags.dataStore() + "+LArTTL1EM");
-    kwargs.setdefault("SignalEmTTL1Key", overlayFlags.evtStore() + "+LArTTL1EM");
-    kwargs.setdefault("OutputEmTTL1Key", overlayFlags.outputStore() + "+LArTTL1EM");
-
-    kwargs.setdefault("BkgHadTTL1Key", overlayFlags.dataStore() + "+LArTTL1HAD");
-    kwargs.setdefault("SignalHadTTL1Key", overlayFlags.evtStore() + "+LArTTL1HAD");
-    kwargs.setdefault("OutputHadTTL1Key", overlayFlags.outputStore() + "+LArTTL1HAD");
-
-    kwargs.setdefault("BkgTileTTL1Key", overlayFlags.dataStore() + "+TileTTL1Cnt");
-    kwargs.setdefault("SignalTileTTL1Key", overlayFlags.evtStore() + "+TileTTL1Cnt");
-    kwargs.setdefault("OutputTileTTL1Key", overlayFlags.outputStore() + "+TileTTL1Cnt");
-
-    kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.dataStore() + "+TileTTL1MBTS");
-    kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.evtStore() + "+TileTTL1MBTS");
-    kwargs.setdefault("OutputTileMBTSTTL1Key", overlayFlags.outputStore() + "+TileTTL1MBTS");
+    if overlayFlags.isOverlayMT():
+        kwargs.setdefault("BkgEmTTL1Key", overlayFlags.bkgPrefix() + "LArTTL1EM");
+        kwargs.setdefault("SignalEmTTL1Key", overlayFlags.sigPrefix() + "LArTTL1EM");
+        kwargs.setdefault("OutputEmTTL1Key", "LArTTL1EM");
+        kwargs.setdefault("BkgHadTTL1Key", overlayFlags.bkgPrefix() + "LArTTL1HAD");
+        kwargs.setdefault("SignalHadTTL1Key", overlayFlags.sigPrefix() + "LArTTL1HAD");
+        kwargs.setdefault("OutputHadTTL1Key", "LArTTL1HAD");
+        kwargs.setdefault("BkgTileTTL1Key", overlayFlags.bkgPrefix() + "TileTTL1Cnt");
+        kwargs.setdefault("SignalTileTTL1Key", overlayFlags.sigPrefix() + "TileTTL1Cnt");
+        kwargs.setdefault("OutputTileTTL1Key", "TileTTL1Cnt");
+        kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.bkgPrefix() + "TileTTL1MBTS");
+        kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.sigPrefix() + "TileTTL1MBTS");
+        kwargs.setdefault("OutputTileMBTSTTL1Key", "TileTTL1MBTS");
+    else:
+        kwargs.setdefault("BkgEmTTL1Key", overlayFlags.dataStore() + "+LArTTL1EM");
+        kwargs.setdefault("SignalEmTTL1Key", overlayFlags.evtStore() + "+LArTTL1EM");
+        kwargs.setdefault("OutputEmTTL1Key", overlayFlags.outputStore() + "+LArTTL1EM");
+        kwargs.setdefault("BkgHadTTL1Key", overlayFlags.dataStore() + "+LArTTL1HAD");
+        kwargs.setdefault("SignalHadTTL1Key", overlayFlags.evtStore() + "+LArTTL1HAD");
+        kwargs.setdefault("OutputHadTTL1Key", overlayFlags.outputStore() + "+LArTTL1HAD");
+        kwargs.setdefault("BkgTileTTL1Key", overlayFlags.dataStore() + "+TileTTL1Cnt");
+        kwargs.setdefault("SignalTileTTL1Key", overlayFlags.evtStore() + "+TileTTL1Cnt");
+        kwargs.setdefault("OutputTileTTL1Key", overlayFlags.outputStore() + "+TileTTL1Cnt");
+        kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.dataStore() + "+TileTTL1MBTS");
+        kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.evtStore() + "+TileTTL1MBTS");
+        kwargs.setdefault("OutputTileMBTSTTL1Key", overlayFlags.outputStore() + "+TileTTL1MBTS");
 
     return CfgMgr.LVL1__OverlayTTL1(name, **kwargs)