athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-27T17:05:31+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/70131Fix infinite recursion loop in truth helpers where truthparticle == truthpart...2024-03-27T17:05:31+01:00Pierre Antoine DelsartFix infinite recursion loop in truth helpers where truthparticle == truthparticle->parent()2 truth-level helper functions are recursive and can cause infinite recursion when a truth particle is its own parent.
This happens in some emerging jet exotic signal as mentionned in https://its.cern.ch/jira/browse/ATLASDPD-2052.
The p...2 truth-level helper functions are recursive and can cause infinite recursion when a truth particle is its own parent.
This happens in some emerging jet exotic signal as mentionned in https://its.cern.ch/jira/browse/ATLASDPD-2052.
The proposed changes fix the crashes. I hope they make physical sense and that experts can confirm (@zmarshal do you know who else we can tag?)
If this MR is ok, we would ask it is added to a derivation release because the issue is currently preventing signal DPD production in our analysis.
Cheers,
P-A
ps: also tagging @ggustavi and @emmat for their infohttps://gitlab.cern.ch/atlas/athena/-/merge_requests/701292024-03-26: merge of 24.0 into main2024-03-27T19:37:55+01:00Edward Moyse2024-03-26: merge of 24.0 into mainThis sweep contains the following MRs:
* !70090 ATR-28985 Trigger request for Multijet TLA ~Trigger, ~TriggerMenu
* !70113 MuonDQA: remove references to Run-2 monitoring config ~DQ, ~MuonSpectrometer
* !70115 LArMonitoring: delete leg...This sweep contains the following MRs:
* !70090 ATR-28985 Trigger request for Multijet TLA ~Trigger, ~TriggerMenu
* !70113 MuonDQA: remove references to Run-2 monitoring config ~DQ, ~MuonSpectrometer
* !70115 LArMonitoring: delete legacy job options ~DQ, ~LAr
* !70117 Pixel Calibration - adding getters and fixing typos ~InnerDetector
* !70112 ZdcMonitoring: cleanup references to legacy config ~ForwardDetectors
* !70109 Fix CMake warning in AthSimulation builds. ~Build
* !69914 Bug fix to generation of links between neutral FE and muons ~JetEtmiss, ~Reconstruction, ~Run2-DataReco-output-changed, ~Run2-MCReco-output-changed, ~Run3-DataReco-output-changed, ~Run3-MCReco-output-changed, ~Tools, ~frozen-tier0-violating
* !70100 Added maxParallelismExtra setting to AvalancheSchedulerSvcCfg ~Trigger
* !70096 Avoid duplicate streamer chain blocks ~Trigger, ~TriggerMenu
* !70108 Remove nullptr initialiser that causes a crashing ~Simulation
* !70048 Adding more test chains for delayed jets ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !70102 AthenaCommon: refactor --profile-python option ~Core
* !70097 remove legacy python config files form Calorimeter/CaloCnv ~Calorimeter
* !70095 ZDC reconstruction ART script, testing on ZDCCalib data ~ForwardDetectors
* !70092 remove obsolete config files from LArEventTest ~LAr
* !70091 remove obsolete config files from LArCondAthenaPool and LArDetMgrDetDescrCnv ~LAr
* !70089 remove obsolete config-files from LArByteStream ~LAr, ~Simulation
* !70074 AFP monitoring update code style ~DQ, ~ForwardDetectors
* !70069 Fix for the multi-threaded event service configuration ~Tools
* !70036 sTGC raw data monitoring: fix problem with shifter occupancy plots ~DQ, ~MuonSpectrometer
* !70060 Update eFexByteStreamTool.cxx - write multislice tobs as xtobs (since only... ~L1Calo, ~Trigger
* !70057 L1calo monitoring improvements ~Core, ~DQ, ~L1Calo, ~Trigger
* !70035 Update gfex parameters in trigger menu ~L1Calo, ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69759 Monitoring of alternative L1 eTAU simulation ~DQ, ~Tau, ~Trigger
* !70030 ATR-28968: Reduce INFO messages from central trigger configuration code ~ACTS, ~Core, ~Tracking, ~Trigger
* !70011 fix failing DataQualityConfigurations tests in dbg build ~DQ
* !70045 CaloSamplingFractionAnalysis: delete legacy job options ~Simulation
* !69994 offline DQ for MMG trigger ~DQ, ~MuonSpectrometer
* !70073 fix StepName ~JetEtmiss, ~Trigger, ~TriggerJet, ~TriggerMenu
* !70061 IDTrig: do not switch on TRT with ITk, deal with InDet/ITk eta dependant cuts ~Trigger, ~TriggerID
* !70068 Run the TIDA Tier0 monitoring correctly ~Trigger
* !70042 pT filter for groomed jets before moment calculation ~JetEtmiss, ~Reconstruction
* !70044 adding missing et conversion factor for KFMET definition for Ph1Topo ~Trigger, ~TriggerMenu
* !70046 DumpGeo: delete legacy job options ~Geometry
* !69953 New efficiency DQ criteria for HLTmuon hanconfig ~DQ
* !70022 clean out legacy config code from LArCalorimeter/LArClusterRec ~LArhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70116Fixes for TauAntiTauJetOverlapTool2024-03-27T08:55:47+01:00Thomas StreblerFixes for TauAntiTauJetOverlapToolFollow up to !69115
Basically
```if(!m_decHelper->isSurvivingObject(*tau) || !isSurvivingAntiTau(*tau)) continue;```
should be used instead of
```if(!m_decHelper->isSurvivingObject(*tau) && !isSurvivingAntiTau(*tau)) continue;```
Adde...Follow up to !69115
Basically
```if(!m_decHelper->isSurvivingObject(*tau) || !isSurvivingAntiTau(*tau)) continue;```
should be used instead of
```if(!m_decHelper->isSurvivingObject(*tau) && !isSurvivingAntiTau(*tau)) continue;```
Added extra clean up also to remove taus failing both ID and antiTauID, to have them failing OR for sure
FYI @princke @pbokan @bmoserhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70103Optimization of the Trigger Menu generation: move CA generation after the ali...2024-03-27T13:49:23+01:00Francesca PastoreOptimization of the Trigger Menu generation: move CA generation after the alignment (ATR-29039)Within the optimization of the menu generation, this MR moves the ability to generate the CAs after the menu alignment, so during the createDataFlow(). This requires few changes
1. When creating a ChainStep, the sequence generators are ...Within the optimization of the menu generation, this MR moves the ability to generate the CAs after the menu alignment, so during the createDataFlow(). This requires few changes
1. When creating a ChainStep, the sequence generators are stored in self.sequenceFunctions, passed via functools.partial
2. the ChainStep has self.create() function to create the CAs when needed, and store them in the self.sequences
3. all loops on self.sequences must be replaced by self.sequenceFucntions
4. in the alignment, use isEmptySequenceCfg to recognise an empty sequence
5. Changes in the emulation tests to use functools.partial
6. Changes in the jet and MET signatures code to handle functools.partial
7. the NoAlg chains that run PEBInfoWriter appears with one step during the sequence generation, so this requires a change in isNoAlg() function
Configuration comparison:
`Run with arguments: confTool.py --diff HLTJobOptions.json ../test_orig/HLTJobOptions.json Step 1: reference file #components: 79030 Step 2: file to check #components: 79030 Legend: Differences in components Settings in 1st file Settings in 2nd file Component PerfMonMTSvc may differ wallTimeOffset = 1711385097450.0 vs 1711129147120.0 << but all are suppressed by renaming/known differences/...`https://gitlab.cern.ch/atlas/athena/-/merge_requests/70085remove old taggers and add GN2v01 in PhysVal monitoring2024-03-27T10:21:10+01:00Ligang Xiaremove old taggers and add GN2v01 in PhysVal monitoring- remove old taggers: DL1dv00, GN1, GN2v00
- add GN2v01 for monitoring
- update physval automation scripts from python2 to python3
tagging @xuyang and @bdong- remove old taggers: DL1dv00, GN1, GN2v00
- add GN2v01 for monitoring
- update physval automation scripts from python2 to python3
tagging @xuyang and @bdonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70075Updating/expanding JetRecConfig README2024-03-25T09:59:26+01:00Chris Malena DelitzschUpdating/expanding JetRecConfig READMEIn light of the documentation week, some examples are added to JetRecConfig.
Tagging @mswiatlo and @bhodkinsIn light of the documentation week, some examples are added to JetRecConfig.
Tagging @mswiatlo and @bhodkinshttps://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/70042pT filter for groomed jets before moment calculation2024-03-26T14:38:24+01:00Bertrand Martin Dit LatourpT filter for groomed jets before moment calculationCherry-picking of !70012 from main to 24.0, in case one would attempt to produce DAODs at T0.
pT filter for groomed jets before moment calculation
See merge request atlas/athena!70012
(cherry picked from commit 76ee2287646674958b7f2a8...Cherry-picking of !70012 from main to 24.0, in case one would attempt to produce DAODs at T0.
pT filter for groomed jets before moment calculation
See merge request atlas/athena!70012
(cherry picked from commit 76ee2287646674958b7f2a80e86fa64f39a95267)
b4ee62fd pT filter for groomed jets before moment calculationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70040Adding originalObjectLink for origin-corrected clusters2024-03-22T10:46:21+01:00Chris Malena DelitzschAdding originalObjectLink for origin-corrected clustersMR simply adds originalObjectLink for `LCOriginTopoClusters` and `EMOriginTopoClusters` to be able to navigate to the underlying `CaloCalTopoClusters` container.MR simply adds originalObjectLink for `LCOriginTopoClusters` and `EMOriginTopoClusters` to be able to navigate to the underlying `CaloCalTopoClusters` container.https://gitlab.cern.ch/atlas/athena/-/merge_requests/700262024-03-21: merge of 24.0 into main2024-03-22T08:46:02+01:00Frank Winklmeier2024-03-21: merge of 24.0 into mainThis sweep contains the following MRs:
* !70032 fix for ATR-29037 - No such flag: minTRTonTrk ~Trigger, ~TriggerID
* !70018 Fix issue with incomplete hashing in HLT Nav conversion ~Trigger
* !70014 AthenaPython: delete copy_file and ...This sweep contains the following MRs:
* !70032 fix for ATR-29037 - No such flag: minTRTonTrk ~Trigger, ~TriggerID
* !70018 Fix issue with incomplete hashing in HLT Nav conversion ~Trigger
* !70014 AthenaPython: delete copy_file and read_file utilities ~Core
* !69991 LArCafJobs: delete legacy config referencing RecExConfig ~LAr
* !69714 MuonConfig: drop RPC cabling map override ~MuonSpectrometer, ~Run3-MCReco-output-changed, ~Tools
* !70015 TrigPSC+TrigServices: set ConcurrencyFlags::numProcs ~Core, ~Trigger
* !69969 ID trigger: dynamic creation of flags ~Trigger, ~TriggerID
* !70001 L1calo efex tau bdt add max and min thresholds ~L1Calo, ~Trigger
* !69992 Remove HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary from T0 monitoring ~Trigger, ~TriggerMenu
* !69865 More fixes for !68913: hasFlag and iterators ~Core
* !69996 Fixes for wrong stream assignment VBFDelayed -> PhysicsStream ~Trigger, ~TriggerMenu
* !69833 AFP ToF monitoring new hist + bugfix ~DQ, ~ForwardDetectors
* !69984 Fix physval memory leak, ATLASDQ-1136 ~DQ
* !69988 TBDetDescrAlg: delete legacy config and cleanup ~TestBeam
* !69987 ForwardTransport[Svc]: delete legacy configuration ~ForwardDetectors
* !69958 Adding versioning in ZDC calibration files via parameter for TDirectory name ~ForwardDetectors
* !69796 fixes some details of the task, container names and updates file to be used. ~DQ, ~LAr
* !69945 Prevent ONNX from spawning additional threads ~Simulation
* !69930 ZDC CA synchronized with Tier0 version ~ForwardDetectors
* !69886 StoreGate: add SG::HiveMgrSvc::setNumProcs helper ~Core
* !68579 AFT-702: Add heterogeneous input support for GN2 ~Analysis, ~BTagging, ~JetEtmiss
* !69899 Fix LAr CAF jobs ~LAr
* !69857 CA-based script to populate the LAr Bad Feb database ~LAr
* !69981 AFP_GeoModel+Digitization: delete legacy job options ~Digitization, ~ForwardDetectors
* !69949 Protect possible rare FPEs in trigger ~Tracking
* !69963 gFEX pileup threshold update ~EDM, ~JetEtmiss, ~L1Calo, ~Trigger
* !69917 ZdcRec: delete legacy configuration ~ForwardDetectors
* !69967 NTUPtoNTUPCore: delete unused package ~Analysis
* !69971 ForwardRec: delete legacy job options ~ForwardDetectors
* !69966 LArL1Sim: delete legacy job options ~LAr
* !69959 Remove custom JetSuper Roi zedHalfWidth ~JetEtmiss, ~Trigger, ~TriggerID
* !69970 Disable ONNXRuntime CUDA Support, 24.0 branch (2024.03.20.) ~Build
* !69939 ATR-28870: add hh4b GN2 80% chain to physics ~Trigger, ~TriggerMenu, ~changes-trigger-countshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70012pT filter for groomed jets before moment calculation2024-03-22T08:37:25+01:00Chris Malena DelitzschpT filter for groomed jets before moment calculationFPEs were observed in the PHYSLITE production caused by jets with zero constituents after grooming. A pT filter of 1 GeV is applied directly after grooming to avoid this. Reported in [ATLASRECTS-7880](https://its.cern.ch/jira/browse/ATLA...FPEs were observed in the PHYSLITE production caused by jets with zero constituents after grooming. A pT filter of 1 GeV is applied directly after grooming to avoid this. Reported in [ATLASRECTS-7880](https://its.cern.ch/jira/browse/ATLASRECTS-7880)
Tagging @mswiatlo @bhodkinshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/70002CPAlgorithms: allow for event selection at particle-level2024-03-26T14:56:57+01:00Baptiste Ravinabaptiste.ravina@cern.chCPAlgorithms: allow for event selection at particle-levelSome users need to run the event selection algorithms using so-called "particle-level" objects (`TruthElectrons`, `TruthMuons`, etc.). This requires the following changes to the event selectors:
- make the MET term a configurable option:...Some users need to run the event selection algorithms using so-called "particle-level" objects (`TruthElectrons`, `TruthMuons`, etc.). This requires the following changes to the event selectors:
- make the MET term a configurable option: at reco-level it's most likely "Final" (new default), at truth-level it's most likely "NonInt"
- replace `xAOD::ElectronContainer` etc. by `xAOD::IParticleContainer` to be able to pass either reco- or truth-level containers
- in a couple of cases, event selectors need to access `charge()`, which is not available for `xAOD::IParticle`. There I simply added dedicated `xAOD::TruthParticleContainer` handles, and I populate the correct type of handle based on a switch in the python config.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69979Fix cppcheck warnings: iterateByValue2024-03-20T18:11:51+01:00Andrii VerbytskyiFix cppcheck warnings: iterateByValueFix cppcheck warnings: iterateByValue
@sroeFix cppcheck warnings: iterateByValue
@sroehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/699652024-03-20: merge of 24.0 into main2024-03-20T15:24:32+01:00Frank Winklmeier2024-03-20: merge of 24.0 into mainThis sweep contains the following MRs:
* !69825 Updating reference run in centrally managed references ~DQ
* !69916 DetectorStatus: delete legacy DetStatusMapGetter ~Geometry
* !69915 MuonDQA: delete MuonDQAMonFlags and related legacy...This sweep contains the following MRs:
* !69825 Updating reference run in centrally managed references ~DQ
* !69916 DetectorStatus: delete legacy DetStatusMapGetter ~Geometry
* !69915 MuonDQA: delete MuonDQAMonFlags and related legacy monitoring job options ~DQ, ~MuonSpectrometer
* !69913 PhysValMonitoring: remove legacy config from PhysValUtils ~Analysis
* !69905 MuonCondAlg+NSWCalibTools: delete legacy config ~MuonSpectrometer
* !69901 Update IPDVM README for CA config ~InnerDetector
* !69895 MuonCondSvc: delete legacy config and update link dependencies ~MuonSpectrometer
* !69892 MuonCnv+MuonCablings: delete legacy flags and job options ~MuonSpectrometer
* !69891 AthenaConfiguration: cleanup comments to legacy code ~Core
* !69912 TrigInDetAnalysisExample: delete obsolete tida_run2 script ~Trigger
* !69887 Delete a number of obsolete Calo-Geometry config files ~Calorimeter, ~Egamma, ~LAr, ~TestBeam
* !69877 Remove reference to RecExCommon_topOptions in RecExOnline ~Reconstruction
* !69876 Update jetMakeRefSamples.py with CA flags ~JetEtmiss, ~Reconstruction
* !69875 Delete legacy PanTauAlgs configs ~Reconstruction, ~Tau
* !69874 Delete legacy InDetAlignmentMonitoring configs ~DQ, ~InnerDetector
* !69873 Clean up legacy SCT_CalibAlgs configs ~InnerDetector
* !69858 Calo bad chan cleanup ~LAr
* !69849 Micromega digitization - Clean up the EDM ~Digitization, ~Egamma, ~MuonSpectrometer, ~Overlay, ~Trigger
* !69888 ATR-27782 ATR-21596 - Assorted Menu Actions for DiPhoton and DarkJet TLA+PEB ~Trigger, ~TriggerMenu, ~changes-trigger-counts
* !69911 TrigT2CaloEgamma: fix FPE ~Trigger
* !69820 gFEX Updates ~JetEtmiss, ~L1Calo, ~Trigger, ~changes-trigger-counts
* !69862 Added minIsoEt parameter to eTAUs ~Trigger, ~TriggerMenu
* !69868 NSW Simulation: fixed BC assignment for MM ~Trigger
* !69882 TrigEFMissingET: add missing ROOT find package call ~Trigger
* !69897 Remove broken seed phi calculation (already not in use) ~Trigger, ~TriggerID
* !69902 Clean up legacy TriggerMatchingTool configs ~Triggerhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69963gFEX pileup threshold update2024-03-21T15:21:42+01:00Cecilia ToscirigFEX pileup threshold updateThis MR introduces the following changes:
1. Update the threshold used to calculate the pile-up correction (energy density rho)
2. Update the truncation and overflow for the gFEX SumEt in the ByteStream decoder
3. Remove the sign extensi...This MR introduces the following changes:
1. Update the threshold used to calculate the pile-up correction (energy density rho)
2. Update the truncation and overflow for the gFEX SumEt in the ByteStream decoder
3. Remove the sign extension for rho in the gFEX Jet EDM (not needed because rho is always positive)https://gitlab.cern.ch/atlas/athena/-/merge_requests/69960Fix isoTTVAToolCfg import in JETM122024-03-20T15:44:55+01:00Thomas StreblerFix isoTTVAToolCfg import in JETM12Follow up to !69575Follow up to !69575https://gitlab.cern.ch/atlas/athena/-/merge_requests/69959Remove custom JetSuper Roi zedHalfWidth2024-03-21T15:21:42+01:00Mark SuttonRemove custom JetSuper Roi zedHalfWidthThe JetSuper b-jet preselection tracking used to use zedHalfWidth of 150 mm, but this was changed to 180 mm.
In another change, the global Roi zedHalfWidth was also reduced to 180 mm, so the JetSuper width should
no longer need to be set...The JetSuper b-jet preselection tracking used to use zedHalfWidth of 150 mm, but this was changed to 180 mm.
In another change, the global Roi zedHalfWidth was also reduced to 180 mm, so the JetSuper width should
no longer need to be set individually. This change removes the custom JetSuper setting, so should have no
operational change.
Addresses ATR-26766https://gitlab.cern.ch/atlas/athena/-/merge_requests/69937AFT-721: Fix FTAG derivations and AntiKt4UFOCSSKJets2024-03-21T11:53:28+01:00Samuel Van StroudAFT-721: Fix FTAG derivations and AntiKt4UFOCSSKJetsFixing derivation bugs in FTAG formats introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/69459.
This should also fix the ghost labels for the `AntiKt4UFOCSSKJets` by adding these to the `JetRecConfig`
cc @tstreble @dgu...Fixing derivation bugs in FTAG formats introduced in https://gitlab.cern.ch/atlas/athena/-/merge_requests/69459.
This should also fix the ghost labels for the `AntiKt4UFOCSSKJets` by adding these to the `JetRecConfig`
cc @tstreble @dguest @bdong @liganghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69923CPAlgorithms: add truth-b-label to jets for JES uncertainties2024-03-19T17:42:04+01:00Baptiste Ravinabaptiste.ravina@cern.chCPAlgorithms: add truth-b-label to jets for JES uncertaintiesThe JES Flavour uncertainties need a "IsBjet" label to be decorated onto jets, as described in [this twiki](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetUncertaintiesRel21Summer2018SmallR#Tool_requirements_and_assumption).The JES Flavour uncertainties need a "IsBjet" label to be decorated onto jets, as described in [this twiki](https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetUncertaintiesRel21Summer2018SmallR#Tool_requirements_and_assumption).https://gitlab.cern.ch/atlas/athena/-/merge_requests/69914Bug fix to generation of links between neutral FE and muons2024-03-26T14:38:22+01:00Mark HodgkinsonBug fix to generation of links between neutral FE and muonsA bug was found in the generation of these links, which was caused by an iterator in a double loop not being reset to begin().
The fix causes differences in:
JetETMissNeutralParticleFlowObjectsAuxDyn.FE_efrac_matched_muon
JetETMissNeu...A bug was found in the generation of these links, which was caused by an iterator in a double loop not being reset to begin().
The fix causes differences in:
JetETMissNeutralParticleFlowObjectsAuxDyn.FE_efrac_matched_muon
JetETMissNeutralParticleFlowObjectsAuxDyn.FE_nMatchedMuons
which does not lead to visible changes on MET, which is the only physics quantity currently using these links:
https://markhodgkinson.web.cern.ch/web_met_main_March18/index.html
At ESD level differences in the MET map are seen though, but these must lead to shifts which are smaller than the bin sizes in the above plots.
This MR also adds a new decoration onto charged FE, which is required for global pflow studies related to muons. This adds:
JetETMissChargedParticleFlowObjectsAuxDyn.FE_efrac_matched_muon