Skip to content
Snippets Groups Projects

WIP Jet Hypo: add Phi Condition - possible use: define a hole in the detector.

Closed Peter Sherwood requested to merge peter/athena:master-22604-0 into master

The new Phi Condition together with an eta Condition and Condition Inverter will make it possible to mask off Eta-Phi regions of the detector when running the jet hypo.

@jbossio @valentem @khoo @peter

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
141 141
142 142
143 143 def trigJetHypoToolFromDict(chain_dict):
144 debug = False # SET TO FALSE WHEN COMMITTING
144 debug = True # SET TO FALSE WHEN COMMITTING
  • Author Developer

    Indeed. Thanks for looking into this, Tom. I am in the process of providing configuration for test chain that uses the recently added functionaliry. The flag will be reset in the next git push.

  • Peter Sherwood added 3 commits

    added 3 commits

    • 4c2387b2 - Jet hypo: mosty make configuration of FastReductionCondition filtering more systematic.
    • f3e7823e - jet hypo: removes unused code.
    • 47488c45 - Turn off jet hypo debug flag prior to git push

    Compare with previous version

  • This merge request affects 2 packages:

    • Trigger/TrigHypothesis/TrigHLTJetHypo
    • Trigger/TriggerCommon/TriggerMenuMT

    Affected files list will not be printed in this case

    Adding @sutt ,@hrussell ,@ademaria ,@malconad ,@carquin ,@dzanzi ,@bernius as watchers

  • :negative_squared_cross_mark: CI Result FAILURE (hash 47488c45)

    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 26415]

  • Peter Sherwood added 2 commits

    added 2 commits

    • c2f33e6b - jet hypo - more work in handling Condition Filters
    • e87d4e99 - jet hypo: debug flag set to False

    Compare with previous version

  • This merge request affects 4 packages:

    • Trigger/TrigHypothesis/TrigHLTJetHypo
    • Trigger/TrigValidation/TrigAnalysisTest
    • Trigger/TrigValidation/TriggerTest
    • Trigger/TriggerCommon/TriggerMenuMT

    Affected files list will not be printed in this case

    Adding @sutt ,@ademaria ,@okumura ,@carquin ,@dzanzi ,@bernius ,@hrussell ,@malconad ,@jpanduro as watchers

  • :negative_squared_cross_mark: CI Result FAILURE (hash e87d4e99)

    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 26421]

  • Author Developer

    Hi @rbielski

    The above report claims there are chain count differences for HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20

    However, I do not see these differences locally. Details follow.

    Do you have any idea why there is this difference?

    thanks,

    Peter

    I have just run the ART tests on the code in master.

    The error report is a little confusing, as it seems to refer to two chains:

    HLT_j60_j0_fbdjshared_L1J20 HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20

    I believe the first is the relevant chain.

    The complaint appears to be that there are now 176 step features, while there were 179. I see, both in the local master tests and the ART tests on the submitted code, through jet hypo dumps, that there are 179 reported jets in both cases.

    runTrigART -m gives

    NFO ---------------------------------------------------------------------------------------------------------------------------------------------- INFO | test_trigAna_RDOtoRDOTrig_v1Dev_build.py | Reco_tf: 0, CheckLog: 0, MessageCount: 3, RootComp: 26, CountRefComp: 0, ZeroCounts: 0, exit: 0 | INFO | test_trigP1_v1Dev_build.py | athenaHLT: 0, CheckLog: 0, MessageCount: 2, RootComp: 173, ZeroCounts: 0, exit: 0 | INFO | test_trig_data_newJO_build.py | athena: 0, ExecSummary: 0, CheckLog: 0, exit: 0 | INFO | test_trig_data_v1Dev_build.py | athena: 0, CheckLog: 0, MessageCount: 0, RootComp: 11, CountRefComp: 0, ZeroCounts: 0, exit: 0 | INFO ---------------------------------------------------------------------------------------------------------------------------------------------- INFO ================================================== INFO All 4 executed tests succeeded INFO =====================================

    And the code has been pushed:

    -bash-4.2$ pwd /afs/cern.ch/work/p/peter/public/Dev2/ART0/runTrigART/results/runTrigART/test_trigAna_RDOtoRDOTrig_v1Dev_build -bash-4.2$ echo $WDEV /afs/cern.ch/work/p/peter/public/Dev2 -bash-4.2$ diff ref_RDOtoRDOTrig_v1Dev_build.new $WDEV/athena/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref -bash-4.2$ cd $WDEV/athena/Trigger/TrigValidation/TrigAnalysisTest/share
    -bash-4.2$ git status On branch master-22604-0 Your branch is up to date with 'origin/master-22604-0'.

    Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: ../../../TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py modified: ../../../TrigHypothesis/TrigHLTJetHypo/python/testChainDictMaker.py

    no changes added to commit (use "git add" and/or "git commit -a") -bash-4.2$ git push Everything up-to-date

    Edited by Peter Sherwood
  • Unfortunately I don't have any good idea why the feature count for HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 changes in this MR while it cannot be reproduced locally. I would normally suggest to rebase the branch on top of upstream/master and use the latest nightly to recompile and test again locally, but we are currently having a serious problem with nightlies and the last three are broken. I'm afraid you will need to wait until we have working nightlies again. I hope tonight's release will be fine, but I think investigation/fixing is still in progress.

  • Author Developer

    ok, thanks for the update

  • Moving back to user until test pass. (L1)

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