athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-03-04T20:44:27+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/69271Refactor the GeneratorFilters2024-03-04T20:44:27+01:00Andrii VerbytskyiRefactor the GeneratorFiltersRefactor the GeneratorFilters moving the code related to MCTruthClassifier functions into a separate files and avoid code duplication.
@jchapman @ewelina @pclarkRefactor the GeneratorFilters moving the code related to MCTruthClassifier functions into a separate files and avoid code duplication.
@jchapman @ewelina @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69457Fixing upper issue in MadGraphControl2024-03-04T20:16:03+01:00Zach MarshallFixing upper issue in MadGraphControlGot a little .upper() happy with the last MR. Of course, the params
dictionary does not have everything in upper to begin with. This fixes a
crash seen in the ART tests. Thanks to @hmildner for the report!Got a little .upper() happy with the last MR. Of course, the params
dictionary does not have everything in upper to begin with. This fixes a
crash seen in the ART tests. Thanks to @hmildner for the report!https://gitlab.cern.ch/atlas/athena/-/merge_requests/69456Updating Pythia8_i README (custom library instructions)2024-03-04T20:13:21+01:00Giancarlo PanizzoUpdating Pythia8_i README (custom library instructions)Adding more details to the custom pythia8 library part (relevant e.g. for testing patches)Adding more details to the custom pythia8 library part (relevant e.g. for testing patches)https://gitlab.cern.ch/atlas/athena/-/merge_requests/69435Herwig7_i: Add option to turn off shower scale variation2024-03-04T19:50:46+01:00Lukas KretschmannHerwig7_i: Add option to turn off shower scale variationWe add a very simple option to turn off the shower scale variations for internal matrix element processes. These variations are turned on by default and this option allows for them to be turned off.
This is neccessary since a lot of kno...We add a very simple option to turn off the shower scale variations for internal matrix element processes. These variations are turned on by default and this option allows for them to be turned off.
This is neccessary since a lot of known warnings will be printed out in some cases and with turning off the shoer scale variations the problem of huge logfiles can be mitigated quite a lot.
The changes have been tested with a JO that strugeled with huge logfiles.Lukas KretschmannLukas Kretschmannhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69400Fix HepMcParticleLink_test compilation with HepMC2 (ATLASSIM-7101)2024-03-01T20:15:56+01:00John Derek ChapmanFix HepMcParticleLink_test compilation with HepMC2 (ATLASSIM-7101)Add HepMC2-specific syntax. Should fix ATLASSIM-7101.
Tested locally, but the CI uses HepMC3, so will not see any change in code compiled.Add HepMC2-specific syntax. Should fix ATLASSIM-7101.
Tested locally, but the CI uses HepMC3, so will not see any change in code compiled.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69387GeneratorFilters: fix logic of the (xAOD)XtoVVDecayFilterExtended.cxx2024-03-01T20:15:16+01:00Ewelina Maria LobodzinskaGeneratorFilters: fix logic of the (xAOD)XtoVVDecayFilterExtended.cxxfix logic of the (xAOD)XtoVVDecayFilterExtended.cxx
to be consistent with what is done for HepMC2 version of the filter,
in the current HepMC3 approach one generation of the ancestors was skipped
For info @qidongfix logic of the (xAOD)XtoVVDecayFilterExtended.cxx
to be consistent with what is done for HepMC2 version of the filter,
in the current HepMC3 approach one generation of the ancestors was skipped
For info @qidonghttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69375Improving coverage of HepMcParticleLink TP Converter unit tests2024-02-29T19:44:38+01:00John Derek ChapmanImproving coverage of HepMcParticleLink TP Converter unit testsImproving coverage of HepMcParticleLink TP Converter unit tests ahead of further updates to HepMcParticleLink class.Improving coverage of HepMcParticleLink TP Converter unit tests ahead of further updates to HepMcParticleLink class.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69330Update Powheg version to 06-042024-02-28T17:47:33+01:00Ewelina Maria LobodzinskaUpdate Powheg version to 06-04Update Powheg version to 06-04Update Powheg version to 06-04https://gitlab.cern.ch/atlas/athena/-/merge_requests/69338Add unit test for HepMcParticleLink less-than operator2024-02-28T17:45:06+01:00John Derek ChapmanAdd unit test for HepMcParticleLink less-than operatorExpanding the unit tests for HepMcParticleLink ahead of further clean-up of the class.Expanding the unit tests for HepMcParticleLink ahead of further clean-up of the class.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/69106AthenaConfiguration: remove global ConfigFlags instance2024-02-28T07:26:38+01:00Frank WinklmeierAthenaConfiguration: remove global ConfigFlags instanceRemove the global `ConfigFlags` instance and the safe-guards to delete the instance manually from the various skeletons and drivers.
There are still quite a few references to [import ConfigFlags](https://acode-browser1.usatlas.bnl.gov/l...Remove the global `ConfigFlags` instance and the safe-guards to delete the instance manually from the various skeletons and drivers.
There are still quite a few references to [import ConfigFlags](https://acode-browser1.usatlas.bnl.gov/lxr/search?!v=24.0&_filestring=.py&_string=import+ConfigFlags&_casesensitive=1) in our repository. But likely these are all unused legacy job options.
Requires: !69145 !69129 !69173
cc @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69263Move more functions from MCTruthClassifier to TruthUtils2024-02-27T09:06:34+01:00Andrii VerbytskyiMove more functions from MCTruthClassifier to TruthUtilsMove more functions from MCTruthClassifier to TruthUtils
@jchapman @pclarkMove more functions from MCTruthClassifier to TruthUtils
@jchapman @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69260MadGraphControl protecting parameter popping2024-02-27T07:09:19+01:00Zach MarshallMadGraphControl protecting parameter poppingThe current implementation seems to be finicky some fraction of the
time. This attempts something a bit more rigorous to be sure that the settings all work.
@hmildner had spotted an issue with this in the wild, so feel free to comment i...The current implementation seems to be finicky some fraction of the
time. This attempts something a bit more rigorous to be sure that the settings all work.
@hmildner had spotted an issue with this in the wild, so feel free to comment in case you think there are some other changes that should be applied to protect against this.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69055HepMcParticleLink Drop support for separate McEventCollections for pile-up truth2024-02-26T10:36:09+01:00John Derek ChapmanHepMcParticleLink Drop support for separate McEventCollections for pile-up truthThe idea of having separate McEventCollection instances for each type of pile-up used was never used in production and with the ability to decorate GenEvents directly with this information using Attributes is now completely redundant.
R...The idea of having separate McEventCollection instances for each type of pile-up used was never used in production and with the ability to decorate GenEvents directly with this information using Attributes is now completely redundant.
Removing this will simplify the HepMcParticleLink EDM. Unfortunately due to the large number of client classes then this merge request is quite large. Here is a breakdown to ease the review process:
1. The main changes are in the `Generators/GeneratorObjects` package. Removing the obsolete code and in particular revising the `ExtendedBarCode` and `HepMcParticleLink` constructor syntax.
1. The next set of changes are in `MuonSpectrometer/MuonPhaseII/Event/xAOD/xAODMuonSimHit/Root/xAODMuonSimHit_V1.cxx` and `InnerDetector/InDetEventCnv/InDetSimEventTPCnv/src/InDetHits/*.cxx` hard-coding variables in some persistent class objects to the only value ever used in production. (Future versions of these persistent classes will drop this variable, but that will be a separate merge request.)
1. The next set of changes are in the various TP converter test classes - avoiding checks on the variable(s) now removed from the transient HepMcParticlelink class.
1. The rest of the changes are dropping the obsolete arguments from HepMcParticleLink constructor calls.
Tagging @ewelina, @averbyts, @pclarkhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69200add a change forgotten in MR 691222024-02-24T13:58:39+01:00Ewelina Maria Lobodzinskaadd a change forgotten in MR 69122I forgotten to add to https://gitlab.cern.ch/atlas/athena/-/merge_requests/69122 one modified file, so adding it nowI forgotten to add to https://gitlab.cern.ch/atlas/athena/-/merge_requests/69122 one modified file, so adding it nowhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69188Small updates to Pythia8 Readme (Release versions)2024-02-24T13:57:01+01:00Giancarlo PanizzoSmall updates to Pythia8 Readme (Release versions)Part of the Documentation Review Campaign, Generator Infrastructure and Tools subgroup, PMGPart of the Documentation Review Campaign, Generator Infrastructure and Tools subgroup, PMGhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69202Updating Powheg Documentation2024-02-24T13:56:33+01:00Andrej SaibelUpdating Powheg DocumentationDear all,
This is an update to the POWHEG documentation reviewed for the ATLAS documentation week.
Kind regards,
AndrejDear all,
This is an update to the POWHEG documentation reviewed for the ATLAS documentation week.
Kind regards,
Andrejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69122GeneratorFilters: protect xAOD filters aginst barcode zero and duplicated par...2024-02-23T17:25:12+01:00Ewelina Maria LobodzinskaGeneratorFilters: protect xAOD filters aginst barcode zero and duplicated particlesGeneratorFilters: protect xAOD filters aginst barcode zero and duplicated particles
It was observed recently, that when EvtGen is used in MC production some barcode=0 or duplicated particles appear in the TruthParticle container. This me...GeneratorFilters: protect xAOD filters aginst barcode zero and duplicated particles
It was observed recently, that when EvtGen is used in MC production some barcode=0 or duplicated particles appear in the TruthParticle container. This merge request protect the filters against these particles.
Since all xAOD filters are affected the MR is rather big, but the changes are similar in all files.
It is rather urgent as we have 2 production requests using xAOD filters waiting for a new release with this fix.
In addition Powheg version is increased to 06-04.https://gitlab.cern.ch/atlas/athena/-/merge_requests/69120Move findAllJetMothers to TruthUtils2024-02-23T16:32:05+01:00Andrii VerbytskyiMove findAllJetMothers to TruthUtilsMove findAllJetMothers to TruthUtils
@pclark @jchapmanMove findAllJetMothers to TruthUtils
@pclark @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/69162GeneratorFilters: fixed clang warning2024-02-23T08:47:27+01:00Vakhtang TsulaiaGeneratorFilters: fixed clang warningLocal variable set but not usedLocal variable set but not used