athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-06-10T23:06:05+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/54090r22 JetTagging: fix_tow_Run32022-06-10T23:06:05+02:00Alessandro Lapertosar22 JetTagging: fix_tow_Run3Fixes for b-tagging DQ towards Run 3 data taking:
- remove reference to tagger name in cxx (easier to change tagger)
- temporary skip pre-selection for early runs (avoid empty plots in low statistics runs)
- additional plots for PV and t...Fixes for b-tagging DQ towards Run 3 data taking:
- remove reference to tagger name in cxx (easier to change tagger)
- temporary skip pre-selection for early runs (avoid empty plots in low statistics runs)
- additional plots for PV and tracks multiplicity divided by <mu> (reduce pile up effect on runs with different <mu>)
Test Webdisplay: https://atlasdqm.cern.ch/webdisplay/test/56/physics_Main/run_348885/run/JetTagging/https://gitlab.cern.ch/atlas/athena/-/merge_requests/54037Add mu3 thresholds and HLT_2mu3 (ATR-23494)2022-06-08T13:08:17+02:00Kunihiro NaganoAdd mu3 thresholds and HLT_2mu3 (ATR-23494)- Add "3GeV" thresholds in TrigMuonHypoConfig
- Add a chain HLT_2mu3_L12MU3V in Dev menu- Add "3GeV" thresholds in TrigMuonHypoConfig
- Add a chain HLT_2mu3_L12MU3V in Dev menuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48007[ATR-24327][ATR-24409] Add UseDirectMenuAccess flag to the TDT and use it in ...2022-06-07T12:14:35+02:00Tim Martin[ATR-24327][ATR-24409] Add UseDirectMenuAccess flag to the TDT and use it in RAWtoALLA bit more invasive than planned, but such are things...
1. As laid out on ATR-24327, I give the TDT the ability to fetch the four JSONs itself when `m_useDirectMenuAccess=True`.
From here it's similar to e.g. the `xAODConfigSvc`, we u...A bit more invasive than planned, but such are things...
1. As laid out on ATR-24327, I give the TDT the ability to fetch the four JSONs itself when `m_useDirectMenuAccess=True`.
From here it's similar to e.g. the `xAODConfigSvc`, we use the JSON to populate a bunch of legacy config objects (here owned by the per-slot `CacheGlobalMemory` object), and from these do the TDT's internal configuration in the way it expects.
2. We don't schedule the `xAODConfigSvc` in RAWtoALL (specifically we refuse to return this when `InputContainsConfigMetadata == False`)
3. The `Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py` is further tided up following the work of @fwinkl, we get it even more streamlined here.
4. `Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.cxx` then has a problem as it was also using the `xAODConfigSvc` in RAWtoALL of R1, R2 data
We remove the `xAODConfigSvc`, it needs access to the list of chains - but it can also get this through the TDT's expert methods.
The TDT's expert methods are expanded to add a function for this (up to now it would only look up specific chains)
The `Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.cxx` now needs to be explicitly linked against `Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx` - we can no longer use the `ITrigDecisionCnvTool` interface as this is too basic (it has `isPassed` and that's about all)https://gitlab.cern.ch/atlas/athena/-/merge_requests/53952Tracking overlay updates for the RDOtoRDOTrigger step2022-06-03T20:45:13+02:00William Axel LeightTracking overlay updates for the RDOtoRDOTrigger stepThe converters need to be updated for the case in which both the input and output collections start with Bkg_, currently only foresees for the RDOtoRDOTrigger step. The configuration is also updated to load the EventCnvSuperTool and set...The converters need to be updated for the case in which both the input and output collections start with Bkg_, currently only foresees for the RDOtoRDOTrigger step. The configuration is also updated to load the EventCnvSuperTool and set its trackOverlay flag for RDOtoRDOTrigger.https://gitlab.cern.ch/atlas/athena/-/merge_requests/53510Track summary update for ITk inner hits in endcaps [ATLIDTRKCP-405]2022-05-23T09:52:41+02:00Thomas StreblerTrack summary update for ITk inner hits in endcaps [ATLIDTRKCP-405]Updated track summary to allow for independent hit counting in ITk innermost and next-to-innermost endcap rings.
`numberOf(NextTo)InnermostPixelLayerHits` is kept for barrel only (as for ID) while the new `numberOf(NextTo)InnermostPixelL...Updated track summary to allow for independent hit counting in ITk innermost and next-to-innermost endcap rings.
`numberOf(NextTo)InnermostPixelLayerHits` is kept for barrel only (as for ID) while the new `numberOf(NextTo)InnermostPixelLayerEndcapHits` fields are for the endcap rings only. The IPXD FTAG categories which were developed in 21.9 where a different convention was used are updated accordingly.
FYI @pagessin @lgagnonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53484Ported ITk detailed hit info from 21.92022-05-23T09:52:21+02:00Thomas StreblerPorted ITk detailed hit info from 21.9Porting `DetailedHitInfo` from 21.9, originally developed by @ncalace, which allows to save extra hit-level information customised for the ITk layout.
FYI @pagessin @lgagnonPorting `DetailedHitInfo` from 21.9, originally developed by @ncalace, which allows to save extra hit-level information customised for the ITk layout.
FYI @pagessin @lgagnonhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53273xAOD, clang-tidy related fixes2022-05-16T21:27:42+02:00Christos Anastopouloschristos.anastopoulos@cern.chxAOD, clang-tidy related fixesxAOD, clang-tidy related fixes, another passxAOD, clang-tidy related fixes, another passhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53225Implementation of Forward Electron EDM in xAODTrigger2022-05-13T21:02:40+02:00Ulla BlumenscheinImplementation of Forward Electron EDM in xAODTriggerImplement the EDM for Forward Electrons in xAODTrigger as requested.
The new files are:
Event/xAOD/xAODTrigger/Root/jFexFwdElRoIAuxContainer_v1.cxx
Event/xAOD/xAODTrigger/Root/jFexFwdElRoI_v1.cxx
Event/xAOD/xAODTrigg...Implement the EDM for Forward Electrons in xAODTrigger as requested.
The new files are:
Event/xAOD/xAODTrigger/Root/jFexFwdElRoIAuxContainer_v1.cxx
Event/xAOD/xAODTrigger/Root/jFexFwdElRoI_v1.cxx
Event/xAOD/xAODTrigger/Root/jFexSRjetRoI_v1.cxx
Event/xAOD/xAODTrigger/xAODTrigger/jFexFwdElRoI.h
Event/xAOD/xAODTrigger/xAODTrigger/jFexFwdElRoIAuxContainer.h
Event/xAOD/xAODTrigger/xAODTrigger/jFexFwdElRoIContainer.h
Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexFwdElRoIAuxContainer_v1.h
Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexFwdElRoIContainer_v1.h
Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexFwdElRoI_v1.hAlison ElliotSergi Rodriguez BoscaAlison Elliothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47020Draft: Make TRTRawDataProvider reentrant2022-04-08T13:07:16+02:00Goetz GayckenDraft: Make TRTRawDataProvider reentrantThe TRTRawDataProvider shows up high in the contention list of the avalanche scheduler. Thus, making it reentrant could improve the event throughput in athenaMT.
This requires a few fixes:
- Only install the TRT compression table versio...The TRTRawDataProvider shows up high in the contention list of the avalanche scheduler. Thus, making it reentrant could improve the event throughput in athenaMT.
This requires a few fixes:
- Only install the TRT compression table version if it does not exist yet, to avoid a use after delete.
- The ROBDataProviderSvc should not store per event information which is reset for each event in a member variable but rather use the existing per event cache.
- Remove unnecessary detection whether the event has changed from TRTRawDataProviderTool, The tool can only be called once per event (or view).https://gitlab.cern.ch/atlas/athena/-/merge_requests/51125Draft: EventBookkeeperTools: lower log level Fix ATLASRECTS-68732022-03-15T14:52:13+01:00Frank Berghausfrank.berghaus@cern.chDraft: EventBookkeeperTools: lower log level Fix ATLASRECTS-6873Should the FileMetaData object be missing from the input file's metadata we can recover. Thus, the message informing the user about the missing object should be DEBUG.
@gemmerenShould the FileMetaData object be missing from the input file's metadata we can recover. Thus, the message informing the user about the missing object should be DEBUG.
@gemmerenhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/49916Disable CaloMuonLikelihoodTool2022-02-10T12:30:13+01:00Emma Catherine GoddenDisable CaloMuonLikelihoodToolDisabling old CaloMuonLikelihood tool in the configuration. [ATLASRECTS-6786](https://its.cern.ch/jira/browse/ATLASRECTS-6786).
This means the CaloLRLikelihood variable is no longer set in [MuonCreatorTool.cxx](https://gitlab.cern.ch/at...Disabling old CaloMuonLikelihood tool in the configuration. [ATLASRECTS-6786](https://its.cern.ch/jira/browse/ATLASRECTS-6786).
This means the CaloLRLikelihood variable is no longer set in [MuonCreatorTool.cxx](https://gitlab.cern.ch/atlas/athena/-/merge_requests/49916/diffs#6d2fc1339eb0922cd081313503966caa70d9e1dd_708_707), so updated the AuxContainer introducing [MuonAuxContainer_v6](https://gitlab.cern.ch/atlas/athena/-/merge_requests/49916/diffs#diff-content-7155acdd6568c63ec546720199cf1c6a6eccfd8e). The changes wrt to _v5 is the removal of the CaloLRLikelihood variable ( [this line](https://gitlab.cern.ch/atlas/athena/-/merge_requests/49916/diffs?diff_id=1443663#c8a0cb87305d4166647f3b4b055c047a7f0c78d6_170_170) )https://gitlab.cern.ch/atlas/athena/-/merge_requests/49108Wrapping CaloRecoConfig, next attempt2021-12-20T13:04:00+01:00Walter LamplWrapping CaloRecoConfig, next attemptAttempt to wrap CaloRecoConfig from RecExCommon.
The AOD compares identical, tiny difference in the ESD as discussed below.
Replaces !48455Attempt to wrap CaloRecoConfig from RecExCommon.
The AOD compares identical, tiny difference in the ESD as discussed below.
Replaces !48455https://gitlab.cern.ch/atlas/athena/-/merge_requests/49193Move Tile ROD to ROB mapping to Tile ROD decoder from BS conversion service2021-12-17T15:38:33+01:00Siarhei HarkushaMove Tile ROD to ROB mapping to Tile ROD decoder from BS conversion serviceThe "ROD2ROBmap" property is used only in Tile ROD decoder, not by BS conversion service.
So, this property has been moved from ByteStreamCnvSvc to TileROD_Decoder.
And since it is mostly used as "-1" it set up like this by default.
The...The "ROD2ROBmap" property is used only in Tile ROD decoder, not by BS conversion service.
So, this property has been moved from ByteStreamCnvSvc to TileROD_Decoder.
And since it is mostly used as "-1" it set up like this by default.
The corresponding reference files for unit tests and job options have been updated accordingly.https://gitlab.cern.ch/atlas/athena/-/merge_requests/45199Draft: Can we remove ROOT includes from IParticle?2021-12-06T09:19:49+01:00Dan GuestDraft: Can we remove ROOT includes from IParticle?This will probably break pretty much everything.This will probably break pretty much everything.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48640Fix type mismatch in gFEX EDM2021-12-02T17:48:00+01:00Cecilia TosciriFix type mismatch in gFEX EDMWith this MR the gFEX Jet EDM type mismatch reported in ATR-24641 is fixed. The gFEX Jet EDM is also written in the output xAOD, reverting !48603.With this MR the gFEX Jet EDM type mismatch reported in ATR-24641 is fixed. The gFEX Jet EDM is also written in the output xAOD, reverting !48603.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48213EDM update with the real position of the Trigger objects2021-11-16T12:22:07+01:00Sergi Rodriguez BoscaEDM update with the real position of the Trigger objectsThis MR is meant to set and save the real position of the different Trigger object sent to L1Topo. As well as a tiny modification in the forward jJ algorithm is done to be bitwise correct.
This MR should also include back the FWD jets.
...This MR is meant to set and save the real position of the different Trigger object sent to L1Topo. As well as a tiny modification in the forward jJ algorithm is done to be bitwise correct.
This MR should also include back the FWD jets.
Tagging Nicola (@orlando) since this should not affect the L1Topo for the central region.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48141Draft: EDM update with the real position of the Trigger objects2021-11-12T13:48:34+01:00Sergi Rodriguez BoscaDraft: EDM update with the real position of the Trigger objectsThis MR is meant to set and save the real position of the different Trigger object sent to L1Topo.
As well as a tiny modification in the forward jJ algorithm is done to be bitwise correct.
This MR should also include back the FWD jets.
...This MR is meant to set and save the real position of the different Trigger object sent to L1Topo.
As well as a tiny modification in the forward jJ algorithm is done to be bitwise correct.
This MR should also include back the FWD jets.
Tagging Nicola (@orlando) since this should not affect the L1Topo for the central region.https://gitlab.cern.ch/atlas/athena/-/merge_requests/47321Adding the Pileup parameters from root files2021-10-21T12:15:13+02:00Sergi Rodriguez BoscaAdding the Pileup parameters from root filesThis MR is used to add in the jFEX Bitwise simulation the pile-up parameters obtained by the trigger performance group.
With this it changes the `PileupAndNoise.cxx` file structure to make it friendly when the COOL database is built.
Ad...This MR is used to add in the jFEX Bitwise simulation the pile-up parameters obtained by the trigger performance group.
With this it changes the `PileupAndNoise.cxx` file structure to make it friendly when the COOL database is built.
Additionally, the `Noise/jTowerCorrection.20210308.r12406.root` and `Calibration/jFEX_MatchedMapping.2021Oct14.r12406.root` are read in the `jDriver.cxx` file to fill the pileup parameters.
Both files are under the path `/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/Run3L1CaloSimulation`
Technical stuff:
- Now the jFEX Bitwise is applying by default the pileup subtraction and noise cuts either for Jet and MET paths. This means that jFEX will run like we expect for Run3
- For Run2 we need to turn off the pileup and change (manually) the noise values to 3000 MeV (only for LAr)
- Adding the SumET Eta boundary in the FPGA.cxx Filehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/44830Draft: classdef version TriggerTower class after evolution v1->v22021-10-08T15:47:02+02:00Jiri MasikDraft: classdef version TriggerTower class after evolution v1->v2Fix mapping of of xAOD::TriggerTower class to the same root version observed in ATR-23761Fix mapping of of xAOD::TriggerTower class to the same root version observed in ATR-23761https://gitlab.cern.ch/atlas/athena/-/merge_requests/46586Sweeping !46572 from 21.0-mc16d to master.
Add a helper postInclude to disabl...2021-09-18T00:19:33+02:00Atlas NightlybuildSweeping !46572 from 21.0-mc16d to master.
Add a helper postInclude to disable file size limit (MC16d)Add a helper postInclude to disable file size limit (MC16d)
See merge request atlas/athena!46572Add a helper postInclude to disable file size limit (MC16d)
See merge request atlas/athena!46572