athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-26T14:38:24+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70044adding missing et conversion factor for KFMET definition for Ph1Topo2024-03-26T14:38:24+01:00Ralf Gugelralf.gugel@cern.chadding missing et conversion factor for KFMET definition for Ph1TopoThis MR updates the final cut values/thresholds for the Ph1Topo based KFMET algorithm to more realistic values. The algorithm itself is still under commissioning and will certainly require more updates (thresholds but also filter coeffic...This MR updates the final cut values/thresholds for the Ph1Topo based KFMET algorithm to more realistic values. The algorithm itself is still under commissioning and will certainly require more updates (thresholds but also filter coefficients) once technically commissioned. Also the L1Topo simulation for this algorithm will still need updates. Yet, having more realistic thresholds configured in hardware at P1 is desirable to ease the commissioning of the firmware implementation, especially once LHC provides high energy+rate collisions again.
Related to https://its.cern.ch/jira/browse/ATR-28657https://gitlab.cern.ch/atlas/athena/-/merge_requests/70068Run the TIDA Tier0 monitoring correctly2024-03-26T14:38:24+01:00Mark SuttonRun the TIDA Tier0 monitoring correctlyWasn't running because the hist service was not being configured correctly
Fixes ATR-28759Wasn't running because the hist service was not being configured correctly
Fixes ATR-28759https://gitlab.cern.ch/atlas/athena/-/merge_requests/70061IDTrig: do not switch on TRT with ITk, deal with InDet/ITk eta dependant cuts2024-03-26T14:38:24+01:00Jiri MasikIDTrig: do not switch on TRT with ITk, deal with InDet/ITk eta dependant cutsfix ATR-29043
signature specific setting/optimization applied also in case of ITk (Xi2Max*,RoadWidth,DoPhiFiltering)
LRT settings may evolve into a separate function once there is a need to differentiate between signaturesfix ATR-29043
signature specific setting/optimization applied also in case of ITk (Xi2Max*,RoadWidth,DoPhiFiltering)
LRT settings may evolve into a separate function once there is a need to differentiate between signatureshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70073fix StepName2024-03-26T14:38:24+01:00Tatiana Ovsiannikovafix StepNameremove the chain name in the stepName definition for Calratio hypos (ATR-29044)remove the chain name in the stepName definition for Calratio hypos (ATR-29044)https://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/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.https://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/70057L1calo monitoring improvements2024-03-26T14:38:23+01:00Will ButtingerL1calo monitoring improvementsCleaned up the sim-hw comparison algorithms
added new profile2d (extendable) histogram to monitor average efex tob ets over time.Cleaned up the sim-hw comparison algorithms
added new profile2d (extendable) histogram to monitor average efex tob ets over time.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70060Update eFexByteStreamTool.cxx - write multislice tobs as xtobs (since only...2024-03-26T14:38:23+01:00Will ButtingerUpdate eFexByteStreamTool.cxx - write multislice tobs as xtobs (since only...Update eFexByteStreamTool.cxx - write multislice tobs as xtobs (since only xtobs have the bcn4 bits in them to identify which slice they are from)Update eFexByteStreamTool.cxx - write multislice tobs as xtobs (since only xtobs have the bcn4 bits in them to identify which slice they are from)https://gitlab.cern.ch/atlas/athena/-/merge_requests/70048Adding more test chains for delayed jets2024-03-26T14:38:23+01:00Lucas BezioAdding more test chains for delayed jetsAs discussed on [28836](https://its.cern.ch/jira/browse/ATR-28836), chains requiring 2 delayed jets are added and copies of timing-based chains with upper limit are added.As discussed on [28836](https://its.cern.ch/jira/browse/ATR-28836), chains requiring 2 delayed jets are added and copies of timing-based chains with upper limit are added.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70096Avoid duplicate streamer chain blocks2024-03-26T14:38:23+01:00John Patrick Mc GowanAvoid duplicate streamer chain blockshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70100Added maxParallelismExtra setting to AvalancheSchedulerSvcCfg2024-03-26T14:38:23+01:00Simone Sottocornolasimone.sottocornola@cern.chAdded maxParallelismExtra setting to AvalancheSchedulerSvcCfgIncreased maxParallelismExtra to 1 when the flag Trigger.enableAsyncIO is set in TriggerUnixStandardSetup.py, as\
discussed in [ATR-26285](https://its.cern.ch/jira/browse/ATR-26285).
Tested in TBed, everything is working fine.Increased maxParallelismExtra to 1 when the flag Trigger.enableAsyncIO is set in TriggerUnixStandardSetup.py, as\
discussed in [ATR-26285](https://its.cern.ch/jira/browse/ATR-26285).
Tested in TBed, everything is working fine.https://gitlab.cern.ch/atlas/athena/-/merge_requests/70090ATR-28985 Trigger request for Multijet TLA2024-03-26T14:38:22+01:00Francesco CurcioATR-28985 Trigger request for Multijet TLAhttps://its.cern.ch/jira/browse/ATR-28985https://its.cern.ch/jira/browse/ATR-28985https://gitlab.cern.ch/atlas/athena/-/merge_requests/70080Clean-up of TrackRecord header ahead of further updates2024-03-26T14:16:07+01:00John Derek ChapmanClean-up of TrackRecord header ahead of further updatesCleaning up the TrackRecord header in preparation to migrate it from
being based on truth barcodes to be-based on truth status and id.
Most changes relate to renaming `GetBarCode()` to the more standard `barcode()` and `SetBarCode()` to...Cleaning up the TrackRecord header in preparation to migrate it from
being based on truth barcodes to be-based on truth status and id.
Most changes relate to renaming `GetBarCode()` to the more standard `barcode()` and `SetBarCode()` to `SetBarcode()`.
I may make a follow-up MR further standardising method names, but I prefer to get the current changes in first.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69461FTF GPU ITk: Add triplet confirmation2024-03-26T11:42:45+01:00Aleksandra PorebaFTF GPU ITk: Add triplet confirmationAdd a fake triplet filter based on duplicates finding:
Criteria for being a duplicate:
- the same inner and middle spacepoint
- outer spacepoints are on different layers
- pT has the same sign
- pT is equal within stddev
Additionally:
...Add a fake triplet filter based on duplicates finding:
Criteria for being a duplicate:
- the same inner and middle spacepoint
- outer spacepoints are on different layers
- pT has the same sign
- pT is equal within stddev
Additionally:
- Set FTF useGPU flag based on InnerDetector flag
- Add two more outer layers from volumes 91/71 and 90/70 as possible middle spacepoint layers
The code will be further optimized to fully utilize GPU resources
Related to EFTRACK-76
Tagging @demelianhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69515Reorganize L1Calo Monitoring2024-03-26T09:40:54+01:00Will ButtingerReorganize L1Calo MonitoringThis is the first MR in what is a major re-organization of L1Calo monitoring as discussed @ https://indico.cern.ch/event/1364745/contributions/5777902/attachments/2809852/4903876/monitoringFeb2024.pdf
The main changes here are:
* A ...This is the first MR in what is a major re-organization of L1Calo monitoring as discussed @ https://indico.cern.ch/event/1364745/contributions/5777902/attachments/2809852/4903876/monitoringFeb2024.pdf
The main changes here are:
* A new L1CaloMonitoringCfgHelper class has been created to manage the defining of all monitoring hists and trees in a coherent way, according to the new convention
* Most of the L1Calo non-legacy monitoring algs have been moved over to using this new class
* The new class allows us to auto-generate the config file needed for DataQualityConfigurations for all the histograms.
This MR is part of a larger project that is a work in progress, but given the significant work done so far in this MR I am pushing it.
Please note lots of bits of code are commented out, this is because this is indeed still a bit of a work in progress but we need to see how things perform in the wider setups.https://gitlab.cern.ch/atlas/athena/-/merge_requests/61980Modularise in-file metadata configuration2024-03-25T13:23:57+01:00Maciej Pawel SzymanskiModularise in-file metadata configurationThis MR builds on !61368 to modularise the in-file metadata configuration. It requires each workflow to explicitly specify which metadata category should be ~~configured~~ created and added to the output stream (nothing ~~added~~ created...This MR builds on !61368 to modularise the in-file metadata configuration. It requires each workflow to explicitly specify which metadata category should be ~~configured~~ created and added to the output stream (nothing ~~added~~ created by default). By default, all the metadata found in the input will be propagated using the relevant tools (can be turned off with `propagateMetadataFromInput=False`).
I decided to keep a single function (although a bit renamed wrt !61368) for propagation and one for creation for each category ~~with an extra argument instead of splitting it into dedicated bits, but I'm open to suggestions. To keep some compatibility with event data configuration, the requested for creation metadata categories are passed as a list of strings, e.g. `["ByteStreamMetaData"]`~~
~~Note that I not yet incorporated !61962 (probably better to wait for merging).~~ [Edit: Done]https://gitlab.cern.ch/atlas/athena/-/merge_requests/700712024-03-23: merge of 24.0 into main2024-03-24T15:44:57+01:00Frank Winklmeier2024-03-23: merge of 24.0 into mainThis sweep contains the following MRs:
* !69782 cTAU algorithm upgrade - added eTAU rCore/BDT and rHad score cuts ~Tau, ~Trigger, ~TriggerMenu
* !70013 xAODCnv: delete legacy job options referencing RecExConfig ~EDM, ~Tau, ~Trigger
* !7...This sweep contains the following MRs:
* !69782 cTAU algorithm upgrade - added eTAU rCore/BDT and rHad score cuts ~Tau, ~Trigger, ~TriggerMenu
* !70013 xAODCnv: delete legacy job options referencing RecExConfig ~EDM, ~Tau, ~Trigger
* !70031 Cherry pick - 69552 ~MuonSpectrometer, ~Trigger
* !70027 Reduce INFO to DEBUG in RorSeqFilter ( ATR-28971) ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70066Inclusion of grid tests for GPUs and fix of build test for GPUCalo2024-03-24T11:20:31+01:00Denis Oliveira DamazioInclusion of grid tests for GPUs and fix of build test for GPUCaloContinuing on the direction of ATR-28790. Inclusion of grid tests for GPUs and fix of build test for GPU Calo.Continuing on the direction of ATR-28790. Inclusion of grid tests for GPUs and fix of build test for GPU Calo.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69294ConfigBlock: change groupName, noneAction and duplicateAction2024-03-23T19:06:18+01:00Joseph Earl LambertConfigBlock: change groupName, noneAction and duplicateActionThe `groupName` variable was made an option from all blocks.
So that it is possible to set options for any block from an arbitrary point in the code, an
`groupName` option was added that tags a block so that it (and any other blocks wi...The `groupName` variable was made an option from all blocks.
So that it is possible to set options for any block from an arbitrary point in the code, an
`groupName` option was added that tags a block so that it (and any other blocks with the same
`groupName`) can be referenced at any time.
Removed code used to potentially throw an error if an option was set more than once. This can
be the responsibility of the user.
The behavior of `noneAction` was changed. `noneAction` is set when adding a variable rather than
when setting a value for an option. The idea is that the author of the class would know whether
it is okay for an option to be set to `None` and what they want to happen if that happens. It
would be the users responsibility to make sure they pass the correct values in their code.
By default, if an option is set to `None`, it is ignored. This decision was made based on the
behavior in the many `make` functions.
Note:
- Removing `groupName` will break custom blocks not part of the central code. To fix this, remove `groupName` from `__init__`.
- The `make` functions typically set `ignoreAction='ignore'`. Since this was removed from `setOptionValue`, this will need to be removed from any custom `make` functions.