Skip to content
Snippets Groups Projects
Commit 80d4e5e2 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master-update-muonconfig' into 'master'

Update muon configuration and fix unit tests

See merge request atlas/athena!25217
parents ddbf97c7 1b573b93
No related branches found
No related tags found
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!25217Update muon configuration and fix unit tests
......@@ -39,4 +39,8 @@ if( NOT SIMULATIONBASE )
atlas_add_test( MuonSegmentFindingConfigTest
SCRIPT python -m MuonConfig.MuonSegmentFindingConfig
POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( flake8
SCRIPT flake8 --select=F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
POST_EXEC_SCRIPT nopost.sh )
endif()
......@@ -56,7 +56,7 @@ def MDTCondSummarySvcCfg(flags, **kwargs):
kwargs['ConditionsServices'] = [cond_svc] # COOL folders not available online
cond_summary = MDTCondSummarySvc(**kwargs)
result.addService(cond_summary)
return result, cond_summary
return result
def RPCCondSummarySvcCfg(flags,**kwargs):
result = ComponentAccumulator()
......
......@@ -87,8 +87,8 @@ def createMuonConfigFlags():
# CalibFlags
mcf.addFlag("Muon.Calib.readMDTCalibFromBlob", True) # Read mdt tube calibration from blob-folders
mcf.addFlag("Muon.Calib.correctMdtRtForBField", lambda prevFlags : (prevFlags.Input.isMC==False and prevFlags.Beam.Type=="collisions")) # Apply B-field correction to drift times only for collision data (as done in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibFlags.py#0028)
mcf.addFlag("Muon.Calib.correctMdtRtForTimeSlewing", lambda prevFlags : prevFlags.Input.isMC==False) # Apply time slewing correction to drift time only for data (as done in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibFlags.py#0028)
mcf.addFlag("Muon.Calib.correctMdtRtForBField", lambda prevFlags : (prevFlags.Input.isMC is False and prevFlags.Beam.Type=="collisions")) # Apply B-field correction to drift times only for collision data (as done in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibFlags.py#0028)
mcf.addFlag("Muon.Calib.correctMdtRtForTimeSlewing", lambda prevFlags : prevFlags.Input.isMC is False) # Apply time slewing correction to drift time only for data (as done in https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibFlags.py#0028)
mcf.addFlag("Muon.Calib.useMLRt", True) # use ML-RT functions from COOL
mcf.addFlag("Muon.Calib.applyRtScaling", False) # TODO - apparently not needed, but currently used in MuonCalibConfig. Set false to match https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibFlags.py#0072
mcf.addFlag("Muon.Calib.correctMdtRtWireSag", False) # Apply RT wiresag correction
......
......@@ -13,7 +13,8 @@ def CscClusterOnTrackCreatorCfg(flags,**kwargs):
result=ComponentAccumulator()
acc, qrat = QratCscClusterFitterCfg(flags)
acc = QratCscClusterFitterCfg(flags)
qrat = acc.getPrimary()
result.addPublicTool(qrat)
result.merge(acc)
......
......@@ -23,13 +23,18 @@ if __name__=="__main__":
from AthenaCommon.Logging import log
from AthenaCommon.Constants import DEBUG
from AthenaConfiguration.AllConfigFlags import ConfigFlags
ConfigFlags.Detector.GeometryMDT = True
ConfigFlags.Detector.GeometryTGC = True
ConfigFlags.Detector.GeometryCSC = True
ConfigFlags.Muon.doCSCs = False # FIXME - this does not yet work. Need to investigate why.
ConfigFlags.Detector.GeometryRPC = True
log.setLevel(DEBUG)
from AthenaCommon.Logging import log
log.debug('About to set up Segment Finding.')
ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.3/v1/myESD.pool.root"]
ConfigFlags.Muon.doCSCs = False
ConfigFlags.lock()
cfg=ComponentAccumulator()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment