Skip to content
Snippets Groups Projects

Configuration of ATLAS Detector Description using ComponentAccumulator

Merged John Derek Chapman requested to merge jchapman/athena:CA_forIDGeoModel_master into master

This merge request introduces code to configure the ATLAS Detector Description using ComponentAccumulator.

Most of the pieces were already there, but code for the Inner Detector has been moved into the appropriate packages under InnerDetector/InDetDetDescr.

It also adds some CI tests to help ensure that the configuration continues to work as the refactoring of the C++ code in the master branch continues.

Edited by John Derek Chapman

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • John Derek Chapman
  • John Derek Chapman
  • added 12 commits

    • 66e0aa67 - Extend AthenaConfiguration modules to better support EVNT and HITS inputs
    • 10fc2a2c - Add some extra flags for Geometry configuration with ComponentAccumulator
    • 21160d5a - Add ComponentAccumulator configuration for BeamPipeDetectorTool and accompanying test
    • 7984f776 - ComponentAccumulator configuration of Pixel Geometry
    • 185f78a7 - ComponentAccumulator configuration of SCT Geometry
    • ecc92fdc - ComponentAccumulator configuration of TRT Geometry
    • 6289f715 - Initial version of Component Accumulator configuration of ID Geometry and Alignment
    • cc682ae3 - Protect simulation against AlignCallbacks in GeoModelSvc
    • d9d5bd61 - Extend MuonGeoModelCfg to support geometry building for simulation jobs
    • d70cfa83 - Initial implementation of ForwardDetector Geometry building
    • 8c376894 - Initial ComponentAccumulator method to build the whole ATLAS Detector
    • 0e6fdeb9 - Update input file paths for MuonConfig tests

    Compare with previous version

  • I just found out that @goetz has already done a lot of this work in his fork:
    goetz/athena@2d80ce2f...jobConfig_master
    (Sorry I'd missed this.)

    @goetz, what are your plans for merging your changes? Thinking back I guess the above branch is what was discussed in some previous configuration meetings right?
    Would you be happy if the changes in this merge request are merged for now (assuming there are no other objections)? The reason that I'd like these changes to go in the meantime is that we need to be able to configure the geometry for the migration of the simulation and digitization configuration.

    In the future you can either use them in your branch or replace this configuration when your branch is merged. The included unit tests should ensure that the configuration that we need for sim,digi,overlay keeps working.

  • I'm going to drop the WIP status on this one now in order to get some further review comments.

  • John Derek Chapman unmarked as a Work In Progress

    unmarked as a Work In Progress

  • This merge request affects 8 packages:

    • AtlasGeometryCommon/BeamPipeGeoModel
    • Control/AthenaConfiguration
    • DetectorDescription/GeoModel/AtlasGeoModel
    • InnerDetector/InDetDetDescr/PixelGeoModel
    • InnerDetector/InDetDetDescr/SCT_GeoModel
    • InnerDetector/InDetDetDescr/TRT_GeoModel
    • MuonSpectrometer/MuonConfig
    • Simulation/BeamEffects

    Adding @jchapman ,@rosati ,@wleight ,@oda ,@vpascuzz ,@ssnyder ,@rbianchi as watchers

  • :negative_squared_cross_mark: CI Result FAILURE

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark:
    required tests :o: :o:
    optional tests :cloud: :white_check_mark:

    Full details available at NICOS MR-20770-2019-02-01-18-06
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :pencil: CI Jenkins server is switched to https://atlas-sit-ci.cern.ch. It is accessible world-wide (behind CERN SSO). In old links to Jenkins server aibuild080.cern.ch:8080 should be replaced with atlas-sit-ci.cern.ch For experts only: Jenkins output [CI-MERGE-REQUEST 33142]

  • Unit tests fail in AthSimulation as some required flags are defined in LArCalorimeter/LArCellRec package which is not part of the AthSimulation project. Best solution is to move the module in question elsewhere. MuonConfig_MuonDataDecodeTest and MuonConfig_MuonDataDecodeTest_Cache fail unit tests fail in Athena build due to extra MetaDataSvc INFO MetaDataSvc::stop() line introduced by another merge request.

  • Hi @wlampl,

    The LAr geometry configuration in LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py depends on the LArCalorimeter/LArCellRec/python/LArConfigFlags.py. In order to be able to build the LAr geometry in the AthSimulation project I need to move this module (or at least the definition of ConfigFlags.LAr.doAlign) elsewhere. Any preferences?

    Cheers,

    John

  • Good point. A dedicated LArConfiguration package with only python could be a solution.

    • Walter
  • OK - I'll make that change as part of this merge request.

    Cheers,

    John

  • added 2 commits

    • f1eeabd3 - Add MuonConfig package to AthSimulation project
    • 6748f058 - Move LArConfigFlags.py from LArCellRec to new LArConfiguration package

    Compare with previous version

  • John Derek Chapman added 284 commits

    added 284 commits

    • 6748f058...b2385a0e - 271 commits from branch atlas:master
    • 511cc98e - Extend AthenaConfiguration modules to better support EVNT and HITS inputs
    • 8b779f2b - Add some extra flags for Geometry configuration with ComponentAccumulator
    • 3081625a - Add ComponentAccumulator configuration for BeamPipeDetectorTool and accompanying test
    • 6b3434b8 - ComponentAccumulator configuration of Pixel Geometry
    • 00979e7e - ComponentAccumulator configuration of SCT Geometry
    • 62120b3e - ComponentAccumulator configuration of TRT Geometry
    • 1ca3a160 - Initial version of Component Accumulator configuration of ID Geometry and Alignment
    • a76734f9 - Protect simulation against AlignCallbacks in GeoModelSvc
    • 26a1c96e - Extend MuonGeoModelCfg to support geometry building for simulation jobs
    • 94ee5864 - Initial implementation of ForwardDetector Geometry building
    • 81ae12d2 - Initial ComponentAccumulator method to build the whole ATLAS Detector
    • 1c731b7e - Add MuonConfig package to AthSimulation project
    • 52d3c15a - Move LArConfigFlags.py from LArCellRec to new LArConfiguration package

    Compare with previous version

  • This merge request affects 11 packages:

    • AtlasGeometryCommon/BeamPipeGeoModel
    • Control/AthenaConfiguration
    • DetectorDescription/GeoModel/AtlasGeoModel
    • InnerDetector/InDetDetDescr/PixelGeoModel
    • InnerDetector/InDetDetDescr/SCT_GeoModel
    • InnerDetector/InDetDetDescr/TRT_GeoModel
    • LArCalorimeter/LArCellRec
    • LArCalorimeter/LArConfiguration
    • MuonSpectrometer/MuonConfig
    • Projects/AthSimulation
    • Simulation/BeamEffects

    Adding @jchapman ,@rosati ,@wleight ,@pavol ,@oda ,@vpascuzz ,@ssnyder ,@rbianchi as watchers

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading