AsgExternal/Asg_Test/CMakeLists.txt

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # The name of the package:
 atlas_subdir( Asg_Test )
@@ -28,16 +28,14 @@ file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCAFII.txt
    ASG_TEST_FILE_LITE_MC_AFII )
 string( STRIP "${ASG_TEST_FILE_LITE_MC_AFII}" ASG_TEST_FILE_LITE_MC_AFII )
 
-# currently don't have a full set of Run 3 test input files
-#file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3Data.txt
-#   ASG_TEST_FILE_RUN3_DATA )
-#string( STRIP "${ASG_TEST_FILE_RUN3_DATA}" ASG_TEST_FILE_RUN3_DATA )
+# currently we only have full sim
 file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MC.txt
    ASG_TEST_FILE_RUN3_MC )
 string( STRIP "${ASG_TEST_FILE_RUN3_MC}" ASG_TEST_FILE_RUN3_MC )
-#file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MCAFII.txt
-#   ASG_TEST_FILE_RUN3_MC_AFII )
-#string( STRIP "${ASG_TEST_FILE_RUN3_MC_AFII}" ASG_TEST_FILE_RUN3_MC_AFII )
+
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MC.txt
+   ASG_TEST_FILE_LITE_RUN3_MC )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC}" ASG_TEST_FILE_LITE_RUN3_MC )
 
 set( ROOTCORE_TEST_FILE ${ASG_TEST_FILE_MC} )
 

AsgExternal/Asg_Test/cmt/TestFileLiteData.txt

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/2023-01-08T2101/data18_13TeV.00357772.physics_Main.deriv.DAOD_PHYSLITE.r13286_p4910_2023-01-08T2101/100events_data18.DAOD_PHYSLITE.pool.root
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6026/data18_13TeV.periodAllYear.physics_Main.PhysCont.DAOD_PHYSLITE.grp18_v01_p6026/DAOD_PHYSLITE.37020692._000388.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteMC.txt

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/2023-01-08T2101/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_s3681_r13145_2023-01-08T2101/100events_ttbar.FullSim.DAOD_PHYSLITE.pool.root
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6026/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_s3681_r13167_p6026/DAOD_PHYSLITE.37620644._000738.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteMCAFII.txt

-/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/2023-01-08T2101/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_a899_r13145_2023-01-08T2101/100events_ttbar.AFII.DAOD_PHYSLITE.pool.root
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p5855/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.deriv.DAOD_PHYSLITE.e6337_a907_r14861_p5855/DAOD_PHYSLITE.35068879._000010.pool.root.1

AsgExternal/Asg_Test/cmt/TestFileLiteR3MC.txt

+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6026/mc23_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.deriv.DAOD_PHYSLITE.e8514_s4162_r14622_p6026/DAOD_PHYSLITE.37223155._000001.pool.root.1

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-"""
-Configuration database for SubDetectorEnvelopes
-Elmar Ritsch, 27/09/2013
-"""
-
-from AthenaCommon.CfgGetter import addService
-
-# Common tools, services and algorithms used by jobs:
-addService("SubDetectorEnvelopes.SubDetectorEnvelopesConfigLegacy.getEnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc")

AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigLegacy.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-
-"""
-SubDetectorEnvelopes configurations for AtlasGeometryCommon
-Elmar Ritsch, 27/09/2013
-"""
-
-def getEnvelopeDefSvcProperties(**kwargs) : 
-    kwargs.setdefault("DBInDetNode"       , 'InDetEnvelope'    )
-    kwargs.setdefault("DBBeamPipeNode"    , 'BeamPipeEnvelope' )
-    kwargs.setdefault("DBCaloNode"        , 'CaloEnvelope'     )
-    kwargs.setdefault("DBMSNode"          , 'MuonEnvelope'     )
-    kwargs.setdefault("DBCavernNode"      , 'CavernEnvelope'   )
-
-    # allow for python-based envelope definitions (see below)
-    #  -> TODO: set this to False once the envelope definitions are tagged in the DDDB
-    kwargs.setdefault("EnableFallback"  , True             )
-
-    # setup fallback BeamPipeEnvelope
-    BeamPipe = Volume()
-    BeamPipe.addRZ(   34.3,   3475.0 )
-    from AthenaCommon.DetFlags import DetFlags
-    if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
-        BeamPipe.addRZ(   47.0,   3475.0 )
-        BeamPipe.addRZ(   47.0,   3535.0 )
-        BeamPipe.addRZ(  120.0,   3535.0 )
-    else:
-        BeamPipe.addRZ(  120.0,   3475.0 )
-    BeamPipe.addRZ(  120.0,   4185.0 )
-    BeamPipe.addRZ(   41.0,   4185.0 )
-    BeamPipe.addRZ(   41.0,   6783.0 )
-    BeamPipe.addRZ(   70.0,   6783.0 )
-    BeamPipe.addRZ(   70.0,  12900.0 )
-    BeamPipe.addRZ(  279.0,  12900.0 )
-    BeamPipe.addRZ(  279.0,  18650.0 )
-    BeamPipe.addRZ(  436.0,  18650.0 )
-    BeamPipe.addRZ(  436.0,  22030.0 )
-    BeamPipe.addRZ( 1050.0,  22030.0 )
-    BeamPipe.addRZ( 1050.0,  26046.0 )
-    BeamPipe.addRZ(    0.0,  26046.0 )
-
-    kwargs.setdefault("FallbackBeamPipeR"    ,  BeamPipe.getRs()        )
-    kwargs.setdefault("FallbackBeamPipeZ"    ,  BeamPipe.getZs()        )
-
-
-    # setup fallback IDEnvelope
-    InDet = Volume()
-    InDet.addRZ( 1148.,  3475. )
-    InDet.addRZ(  34.3,  3475. )
-    kwargs.setdefault("FallbackInDetR"  , InDet.getRs()        )
-    kwargs.setdefault("FallbackInDetZ"  , InDet.getZs()        )
-
-
-    # setup fallback CaloEnvelope
-    Calo = Volume()
-    Calo.addRZ( 1148.0,  3475.0 )
-    from AthenaCommon.DetFlags import DetFlags
-    if hasattr(DetFlags.simulate, 'HGTD_on') and DetFlags.simulate.HGTD_on():
-        Calo.addRZ(   47.0,  3475.0 )
-        Calo.addRZ(   47.0,  3535.0 )
-        Calo.addRZ(  120.0,  3535.0 )
-    else:
-        Calo.addRZ(  120.0,  3475.0 )
-    Calo.addRZ(  120.0,  4185.0 )
-    Calo.addRZ(   41.0,  4185.0 )
-    Calo.addRZ(   41.0,  6783.0 )
-    Calo.addRZ(  420.0,  6783.0 )
-    Calo.addRZ(  420.0,  6736.0 )
-    Calo.addRZ( 3800.0,  6736.0 )
-    Calo.addRZ( 3800.0,  6550.0 )
-    Calo.addRZ( 4255.0,  6550.0 )
-
-    kwargs.setdefault("FallbackCaloR"   , Calo.getRs()        )
-    kwargs.setdefault("FallbackCaloZ"   , Calo.getZs()        )
-
-
-    # setup fallback MuonEnvelope
-    Muon = Volume()
-    Muon.addRZ(  4255.0 ,  4000.0 )
-    Muon.addRZ(  4255.0 ,  6550.0 )
-    Muon.addRZ(  3800.0 ,  6550.0 )
-    Muon.addRZ(  3800.0 ,  6736.0 )
-    Muon.addRZ(   420.0 ,  6736.0 )
-    Muon.addRZ(   420.0 ,  6783.0 )
-    Muon.addRZ(    70.0 ,  6783.0 )
-    Muon.addRZ(    70.0 , 12900.0 )
-    Muon.addRZ(   279.0 , 12900.0 )
-    Muon.addRZ(   279.0 , 18650.0 )
-    Muon.addRZ(   436.7 , 18650.0 )
-    Muon.addRZ(   436.7 , 22030.0 )
-    Muon.addRZ(  1050.0 , 22030.0 )
-    Muon.addRZ(  1050.0 , 26046.0 )
-    Muon.addRZ(  1500.0 , 26046.0 )
-    Muon.addRZ(  1500.0 , 23001.0 )
-    Muon.addRZ(  2750.0 , 23001.0 )
-    Muon.addRZ(  2750.0 , 22030.0 )
-    Muon.addRZ( 12650.0 , 22030.0 )
-    Muon.addRZ( 12650.0 , 18650.0 )
-    Muon.addRZ( 13400.0 , 18650.0 )
-    Muon.addRZ( 13400.0 , 12900.0 )
-    Muon.addRZ( 14200.0 , 12900.0 )
-    Muon.addRZ( 14200.0 ,  4000.0 )
-    Muon.addRZ( 13000.0 ,  4000.0 )
-    kwargs.setdefault("FallbackMuonR"   , Muon.getRs()        )
-    kwargs.setdefault("FallbackMuonZ"   , Muon.getZs()        )
-
-
-    # setup fallback CavernEnvelope
-    Cavern = Volume()
-    Cavern.addRZ( 13000.0 , 4000.0 )
-    Cavern.addRZ( 14200.0 , 4000.0 )
-    Cavern.addRZ( 14200.0 , 12900.0 ) # boundary with MS
-    Cavern.addRZ( 13400.0 , 12900.0 ) # boundary with MS
-    Cavern.addRZ( 13400.0 , 18650.0 ) # boundary with MS
-    Cavern.addRZ( 12650.0 , 18650.0 ) # boundary with MS
-    Cavern.addRZ( 12650.0 , 22030.0 ) # boundary with MS
-    Cavern.addRZ(  2750.0 , 22030.0 ) # boundary with MS
-    Cavern.addRZ(  2750.0 , 23001.0 ) # boundary with MS
-    Cavern.addRZ(  1500.0 , 23001.0 ) # boundary with MS
-    Cavern.addRZ(  1500.0 , 26046.0 ) # boundary with MS
-    Cavern.addRZ(     0.0 , 26046.0 ) #
-
-    # the outer dimesions differ between collision and cosmics jobs
-    from AthenaCommon.BeamFlags import jobproperties
-    if jobproperties.Beam.beamType() != 'cosmics':
-      #  -> for collision jobs the 'cavern' envelope is much smaller
-      Cavern.addRZ(      0.0 , 500000.0 ) # z= +500m
-      Cavern.addRZ( 500000.0  , 500000.0 ) # r=  500m
-    else:
-      #  -> for cosmics simulation the 'cavern' envelope spans much further
-      kwargs.setdefault("DBCavernNode"    , 'CavernEnvelopeNONE'   )
-      kwargs.setdefault("EnableFallback"  , True                   )
-      Cavern.addRZ(       0.0 , 3000000.0 ) # z= +3km
-      Cavern.addRZ( 3000000.0 , 3000000.0 ) # r=  3km
-    kwargs.setdefault("FallbackCavernR"   , Cavern.getRs()        )
-    kwargs.setdefault("FallbackCavernZ"   , Cavern.getZs()        )
-    return kwargs
-
-def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
-    from SubDetectorEnvelopes.SubDetectorEnvelopesConf import DetDescrDBEnvelopeSvc
-    return DetDescrDBEnvelopeSvc(name, **getEnvelopeDefSvcProperties(**kwargs))
-
-def getEnvelopeDefSvcCfg(flags, name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
-    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-    from AthenaConfiguration.ComponentFactory import CompFactory
-    result = ComponentAccumulator()
-    result.addService( CompFactory.DetDescrDBEnvelopeSvc(name, **getEnvelopeDefSvcProperties(**kwargs)), primary=True)
-    return result
-
-# class used for more readable definitions of envelope volumes
-#  -> create new volume boundary definitions
-#  -> return the coordinate vectors in R and Z and VolumeID
-class Volume:
-  # initialize empy
-  def __init__(self):
-    self.r  = [ ]
-    self.z  = [ ]
-
-  def addRZ(self, r, z):
-    self.r  += [ r  ]
-    self.z  += [ z  ]
-
-  def getRs(self):
-    return self.r
-
-  def getZs(self):
-    return self.z

AtlasGeometryCommon/SubDetectorEnvelopes/share/postInclude.showEnvelopesGUI.py

-"""
-Visualize envelopes as defined in EnvelopeDefSvc
-Elmar Ritsch, 13/05/2016
-"""
-
-from AthenaCommon.CfgGetter import getService
-
-
-def draw_envelope(ax, rlist_half, zlist_half, color, label):
-
-    # mirror the given (r,z) values in the x-y plane
-    rlist = rlist_half[:]
-    zlist = zlist_half[:]
-    for r in reversed(rlist_half):
-        rlist.append(r)
-    for z in reversed(zlist_half):
-        zlist.append(-z)
-    rlist.append(rlist[0])
-    zlist.append(zlist[0])
-
-    area = Polygon(zip(zlist, rlist), alpha=0.5, closed=True, color=color, label=label, linewidth=0.)
-    ax.add_patch(area)
-
-
-if __name__ == "__main__":
-    import matplotlib
-    matplotlib.use('Qt4Agg') # use backend that supports GUI (rather than file output only)
-    import matplotlib.pyplot as plt
-    from matplotlib.patches import Polygon
-
-    svc = getService('AtlasGeometry_EnvelopeDefSvc')
-
-    fig, ax = plt.subplots(figsize=(20,10))
-
-    draw_envelope(ax, svc.FallbackBeamPipeR, svc.FallbackBeamPipeZ, 'r', label='BeamPipe')
-    draw_envelope(ax, svc.FallbackInDetR, svc.FallbackInDetZ, 'b', label='InDet')
-    draw_envelope(ax, svc.FallbackCaloR, svc.FallbackCaloZ, 'c', label='Calo')
-    draw_envelope(ax, svc.FallbackMuonR, svc.FallbackMuonZ, 'm', label='MS')
-    draw_envelope(ax, svc.FallbackCavernR, svc.FallbackCavernZ, 'k', label='Cavern')
-
-    ax.autoscale_view()
-    plt.ylabel('r  (mm)')
-    plt.xlabel('z  (mm)')
-    plt.legend()
-    plt.show(block=True)
-    exit(1)

AtlasTest/CITest/Athena.cmake

@@ -132,6 +132,10 @@ atlas_add_citest( DerivationRun3Data_PHYSLITE
    SCRIPT RunWorkflowTests_Run3.py --CI -d -w Derivation --tag data_PHYSLITE --threads 4
    PROPERTIES PROCESSORS 4 )
 
+atlas_add_citest( DerivationRun3Data_Train
+   SCRIPT RunWorkflowTests_Run3.py --CI -d -w Derivation --tag data_PHYS_PHYSLITE --threads 4 --no-output-checks
+   PROPERTIES PROCESSORS 4 )
+
 atlas_add_citest( DerivationRun3MC_PHYS
    SCRIPT RunWorkflowTests_Run3.py --CI -d -w Derivation --tag mc_PHYS --threads 4
    PROPERTIES PROCESSORS 4 )
@@ -140,6 +144,14 @@ atlas_add_citest( DerivationRun3MC_PHYSLITE
    SCRIPT RunWorkflowTests_Run3.py --CI -d -w Derivation --tag mc_PHYSLITE --threads 4
    PROPERTIES PROCESSORS 4 )
 
+atlas_add_citest( DerivationRun3MCAF3_PHYS
+   SCRIPT RunWorkflowTests_Run3.py --CI -d -w Derivation --tag af3_PHYS --threads 4
+   PROPERTIES PROCESSORS 4 )
+
+atlas_add_citest( DerivationRun3MCAF3_PHYSLITE
+   SCRIPT RunWorkflowTests_Run3.py --CI -d -w Derivation --tag af3_PHYSLITE --threads 4
+   PROPERTIES PROCESSORS 4 )
+
 atlas_add_citest( RecoRun4MC_DAODPHYS
    SCRIPT RunWorkflowTests_Run4.py --CI -d -w Derivation -e '--maxEvents 5 --inputAODFile=../../RecoRun4MC/run_q447/myAOD.pool.root' --no-output-checks  # go two levels up as the test runs in a subfolder
    DEPENDS_SUCCESS RecoRun4MC )

Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt

@@ -14,7 +14,6 @@ atlas_add_poolcnv_library( CaloAthenaPoolPoolCnv
    CaloUtilsLib StoreGateLib AthenaPoolCnvSvcLib )
 
 # Install files from the package:
-atlas_install_joboptions( share/*.py )
 atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
 # Find the helper code for the T/P tests:

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_14.5.0_test.py

-infile = 'aod/AOD-14.5.0/AOD-14.5.0-full.pool.root'
-keys = [
-    #CaloCellLinkContainer_p2
-    'MuonClusterCollection_Link',
-    'egClusterCollection_Link',
-
-    #CaloClusterContainer_p4
-    'HLT@10',
-    'LArClusterEMFrwd@10',
-    'MuonClusterCollection@10',
-    'Tau1P3PCellCluster@10',
-    'Tau1P3PCellEM012ClusterContainer@10',
-    'Tau1P3PPi0ClusterContainer@10',
-    'LArClusterEMSofte@10',
-    'egClusterCollection@10',
-    'HLT_TrigCaloClusterMaker@10',
-    'EMTopoCluster430@10',
-    'CaloCalTopoCluster@10',
-
-    #CaloTowerContainer_p1
-    'HLT_TrigCaloTowerMaker',
-
-    #CaloCompactCellContainer
-    #'AODCellContainer',
-         ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags      import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.1.0_test.py

-infile = 'aod/AOD-15.1.0/AOD-15.1.0-full.pool.root'
-keys = [
-    #CaloCellLinkContainer_p2
-    'MuonClusterCollection_Link',
-    'egClusterCollection_Link',
-
-    #CaloClusterContainer_p5
-    'HLT@10',
-    'Tau1P3PCellEM012ClusterContainer@10',
-    'Tau1P3PCellCluster@10',
-    'Tau1P3PPi0ClusterContainer@10',
-    'LArClusterEMFrwd@10',
-    'MuonClusterCollection@10',
-    'egClusterCollection@10',
-    'LArClusterEMSofte@10',
-    'EMTopoCluster430@10',
-    'HLT_TrigCaloClusterMaker@10',
-    'CaloCalTopoCluster@10',
-
-    #CaloShowerContainer_p2
-    'HLT',
-
-    #CaloCompactCellContainer
-    #'AODCellContainer',
-         ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags      import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.5.0_test.py

-infile = 'aod/AOD-15.5.0/AOD-15.5.0-full.pool.root'
-keys = [
-    #CaloCellLinkContainer_p2
-    'MuonClusterCollection_Link',
-    'egClusterCollection_Link',
-
-    #CaloClusterContainer_p6
-    'HLT@10',
-    'HLT_TrigCaloClusterMaker@10',
-    'Tau1P3PCellEM012ClusterContainer@10',
-    'Tau1P3PCellCluster@10',
-    'MuonClusterCollection@10',
-    'LArClusterEMFrwd@10',
-    'Tau1P3PPi0ClusterContainer@10',
-    'LArClusterEMSofte@10',
-    'HLT_TrigCaloClusterMaker_slw@10',
-    'egClusterCollection@10',
-    'EMTopoCluster430@10',
-    'HLT_TrigCaloClusterMaker_topo@10',
-    'CaloCalTopoCluster@10',
-
-    #CaloShowerContainer_p2
-    'HLT',
-
-    #CaloCompactCellContainer
-    'AODCellContainer',
-         ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags      import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0_test.py

-infile = 'esd/ESD-18.0.0.pool.root'
-keys = [
-    #CaloCellLinkContainer_p2
-    'LArClusterEMFrwd_Link',
-    'LArClusterEM_Link',
-    'egClusterCollection_Link',
-    'EMTopoSW35_Link',
-    'MuonClusterCollection_Link',
-    'LArClusterEM7_11Nocorr_Link',
-    'LArClusterEMSofte_Link',
-    'Tau1P3PCellEM012ClusterContainer_Link',
-    'Tau1P3PCellCluster_Link',
-    'TauPi0BonnClusterContainer_Link',
-    'HLT_TrigCaloClusterMaker_topo_Link',
-    'CaloCalTopoCluster_Link',
-
-    #CaloClusterContainer_p7
-    'HLT@10',
-    'LArClusterEMFrwd@10',
-    'MuonClusterCollection@10',
-    'Tau1P3PCellEM012ClusterContainer@10',
-    'Tau1P3PCellCluster@10',
-    'HLT_TrigT2Calo@10',
-    'HLT_TrigCaloClusterMaker_slw@10',
-    'LArClusterEMSofte@10',
-    'LArClusterEM7_11Nocorr@10',
-    'LArClusterEM@10',
-    'egClusterCollection@10',
-    'TauPi0BonnClusterContainer@10',
-    'EMTopoSW35@10',
-    'HLT_TrigCaloClusterMaker_topo@10',
-    'HLT_TrigCaloClusterMaker@10',
-    'CaloCalTopoCluster@10',
-
-    #CaloShowerContainer_p2
-    'HLT@10',
-    'MuonClusterCollection_Data@10',
-    'LArClusterEM_Data@10',
-    'LArClusterEM7_11Nocorr_Data@10',
-    'egClusterCollection_Data@10',
-    'Tau1P3PCellEM012ClusterContainer_Data@10',
-    'LArClusterEMSofte_Data@10',
-    'EMTopoSW35_Data@10',
-    'Tau1P3PCellCluster_Data@10',
-    'TauPi0BonnClusterContainer_Data@10',
-    'CaloCalTopoCluster_Data@10',
-
-    #CaloTopoTowerContainer_p1
-    'TopoTower',
-
-    #CaloTowerContainer_p1
-    'CombinedTower',
-         ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags      import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-

Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2_test.py

-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
-    #CaloClusterCellLinkContainer
-    'InDetTrackParticlesAssociatedClusters_links@10',
-    'MuonClusterCollection_links@10',
-    'LArClusterEM_links@10',
-    'egammaClusters_links@10',
-    'LArClusterEM7_11Nocorr_links@10',
-    'CaloCalTopoClusters_links@10',
-         ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags      import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-

Calorimeter/CaloRec/python/CaloConfigFlags.py

@@ -51,7 +51,9 @@ def createCaloConfigFlags():
     ccf.addFlag("Calo.TopoCluster.addCPData",False)
     ccf.addFlag("Calo.TopoCluster.skipWriteList", lambda prevFlags:
                 ["CaloCalTopoClusters", "CaloTopoClusters"] if prevFlags.Reco.HIMode is HIMode.HI else [])
-
+    
+    ccf.addFlag("Calo.TopoCluster.xtalkInfoDumper", False) # dump raw energy, digits and some calibration for xtalk studies
+    
     #### Cluster correction flags:
     # If true, then reweight cells to prevent double-counting between clusters.
     ccf.addFlag ('Calo.ClusterCorrection.doSlidingWindowCellWeights', False)

Calorimeter/CaloRec/python/CaloRecoConfig.py

@@ -62,7 +62,7 @@ def CaloRecoCfg(flags, clustersname=None):
         #Configure LArDigitsThinner:
         from LArROD.LArDigitThinnerConfig import LArDigitThinnerCfg
         result.merge(LArDigitThinnerCfg(flags))
-
+        
     #Configure MBTSTimeDiff
     #Clients are BackgroundWordFiller and (deprecated?) DQTBackgroundMonTool
     #Consider moving to BackgroundWordFiller config
@@ -74,7 +74,11 @@ def CaloRecoCfg(flags, clustersname=None):
     #Configure AOD Cell-Thinning based on samplings:
     from CaloRec.CaloThinCellsBySamplingAlgConfig import CaloThinCellsBySamplingAlgCfg
     result.merge(CaloThinCellsBySamplingAlgCfg(flags,'StreamAOD', ['TileGap3']))
-    
+        
+    # Optional: AOD Cell, rawCh, digits thinning, based on clusters, for XTalk studies
+    if flags.Calo.TopoCluster.xtalkInfoDumper and not flags.Overlay.DataOverlay:
+        from LArClusterCellDumper.CaloThinCellsInAODAlgConfig import CaloThinCellsInAODAlgCfg
+        result.merge(CaloThinCellsInAODAlgCfg(flags))
 
     return result
 

Calorimeter/CaloRec/share/CaloRecOutputItemList_jobOptions.py

-#**************   ESD list  ************************************************
-from CaloRec.CaloRecFlags import jobproperties
-from AthenaCommon.JobProperties import jobproperties
-from AthenaCommon.Logging import logging
-
-CaloESDList = []
-
-CaloESDList += [ "CaloCellContainer#AllCalo" ]
-
-# add explicitly E4', MBTS cells and trigger output to ESD
-CaloESDList += [ "TileCellContainer#E4prContainer" ]
-CaloESDList += [ "TileCellContainer#MBTSContainer" ]
-CaloESDList += [ "TileTTL1Container#TileTTL1MBTS" ]
-
-# explicitly list of CaloCluster related keys
-CaloClusterItemList=[]
-CaloClusterKeys=[]
-
-from RecExConfig.AutoConfiguration import IsInInputFile
-
-storedFwdTowersInESD = IsInInputFile("xAOD::CaloClusterContainer","CaloCalFwdTopoTowers")
-
-CaloClusterKeys+=["CaloCalTopoClusters"]
-if jobproperties.CaloRecFlags.doCaloTopoTower.get_Value():
-    CaloClusterKeys+=["CaloCalTopoTowers"]
-if jobproperties.CaloRecFlags.doCaloTopoSignal.get_Value():
-    CaloClusterKeys+=["CaloCalTopoSignals"]
-if jobproperties.CaloRecFlags.doCaloFwdTopoTower.get_Value() or storedFwdTowersInESD:
-    CaloClusterKeys+=["CaloCalFwdTopoTowers"]
-
-CaloClusterKeys+=["CombinedCluster"]
-#CaloClusterKeys+=["EMTopoCluster430"]
-CaloClusterKeys+=["EMTopoSW35"]
-
-# reshuffl em 
-#CaloClusterKeys+=["LArClusterEM"]
-
-#CaloClusterKeys+=["LArClusterEM7_11Nocorr"]
-#CaloClusterKeys+=["egClusterCollection"] Move to eg output list
-#CaloClusterKeys+=["LArClusterEMSofte"]
-
-if rec.Commissioning():
-    # CaloClusterKeys += ["LArMuClusterCandidates","CaloTopoClusters","EMTopoCluster420","TileTopoCluster","MuonClusterCollection"]
-    CaloClusterKeys += ["MuonClusterCollection"]    
-
-for theKey in CaloClusterKeys:
-    CaloClusterItemList+=["xAOD::CaloClusterContainer#"+theKey]
-    CaloClusterItemList+=["xAOD::CaloClusterAuxContainer#"+theKey+"Aux."]
-    CaloClusterItemList+=["CaloClusterCellLinkContainer#"+theKey+"_links"]
-
-CaloESDList+=CaloClusterItemList
-logRecoOutputItemList_jobOptions.info('CaloClusterItemList = ')
-printfunc (CaloClusterItemList)
-
-#CaloTowerContainer needed for jet->cell
-#FIXME
-CaloESDList += [ "CaloTowerContainer#CombinedTower" ]
-
-# LAr thinned digits
-CaloESDList += ["LArDigitContainer#LArDigitContainer_Thinned"]
-
-# LAr FEB error summary data 
-CaloESDList += ["LArFebErrorSummary#LArFebErrorSummary"]
-
-# LAr thinned digits for LArMuId
-if jobproperties.Beam.beamType() == "cosmics" :
-    CaloESDList += ["LArDigitContainer#LArDigitContainer_IIC"]
-# LAr thinned digits from EM clusters
-CaloESDList += ["LArDigitContainer#LArDigitContainer_EMClust"]
-
-# LAr noisy Feb/PA summary
-CaloESDList += ["LArNoisyROSummary#LArNoisyROSummary"]
-
-# Tile filtered digits, muons reconstructed offline or inside ROD
-CaloESDList += ["TileDigitsContainer#TileDigitsFlt"]
-CaloESDList += ["TileRawChannelContainer#TileRawChannelFlt"]
-CaloESDList += ["TileMuContainer#TileMuObj"]
-CaloESDList += ["TileL2Container#TileL2Cnt"]
-
-# Tile TMDB output
-CaloESDList += ["TileDigitsContainer#MuRcvDigitsCnt"]
-CaloESDList += ["TileRawChannelContainer#MuRcvRawChCnt"]
-CaloESDList += ["TileMuonReceiverContainer#TileMuRcvCnt"]
-
-# Cosmic muons reconstructed with Tile muon fitter
-if jobproperties.Beam.beamType() == 'cosmics' or jobproperties.Beam.beamType() == 'singlebeam' :
-    CaloESDList +=["TileCosmicMuonContainer#TileCosmicMuonHT","TileCosmicMuonContainer#TileCosmicMuonMF"]
-
-
-#**************   AOD list  ************************************************
-
-#List of AOD moments: (copied from CaloClusterTopoGetter)
-
-AODMoments=[ "SECOND_R" 
-            ,"SECOND_LAMBDA"
-            ,"CENTER_MAG"
-            ,"CENTER_LAMBDA"
-            ,"FIRST_ENG_DENS"
-            ,"ENG_FRAC_MAX" 
-            ,"ISOLATION"
-            ,"ENG_BAD_CELLS"
-            ,"N_BAD_CELLS"
-            ,"BADLARQ_FRAC"
-            ,"ENG_POS"
-            ,"SIGNIFICANCE"
-            ,"AVG_LAR_Q"
-            ,"AVG_TILE_Q"
-            ,"EM_PROBABILITY"
-            ,"BadChannelList"
-            ,"SECOND_TIME"
-            ,"NCELL_SAMPLING" 
-            ]
-
-if jobproperties.CaloRecFlags.doExtendedClusterMoments.get_Value():
-    AODMoments += ["LATERAL"
-                   ,"LONGITUDINAL"
-                   ,"CELL_SIGNIFICANCE"
-                   ,"PTD"
-                   ,"MASS"
-                   ]
-
-    if jobproperties.Rec.doHeavyIon() or jobproperties.Rec.doHIP():
-        AODMoments += ["CELL_SIG_SAMPLING"]
-
-try:
-    from Digitization.DigitizationFlags import digitizationFlags
-    if digitizationFlags.doDigiTruth():
-
-      AODMoments+=["SECOND_R_DigiHSTruth"
-                ,"SECOND_LAMBDA_DigiHSTruth"
-                ,"CENTER_MAG_DigiHSTruth"
-                ,"CENTER_LAMBDA_DigiHSTruth"
-                ,"FIRST_ENG_DENS_DigiHSTruth"
-                ,"ISOLATION_DigiHSTruth"
-                ,"ENG_POS_DigiHSTruth"
-                ,"AVG_LAR_Q_DigiHSTruth"
-                ,"AVG_TILE_Q_DigiHSTruth"
-                ,"ENERGY_DigiHSTruth"
-                ,"ETA_DigiHSTruth"
-                ,"PHI_DigiHSTruth"
-                ]
-      if jobproperties.CaloRecFlags.doExtendedClusterMoments.get_Value():
-            AODMoments+=[ "SIGNIFICANCE_Truth"
-                         ,"CELL_SIGNIFICANCE_Truth"
-                         ,"PTD_Truth"
-                 ]
-            if jobproperties.Rec.doHeavyIon() or jobproperties.Rec.doHIP():
-                AODMoments += ["CELL_SIG_SAMPLING"]
-
-except:
-    log = logging.getLogger('CaloRecOutputItemList')
-    log.info('Unable to import DigitizationFlags in CaloRecOutputItemList_jobOptions. Expected in AthenaP1')
-
-
-CaloAODList = []
-
-# cells 
-CaloAODList+=["CaloCellContainer#AODCellContainer"]
-
-# CaloClusters 
-CaloClusterItemList=[]
-CaloClusterKeys=[]
-
-
-CaloClusterKeys+=["CaloCalTopoClusters"]
-if jobproperties.CaloRecFlags.doCaloTopoTower.get_Value():
-    CaloClusterKeys+=["CaloCalTopoTowers"]
-if jobproperties.CaloRecFlags.doCaloTopoSignal.get_Value():
-    CaloClusterKeys+=["CaloCalTopoSignals"]
-
-
-CaloClusterKeys+=["CombinedCluster"]
-#CaloClusterKeys+=["EMTopoCluster430"]
-CaloClusterKeys+=["EMTopoSW35"]
-
-#CaloClusterKeys+=["egClusterCollection"] Moved to eg output item list
-#CaloClusterKeys+=["LArClusterEMSofte"]
-
-
-
-for theKey in CaloClusterKeys: #Fixme .. Apply this only to TopoClusters?
-     CaloClusterItemList+=["xAOD::CaloClusterContainer#"+theKey]
-     AuxListItem="xAOD::CaloClusterAuxContainer#"+theKey+"Aux"
-     for moment in AODMoments:
-         AuxListItem+="."+moment
-     # for tau clusters
-     if theKey == "CaloCalTopoClusters":
-         AuxListItem += ".CellLink"
-     if len(AODMoments)==0: AuxListItem+="." 
-     CaloClusterItemList+=[AuxListItem]
-
-# write the link only for egClusterColl
-#CaloClusterItemList+=["CaloClusterCellLinkContainer#egClusterCollection_links"]
-
-# for tau clusters (CaloCalTopoClusters within 0.2 of the tau axis)
-CaloClusterItemList += ["CaloClusterCellLinkContainer#CaloCalTopoClusters_links"]
-
-#CaloCalFwdTopoClusters are also clusters but with a dedicated sliming:
-if jobproperties.CaloRecFlags.doCaloFwdTopoTower.get_Value() or storedFwdTowersInESD:
-    theKey="CaloCalFwdTopoTowers"
-    CaloClusterItemList+=["xAOD::CaloClusterContainer#"+theKey]
-    AuxListItem="xAOD::CaloClusterAuxContainer#"+theKey+"Aux"
-    for moment in ("CENTER_LAMBDA", 
-                   #"CENTER_MAG",
-                   "LONGITUDINAL",
-                   #"FIRST_ENG_DENS",
-                   #"ENG_FRAC_MAX",
-                   "ENG_FRAC_EM",
-                   #"PTD",
-                   "SIGNIFICANCE",
-                   "ENG_POS"):
-         AuxListItem+="."+moment
-    CaloClusterItemList+=[AuxListItem]
-
-CaloAODList+=CaloClusterItemList
-
-# E4' cells
-CaloAODList+=["TileCellContainer#E4prContainer"]
-
-# MBTS cells
-CaloAODList+=["TileCellContainer#MBTSContainer"]
-
-# muons in Tile
-CaloAODList+=["TileMuContainer#TileMuObj"]
-
-# LAr noisy Feb/PA summary
-CaloAODList +=  ["LArNoisyROSummary#LArNoisyROSummary"]
-

Calorimeter/CaloRec/share/CaloTopoCluster_jobOptions.py

-#
-# $Id: CaloTopoCluster_jobOptions.py,v 1.48 2008-09-12 09:08:56 menke Exp $
-#
-# File: CaloRec/share/CaloTopoCluster_jobOptions.py
-# Created: June 2007, S.Menke
-# Purpose: Define default calibrated topo cluster algo and corrections
-#
-
-try:
-    from CaloRec.CaloClusterTopoGetter import CaloClusterTopoGetter
-    CaloClusterTopoGetter()
-    #from CaloRec.CaloCell2ClusterMapperGetters import CaloCell2TopoClusterMapperGetter
-    #CaloCell2TopoClusterMapperGetter()
-except Exception:
-    from AthenaCommon.Resilience import treatException
-    treatException("Problem with CaloTopoCluster. Switched off")
-