Skip to content
Snippets Groups Projects
Commit e6e6e2cb authored by Melissa Yexley's avatar Melissa Yexley
Browse files

revert jivexml config changes for offline tests until fixed

parent 0b60c09e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
graphics/JiveXML/python/JiveXMLConfig.py
+ 103
− 80
View file @ e6e6e2cb
# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import Format
def getATLASVersion():
import os
......@@ -47,7 +48,7 @@ def getDataTypes(flags, haveRDO=False, readAOD=False):
# Taken from CaloJiveXML_DataTypes.py
# TODO find correct flag and check the LArDigitRetriever is doing what we want it to do
#if doLArDigits:
# data_types += ["JiveXML::LArDigitRetriever/LArDigitRetriever"]
#data_types += ["JiveXML::LArDigitRetriever/LArDigitRetriever"]
#else:
data_types += ["JiveXML::CaloFCalRetriever/CaloFCalRetriever"]
data_types += ["JiveXML::CaloLArRetriever/CaloLArRetriever"]
......@@ -179,11 +180,6 @@ def TrackRetrieverCfg(flags, name="TrackRetriever", **kwargs):
# kwargs.setdefault("DoWriteHLT", True)
### switch residual data off:
kwargs.setdefault("DoWriteResiduals", False)
if flags.Common.isOnline:
doHitsDetails = False
else:
doHitsDetails = True
kwargs.setdefault("DoHitsDetails", doHitsDetails)
the_tool = CompFactory.JiveXML.TrackRetriever(name, **kwargs)
result.addPublicTool(the_tool)
return result
......@@ -215,95 +211,129 @@ def CaloRetrieversCfg(flags, **kwargs):
from LArRecUtils.LArADC2MeVCondAlgConfig import LArADC2MeVCondAlgCfg
result.merge(LArADC2MeVCondAlgCfg (flags))
rawChannelContainer = flags.Tile.RawChannelContainer
digitsContainer = "TileDigitsCnt"
if "TileDigitsFlt" in flags.Input.Collections:
digitsContainer = "TileDigitsFlt"
from AthenaConfiguration.Enums import Format
if flags.Input.Format is Format.BS:
tileDigitsContainer = "TileDigitsCnt"
if flags.Tile.doOpt2:
tileRawChannelContainer = 'TileRawChannelOpt2'
elif flags.Tile.doOptATLAS:
tileRawChannelContainer = 'TileRawChannelFixed'
elif flags.Tile.doFitCOOL:
tileRawChannelContainer = 'TileRawChannelFitCool'
elif flags.Tile.doFit:
tileRawChannelContainer = 'TileRawChannelFit'
else:
tileRawChannelContainer = 'TileRawChannelCnt'
result.addPublicTool(
CompFactory.JiveXML.CaloClusterRetriever(name = "CaloClusterRetriever",**kwargs
)
)
if flags.Common.isOnline:
doTileCellDetails = True
doTileDigit = True
else:
doTileCellDetails = False
doTileDigit = False
result.addPublicTool(
CompFactory.JiveXML.CaloTileRetriever(
name = "CaloTileRetriever",
TileDigitsContainer = digitsContainer,
TileRawChannelContainer = rawChannelContainer,
DoTileCellDetails = doTileCellDetails,
DoTileDigit = doTileDigit,
DoBadTile = False,
if "TileDigitsCnt" in flags.Input.Collections:
tileDigitsContainer = "TileDigitsCnt"
elif "TileDigitsFlt" in flags.Input.Collections:
tileDigitsContainer = "TileDigitsFlt"
if "TileRawChannelOpt2" in flags.Input.Collections:
tileRawChannelContainer = 'TileRawChannelOpt2'
elif "TileRawChannelFitCool" in flags.Input.Collections:
tileRawChannelContainer = 'TileRawChannelFitCool'
elif "TileRawChannelFit" in flags.Input.Collections:
tileRawChannelContainer = 'TileRawChannelFit'
elif "TileRawChannelCnt" in flags.Input.Collections:
tileRawChannelContainer = 'TileRawChannelCnt'
from CaloJiveXML.CaloJiveXMLConf import JiveXML__LArDigitRetriever
theLArDigitRetriever = JiveXML__LArDigitRetriever(name="LArDigitRetriever")
theLArDigitRetriever.DoLArDigit = False
theLArDigitRetriever.DoHECDigit = False
theLArDigitRetriever.DoFCalDigit = False
if (theLArDigitRetriever.DoLArDigit or theLArDigitRetriever.DoHECDigit or theLArDigitRetriever.DoFCalDigit):
result.addPublicTool(
CompFactory.JiveXML.LArDigitRetriever(
name="LArDigitRetriever",
DoLArDigit=False,
DoHECDigit=False,
DoFCalDigit=False,
)
)
)
if flags.Common.isOnline:
doMBTSDigits = True
doMBTSCellDetails = True
else:
doMBTSDigits = False
doMBTSCellDetails = False
result.addPublicTool(
CompFactory.JiveXML.CaloFCalRetriever(
name="CaloFCalRetriever",
DoFCalCellDetails=False,
DoBadFCal=False,
)
)
result.addPublicTool(
CompFactory.JiveXML.CaloMBTSRetriever(
name = "CaloMBTSRetriever",
TileDigitsContainer= digitsContainer,
TileRawChannelContainer = rawChannelContainer,
DoMBTSDigits = doMBTSDigits,
DoMBTSCellDetails = doMBTSCellDetails,
result.addPublicTool(
CompFactory.JiveXML.CaloLArRetriever(
name="CaloLArRetriever",
DoLArCellDetails=False,
DoBadLAr=False,
)
)
)
result.addPublicTool(
CompFactory.JiveXML.CaloFCalRetriever(
name = "CaloFCalRetriever",
DoFCalCellDetails = False,
DoBadFCal = False,
result.addPublicTool(
CompFactory.JiveXML.CaloHECRetriever(
name="CaloHECRetriever",
DoHECCellDetails=False,
DoBadHEC=False,
)
)
)
result.addPublicTool(
CompFactory.JiveXML.CaloLArRetriever(
name = "CaloLArRetriever",
DoLArCellDetails = False,
DoBadLAr = False,
CompFactory.JiveXML.CaloClusterRetriever(name = "CaloClusterRetriever",**kwargs
)
)
result.addPublicTool(
CompFactory.JiveXML.CaloHECRetriever(
name = "CaloHECRetriever",
DoHECCellDetails = False,
DoBadHEC = False,
CompFactory.JiveXML.CaloTileRetriever(
name = "CaloTileRetriever",
TileDigitsContainer = tileDigitsContainer,
TileRawChannelContainer = tileRawChannelContainer,
DoTileCellDetails = False,
DoTileDigit = False,
DoBadTile = False,
)
)
result.addPublicTool(
CompFactory.JiveXML.LArDigitRetriever(
name = "LArDigitRetriever",
DoLArDigit = False,
DoHECDigit = False,
DoFCalDigit = False,
CompFactory.JiveXML.CaloMBTSRetriever(
name = "CaloMBTSRetriever",
TileDigitsContainer= tileDigitsContainer,
TileRawChannelContainer = tileRawChannelContainer,
DoMBTSDigits = False,
)
)
return result
def MuonRetrieversCfg(flags, **kwargs):
result = ComponentAccumulator()
# TODO add in other retrievers
# Based on MuonJiveXML_DataTypes.py
#kwargs.setdefault("StoreGateKey", "MDT_DriftCircles")
result.addPublicTool(
CompFactory.JiveXML.MdtPrepDataRetriever(name = "MdtPrepDataRetriever",**kwargs
)
)
if flags.Detector.EnableMuon:
# Taken from MuonJiveXML_DataTypes.py
if flags.Detector.EnableMDT:
result.addPublicTool(CompFactory.JiveXML.MdtPrepDataRetriever(name="MdtPrepDataRetriever"), **kwargs)
if flags.Detector.EnableTGC:
result.addPublicTool(CompFactory.JiveXML.TgcPrepDataRetriever(name="TgcPrepDataRetriever"), **kwargs)
if flags.Detector.EnableRPC:
result.addPublicTool(CompFactory.JiveXML.RpcPrepDataRetriever(name="RpcPrepDataRetriever"), **kwargs)
if flags.Detector.EnableCSC:
result.addPublicTool(CompFactory.JiveXML.CSCClusterRetriever(name="CSCClusterRetriever"), **kwargs)
result.addPublicTool(CompFactory.JiveXML.CscPrepDataRetriever(name="CscPrepDataRetriever"), **kwargs)
if flags.Detector.EnablesTGC:
result.addPublicTool(CompFactory.JiveXML.sTgcPrepDataRetriever(name="sTgcPrepDataRetriever"), **kwargs)
if flags.Detector.EnableMM:
result.addPublicTool(CompFactory.JiveXML.MMPrepDataRetriever(name="MMPrepDataRetriever"), **kwargs)
# TODO Not sure if below are still needed?
# data_types += ["JiveXML::TrigMuonROIRetriever/TrigMuonROIRetriever"]
# data_types += ["JiveXML::MuidTrackRetriever/MuidTrackRetriever]
# data_types += ["JiveXML::TrigRpcDataRetriever/TrigRpcDataRetriever"]
return result
......@@ -386,7 +416,6 @@ def xAODRetrieversCfg(flags):
)
return result
def TriggerRetrieversCfg(flags):
result = ComponentAccumulator()
if flags.Reco.EnableTrigger:
......@@ -430,8 +459,7 @@ def TriggerRetrieversCfg(flags):
)
return result
def AlgoJiveXMLCfg(flags, name="AlgoJiveXML", **kwargs):
def AlgoJiveXMLCfg(flags, name="MuonCombinePatternTool", **kwargs):
# This is based on a few old-style configuation files:
# JiveXML_RecEx_config.py
# JiveXML_jobOptionBase.py
......@@ -439,12 +467,9 @@ def AlgoJiveXMLCfg(flags, name="AlgoJiveXML", **kwargs):
kwargs.setdefault("AtlasRelease", getATLASVersion())
kwargs.setdefault("WriteToFile", True)
# Enable this to recreate the geometry XML files for Atlantis
kwargs.setdefault("OnlineMode", False)
### Enable this to recreate the geometry XML files for Atlantis
kwargs.setdefault("WriteGeometry", False)
if flags.Common.isOnline:
kwargs.setdefault("OnlineMode", True)
else:
kwargs.setdefault("OnlineMode", False)
# This next bit sets the data types, then we set the associated public tools
readAOD = False # FIXME - set this properly
......@@ -473,6 +498,4 @@ def AlgoJiveXMLCfg(flags, name="AlgoJiveXML", **kwargs):
the_alg = CompFactory.JiveXML.AlgoJiveXML(name="AlgoJiveXML", **kwargs)
result.addEventAlgo(the_alg, primary=True)
return result
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment