ATR-22206, adding functionality for multi-leg merging
Now that !39204 (merged) has been merged, this should be ready to go (changes to the InputMaker to allow for objects other than xAOD::IParticle to be used in mergeUsingFeature)
Significant changes to the chain merging to allow for multi-leg combined chains ( > 2).
Changes to the naming of empty sequences in all types of merged chains, as per discussions in ATR-22206.
Added a single chain, HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI
, requested in ATR-22107, so this new code is tested in the nightlies.
At this point, other chains should work too, but adding chains can be done separately to the code modifications.
There are a few changes in the log files, all for known reasons:
(1) addition of one chain HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI
(2) change in 2muXnoL1 chains: the sequences are now correctly seeded with multiplicity 2 - but this means that the combo hypo tries to find 2 fullscan RoIs - and this is impossible. We knew we would come up against this at some point, and the combo hypo just needs to know that N fullscan RoIs = 1 fullscan RoI (not for this MR, it's not a menu change)
!39196 (merged) has fixed this behaviour - the references are now updated to not change the counts of multi-fullscan RoI chains.
(3) HLT_e12_lhloose_2mu10_L12MU10
in the data test: now this one is interesting. It looks like in the previous setup, the first combo hypo wasn't looking at the L1_2MU10 requirement - because the multiplicity was not set correctly for the empty sequences. Now, the empty sequences get the proper multiplicity of 2, and in the first step 2MU10 fails - so no more counts. This is confirmed by other chains with an L12MU10 requirement not passing the first step either.
Merge request reports
Activity
This merge request affects 3 packages:
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @sutt ,@ademaria ,@okumura ,@carquin ,@bernius ,@hrussell ,@ckaldero ,@malconad ,@jpanduro as watchers
added Trigger TriggerMenu changes-trigger-counts master review-pending-level-1 labels
CI Result FAILURE (hash 078ea69b)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25081]Test that failed succeeded locally, should not be affected by this MR, seems to be running over old files on an unclean machine:
23:58:37 ApplicationMgr INFO Application Manager Configured successfully 23:58:37 Py:Athena INFO configuration complete, now exiting ... 23:58:37 Py:TriggerMenuConfigTest INFO 3 successes, 1 failure for /build/ci-builds/master/Athena/build/Athena/Trigger/TriggerCommon/TriggerMenuMT/unitTestRun_generateMenuMT/HLTMenu_LS2_v1_22.0.23.json 23:58:37 Py:TriggerMenuConfigTest ERROR 'Config consistency of Partial Event Building' failed for: PEB chain HLT_cscmon_CSCPEB_L1All streamed to a full-event-building stream CSC 23:58:37 Py:TriggerMenuConfigTest INFO 3 successes, 1 failure for /build/ci-builds/master/Athena/build/Athena/Trigger/TriggerCommon/TriggerMenuMT/unitTestRun_generateMenuMT/HLTMenu_LS2_v1_22.0.24.json 23:58:37 Py:TriggerMenuConfigTest ERROR 'Config consistency of Partial Event Building' failed for: PEB chain HLT_cscmon_CSCPEB_L1All streamed to a full-event-building stream CSC 23:58:37 Py:TriggerMenuConfigTest INFO 3 successes, 1 failure for /build/ci-builds/master/Athena/build/Athena/Trigger/TriggerCommon/TriggerMenuMT/unitTestRun_generateMenuMT/HLTMenu_LS2_v1_22.0.25.json 23:58:37 Py:TriggerMenuConfigTest ERROR 'Config consistency of Partial Event Building' failed for: PEB chain HLT_cscmon_CSCPEB_L1All streamed to a full-event-building stream CSC 23:58:37 Py:TriggerMenuConfigTest INFO 2 successes, 0 failures for /build/ci-builds/master/Athena/build/Athena/Trigger/TriggerCommon/TriggerMenuMT/unitTestRun_generateMenuMT/L1Menu_LS2_v1_22.0.23.json 23:58:37 Py:TriggerMenuConfigTest INFO 2 successes, 0 failures for /build/ci-builds/master/Athena/build/Athena/Trigger/TriggerCommon/TriggerMenuMT/unitTestRun_generateMenuMT/L1Menu_LS2_v1_22.0.24.json 23:58:37 Py:TriggerMenuConfigTest INFO 2 successes, 0 failures for /build/ci-builds/master/Athena/build/Athena/Trigger/TriggerCommon/TriggerMenuMT/unitTestRun_generateMenuMT/L1Menu_LS2_v1_22.0.25.json 23:58:37 ERROR: Menu verification failed
This merge request affects 3 packages:
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @sutt ,@ademaria ,@okumura ,@carquin ,@bernius ,@hrussell ,@ckaldero ,@malconad ,@jpanduro as watchers
CI Result SUCCESS (hash 078ea69b)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25103]This merge request affects 3 packages:
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerMenuMT
Affected files list will not be printed in this case
Adding @sutt ,@ademaria ,@okumura ,@carquin ,@bernius ,@hrussell ,@ckaldero ,@malconad ,@jpanduro as watchers
CI Result FAILURE (hash 16605388)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25183]