athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2023-11-20T16:22:52+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/67197B-physics trigger: remove noGSF and noringer versions of bBeeM6000 chains (AT...2023-11-20T16:22:52+01:00Vladimir LyubushkinB-physics trigger: remove noGSF and noringer versions of bBeeM6000 chains (ATR-28162)Remove noGSF and noringer versions of bBeeM6000 chains from Dev_pp_run3_v1 Menu.
Also enable CA version of bBeeM6000 chains: the ComboHypo is ready to be used in CA.Remove noGSF and noringer versions of bBeeM6000 chains from Dev_pp_run3_v1 Menu.
Also enable CA version of bBeeM6000 chains: the ComboHypo is ready to be used in CA.https://gitlab.cern.ch/atlas/athena/-/merge_requests/67093CA migration for Muon Trigger Isolation Sequence2023-11-20T16:16:28+01:00Savanna ShawCA migration for Muon Trigger Isolation SequenceMigrating the isolation sequence to MenuSequenceCA (ATR-25087)
- Migration of the hypo alg for the isolation and also the invariant mass hypo
- Update the edm config to match the new view names
- Exclude the DY combined hypo alg from ...Migrating the isolation sequence to MenuSequenceCA (ATR-25087)
- Migration of the hypo alg for the isolation and also the invariant mass hypo
- Update the edm config to match the new view names
- Exclude the DY combined hypo alg from the CA configuration as the CA version is not yet ready
- Switch the muon sequence to return a CA and move the menu sequence to MenuSequenceCAhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/67071TriggerJobOpts+TrigEDMConfig: Add a flag to control whether run-1 data are co...2023-11-14T14:42:13+01:00Scott SnyderTriggerJobOpts+TrigEDMConfig: Add a flag to control whether run-1 data are converted to xAOD.Allow suppressing the conversion of run-1 data to xAOD.
Mostly for the use of PyDumper, to avoid dumping things twice.Allow suppressing the conversion of run-1 data to xAOD.
Mostly for the use of PyDumper, to avoid dumping things twice.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66963the new Run3 calratio triggers2023-12-15T15:17:17+01:00Tatiana Ovsiannikovathe new Run3 calratio triggersthe first version of the new Run3 calratio triggers ATR-22696.the first version of the new Run3 calratio triggers ATR-22696.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66866Bjet CA2024-02-13T10:40:39+01:00Stewart Martin-HaughBjet CABjet CA migration, trying to keep changes minimal. cc @lbeemsteBjet CA migration, trying to keep changes minimal. cc @lbeemstehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/667432023-10-26: merge of 23.0 into main2023-10-26T21:43:40+02:00Vakhtang Tsulaia2023-10-26: merge of 23.0 into mainNo conflicts
This sweep contains the following MRs:
* !66696 Add HI view to Electron precision tracking views ~Trigger, ~TriggerEDM
* !66693 implemented paths for monitoring histograms ~ForwardDetectorsNo conflicts
This sweep contains the following MRs:
* !66696 Add HI view to Electron precision tracking views ~Trigger, ~TriggerEDM
* !66693 implemented paths for monitoring histograms ~ForwardDetectorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66714Correct the addition of b-tagging variables to the CSSK SD large-R jet collec...2023-10-26T09:42:34+02:00Roshan JoshiCorrect the addition of b-tagging variables to the CSSK SD large-R jet collectionThis MR corrects the addition of b-tagging variables to large-R jet (EMPFlow) collection. Originally in MR !64936, the variables were added to the wrong collection (non-CSSK large-R jet). So the MR removes the added variables from non-CS...This MR corrects the addition of b-tagging variables to large-R jet (EMPFlow) collection. Originally in MR !64936, the variables were added to the wrong collection (non-CSSK large-R jet). So the MR removes the added variables from non-CSSK jet and adds them to CSSK SD jets. Tests performed locally: minimal trigART tests. `runTrigART -m -j4`. CC: @cantelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66696Add HI view to Electron precision tracking views2023-10-26T00:06:05+02:00Mark SuttonAdd HI view to Electron precision tracking viewsThe precision tracking might not appear to be present in all electron events, ao the suspicion is that
not all rewquired views are being provided. This is a first attempt to fix this. May address ATR-28332The precision tracking might not appear to be present in all electron events, ao the suspicion is that
not all rewquired views are being provided. This is a first attempt to fix this. May address ATR-28332https://gitlab.cern.ch/atlas/athena/-/merge_requests/66544Implement DAOD_TLAFTAGPEB with combined TLA decoding and tracking + b-tagging2023-11-16T20:10:03+01:00Teng Jian KhooImplement DAOD_TLAFTAGPEB with combined TLA decoding and tracking + b-taggingFollow up on !64299
Adds a BTagPEBPhysicsTLA event building type to write Si hits in the vicinity of the leading N TLA jets -- N and RoI size to be optimised. Also, adds a `DAOD_TLAFTAGPEB` data format as an extension of `DAOD_TLA` that...Follow up on !64299
Adds a BTagPEBPhysicsTLA event building type to write Si hits in the vicinity of the leading N TLA jets -- N and RoI size to be optimised. Also, adds a `DAOD_TLAFTAGPEB` data format as an extension of `DAOD_TLA` that also activates the Si detectors to activate track reconstruction, then configures quasi-offline b-tagging on the decoded TLA jets.
Other noteworthy details
- Add an ART test to monitor the decoding + PEB reco
- Updated the physics streams to maintain a 1:1 event building type to stream mapping (e.g. FTagPEBTLA)
- Created the `Reconstruction/TLARecoConfig` package to hold related python, rather than placing in `TrigTLAMonitoring` as before.https://gitlab.cern.ch/atlas/athena/-/merge_requests/66527CA migration for combined muon trigger menu sequences2023-10-17T15:42:36+02:00Savanna ShawCA migration for combined muon trigger menu sequencesMigrating the combined muon menu sequences to MenuSequenceCA (ATR-25086):
- Change the combined muon alg sequences (nominal, LRT and full scan) to use the SelectionCA, and use the CA configurations for all algorithms directly without wra...Migrating the combined muon menu sequences to MenuSequenceCA (ATR-25086):
- Change the combined muon alg sequences (nominal, LRT and full scan) to use the SelectionCA, and use the CA configurations for all algorithms directly without wrappers
- Change all the MenuSeqeunces for combined muons to use MenuSequenceCA (covers nominal combined, LRT combined, and full scan combined dequences including idperf versions)
- Update the the hypo config to include CA based hypo alg and tool configs for all needed hypo algs/tools, and restructur a bit to reuse the generic TrigMuonEFHypoTool configuration for combined and standaline muons
- Remove the configuration for TrigMuonEFIdtpHypoToolFromName since it is never used
- Update the EDM config with the new view names from the migration
- Add the MenuSequenceCAToGlobalWrapper to the menu sequences when used in the legacy configurationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66393Migrate MinBias to CA part12023-10-13T18:07:35+02:00Tomasz BoldMigrate MinBias to CA part1This MR is setting up MinBias triggers in CA
As a side it fixes: ATR-28177
It probably supersedes: !66018
Tagging @campanel @mark (I think we have JIRA for this migration but can't find it), @jmasik - to check the use of ID configThis MR is setting up MinBias triggers in CA
As a side it fixes: ATR-28177
It probably supersedes: !66018
Tagging @campanel @mark (I think we have JIRA for this migration but can't find it), @jmasik - to check the use of ID confighttps://gitlab.cern.ch/atlas/athena/-/merge_requests/660822023-09-27: merge of 23.0 into main2023-10-06T15:54:25+02:00Johannes Elmsheuser2023-09-27: merge of 23.0 into mainThis sweep contains the following MRs:
* !66035 fix photon trigger container for Heavy_ions ~Egamma, ~Trigger, ~TriggerEDM, ~TriggerMenu
* !66052 Bugfix for Status Bit in RPD Centroid ~ForwardDetectors
* !66061 ZDC: looser chi-square ...This sweep contains the following MRs:
* !66035 fix photon trigger container for Heavy_ions ~Egamma, ~Trigger, ~TriggerEDM, ~TriggerMenu
* !66052 Bugfix for Status Bit in RPD Centroid ~ForwardDetectors
* !66061 ZDC: looser chi-square cuts to fix signal processing ~ForwardDetectorshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66066Fix view name for muon l2io container in EDM config2023-10-06T15:57:24+02:00Savanna ShawFix view name for muon l2io container in EDM configAs part of teh CA migration, one of the view names was forgotten to be updated for the L2 inside-out muon containers in the EDM config, causing the containers to be missing which is a problem for the monitoring that expects the container...As part of teh CA migration, one of the view names was forgotten to be updated for the L2 inside-out muon containers in the EDM config, causing the containers to be missing which is a problem for the monitoring that expects the containers to exists. Updating the view name to the correct version. Fixes ATR-28283.
cc @okuprash @cantelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66035fix photon trigger container for Heavy_ions2023-09-27T08:41:34+02:00Sebastian Tapia Arayafix photon trigger container for Heavy_ionsIn Heavy-Ion trigger setup, ion, the HLT CaloEMClusters containers for electrons and photons were merged into one losing information of individual objects links.
This MR creates a new container for each object, electron, and photon. Cr...In Heavy-Ion trigger setup, ion, the HLT CaloEMClusters containers for electrons and photons were merged into one losing information of individual objects links.
This MR creates a new container for each object, electron, and photon. Creating new Keys and modifying the EDM.
Tagging HI trigger coordinator @asmaga @jkremer, HI Conveners @mrybar @angerami @qhuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/660102023-09-24: merge of 23.0 into main2023-10-06T15:58:04+02:00Johannes Elmsheuser2023-09-24: merge of 23.0 into mainReverted/Removed:
* !63562 Adding cross compatability between onnx and lwtnn as a library for NNs ~Simulation CC @hdayhall and @tsulaia - this MR creates ctest problems in MR !65944
Conflicts:
* `DataQuality/dqm_algorithms/src/TRTWeigh...Reverted/Removed:
* !63562 Adding cross compatability between onnx and lwtnn as a library for NNs ~Simulation CC @hdayhall and @tsulaia - this MR creates ctest problems in MR !65944
Conflicts:
* `DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx` Kept the ~main version
* `Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py` Kept the ~"23.0" version. CC @cdelitzs (!65911)
* `Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py` Manual merge. Combined lambda with the help message for the `Trigger.Jet.pflowCalibKey` flag. CC @cantel (!65831)
* `Simulation/G4Extensions/RHadrons/src/CustomParticleFactory.cxx` Kept the ~"23.0" version. CC @jchapman (!65834)
This sweep contains the following MRs:
* !66006 fixing bug in electron triggers for Pb+Pb run ~Egamma, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !65946 Update the trigger HI references ~DQ, ~Egamma, ~Trigger
* !65954 copy collisions_run.config to other config files ~DQ, ~MuonSpectrometer
* !65955 automating choice of best chain for tag and probe for HLT muon efficiency monitoring ~DQ, ~Trigger
* !65795 Add UPC pflow jet chains to HI Menu ~DQ, ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !65951 TrigMinBiasMonitoring: Add few missing chains to monitoring ~DQ, ~Trigger, ~TriggerMinBias
* !65958 Update heavyions_run.config with new DQ references for the express, physics_Main and UPC streams ~DQ
* !65950 Add `pixCLnoToT` to `HLT_SpacePointCounts` container ~Trigger, ~TriggerEDM
* !65834 Getting RHadrons Simulation working in ComponentAccumulator-based jobs ~Core, ~ForwardDetectors, ~InnerDetector, ~Simulation
* !65945 Adding HLT_AntiKt4EMPFlowJets_jes_ftf jets to the EDM (ATR-22067) ~Trigger, ~TriggerEDM
* !65943 Update IDGlobal Monitoring axis ranges and several plots for HI config ~DQ, ~InnerDetector
* !65947 Further tune electron selection for UPC ~Egamma, ~Reconstruction
* !65938 TRT config updates are merged from 'main' into '23.0' (resubmission of 65926) ~DQ
* !65931 ZDC: implement EventInfo flags in case of LUCROD decoding failure, and update to ZdcRecConfig ~ForwardDetectors
* !65752 Updates to RPD/Centroid Analysis and ZdcNtuple for Heavy Ions ~ForwardDetectors
* !65925 merging new Algo for TRT (and few changes on config) from 'main' into '23.0' ~DQ
* !65911 Configure correct jet collections for monitoring in HI and UPC mode ~Core, ~DQ, ~JetEtmiss, ~Reconstruction, ~Tile
* !65831 Trigger Jet: Add HI UPC pflow calibration configs (ATR-22067) ~JetEtmiss, ~Reconstruction, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !65881 Heavy Ion : Disable out-of-time pileup topo cluster cut ~Reconstructionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65995TrigEgamma:Moving precision electron to ca2023-10-06T15:54:32+02:00Debottam Bakshi GuptaTrigEgamma:Moving precision electron to caMoving final step of electron signature to CA (linking the jira ATR-26736 created for this)Moving final step of electron signature to CA (linking the jira ATR-26736 created for this)https://gitlab.cern.ch/atlas/athena/-/merge_requests/65950Add `pixCLnoToT` to `HLT_SpacePointCounts` container2023-09-24T16:52:49+02:00Krzysztof Cieslakrzysztof.marcin.ciesla@cern.chAdd `pixCLnoToT` to `HLT_SpacePointCounts` container!64190 added new counter in `TrigCountSpacePoints` tool -- `pixCLnoToT`. However, the new counter was not propagated further into `HLT_SpacePointCounts` container (i.e. for DQ monitoring). This MR fixes this.
CC: @tbold!64190 added new counter in `TrigCountSpacePoints` tool -- `pixCLnoToT`. However, the new counter was not propagated further into `HLT_SpacePointCounts` container (i.e. for DQ monitoring). This MR fixes this.
CC: @tboldhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65945Adding HLT_AntiKt4EMPFlowJets_jes_ftf jets to the EDM (ATR-22067)2023-09-24T16:52:50+02:00Martin RybarAdding HLT_AntiKt4EMPFlowJets_jes_ftf jets to the EDM (ATR-22067)Adding HLT_AntiKt4EMPFlowJets_jes_ftf jets to the EDM (ATR-22067)
- this follows MR! 65831 by @cantel
- standard HI tests are Ok
- offline reconstruction without problems
tagging @begilber @asmaga and @jkremerAdding HLT_AntiKt4EMPFlowJets_jes_ftf jets to the EDM (ATR-22067)
- this follows MR! 65831 by @cantel
- standard HI tests are Ok
- offline reconstruction without problems
tagging @begilber @asmaga and @jkremerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/65901Draft: TrigEgamma:Migrating Electron precision tracks to ca2024-01-18T09:56:00+01:00Debottam Bakshi GuptaDraft: TrigEgamma:Migrating Electron precision tracks to caMigrating Electron precision tracks to ca (linking the jira ATR-26736 created for this)Migrating Electron precision tracks to ca (linking the jira ATR-26736 created for this)https://gitlab.cern.ch/atlas/athena/-/merge_requests/65798Muon Trigger CA migration for muComb step2023-10-06T15:56:48+02:00Savanna ShawMuon Trigger CA migration for muComb stepMigrate the muComb trigger sequence to CA (ATR-25085)
- Move the cosmic ID tracking sequence to return a CA
- Update the view collection used in the generic cosmic tracking sequence to be more obvious and match accordingly with muon cosm...Migrate the muComb trigger sequence to CA (ATR-25085)
- Move the cosmic ID tracking sequence to return a CA
- Update the view collection used in the generic cosmic tracking sequence to be more obvious and match accordingly with muon cosmic views
- Migrate all the muComb related sequences to MenuSequenceCA, and add the wrapping to be able to run in the legacy trigger config
- Migrate also the dimuL2SequenceCfg to MenuSequenceCA as it uses the muComb sequence (cc @lyubushk and @abarton)
- Updating some names of selectionCA names for the muFast sequences so we can use different hypo algs for different chains that share the sequences
- Update the view names in the EDM config to match the migrated view names.