Skip to content
Snippets Groups Projects

jet hypo - mostly fixing code that handles identical Conditions

Merged jet hypo - mostly fixing code that handles identical Conditions
peter/athena:master-22724-1 into master
All threads resolved!
Merged Peter Sherwood requested to merge peter/athena:master-22724-1 into master
All threads resolved!

Previously, identical conditions were recognised early on in the jet configuration. The approach broke down when we introduced the constraint of one Condition per node.

The new approach is to build the single-Condition node tree, then for each node, check whether the child nodes include identical nodes. If this is the case, all but one of the identical child nodes are deleted, and the multiplicity of the sole surviving child node is set appropriately.

It turns out this also brings about code simplification.

This commit also includes improvements to code testing tools.

Note - the local branch is incorrectly labelled as 22724. This should be 22727

ATR-22727

@amete @jbossios @valentem @peter

Edited by Peter Sherwood

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
  • P
    Peter Sherwood @peter ·
    Author Developer

    yep -otherwise immediate ctest failure

  • Peter Sherwood added 1 commit

    added 1 commit

    • 521fc2ff - jet hypo: set debug flag to False

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigHypothesis/TrigHLTJetHypo

    This merge request affects 5 files:

    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/treeVisitors.py
  • Jonathan Bossio resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash db1f10db)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :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:
    required tests :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:

    Full details available on this CI monitor view
    :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 27504]

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash f3e6c6a8)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :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:
    required tests :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:

    Full details available on this CI monitor view
    :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 27505]

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 521fc2ff)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :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:
    required tests :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:

    Full details available on this CI monitor view
    :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 27508]

  • P
    Peter Sherwood @peter ·
    Author Developer

    This q440 test failure seems unrelated to the MR-

    Edited by Peter Sherwood
  • Peter Sherwood changed title from WIP jet hypo - mostly fixing code that handles identical Conditions to jet hypo - mostly fixing code that handles identical Conditions

    changed title from WIP jet hypo - mostly fixing code that handles identical Conditions to jet hypo - mostly fixing code that handles identical Conditions

  • Gordon Watts
    Gordon Watts @gwatts ·
    Developer
    • Changes look ok, code is simpler (less hidden variables and tuples)
    • Tests are passing beside one unrelated failure
    • Not too comfortable with trigger code, so referring to l2.
  • Gordon Watts added review-pending-level-2 label and removed review-pending-level-1 label

    added review-pending-level-2 label and removed review-pending-level-1 label

  • Abhishek Nag
    Abhishek Nag @abnag ·

    MR looks good. Approving.

    Abhishek [L2]

  • Abhishek Nag added review-approved label and removed review-pending-level-2 label

    added review-approved label and removed review-pending-level-2 label

  • Walter Lampl merged

    merged

  • Walter Lampl mentioned in commit afd7e306

    mentioned in commit afd7e306

  • Atlas Nightlybuild added sweep:ignore label

    added sweep:ignore label

    • Please register or sign in to reply