athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-01T20:36:13+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68756InDetTrig: replace access to ConfigSettings with ConfigFlags.2024-03-01T20:36:13+01:00Jiri MasikInDetTrig: replace access to ConfigSettings with ConfigFlags.Consolidate access to configuration values.
Jets part is not complete and the remaining cases will be addressed in a follow up MR
ATR-26732, ATR-28768Consolidate access to configuration values.
Jets part is not complete and the remaining cases will be addressed in a follow up MR
ATR-26732, ATR-28768https://gitlab.cern.ch/atlas/athena/-/merge_requests/69392Move HH->bbtautau chains with tau preselections into physics; upgrade to bgn2...2024-03-01T20:36:13+01:00Chris PollardMove HH->bbtautau chains with tau preselections into physics; upgrade to bgn2 for all chains.We're moving all HH->bbtautau chains with tau preselections into the Physics menu. These should be a strict subset of chains that are already there but allow flexibility in case of a CPU use crunch in the HLT farm.
We also upgrade to bg...We're moving all HH->bbtautau chains with tau preselections into the Physics menu. These should be a strict subset of chains that are already there but allow flexibility in case of a CPU use crunch in the HLT farm.
We also upgrade to bgn2 for all b+tau chains.
JIRA: https://its.cern.ch/jira/browse/ATR-28198https://gitlab.cern.ch/atlas/athena/-/merge_requests/69398updates to trigJetMonitor, monGroups and additions to express stream2024-03-01T20:36:12+01:00Ines Ochoaupdates to trigJetMonitor, monGroups and additions to express streamUpdates to TrigJetMonitor: https://its.cern.ch/jira/browse/ATR-28650
* No longer monitoring large-R jFEX outputs (`L1_jFexLRJetRoI` folder removed)
* No longer looping over monitored chains to add the corresponding PhI chain: this is com...Updates to TrigJetMonitor: https://its.cern.ch/jira/browse/ATR-28650
* No longer monitoring large-R jFEX outputs (`L1_jFexLRJetRoI` folder removed)
* No longer looping over monitored chains to add the corresponding PhI chain: this is completely defined by mongroups now.
* Other updates include: new binning for efficiency monitoring of high-Et chains, new efficiency curves and reference triggers in effmon set to PhI chains.
Updates to Physics menu:
* Updates to jet monGroups (including removal of jLJ chains)
* 2 new chains added to express stream (+1 replacing the corresponding legacy)
@xingguo @pakontaxhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69397ATR-28888 -- Reimplement End-of-Event processing in HLT2024-03-01T20:36:12+01:00Teng Jian KhooATR-28888 -- Reimplement End-of-Event processing in HLTWe operate LAr noise burst detection and MET trigger reconstruction for monitoring in events accepted by the HLT. This sequence was lost in the CA menu generation refactoring, so reintroducing it here.
It fits more naturally in `Generat...We operate LAr noise burst detection and MET trigger reconstruction for monitoring in events accepted by the HLT. This sequence was lost in the CA menu generation refactoring, so reintroducing it here.
It fits more naturally in `GenerateMenuMT.py` than where it was previously in `HLTCFConfig.py`. Arguably even more apt [here](https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py#0669) in `TriggerConfig.py` c.f. an old TODO note, but that option would require us to separately extract the `chainDicts`.
Sequence doesn't seem to be added correctly to `HLTFinalizeSeq` currently, needs more debugging.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69373add support for the upcoming new b-tagger2024-02-29T19:45:31+01:00Binbin Dongadd support for the upcoming new b-taggerFor the upcoming new b-tagger, there is a new output class tau. Adding the support of tau class in AnalysisTop similar as in https://gitlab.cern.ch/atlas/athena/-/merge_requests/69017For the upcoming new b-tagger, there is a new output class tau. Adding the support of tau class in AnalysisTop similar as in https://gitlab.cern.ch/atlas/athena/-/merge_requests/69017https://gitlab.cern.ch/atlas/athena/-/merge_requests/693632024-02-29: merge of 24.0 into main2024-02-29T11:07:11+01:00Tadej Novaktadej.novak@cern.ch2024-02-29: merge of 24.0 into mainThis sweep contains the following MRs:
* !69347 TrigValTools: fix for running transforms ~Trigger
* !69312 B-jet physics menu fastDIPS+GN1 -> fastGN2+GN2 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69300 IOVSvc+IOVDbSvc: delete...This sweep contains the following MRs:
* !69347 TrigValTools: fix for running transforms ~Trigger
* !69312 B-jet physics menu fastDIPS+GN1 -> fastGN2+GN2 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69300 IOVSvc+IOVDbSvc: delete legacy job options ~Analysis, ~Calorimeter, ~Core, ~Database, ~HGTD, ~InnerDetector, ~MuonSpectrometer, ~Test, ~Trigger
* !69289 B-physics trigger: move HLT_e5_lhvloose_e3_lhvloose_bBeeM6000 R(K*) trigger chains from Dev_pp_run3_v1 to Physics_pp_run3_v1 (ATR-19501, ATR-28162) ~Trigger, ~TriggerMenu
* !69235 Fix egamma HI HLT config ~Egamma, ~Trigger, ~TriggerMenu
* !69272 TrigP1Test: update test_trigP1_v1Dev_build to match reprocessing setup ~Trigger
* !69326 Demote ERROR to WARNING and ignore status check ~MuonSpectrometer
* !69322 LumiBlockComps: restore txt configuration for tests ~DQ
* !69301 Add additional monitoring to displaced jet trigger ~JetEtmiss, ~Trigger
* !69316 ATR-28712 Lowering MET preselection in the isolated high-pT trigger chains ~Trigger, ~TriggerMenu
* !69280 PyJobTransforms: Automatically run with CA if only CA skeleton available ~Tools
* !69303 AthenaMonitoring: don't monitor AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets in cosmics ~Core, ~DQ
* !69315 ATR-28198, more b+tau triggers for HH->bbtt ~Trigger, ~TriggerMenu, ~changes-trigger-countshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69301Add additional monitoring to displaced jet trigger2024-02-29T07:27:17+01:00Benjamin Philip KerridgeAdd additional monitoring to displaced jet triggerAdd additional monitoring to capture info about the jets which pass the different stages of the displaced jet trigger.Add additional monitoring to capture info about the jets which pass the different stages of the displaced jet trigger.https://gitlab.cern.ch/atlas/athena/-/merge_requests/693202024-02-28: merge of 24.0 into main2024-02-28T15:08:53+01:00Tadej Novaktadej.novak@cern.ch2024-02-28: merge of 24.0 into mainThis sweep contains the following MRs:
* !69302 Uncomment Larnoiseburst chains, fix BGRP typo ~Trigger, ~TriggerMenu
* !69305 Replacing L1BTAG-MU5VFjJ50 with L1BTAG-MU5VFjJ80. ATR-24698 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
...This sweep contains the following MRs:
* !69302 Uncomment Larnoiseburst chains, fix BGRP typo ~Trigger, ~TriggerMenu
* !69305 Replacing L1BTAG-MU5VFjJ50 with L1BTAG-MU5VFjJ80. ATR-24698 ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69275 ATR-28571: Extend Trig_reco_tf.py functionality to allow athenaHLT running with legacy release inside a container ~Trigger
* !69106 AthenaConfiguration: remove global ConfigFlags instance ~Core, ~Derivation, ~Generators, ~Overlay, ~Reconstruction, ~Simulation, ~Tools, ~Trigger, ~TriggerMenu
* !69245 Removed obsolete DIPS, JetFitter and SV1 taggers and added spaceholders to... ~DQ, ~Trigger
* !69286 Fixup SiliconHitsTruthRelink ~Simulation
* !69296 CaloRingerAlgs: delete legacy job options ~CaloRinger, ~Reconstruction
* !69278 MuonRecRTT: Prevent cross-talk of Reco_tf runs ~MuonSpectrometer
* !69281 Minor fix for SimConfigFlags when running outside of ISF ~Simulation
* !69233 Inner Detector alignment monitoring (Run3) new npixhits_per_track_barrel histogram ~DQ, ~InnerDetector
* !69282 fix LArConditions2Ntuple.py, remove its legacy counterpart ~LAr
* !69277 delete LArConditionsCommon_H8_jobOptions.py and remaining (dysfunctional) clients ~LAr
* !69283 TrkVertexSeedFinderTools: run unit tests in their own directory ~Tracking
* !69168 TrigValTools: remove support of setting flags in legacy jobs ~Trigger
* !69291 B-physics trigger: move HLT_mu4_ivarloose_2mu3noL1_L1BPH-7M14-0DR25-MU5VFMU3VF chain from Dev_pp_run3_v1 to Physics_pp_run3_v1 (ATR-28868) ~Trigger, ~TriggerMenu
* !69293 L1CaloFEXSim: remove legacy job options and update unit tests ~L1Calo, ~Trigger
* !69284 ATR-28443 moving H->Z->qq/vv chains to Physics from Dev ~Trigger, ~TriggerMenu
* !69273 TriggerMenuMT+TriggerJobOpts: cleanup usage of CFElements ~Trigger, ~TriggerMenu
* !69201 maxmultfilter now filters jets depending on eta ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu, ~changes-trigger-counts
* !69249 Clean up legacy configs in JetTagging ~Analysis, ~BTagging, ~DQ, ~Derivation, ~JetEtmiss, ~Trigger
* !69248 Clean up legacy configs in PhysValMonitoring ~Analysis, ~JetEtmiss, ~Tau, ~Trigger
* !69244 TriggerMenuMT: remove caching of pebSequenceCfg ~Trigger, ~TriggerMenu
* !69220 Add L1BTAG-MU3VjJ40 seeded muon + bjet chains and the corresponding validation support chains to physics ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69270 WorkflowTestRunner: Add ability for detailed comparison ~Tools
* !69173 AthenaConfiguration: delete OldFlags2NewFlags ~Core
* !69268 TrfTestsART: Fix configuration of serial merge tests ~Tools
* !68913 Improve implementation of flags cloneAndReplace ~ACTS, ~Core, ~Tracking
* !69257 update trig section of TauCP monitoring ~DQ, ~Reconstruction
* !69242 MagFieldUtils: delete legacy job options ~Magnetshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69248Clean up legacy configs in PhysValMonitoring2024-02-28T07:26:38+01:00Thomas StreblerClean up legacy configs in PhysValMonitoringSelf-explanatorySelf-explanatoryhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69249Clean up legacy configs in JetTagging2024-02-28T07:26:38+01:00Thomas StreblerClean up legacy configs in JetTaggingSelf-explanatorySelf-explanatoryhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69201maxmultfilter now filters jets depending on eta2024-02-28T07:26:38+01:00Ines Ochoamaxmultfilter now filters jets depending on etaThis MR changes the MaxMultFilter in the jet hypo (currently used only in chains using DIPZ - ATR-28352 - that are under validation in the dev menu).
It updates the filter to only take into account jets in a given eta region. Tagging @m...This MR changes the MaxMultFilter in the jet hypo (currently used only in chains using DIPZ - ATR-28352 - that are under validation in the dev menu).
It updates the filter to only take into account jets in a given eta region. Tagging @maboelel and @khoo.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69190Small MET validation change - don't make METReference or TrackMET histograms2024-02-28T07:12:48+01:00Ben HodkinsonSmall MET validation change - don't make METReference or TrackMET histogramsThe METReference and TrackMET histograms have been empty in all MET validation tasks for two years, as AODs don't contain the relevant containers anymore. This occasionally causes confusion as MET validation tasks get flagged as "red" du...The METReference and TrackMET histograms have been empty in all MET validation tasks for two years, as AODs don't contain the relevant containers anymore. This occasionally causes confusion as MET validation tasks get flagged as "red" due to these empty histograms.
This change removes the histograms entirely unless the `m_doMETRefPlots` flag (introduced in [!45261](https://gitlab.cern.ch/atlas/athena/-/merge_requests/45261)) is set to True.
Tagging @snechaev @acervell @mswiatlo @cdelitzs @wbalunas @turrahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/66303Modify LR Jet contianer in AOD Configuration file and JetEffMon framework2024-02-27T17:12:08+01:00Kristin DonaModify LR Jet contianer in AOD Configuration file and JetEffMon frameworkAddition of AntiKt10UFOCSSKSoftDropBeta to the LR jet container inside the athena monitoring aod configuration file. Also, updating the lr jet trigger container in the jet trigger efficiency monitoring codeAddition of AntiKt10UFOCSSKSoftDropBeta to the LR jet container inside the athena monitoring aod configuration file. Also, updating the lr jet trigger container in the jet trigger efficiency monitoring codeATLAS RobotATLAS Robothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69195VP1: fix more warnings and UI issues2024-02-26T11:41:50+01:00Edward MoyseVP1: fix more warnings and UI issuesThis follows on from !69144 and fixes the following problems, as reported in ATLASVPONE-659:
* `VisAttributes::add Warning: Found transparency value different from 0 in material IPTvol`
* Here we just suppress the warning, since it doe...This follows on from !69144 and fixes the following problems, as reported in ATLASVPONE-659:
* `VisAttributes::add Warning: Found transparency value different from 0 in material IPTvol`
* Here we just suppress the warning, since it doesn't seem like it's really a problem
* `VisAttributes::add ERROR: Material Peek already added!`
* Some materials were really duplicated
* `QLayout: Attempting to add QLayout "" to QWidget "IParticleCollectionSettingsForm", which already has a layout`
* The way it was done before was not correct - you cannot assign two UIs to the same widget. I would normally prefer to do it all in Designer by 'promoting' a widget to our custom type, but this would be a more signficant re-write so I think the fix here is fine)
It also removes a lot of debugging output that shouldn't be there, and I noticed that there was a duplicated (and non-functional) widget in the track collections settings.
The only remaining part of ATLASVPONE-659 is now:
* `VP1MESSAGE [VP1Deserialise]: ERROR: Handled widget more than once: Type=QCheckBox, name=checkBox_cut_minpt`
Unfortunately this is very hard to fix, and so I will need to come back to it.
This MR only affects VP1, and so is not a problem for production.
cc @rbianchi @christos @ncalacehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/692252024-02-26: merge of 24.0 into main2024-02-26T08:51:00+01:00Tadej Novaktadej.novak@cern.ch2024-02-26: merge of 24.0 into mainThis sweep contains the following MRs:
* !69186 Clean up of legacy HIJetRec configs ~Egamma, ~JetEtmiss, ~Reconstruction
* !69184 Clean up legacy configs in JetMonitoring ~DQ, ~JetEtmiss, ~Reconstruction
* !69177 TrackingGeometryCondA...This sweep contains the following MRs:
* !69186 Clean up of legacy HIJetRec configs ~Egamma, ~JetEtmiss, ~Reconstruction
* !69184 Clean up legacy configs in JetMonitoring ~DQ, ~JetEtmiss, ~Reconstruction
* !69177 TrackingGeometryCondAlg: remove workaround for use in RecExCommon ~Tracking
* !69213 Clean up more legacy config from RunDependentSimComps ~Digitization, ~Simulationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69184Clean up legacy configs in JetMonitoring2024-02-26T07:24:07+01:00Thomas StreblerClean up legacy configs in JetMonitoringhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69186Clean up of legacy HIJetRec configs2024-02-26T07:24:06+01:00Thomas StreblerClean up of legacy HIJetRec configshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/692142024-02-24: merge of 24.0 into main2024-02-25T09:20:24+01:00Tadej Novaktadej.novak@cern.ch2024-02-24: merge of 24.0 into mainThis sweep contains the following MRs:
* !69183 ATR-28667 Changing type of L1Topo ZeroBias Threshold masks to unsigned int ~Trigger, ~TriggerMenu
* !69151 ATR-28836, additional delayed jets (time significance) in the deve menu ~Trigger...This sweep contains the following MRs:
* !69183 ATR-28667 Changing type of L1Topo ZeroBias Threshold masks to unsigned int ~Trigger, ~TriggerMenu
* !69151 ATR-28836, additional delayed jets (time significance) in the deve menu ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !68616 TRT calibration migration reflected in attrtcal account ~InnerDetector
* !69197 Clean up legacy configs test in SCT_ModuleDistortions ~InnerDetector
* !69193 TileRecUtils: Remove legacy Tile JO configurations (ATLASRECTS-7898) ~Tile
* !69181 Clean up of TrackToCalo legacy config ~Egamma, ~Reconstruction
* !69189 RecExRecoTest & RecJobTransformTests: Run ART in 24.0 ~Derivation, ~JetEtmiss, ~Reconstruction, ~Tau
* !69182 Clean up JetValidation legacy configs ~JetEtmiss, ~Reconstruction
* !69185 Clean up HIMonitoring legacy configs ~DQ, ~Reconstruction
* !69171 PoolSvc: make check for ATLAS_POOL_COND_PATH autofs compliant ~Database
* !69172 TrfTestsART: Fix esdmerge test choice ~Tools
* !69143 confTool: correctly represent ApplicationMgr and MessageSvc properties ~Core
* !69144 VP1: Add support for loading config files (missing since CA move) ~EventDisplay
* !69165 Remove obsolete SCT calibration loop transform and cleanup the existing one ~InnerDetector
* !69141 24.0-coverity-SCT_CalibAlgs ~InnerDetector
* !69164 Fix missing x-axis titles in web-display TEfficiencies ~DQ
* !69135 24.0-coverity-ZDC_SimEvent ~Digitization, ~ForwardDetectors, ~Simulation
* !69132 ComponentAccumulator: fix naming of public tools ~Core
* !69180 B-physics trigger: move bDimu2700 trigger chains from Dev_pp_run3_v1 to Physics_pp_run3_v1 (ATR-28779) ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69175 TrigBtagEmulationTool: remove usage of ConfigurableCABehavior ~Trigger
* !69178 ByteStreamEmonSvc: remove legacy job options ~Trigger
* !69169 TrigAnalysisTest: delete duplicate RDOtoRDOTrig_v1Dev_newJO test ~Trigger
* !69160 Clean up legacy VrtSecInclusive configs ~Reconstruction
* !69150 RecExOnline: remove legacy configuration ~L1Calo, ~Reconstruction
* !69146 TileRecEx+TileMonitoring+TileRec+TileRecAlgs: Remove Tile legacy JO configurations ~DQ, ~JetEtmiss, ~Tile
* !69145 Remove legacy CutFlowSvc testing infrastructrure ~EDM
* !69140 remove Control/AthenaExamples/AthExJobOptions ~Core
* !69138 Remove more files using MuonRecExample ~DQ, ~MuonSpectrometer
* !69134 old L1Topo removal (ATR-28822) ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69052 Moving DiPhoton TLA Chains from Dev to Physics Menu ~Trigger, ~TriggerMenu
* !69070 Removal of legacy DAOD configuration part 6 ~BTagging, ~Derivation, ~InnerDetector, ~JetEtmiss, ~Reconstruction, ~Tau, ~Trigger
* !69161 Clean up legacy TrackCaloClusterRecValidation configs ~Reconstruction
* !69137 Remove MuonRecExample & MuonCombinedRecExample flags ~MuonSpectrometer, ~Reconstruction
* !69129 Migrate tests in LArCondtionsTest to CA ~LAr
* !69093 Fix correlated smearing bug in JER in JetUncertainties in 24.0 and main ~JetEtmiss, ~Reconstruction
* !69147 Reducing MinHits for FTF trigger ITk implementation ~Trigger, ~TriggerID
* !69156 gFEX: fix bug in gTower class ~L1Calo, ~Trigger
* !69163 TrigTauMonitoring: fix highPt single-tau efficiencies ~DQ, ~Tau, ~Trigger
* !69158 Update gFexByteStreamTool.cxx - ensure MET2 has enough space to be stored... ~L1Calo, ~Trigger
* !69139 Added AFP TOF L1 items and streamers ~Trigger, ~TriggerMenuhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69093Fix correlated smearing bug in JER in JetUncertainties in 24.0 and main2024-02-24T14:13:24+01:00Christopher YoungFix correlated smearing bug in JER in JetUncertainties in 24.0 and mainThis is a copy of https://gitlab.cern.ch/atlas/athena/-/merge_requests/68331 but in 24.0 and main
**I want to target both 24.0 and main - currently labels only exist for alsoTargeting:master and not either main or 24.0**
@markowen foun...This is a copy of https://gitlab.cern.ch/atlas/athena/-/merge_requests/68331 but in 24.0 and main
**I want to target both 24.0 and main - currently labels only exist for alsoTargeting:master and not either main or 24.0**
@markowen found that the JER was using the same seed for smearing jets as is done in JetCalibTools. This results in a correlated smearing and a large over-estimation of the uncertainty. Additionally, as most people use MC as pseudo-data it is more correct to use the max(MC,data) resolution. This was not anticipated when the tool was originally written but results in very small changes. Finally advanced users can set the seed themselves, but this currently set the seed the same for all jets which is not a usual use-case so this has also been modified.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69070Removal of legacy DAOD configuration part 62024-02-24T14:13:24+01:00James CatmoreRemoval of legacy DAOD configuration part 6ATLASG-2592
This MR removes residual legacy DAOD configuration files, mostly things that are hiding in the python directories. All of these job options depend on content that has been deleted in previous MRs and so are now completely br...ATLASG-2592
This MR removes residual legacy DAOD configuration files, mostly things that are hiding in the python directories. All of these job options depend on content that has been deleted in previous MRs and so are now completely broken and obsolete.
Although this is primarily related to DAODs it concerns legacy config removal, which should go via 24.0.