Skip to content
Snippets Groups Projects

Report jets participating in passing the jet hypo by chain leg

Merged Report jets participating in passing the jet hypo by chain leg
peter/athena:master-ATR-20700-5 into master
Merged Peter Sherwood requested to merge peter/athena:master-ATR-20700-5 into master

ATR-20700

This MR reports the jets participating in the passing the jet hypo by chain leg.

The leg index is taken to be the position of the chain part that describes the leg in the "chainParts" entry of the chainDict which is passed to jet configuration code.

This is clearly fragile. More robust would be to have the chainPart contained the leg label. If and when the label is made available, the jet code will be updated.

The label is propagated through the jet configuration process, and is passed to the relevant C++ AlgTools.

@jbossios @valentem @khoo @peter @tamartin @markowen @rbielski

Edited by Tim Martin

Merge request reports

Pipeline #2268242 passed

Stage: external

Pipeline passed for 0fc646a0 on peter:master-ATR-20700-5

Approval is optional

Merged by Frank WinklmeierFrank Winklmeier 4 years ago (Jan 29, 2021 5:11pm UTC)

Merge details

  • Changes merged into master with a073c5cb (commits were squashed).
  • Did not delete the source branch.

Activity

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

    added master label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigHypothesis/TrigHLTJetHypo

    This merge request affects 11 files:

    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/CapacityCheckedCondition.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/CapacityCheckedCondition.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/ICapacityCheckedCondition.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h
  • ATLAS Robot added JetEtmiss Trigger review-pending-level-1 labels

    added JetEtmiss Trigger review-pending-level-1 labels

  • Peter Sherwood changed the description

    changed the description

  • Peter Sherwood removed JetEtmiss Trigger review-pending-level-1 labels

    removed JetEtmiss Trigger review-pending-level-1 labels

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 5964adec)

    Athena AthSimulation AthGeneration AnalysisBase
    externals :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:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :cloud: :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25518]

  • Peter Sherwood changed the description

    changed the description

  • Peter Sherwood changed title from WIP Report jets participating in passing the jet hypo by chain leg to Report jets participating in passing the jet hypo by chain leg

    changed title from WIP Report jets participating in passing the jet hypo by chain leg to Report jets participating in passing the jet hypo by chain leg

  • P
    Peter Sherwood @peter ·
    Author Developer

    Removed WIP.

    This changes the chain counts in the trigger tests for j80_j60.

    Further changes to handling of Decision objects outside of the jet hypo are required.

    See comments by Tim Martin in ATR-20700.

  • Walter Lampl
    Walter Lampl @wlampl ·
    Owner

    Jenkins please retry a build

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigHypothesis/TrigHLTJetHypo

    This merge request affects 11 files:

    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/ConditionsToolSetterFastReduction.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/CapacityCheckedCondition.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/CapacityCheckedCondition.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/ICapacityCheckedCondition.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetConditionConfig_capacitychecked.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h
  • ATLAS Robot added JetEtmiss Trigger review-pending-level-1 labels

    added JetEtmiss Trigger review-pending-level-1 labels

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 5964adec)

    Athena AthSimulation AthGeneration AnalysisBase
    externals :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:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :cloud: :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25575]

  • Gordon Watts
    Gordon Watts @gwatts ·
    Developer
    • Description still mentions this as a WIP
    • Several test failures (like TrigHLTJetHypo_TrigHLTJetHypoTool_ctest).

    (L1)

  • Gordon Watts removed review-pending-level-1 label

    removed review-pending-level-1 label

  • Gordon Watts added review-user-action-required label

    added review-user-action-required label

  • Peter Sherwood changed the description

    changed the description

  • P
    Peter Sherwood @peter ·
    Author Developer

    Chains with two chain parts (in particular j80_j60) report via the mechanisms described in ATR-20700, the chain counts for this chain are zero in the trigger ART tests (eg those run by the command "runTrigART.py -m"). Tim Martin asks for the code to be merged before working on the Decision object logic - see discussion at ATR-20700.

  • Peter Sherwood added 1 commit

    added 1 commit

    • f966bd8f - switch off tje jet hypo debug flag

    Compare with previous version

  • Tim Martin
    Tim Martin @tamartin ·
    Developer

    Hello @peter - looks like we picked up a merge conflict here over the break.

  • Peter Sherwood added 616 commits

    added 616 commits

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigHypothesis/TrigHLTJetHypo

    This merge request affects 9 files:

    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/CapacityCheckedCondition.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/CapacityCheckedCondition.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/ICapacityCheckedCondition.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h
  • ATLAS Robot added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • Peter Sherwood added 30 commits

    added 30 commits

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash f8b0957d)

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

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigHypothesis/TrigHLTJetHypo

    This merge request affects 6 files:

    • Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolConfig_fastreduction.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h
  • P
    Peter Sherwood @peter ·
    Author Developer

    Right. I will reconsult, and update (either by making this MR WIP or not...)

  • P
    Peter Sherwood @peter ·
    Author Developer

    @jbossios

    Hi Jona

    I would like to not make this merge request WIP

    • it breaks nothing, as the tests show. It will break multijet chains of the simple scenario, eg j80_j60, but Tim will presumably add these in a local version for development.
    • Otherwise I have to continually update the branch if anything changes in jet hypo. This is neither sensible nor safe.

    Please note any objections.

    Peter

    Edited by Peter Sherwood
  • P
    Peter Sherwood @peter ·
    Author Developer

    @jbossios

    Wrong. There is a j80_j60 chain- and it breaks. will make this a WIP for now.

  • Peter Sherwood changed title from Report jets participating in passing the jet hypo by chain leg to WIP Report jets participating in passing the jet hypo by chain leg

    changed title from Report jets participating in passing the jet hypo by chain leg to WIP Report jets participating in passing the jet hypo by chain leg

  • Jonathan Bossio
    Jonathan Bossio @jbossios ·

    Yes, as Rafal pointed out (thanks for following up here), I propose to put this MR on hold so we merge all fixes simultaneously to avoid breaking up things (in this case j80_j60).

  • P
    Peter Sherwood @peter ·
    Author Developer

    Ok now I do not understand what is going on.

    I ran ART tests locally on a new MR - and am getting the dsame failures. It seems the failures are NOT coming from this MR... needs more investigation.

  • P
    Peter Sherwood @peter ·
    Author Developer

    Also, I believe j80_j60 is already broken in the master code - in that the jet reporting is wrong. This MR does not, however, affect the jet hypo result.

  • Tim Martin
    Tim Martin @tamartin ·
    Developer

    Think the CI failures are now just what I need to fix before we proceed with the MR, i.e. just recognising the accept of the multi-leg jet chains

    chainComp ERROR    Trigger counts differ from the reference. If the above differences are intended, update the reference
