athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-26T14:38:23+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70035Update gfex parameters in trigger menu2024-03-26T14:38:23+01:00Cecilia TosciriUpdate gfex parameters in trigger menuWith this MR the gFEX parameters in the Trigger Menu are changed as discussed in ATR-29036.With this MR the gFEX parameters in the Trigger Menu are changed as discussed in ATR-29036.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70032fix for ATR-29037 - No such flag: minTRTonTrk2024-03-21T19:59:47+01:00Jiri Masikfix for ATR-29037 - No such flag: minTRTonTrkquick fix for ATR-29037 - No such flag: minTRTonTrkquick fix for ATR-29037 - No such flag: minTRTonTrkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70031Cherry pick - 695522024-03-23T12:23:16+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chCherry pick - 69552bug fix with off by one pointer check
See merge request atlas/athena!69552
(cherry picked from commit 3de6ba47a4dde15da2d68d4208b96387df5f1eb8)
eb67be97 bug fix with off by one pointer check
Tagging: @ekajomov, @pscholerbug fix with off by one pointer check
See merge request atlas/athena!69552
(cherry picked from commit 3de6ba47a4dde15da2d68d4208b96387df5f1eb8)
eb67be97 bug fix with off by one pointer check
Tagging: @ekajomov, @pscholerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70030ATR-28968: Reduce INFO messages from central trigger configuration code2024-03-26T14:38:23+01:00Teng Jian KhooATR-28968: Reduce INFO messages from central trigger configuration codeChange all of these to DEBUG:
- ATR-28977: cloneAndReplace info message
- ATR-28983: RoI unpacking tool messages
- ATR-28979: GapFiller
- ATR-28984: Athena scheduler Data Flow/Control Flow printouts in a full menu job, full menu CA d...Change all of these to DEBUG:
- ATR-28977: cloneAndReplace info message
- ATR-28983: RoI unpacking tool messages
- ATR-28979: GapFiller
- ATR-28984: Athena scheduler Data Flow/Control Flow printouts in a full menu job, full menu CA dump
I anticipate that people may have opinions on the last of these, but hopefully if we enable these printouts automatically in reduced menu jobs (i.e. for debugging), and they are already easy to enable via flags, this is a good compromise.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70027Reduce INFO to DEBUG in RorSeqFilter (ATR-28971)2024-03-23T12:23:16+01:00Francesca PastoreReduce INFO to DEBUG in RorSeqFilter (ATR-28971)https://gitlab.cern.ch/atlas/athena/-/merge_requests/70018Fix issue with incomplete hashing in HLT Nav conversion2024-03-21T19:59:47+01:00Tomasz BoldFix issue with incomplete hashing in HLT Nav conversionThis MR fixes a very subtle bug in nav conversion. We were using a home made hashing functions to decide if two TEs were result of the same reco (i.e. can be merged). That hashing function resulted occasionally in the same hash value fo...This MR fixes a very subtle bug in nav conversion. We were using a home made hashing functions to decide if two TEs were result of the same reco (i.e. can be merged). That hashing function resulted occasionally in the same hash value for actually differently made TEs.
The code is now repalced by boost hash_combine.
In addition,
- revived standalone test (much faster than runnging derivation)
- setup unit tests
- added handy printer function in converter to aid future debugging
- improved messaging
FI: @wprzygod @tamartin @khoo @mrimoldihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70015TrigPSC+TrigServices: set ConcurrencyFlags::numProcs2024-03-21T15:21:42+01:00Frank WinklmeierTrigPSC+TrigServices: set ConcurrencyFlags::numProcsPropagate the number of forks to `Gaudi::ConcurrencyFlags` so clients
can use this to detect if we are in MP-mode.
Relates to ATR-28997.Propagate the number of forks to `Gaudi::ConcurrencyFlags` so clients
can use this to detect if we are in MP-mode.
Relates to ATR-28997.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70013xAODCnv: delete legacy job options referencing RecExConfig2024-03-23T12:23:16+01:00Frank WinklmeierxAODCnv: delete legacy job options referencing RecExConfigFirst pass in deleting the legacy xAODCnv job options. For now just deleting all job options explicitly or implicitly relying on RecEx\[Common,Config\].First pass in deleting the legacy xAODCnv job options. For now just deleting all job options explicitly or implicitly relying on RecEx\[Common,Config\].https://gitlab.cern.ch/atlas/athena/-/merge_requests/70001L1calo efex tau bdt add max and min thresholds2024-03-21T15:21:42+01:00David ReikherL1calo efex tau bdt add max and min thresholdsThis reflects the latest l1calo efex tau BDT modifications added in [this MR](https://gitlab.cern.ch/atlas-l1calo-efex/eFEXFirmware/-/merge_requests/322) to eFEXFirmware.
* Add min. ET threshold for the l1calo efex tau BDT condition sho...This reflects the latest l1calo efex tau BDT modifications added in [this MR](https://gitlab.cern.ch/atlas-l1calo-efex/eFEXFirmware/-/merge_requests/322) to eFEXFirmware.
* Add min. ET threshold for the l1calo efex tau BDT condition shown to improve performance (e.g. see [here](https://indico.cern.ch/event/1382847/contributions/5813534/attachments/2819559/4923306/L1CaloDaq.pdf), slide 18), integrated with the parameter added in [this MR](https://gitlab.cern.ch/atlas/athena/-/merge_requests/69862) (https://its.cern.ch/jira/browse/ATR-28991)
* Implement max. ET cutoff for BDT conditionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69996Fixes for wrong stream assignment VBFDelayed -> PhysicsStream2024-03-21T15:21:42+01:00Damiano VannicolaFixes for wrong stream assignment VBFDelayed -> PhysicsStreamIt has been noticed that some chains have wrong stream assignment. VBFDelayed -> PhysicsStream
Closes ATR-29010It has been noticed that some chains have wrong stream assignment. VBFDelayed -> PhysicsStream
Closes ATR-29010https://gitlab.cern.ch/atlas/athena/-/merge_requests/69992Remove HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary from T0 monitoring2024-03-21T15:21:42+01:00Semen TurchikhinRemove HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary from T0 monitoringFollowing the introduction of prescales for HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary (ATR-19501) we do not need to monitor this chain offline, hence removing it from the monGroup.
cc: @lyubushk , @abarton (for BLS trigger), @ebergeas , @...Following the introduction of prescales for HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary (ATR-19501) we do not need to monitor this chain offline, hence removing it from the monGroup.
cc: @lyubushk , @abarton (for BLS trigger), @ebergeas , @jlieberm (for trigger DQ)https://gitlab.cern.ch/atlas/athena/-/merge_requests/69969ID trigger: dynamic creation of flags2024-03-21T16:45:01+01:00Jiri MasikID trigger: dynamic creation of flagsallow instantiation of flag categories on demand
native generation of AthConfigFlags
submitting to 24.0 so that the structure of the configuration is the same between 24.0 and main to facilitate bug fixing and sweeps.
related to ATR-2...allow instantiation of flag categories on demand
native generation of AthConfigFlags
submitting to 24.0 so that the structure of the configuration is the same between 24.0 and main to facilitate bug fixing and sweeps.
related to ATR-26732, ATR-28768
reduce signature specific code. InDet/ITk/Acts modifications are going to be updated in the next stage.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69963gFEX pileup threshold update2024-03-21T15:21:42+01:00Cecilia ToscirigFEX pileup threshold updateThis MR introduces the following changes:
1. Update the threshold used to calculate the pile-up correction (energy density rho)
2. Update the truncation and overflow for the gFEX SumEt in the ByteStream decoder
3. Remove the sign extensi...This MR introduces the following changes:
1. Update the threshold used to calculate the pile-up correction (energy density rho)
2. Update the truncation and overflow for the gFEX SumEt in the ByteStream decoder
3. Remove the sign extension for rho in the gFEX Jet EDM (not needed because rho is always positive)https://gitlab.cern.ch/atlas/athena/-/merge_requests/69959Remove custom JetSuper Roi zedHalfWidth2024-03-21T15:21:42+01:00Mark SuttonRemove custom JetSuper Roi zedHalfWidthThe JetSuper b-jet preselection tracking used to use zedHalfWidth of 150 mm, but this was changed to 180 mm.
In another change, the global Roi zedHalfWidth was also reduced to 180 mm, so the JetSuper width should
no longer need to be set...The JetSuper b-jet preselection tracking used to use zedHalfWidth of 150 mm, but this was changed to 180 mm.
In another change, the global Roi zedHalfWidth was also reduced to 180 mm, so the JetSuper width should
no longer need to be set individually. This change removes the custom JetSuper setting, so should have no
operational change.
Addresses ATR-26766https://gitlab.cern.ch/atlas/athena/-/merge_requests/69939ATR-28870: add hh4b GN2 80% chain to physics2024-03-21T15:21:43+01:00Liaoshan ShiATR-28870: add hh4b GN2 80% chain to physicsAdd a looser option for the hh4b asymmetric 2b2j chain, relaxing GN2 from 77% to 80% if rate allows.
Tagging @lidiaz @astruebi @gipezzul for menu, @cpollard @kleney for HDBS, @lbezio @lbeemste for b-jet triggerAdd a looser option for the hh4b asymmetric 2b2j chain, relaxing GN2 from 77% to 80% if rate allows.
Tagging @lidiaz @astruebi @gipezzul for menu, @cpollard @kleney for HDBS, @lbezio @lbeemste for b-jet triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69912TrigInDetAnalysisExample: delete obsolete tida_run2 script2024-03-20T08:15:46+01:00Frank WinklmeierTrigInDetAnalysisExample: delete obsolete tida_run2 scriptDelete obsolete script.Delete obsolete script.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69849Micromega digitization - Clean up the EDM2024-03-20T08:15:46+01:00Johannes Junggeburthjohannes.josef.junggeburth@cern.chMicromega digitization - Clean up the EDM- Remove unmaintained trigger path
- Create one digit per channel
- Remove digit -> TP converter. The digit is a completely transient format and should be dumped as a RDO
The first step towards a consistent trigger simulation starts with...- Remove unmaintained trigger path
- Create one digit per channel
- Remove digit -> TP converter. The digit is a completely transient format and should be dumped as a RDO
The first step towards a consistent trigger simulation starts with an understandable EDM (ATR-28607)
Tagging: @pscholer, @sfranceshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69804Drop SlimmingHelper legacy config2024-03-18T08:44:15+01:00Thomas StreblerDrop SlimmingHelper legacy configDropped dependence to legacy `RecExConfig` in `SlimmingHelper` + pass the CA flags as `flags` instead of `ConfigFlags`.
All derivation configs configuring the `SlimmingHelper` are updated accordingly, changing as well `flags` into `Conf...Dropped dependence to legacy `RecExConfig` in `SlimmingHelper` + pass the CA flags as `flags` instead of `ConfigFlags`.
All derivation configs configuring the `SlimmingHelper` are updated accordingly, changing as well `flags` into `ConfigFlags`.
As this is ~"Legacy Config Removal" aimed at ~"24.0" but backport a few derivation configs impacted by this update from ~main to make sweep easier. In particular:
- the `BTagging_AntiKt4UFOCSSK` collection added with !69459 is also added
- `TEST7.py` is added following !69413
- include updates to `PHYS.py` following !68278https://gitlab.cern.ch/atlas/athena/-/merge_requests/69782cTAU algorithm upgrade - added eTAU rCore/BDT and rHad score cuts2024-03-23T12:23:16+01:00Jean Yves Beaucampjean.yves.beaucamp@cern.chcTAU algorithm upgrade - added eTAU rCore/BDT and rHad score cutsHopefully, this is the last change we need to add to the cTAU algorithm (ATR-28641).
This MR adds the eTAU rCore/BDT and rHad selections on the cTauMultiplicity L1Topo algorithm and in the RoI construction during the HLT Seeding. It's d...Hopefully, this is the last change we need to add to the cTAU algorithm (ATR-28641).
This MR adds the eTAU rCore/BDT and rHad selections on the cTauMultiplicity L1Topo algorithm and in the RoI construction during the HLT Seeding. It's disabled by default, so that we don't introduce any immediate changes until the change is implemented in the L1Topo firmware, and the tuning is complete.
In the cTAU algorithm, we cannot cut on arbitrary values of the rCore/BDT and rHad scores, since they're not included in the eTAU TOB (only on the xTOB). We select the minimum eTAU WPs that the TOBs are required to pass (None, Loose, Medium, or Tight, each instead defined in the eTAU configuration) for each cTAU WP. We essentially copy the behavior of the eTauMultiplicity algorithm: e.g. `eTAU_TOB_rCoreMin >= cTAU_eTAU_rCoreMin_WP` (remember we are reusing on some parts of the existing code the `rCore` variable to hold the BDT score).
I also fixed the passing of isolation parameters to the Multiplicity algorithms: now we fetch the settings directly from the `L1ThrExtraInfo_cTAU/jTAU` objects, that we can retrieve from the `L1Threshold_cTAU/jTAU`s. This required also slightly tweaking the parameters in the `jTauNoSort` Athena implementation (we don't use yet anywhere in the Menu/Firmware, but the code is there nonetheless), but it's actually now closer to the L1Topo firmware implementation (and same as how we have the `eTauNoSort`, `eEMNoSort`, etc... implementations).
Tagging @rgugel, @thompson, @astruebi, @lidiaz, @gipezzul, @mashamim.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69759Monitoring of alternative L1 eTAU simulation2024-03-26T14:38:23+01:00Jean Yves Beaucampjean.yves.beaucamp@cern.chMonitoring of alternative L1 eTAU simulationAdded option to monitor alternative eTAU simulation, as requested by L1Calo. This is of course disabled by default, only to be enabled when the simulation is also available. We also added handling of HLT streamers on TrigTauInfo, for add...Added option to monitor alternative eTAU simulation, as requested by L1Calo. This is of course disabled by default, only to be enabled when the simulation is also available. We also added handling of HLT streamers on TrigTauInfo, for additional L1 items.
To test it on DAOD_L1CALO1 files, run:
```plaintext
Run3DQTestingDriver.py --threads 12 --dqOffByDefault --inputFiles /afs/cern.ch/work/t/thompson/public/L1CaloRunDaod/run/data23_13p6TeV.00455975.physics_Main.daq.RAW_1000evts_DAOD_L1CALO1.root --preExec 'from TrigTauMonitoring.TrigTauMonitoringConfig import TrigTauMonAlgBuilder; TrigTauMonAlgBuilder.do_single_tau=False; TrigTauMonAlgBuilder.do_ditau=False; TrigTauMonAlgBuilder.do_tag_and_probe=False; TrigTauMonAlgBuilder.do_truth=False; TrigTauMonAlgBuilder.do_alternative_eTAU_monitoring=True' DQ.Steering.doHLTMon=True DQ.Steering.HLT.doBjet=False DQ.Steering.HLT.doBphys=False DQ.Steering.HLT.doCalo=False DQ.Steering.HLT.doEgamma=False DQ.Steering.HLT.doJet=False DQ.Steering.HLT.doMET=False DQ.Steering.HLT.doMinBias=False DQ.Steering.HLT.doMuon=False DQ.Steering.HLT.doInDet=False
```
The HLT Tau containers are not available in the DAOD. Neither are some of the aux containers of the offline Taus, producing crashes as seen by Mansoora. Therefore, for these standalone tests, they need to be disabled.
Tagging @mashamim, @thompson, @will.