Merge branch 'overlay/LAr-BS-config' into 'master'

Migrate LAr overlay to the new conditions configuration

See merge request atlas/athena!16608

Former-commit-id: 0459b295

Event/EventOverlay/EventOverlayJobTransforms/scripts/chain.sh

@@ -46,11 +46,9 @@ Reco_tf.py \
 --inputRDOFile testRTT.RDO.pool.root --outputESDFile testRTT.ESD.pool.root $aodout $rdotrig \
 --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' \
 --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' \
---preExec "from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock('4samples1phase'); $dotrig $trigflag $domon $dojive " \
---postExec "r2e:from AthenaCommon import CfgGetter;CfgGetter.getPublicTool('LArCellBuilderFromLArRawChannelTool').RawChannelsName='LArRawChannels_FromDigits';"
+--preExec "from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock('4samples1phase'); $dotrig $trigflag $domon $dojive "
 
 #svcMgr.MdtCalibrationSvc.OutputLevel=VERBOSE; svcMgr.MessageSvc.verboseLimit=100000; '
 fi
 
 #Reco_tf.py --inputESDFile testRTT.ESD.pool.root --outputAODFile testRTT.AOD.pool.root
-

Event/EventOverlay/EventOverlayJobTransforms/scripts/overlay_notrig_grid_rel20.7.sh

@@ -63,7 +63,7 @@ fsamp="LARElecCalibMCfSampl-G496-19213-"
 
 OverlayChain="OverlayChain_tf.py --inputZeroBiasBSFile $ffile --outputRDOFile %OUT.RDO.pool.root $filterstring  --skipEvents 0 --maxEvents $teste --triggerBit 240 --DataRunNumber $run --inputEVNTFile %MININ --randomSeed %RNDM:${inputevgenfile} --geometryVersion $geo --conditionsTag $dco --digiSeedOffset1 211 --digiSeedOffset2 122 --conditionsTag $dco --samplingFractionDbTag FTFP_BERT_BIRK --fSampltag $fsamp --preInclude 'sim:EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/magfield.py' 'overlayBS:EventOverlayJobTransforms/custom.py' --preExec 'from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from LArConditionsCommon.LArCondFlags import larCondFlags; larCondFlags.OFCShapeFolder.set_Value_and_Lock(\"4samples1phase\")' --postInclude 'sim:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign.py,EventOverlayJobTransforms/g4runnumber.py' 'overlayBS:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py' --ignorePatterns 'L1TopoMenuLoader.+ERROR.'"
 
-Reco="; Reco_tf.py --autoConfiguration 'everything' --inputRDOFile %OUT.RDO.pool.root --outputESDFile %OUT.ESD.pool.root --outputAODFile %OUT.AOD.pool.root --maxEvents $teste --skipEvents 0 --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock(\"4samples1phase\");rec.doTrigger=False' --postExec 'r2e:from AthenaCommon import CfgGetter;CfgGetter.getPublicTool(\"LArCellBuilderFromLArRawChannelTool\").RawChannelsName=\"LArRawChannels_FromDigits\"' --ignorePatterns 'L1TopoMenuLoader.+ERROR.'"
+Reco="; Reco_tf.py --autoConfiguration 'everything' --inputRDOFile %OUT.RDO.pool.root --outputESDFile %OUT.ESD.pool.root --outputAODFile %OUT.AOD.pool.root --maxEvents $teste --skipEvents 0 --preInclude 'EventOverlayJobTransforms/custom.py,EventOverlayJobTransforms/recotrfpre.py' --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock(\"4samples1phase\");rec.doTrigger=False' --ignorePatterns 'L1TopoMenuLoader.+ERROR.'"
 
 tmp6dir="/tmp/tkharlam/"
 

Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py

@@ -27,25 +27,30 @@ if DetFlags.overlay.LAr_on():
     #include( "LArAthenaPool/LArAthenaPool_joboptions.py" )
     # We also need the conditions svc for MC constants:
     if overlayFlags.isDataOverlay():
+       from LArROD.LArRODFlags import larRODFlags
+       larRODFlags.keepDSPRaw = False
+
        theApp.Dlls += [ "LArByteStream"]
        LArDigitKey = "FREE"
        ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += ["LArDigitContainer/"+LArDigitKey]
        ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += ["LArFebHeaderContainer/LArFebHeader"]
        ServiceMgr.ByteStreamAddressProviderSvc.TypeNames+=["LArDigitContainer/LArDigitContainer_MC"]
 
-    from LArROD.LArRawChannelGetter import LArRawChannelGetter
-    LArRawChannelGetter()
+    from LArDigitization.LArDigitGetter import LArDigitGetter
+    theLArDigitGetter = LArDigitGetter()
+
+    if overlayFlags.isDataOverlay():
+        from LArROD.LArRawChannelBuilderDefault import LArRawChannelBuilderDefault
+        LArRawChannelBuilderDefault()
+    else:
+        job += CfgGetter.getAlgorithm("LArRawChannelBuilder", tryDefaultConfigurable=True)
 
     from LArROD.LArDigits import DefaultLArDigitThinner
     LArDigitThinner = DefaultLArDigitThinner('LArDigitThinner') # automatically added to topSequence
+
     if overlayFlags.isDataOverlay():
-       job.LArDigitThinner.InputContainerName = overlayFlags.dataStore()+"+FREE"
-       job.LArDigitThinner.RawChannelContainerName = "LArRawChannels_FromDigits"
-       #job.digitmaker1.LArPileUpTool.OutputLevel=DEBUG
-       #MessageSvc.debugLimit = 100000
-       #job.digitmaker1.LArPileUpTool.useLArFloat=False
-       job.digitmaker1.LArPileUpTool.PedestalKey = "LArPedestal"
-       job.LArRawChannelBuilder.DataLocation = "LArDigitContainer_MC"
+        job.LArDigitThinner.InputContainerName = overlayFlags.dataStore()+"+FREE"
+        job.LArRawChannelBuilderAlg.LArDigitKey = "LArDigitContainer_MC"
 
 #----------------------------------------------------------------
 if DetFlags.overlay.Tile_on():

Event/EventOverlay/OverlayMonitoringRTT/CMakeLists.txt

@@ -11,5 +11,3 @@ atlas_depends_on_subdirs( PRIVATE
 
 # Install files from the package:
 atlas_install_headers( OverlayMonitoringRTT )
-atlas_install_runtime( test/OverlayMonitoringRTT_TestConfiguration.xml )
-

Event/EventOverlay/OverlayMonitoringRTT/test/test_DataOverlayMC16.sh

@@ -39,7 +39,6 @@ Reco_tf.py \
 --postInclude 'r2e:EventOverlayJobTransforms/Rt_override_CONDBR2-BLKPA-2015-12.py,EventOverlayJobTransforms/muAlign_reco.py' \
 --preExec 'from LArConditionsCommon.LArCondFlags import larCondFlags;larCondFlags.OFCShapeFolder.set_Value_and_Lock("4samples1phase");rec.doTrigger=False;from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArThinnedDigits.set_Value_and_Lock(False)' \
 --ignorePatterns "L1TopoMenuLoader.+ERROR." \
---postExec 'r2e:from LArCellRec.LArCellRecConf import LArCellBuilderFromLArRawChannelTool;LArCellBuilderFromLArRawChannelTool.RawChannelsName="LArRawChannels_FromDigits"' \
 --imf False
 echo "art-result: $? reco"