chainComp INFO     Patch file created. To apply, run in the athena source directory:
chainComp INFO     git apply /var/lib/jenkins/workspace/CI-test-driver/CI-test-driver_39343_56748/Athena/Trigger_athena_data/test_trig_data_v1Dev_build/ref_data_v1Dev_build.patch
chainComp INFO     Then check with git diff and, if everything is correct, add and commit
chainComp INFO     or see the patch below:

diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -803,7 +803,3 @@
 HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
-  eventCount: 7
-  stepCounts:
-    0: 7
-  stepFeatures:
-    0: 103
+  eventCount: 0
 HLT_j420_L1J100:

    and

    chainComp ERROR    Trigger counts differ from the reference. If the above differences are intended, update the reference
chainComp INFO     Patch file created. To apply, run in the athena source directory:
chainComp INFO     git apply /var/lib/jenkins/workspace/CI-test-driver/CI-test-driver_39343_56748/Athena/Trigger_athena_MC/test_trigAna_RDOtoRDOTrig_v1Dev_build/ref_RDOtoRDOTrig_v1Dev_build.patch
chainComp INFO     Then check with git diff and, if everything is correct, add and commit
chainComp INFO     or see the patch below:

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -1611,7 +1611,3 @@
 HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20:
-  eventCount: 1
-  stepCounts:
-    0: 1
-  stepFeatures:
-    0: 5
+  eventCount: 0
 HLT_j0_fbdjnosharedSEP10etSEP20etSEP34massSEP50fbet_L1J20:
