athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2022-07-02T00:15:43+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/54737Draft: HLT_mu3vtx_L12MU8F Trigger Updates2022-07-02T00:15:43+02:00Michael Louis SchottDraft: HLT_mu3vtx_L12MU8F Trigger UpdatesUpdates to HLT_mu3vtx_L12MU8F trigger include changing file/directory names to be compliant with AthenaMT naming conventions; removal of intermediate variables in the TrigLongLivedParticles TrigAlgorithms package configuration files; mov...Updates to HLT_mu3vtx_L12MU8F trigger include changing file/directory names to be compliant with AthenaMT naming conventions; removal of intermediate variables in the TrigLongLivedParticles TrigAlgorithms package configuration files; moving all files associated with the MuonCluster class, MuonClusterHypoAlg class, and MuonClusterHypoTool class into their respective package src/ directories to match directory structure of other HLT triggers; moving/changing the include statements of these same files to be compliant with both Atlas Style Guidelines and the new package directory structure; and changes from C-ctyle casts to C++-style static casts for all float/double variables in the MuonCluster algorithm.https://gitlab.cern.ch/atlas/athena/-/merge_requests/54591Adding/removing few triggers from various menus2022-06-29T13:34:39+02:00Francesco GiuliAdding/removing few triggers from various menusIn this MR, I added/removed few triggers from the following JIRAs:
- ATR-25764 (adding Photon chains with different isolation WPs)
- ATR-25727 (adding/removing e/g chains from physics menu)
- ATR-25769 (muon triggers to be removed from t...In this MR, I added/removed few triggers from the following JIRAs:
- ATR-25764 (adding Photon chains with different isolation WPs)
- ATR-25727 (adding/removing e/g chains from physics menu)
- ATR-25769 (muon triggers to be removed from the menu)
- ATR-25775 (remove "subjesgscIS" from the mhtpufit chain names)
Best,
Frahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/54094ATR-25425 : add more monGroups for ID2022-06-08T18:58:17+02:00Stefanie MorgensternATR-25425 : add more monGroups for IDfyi @hartj , @nagano , @sutt
also ATR-24283fyi @hartj , @nagano , @sutt
also ATR-24283https://gitlab.cern.ch/atlas/athena/-/merge_requests/53864Daily "22.0 to master" sweep: 01/06/222022-06-01T19:44:54+02:00Johannes ElmsheuserDaily "22.0 to master" sweep: 01/06/22This is the manual sweep of MRs from the 22.0 branch to the master branch for 01/06/22.
There had been MR conflicts in the following 4 files when using a simple `git merge upstream/22.0`:
```
MuonSpectrometer/MuonDigitization/MM_Digitiz...This is the manual sweep of MRs from the 22.0 branch to the master branch for 01/06/22.
There had been MR conflicts in the following 4 files when using a simple `git merge upstream/22.0`:
```
MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
MuonSpectrometer/MuonValidation/MuonPRDTest/Root/sTGCSimHitVariables.cxx
Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
```
I've used instead in the MR here: `git merge --strategy-option theirs upstream/22.0` to avoid these 4 MR conflicts and give preference to the 22.0 branch code.
I've also applied `git revert 1f0e044b405f90fe56d33bcb38e69a311c9b32fd` to avoid sweeping MR https://gitlab.cern.ch/atlas/athena/-/merge_requests/53740\
Reverted also the `Project/*/version.txt` updates by hand
Tagging @jojungge, @tamartin, @tadej for info.https://gitlab.cern.ch/atlas/athena/-/merge_requests/53810Draft: Remove TRTNN (eprobabilityNN) for GSF (chains) for both Online and Of...2022-05-31T05:10:34+02:00Christos Anastopouloschristos.anastopoulos@cern.chDraft: Remove TRTNN (eprobabilityNN) for GSF (chains) for both Online and OfflineRemove TRT NN for GSF ``eprobabilityNN`` Online/Offline.
I do not touch "general" tracking but the specific algorithm
that ``refits`` and calculates these for the refitted track particles.
- OAB slide 4 : https://indico.cern.ch/event...Remove TRT NN for GSF ``eprobabilityNN`` Online/Offline.
I do not touch "general" tracking but the specific algorithm
that ``refits`` and calculates these for the refitted track particles.
- OAB slide 4 : https://indico.cern.ch/event/1163021/contributions/4884896/attachments/2448758/4197405/220523_Trigger_OAB.pdf
- PC Slide 3 : https://indico.cern.ch/event/1160792/contributions/4874944/attachments/2444832/4189177/pc-intro16may2022.pdf
- See also conclusion of ATR-25224
Ping @aranzazu , @ludovica , @turra .
Now for sure I remove one unused variable
Quote from ATR-25224
>for egamma the decision is made and we wont use TRT NN PID not online nor online.
Unused but is an ``AuxDyn`` appearing in places.
So at least 2-3 "frozen" Tier-0 test prb testing exact outputs will fail...
Lets see this 1st and then take it from there ...https://gitlab.cern.ch/atlas/athena/-/merge_requests/53667Adding L1CaloCalib stream2022-05-25T18:57:23+02:00Debottam Bakshi GuptaAdding L1CaloCalib streamas mentioned in ATR-25578 this MR introduces L1CaloCalib to StreamInfo.py and related changes to run PEB chains with this stream. Adding @sshaw , @khooas mentioned in ATR-25578 this MR introduces L1CaloCalib to StreamInfo.py and related changes to run PEB chains with this stream. Adding @sshaw , @khoohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/53610Add meson+photon triggers to the Physics menu. ATR-232392022-05-30T10:46:30+02:00Gianantonio Pezzullog.pezzullo@yale.eduAdd meson+photon triggers to the Physics menu. ATR-23239Add dipion 1/2 triggers to LS2 menuAdd dipion 1/2 triggers to LS2 menuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/52747L1 topo groups v2 ATR-251122022-04-29T16:34:06+02:00Luisa CarvalhoL1 topo groups v2 ATR-25112Adding groups for chains with L1 item from Topo2, Topo3 or legacy Topo boardsAdding groups for chains with L1 item from Topo2, Topo3 or legacy Topo boardshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/50856MR ATR-24959 2nd round eEM HLT duplication2022-03-11T20:51:52+01:00Damiano VannicolaMR ATR-24959 2nd round eEM HLT duplicationB K*ee chains – need threshold update, expand/duplicate background seed definitions?
HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary
HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled
HLT_2e5_lhvloose_bBeeM6000_L1...B K*ee chains – need threshold update, expand/duplicate background seed definitions?
HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary
HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled
-> Discuss, should we put in with explicit eEM5 and rename the legacy chains to BKeePrimaryLeg/BKeePrimaryPrescaledLeg?
Combined chains
Physics_pp_run3_v1
tau + electron triggers
HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1EM15VHI_2TAU12IM_4J12
HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVABDT_03dRAB_L1EM15VHI_2TAU12IM_4J12
-> Coordinate with taus, need eEM + jJ + appropriate tau seeds
E+tau+MET
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVABDT_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35 -> postpone
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM_XE35 -> postpone
-> Coordinate with taus, need eEM + jJ + appropriate tau seeds
meson + photon
HLT_g25_medium_tau25_dikaonmass_tracktwoMVA_50invmAB_L1EM22VHI
HLT_g25_medium_tau25_kaonpi1_tracktwoMVA_50invmAB_L1EM22VHI
HLT_g25_medium_tau25_kaonpi2_tracktwoMVA_50invmAB_L1EM22VHI
HLT_g25_medium_tau25_singlepion_tracktwoMVA_50invmAB_L1EM22VHI
HLT_g25_medium_tau25_dipion1_tracktwoMVA_50invmAB_L1EM22VHI
HLT_g25_medium_tau25_dipion2_tracktwoMVA_50invmAB_L1EM22VHI
HLT_g35_medium_tau25_dipion3_tracktwoMVA_60invmAB_L1EM22VHI
HLT_g25_medium_tau25_dipion4_tracktwoMVA_50invmAB_L1EM22VHI
– Wait for follow-up from team (ATR-23239)
LLP
HLT_g40_loose_mu40_msonly_L1MU14FCH -> commented for the moment
-> to be duplicated with explicit L1 seed thresholdshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/50682Add back EM12 as monitored CTP item for lumi group2022-02-22T22:00:53+01:00Daniele ZanziAdd back EM12 as monitored CTP item for lumi groupin !49804, all CTP monitored items have been cleaned up in discussion with the L1CT experts as these would need to be added later on based on available CTP resources. However, in doing so I removed also EM12 that is needed by the lumi gr...in !49804, all CTP monitored items have been cleaned up in discussion with the L1CT experts as these would need to be added later on based on available CTP resources. However, in doing so I removed also EM12 that is needed by the lumi group. This MR brings this backhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/50254Support and T&P chains for L2MuonSA2022-02-06T11:51:43+01:00Yohei YamaguchiSupport and T&P chains for L2MuonSABased on a discussion at the [MTSG meeting on Jan 17](https://indico.cern.ch/event/1113704/#3-update-of-l2sa-studies), some support triggers and a T&P trigger are added by this MR. The T&P trigger is for L2 inside-out which was developed...Based on a discussion at the [MTSG meeting on Jan 17](https://indico.cern.ch/event/1113704/#3-update-of-l2sa-studies), some support triggers and a T&P trigger are added by this MR. The T&P trigger is for L2 inside-out which was developed for close-by muon events during LS2.
tagging @cdiez and @anventurhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/49717L1Topo Simulation update2022-01-27T14:26:16+01:00Paula Martinez SuarezL1Topo Simulation updateThis MR includes several updates to the L1Topo Simulation:
- Add muon flags to MuonSort algorithm
- Update eTau isolation parameters
- Enable new NoSort L1Topo algorithms for Run 3 in the menu
- Implement missing algorithms for jEm and g...This MR includes several updates to the L1Topo Simulation:
- Add muon flags to MuonSort algorithm
- Update eTau isolation parameters
- Enable new NoSort L1Topo algorithms for Run 3 in the menu
- Implement missing algorithms for jEm and gJet TOBs
- Code cleanup
ATR-24123, ATR-23196, ATR-18812
Tagging @orlando @iriu @asonay @jmharris.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48994Try to fix ATR-24713 and CI failures. The property got removed in MR488932021-12-10T10:26:45+01:00Christos Anastopouloschristos.anastopoulos@cern.chTry to fix ATR-24713 and CI failures. The property got removed in MR48893Try to fix ATR-24713 and CI failures see https://gitlab.cern.ch/atlas/athena/-/merge_requests/48990.
The property got removed in
https://gitlab.cern.ch/atlas/athena/-/merge_requests/48893
not sure why not picked by CI ...Try to fix ATR-24713 and CI failures see https://gitlab.cern.ch/atlas/athena/-/merge_requests/48990.
The property got removed in
https://gitlab.cern.ch/atlas/athena/-/merge_requests/48893
not sure why not picked by CI ...https://gitlab.cern.ch/atlas/athena/-/merge_requests/48614Egamma flags cleaning : Fix ATLASRECTS-6714 and ATLASRECTS-67172021-11-29T15:14:25+01:00Jean-Baptiste De Vivie De RegieEgamma flags cleaning : Fix ATLASRECTS-6714 and ATLASRECTS-6717Egamma cleaning : some changes were not propagated to tests. This MR is doing that (hopefully)Egamma cleaning : some changes were not propagated to tests. This MR is doing that (hopefully)https://gitlab.cern.ch/atlas/athena/-/merge_requests/48380[ATR-23965] Auto configure input maker merging for empty steps (Vol.3)2021-11-22T11:25:22+01:00Tim Martin[ATR-23965] Auto configure input maker merging for empty steps (Vol.3)follow up to @fpastore 's !48183 which is a follow up to @tamartin ’s branch !45624 Copying here the description, plus updates:
Aims to let the InputMaker in empty Steps auto-configure how it merges its inputs in empty steps.
In steps ...follow up to @fpastore 's !48183 which is a follow up to @tamartin ’s branch !45624 Copying here the description, plus updates:
Aims to let the InputMaker in empty Steps auto-configure how it merges its inputs in empty steps.
In steps where there is such thing as a most-recent feature (i.e. empty steps which are appended on to pad the end of a leg), we should merge using the features to test equality.
In steps where there is no feature yet (i.e. empty steps which are prepended on to pad the start of a leg), we should merge using the only thing we can be 100% is accessible which is the "initiaRoI" link added by the HLT seeding algorithm.
Further improvements: 45624 -> 48183
* To provide consistency and to save CPU, we now cache a hash of the ElementLink which we identify on each incoming Decision Object as the thing which we are using to match "identical" Decision Objects and hence perform the de-duplication from the filters.
* WARNING messages are raised if an individual IM uses both feature-matching AND roi-matching. It is tested happening in a combination of tau+jet+tau_probe chains without problems, but leave the WARNING to monitor other such cases
* Loosen the runtime validation checks. No longer require the "roi" link to be added in Empty IMs.
* One CI running caused ATLINFR-4329, debug messages are then removed.
Further improvements: 48183 -> this MR
* Squash!https://gitlab.cern.ch/atlas/athena/-/merge_requests/47987Draft: Update many of the names and calls in TrigInDetConfig2021-11-07T21:51:46+01:00Mark SuttonDraft: Update many of the names and calls in TrigInDetConfigSome of the function and file names were very opaque - these have now been modified using a
more consistent and hopefully clearer naming convention
In addition, the no longer used "secondstage" FTF configuration has been removedSome of the function and file names were very opaque - these have now been modified using a
more consistent and hopefully clearer naming convention
In addition, the no longer used "secondstage" FTF configuration has been removedhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/47577Tau Tag and Probe trig : move to primary MET tag trig2021-10-28T14:38:13+02:00Antonio De MariaTau Tag and Probe trig : move to primary MET tag trigThis MR will:
* more to primary MET trigger for MET+tau tag and probe chain (ATR-23507) -> From `HLT_xe110_pfsum_vssk_L1XE50` to `xe65_cell_xe90_pfopufit_L1XE50`
Tagging @iriu, @carquin, @khoo, @jburrThis MR will:
* more to primary MET trigger for MET+tau tag and probe chain (ATR-23507) -> From `HLT_xe110_pfsum_vssk_L1XE50` to `xe65_cell_xe90_pfopufit_L1XE50`
Tagging @iriu, @carquin, @khoo, @jburrhttps://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/46329Draft: Update CaloSequences.py2021-09-07T13:35:22+02:00Javier Montejo BerlingenDraft: Update CaloSequences.pyTest to see the diffTest to see the diffhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45162Set the tau second stage Roi size from job options2021-07-14T14:46:42+02:00Mark SuttonSet the tau second stage Roi size from job optionsAdd the tau menu configuration changes to allow roi sizes to be set
centrallyAdd the tau menu configuration changes to allow roi sizes to be set
centrally