Skip to content
Snippets Groups Projects

Wrapping CaloRecoConfig, next attempt

Closed Walter Lampl requested to merge wlampl/athena:WrapCaloConfig3 into master
All threads resolved!

Attempt to wrap CaloRecoConfig from RecExCommon.

The AOD compares identical, tiny difference in the ESD as discussed below.

Replaces !48455 (closed)

Edited by Walter Lampl

Merge request reports

Pipeline #3367574 passed

Pipeline passed for 869060d0 on wlampl:WrapCaloConfig3

Closed by Walter LamplWalter Lampl 3 years ago (Dec 20, 2021 12:04pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added NewConfig label

  • Walter Lampl mentioned in merge request !48455 (closed)

    mentioned in merge request !48455 (closed)

  • Walter Lampl added 1 commit

    added 1 commit

    • f0dfe9d7 - CaloRecoConfig: Remove duplicate config of LArDigitThinnerCfg

    Compare with previous version

  • Hi Walter,

    The following property should be set up in new configuration:

      ByteStreamCnvSvc.ROD2ROBmap = [ "-1" ]

    like it is done in here in old configuration:

    https://gitlab.cern.ch/atlas/athena/-/blob/master/Calorimeter/CaloRec/python/CaloCellGetter.py#L112

    One way to do this is to add the following line in CaloRecoConfig.py:

       result.getService('ByteStreamCnvSvc').ROD2ROBmap = [ "-1" ]

    after the following line:

    result.merge(ByteStreamReadCfg(configFlags,type_names=['TileDigitsContainer/TileDigitsCnt',                                                                                 
                                                                   'TileRawChannelContainer/TileRawChannelCnt',                                                                         
                                                                   'TileMuonReceiverContainer/TileMuRcvCnt'])) 

    Unfortunately, in this case it is not possible to merge CaloRecoConfig with old configuration
    due to the following error:

     Failed merging new config value (['-1']) and old config value ([]) for the (ROD2ROBmap) property of ByteStreamCnvSvc/ByteStreamCnvSvc (ByteStreamCnvSvc/ByteStreamCnvSvc) old (new).

    because when new configuration for Caloremeter is used in SystemRec_config.py
    the old one (including CaloRec_jobOptions.py, where this property is set up) is switched off.

    I need to think a bit or maybe you can propose the solution.

    Adding @solodkov.

    Cheers,
    Siarhei

  • Walter Lampl added 2 commits

    added 2 commits

    • 41e735dd - Set semantics for property ByteStreamCnvSvcBase.ROD2ROBmap
    • 1e6416b2 - set property ByteStreamCnvSvcBase.ROD2ROBmap to -1

    Compare with previous version

  • Hello @harkusha,

    thanks that seems to do the trick.

    Remaining issue: I see difference in Muons with diffPoolFile on ESD.

    ::: comparing common content (mem-size / disk-size)...
    [ERR]        8.946 /        3.124 kb (ref) ==>        8.927 /        3.069 kb (chk) | CaloClusterCellLinkContainer_p1_MuonClusterCollection_links
    [ERR]      218.329 /       48.992 kb (ref) ==>      218.146 /       49.066 kb (chk) | Trk::TrackCollection_tlp6_ExtrapolatedMuonTracks
    [ERR]      181.641 /       40.902 kb (ref) ==>      181.458 /       40.914 kb (chk) | Trk::TrackCollection_tlp6_MSOnlyExtrapolatedTracks
    [ERR]        2.612 /        1.083 kb (ref) ==>        2.585 /        1.079 kb (chk) | xAOD::BTaggingAuxContainer_v1_BTagging_AntiKt4EMTopoAuxDyn.Muons
    [ERR]        2.620 /        1.083 kb (ref) ==>        2.593 /        1.083 kb (chk) | xAOD::JetAuxContainer_v1_AntiKt4EMTopoJetsAuxDyn.MuonsForBTagging
    [ERR]       21.197 /        1.384 kb (ref) ==>       20.995 /        1.282 kb (chk) | xAOD::TrackParticleAuxContainer_v5_ExtraPolatedMuonsLRTTrackParticlesAux.
    [ERR]        1.628 /        0.785 kb (ref) ==>        1.624 /        0.781 kb (chk) | xAOD::TrackParticleAuxContainer_v5_ExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdx
    [ERR]        1.674 /        0.800 kb (ref) ==>        1.673 /        0.799 kb (chk) | xAOD::TrackParticleAuxContainer_v5_ExtraPolatedMuonsLRTTrackParticlesAuxDyn.TRTdEdxUsedHits

    I have been seeing this pattern coming and going over the last few days while playing with this MR. I wonder if we picked up an irreproduciblity again ..

    Good enough to up-WIP ...

  • Walter Lampl marked this merge request as ready

    marked this merge request as ready

  • Walter Lampl changed the description

    changed the description

  • This merge request affects 4 packages:

    • Calorimeter/CaloRec
    • Event/ByteStreamCnvSvcBase
    • LArCalorimeter/LArROD
    • Reconstruction/RecExample/RecExCommon

    Affected files list will not be printed in this case

    Adding @bcarlson ,@goetz ,@joheinri ,@pavol ,@tadej ,@damazio as watchers

  • Tadej Novak
  • :negative_squared_cross_mark: CI Result FAILURE (hash 1e6416b2)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :cloud: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :o: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 44253]

  • CI failure is unrelated FPE in SimulationRun2FullSim. Let's wait until the end of the discussions

    Sergei L1

  • Walter Lampl resolved all threads

    resolved all threads

  • Carlo Varni
  • Carlo Varni
  • Carlo Varni
  • Walter Lampl added 2 commits

    added 2 commits

    • ebac6106 - remove duplicate definition of ROD2ROBmap
    • 869060d0 - remove commented code-line

    Compare with previous version

  • Walter Lampl resolved all threads

    resolved all threads

  • This merge request affects 4 packages:

    • Calorimeter/CaloRec
    • Event/ByteStreamCnvSvcBase
    • LArCalorimeter/LArROD
    • Reconstruction/RecExample/RecExCommon

    Affected files list will not be printed in this case

    Adding @bcarlson ,@goetz ,@joheinri ,@pavol ,@tadej ,@damazio as watchers

  • :white_check_mark: CI Result SUCCESS (hash 869060d0)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :cloud: :white_check_mark: :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 44346]

  • Approving -- L1

  • added review-approved label and removed review-pending-level-1 label

  • Edward Moyse resolved all threads

    resolved all threads

  • Edward Moyse resolved all threads

    resolved all threads

  • "Failed to squash. Should be done manually"

    :-(

  • I suspect a rebase would also work fine here, since it's pretty unlikely anyone else is touching this. https://atlassoftwaredocs.web.cern.ch/gittutorial/resolve-conflict/#resolving-conflicts-by-rebasing

  • Walter Lampl mentioned in merge request !49266 (merged)

    mentioned in merge request !49266 (merged)

  • Rebase created a conflict on every single commit of this MR. Resorting to git merge --squash (that I prefer anyway). See !49266 (merged)

    Closing this one.

  • closed

  • Please register or sign in to reply
    Loading