@@ -1707,7 +1703,3 @@
 HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
-  eventCount: 19
-  stepCounts:
-    0: 19
-  stepFeatures:
-    0: 493
+  eventCount: 0
 HLT_j420_L1J100:
@@ -1977,7 +1969,3 @@
 HLT_j80_j60_L1J15:
-  eventCount: 8
-  stepCounts:
-    0: 8
-  stepFeatures:
-    0: 24
+  eventCount: 0
 HLT_j85_L1J20:
    • Jonathan Bossio
      Jonathan Bossio @jbossios ·
      Resolved by Tim Martin

      Perter: in ATR-20700, you said that you were observing also count changes for j80_j60:

      chainComp INFO Test file: ref_RDOtoRDOTrig_v1Dev_build.new
chainComp INFO Reference file: /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-12-17T2101/Athena/22.0.25/InstallArea/x86_64-centos7-gcc8-opt/data/TrigAnalysisTest/ref_RDOtoRDOTrig_v1Dev_build.ref
chainComp INFO Found 1 chain with count differences:
chainComp INFO HLT_j80_j60_L1J15:
chainComp INFO eventCount: 8 -> 0
chainComp INFO stepCounts:
chainComp INFO 0: 8 -> 0
chainComp INFO stepFeatures:
chainComp INFO 0: 24 -> 0

      Indeed, if we would only see differences in the features, I wouldn't mind merging this in.

      Edited by Jonathan Bossio
  • P
    Peter Sherwood @peter ·
    Author Developer

    So probably more of the same:

    • two chains which pass with the current ref files in master

    HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20

    HLT_j80_j60_L1J15

    The event counts go to zero in the new code for both of these chains. Both chains have 2 chain parts (The first is agg + simple for jet hypo aficionados)

    I believe we do not have any other two chain part chains.

    Edited by Peter Sherwood
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 72cf2d42)

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

  • Thomas James Neep added review-user-action-required label and removed review-pending-level-1 label

    added review-user-action-required label and removed review-pending-level-1 label

  • P
    Peter Sherwood @peter ·
    Author Developer

    @tamartin

    Just checking that there is not a misunderstanding... I believe ypu have access to this branch. If this is not the case - do ypu ypu know Ihow I can allocate it?

    thanks

    Peter

  • Tim Martin
    Tim Martin @tamartin ·
    Developer

    Hi @peter, you can add me here https://gitlab.cern.ch/peter/athena/-/project_members

  • P
    Peter Sherwood @peter ·
    Author Developer

    @tamartin Done. Thanks.

  • M
    Mark Andrew Owen @markowen ·
    Developer

    Hi @tamartin, @peter - just wondering what the status with this one was, any chance of getting it completed soon?

  • P
    Peter Sherwood @peter ·
    Author Developer

    Hi @markowen

    I believe we are waiting on Tim. If Tim disagrees, please let me know.

    Peter

  • Tim Martin
    Tim Martin @tamartin ·
    Developer

    I am up and running from Peter's branch. Real work going in tomorrow.

  • Tim Martin added 526 commits

    added 526 commits

    • 72cf2d42...da8998c6 - 524 commits from branch atlas:master
    • 4e0d0cce - Merge remote-tracking branch 'upstream/master' into master-ATR-20700-5 cbuild#...
    • 038db533 - Add chainID as well as legID like framework ComboHypoAlg

    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/TrigJetHypoToolConfig.py
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/FastReductionMatcher.h
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
    • Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.h
  • ATLAS Robot added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • Tim Martin
    Tim Martin @tamartin ·
    Developer

    In the end the changed I needed to make were really quite small: 038db533

    I just forgot in the original instructions that the Chain-ID was needed too for event-passing purposes.

    The jet HypoAlg hence closely mimics the behaviour of the framework ComboHypoAlg.

    Chain counts unchanged - as expected.

    @peter - I will un-WIP this now then.

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