athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-09-02T03:02:30+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/46198modify ART tests so that they could run also on master--HepMC3/Athena2021-09-02T03:02:30+02:00Ewelina Maria Lobodzinskamodify ART tests so that they could run also on master--HepMC3/Athenamodify ART tests so that they could run also on master--HepMC3/Athenamodify ART tests so that they could run also on master--HepMC3/Athenahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46159CountHepMC: use long long int for event number2021-09-02T03:05:30+02:00Christian GutschowCountHepMC: use long long int for event numberThis is using @averbyts's wrapper function from !44461.
Struggling a little to test this as all evgen jobs seem to crash with the HepMC3 nightly when the generators try to call `evt->run_info()->set_weight_names(names)` ...? Seems to be...This is using @averbyts's wrapper function from !44461.
Struggling a little to test this as all evgen jobs seem to crash with the HepMC3 nightly when the generators try to call `evt->run_info()->set_weight_names(names)` ...? Seems to be an unrelated issue though ...
FYI @jkretz @ewelina @gpanizzo @jchapmanhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46120GeneratorFilters: update ChargedTracksFilter to version from 21.62021-08-28T03:05:16+02:00Ewelina Maria LobodzinskaGeneratorFilters: update ChargedTracksFilter to version from 21.6GeneratorFilters: update ChargedTracksFilter to version from 21.6GeneratorFilters: update ChargedTracksFilter to version from 21.6https://gitlab.cern.ch/atlas/athena/-/merge_requests/46112Sweeping !46078 from master to 21.6.
Fix possible bug in modify_param_card2021-09-09T03:06:41+02:00Atlas NightlybuildSweeping !46078 from master to 21.6.
Fix possible bug in modify_param_cardFix possible bug in modify_param_card
See merge request atlas/athena!46078Fix possible bug in modify_param_card
See merge request atlas/athena!46078https://gitlab.cern.ch/atlas/athena/-/merge_requests/46098GeneratorFilters: update DecaysFinalStateFilter and VBFMjjIntervalFilter to v...2021-09-03T03:03:53+02:00Ewelina Maria LobodzinskaGeneratorFilters: update DecaysFinalStateFilter and VBFMjjIntervalFilter to versions from 21.6GeneratorFilters: update DecaysFinalStateFilter and VBFMjjIntervalFilter to versions from 21.6GeneratorFilters: update DecaysFinalStateFilter and VBFMjjIntervalFilter to versions from 21.6https://gitlab.cern.ch/atlas/athena/-/merge_requests/46080Update systematics tool2021-08-27T03:09:19+02:00Louie Dartmoor CorpeUpdate systematics toolThis MR may seem large but it's mostly lots of small changes affecting many lines after de-linting using flake8
- fixes broken setupSystematicsTool.sh
- delinting of the python (cleanup of conventions etc) after running flake8
- sync w...This MR may seem large but it's mostly lots of small changes affecting many lines after de-linting using flake8
- fixes broken setupSystematicsTool.sh
- delinting of the python (cleanup of conventions etc) after running flake8
- sync with systematicsTool repo version hash feb8fabfa0e7a38d335bdf286f1fe66d1e33ad27Ewelina Maria LobodzinskaEwelina Maria Lobodzinskahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46078Fix possible bug in modify_param_card2021-09-08T12:44:37+02:00Chris PollardFix possible bug in modify_param_cardI ran into a problem while adding only new masses to madgraph param cards. At
https://gitlab.cern.ch/atlas/athena/-/blob/5e760ba3c00b6b4f561c30d11127e3aba6f4510f/Generators/MadGraphControl/python/MadGraphUtils.py#L1995
doneParams is in...I ran into a problem while adding only new masses to madgraph param cards. At
https://gitlab.cern.ch/atlas/athena/-/blob/5e760ba3c00b6b4f561c30d11127e3aba6f4510f/Generators/MadGraphControl/python/MadGraphUtils.py#L1995
doneParams is initialized as an empty dict, but later when building leftovers, it assumes that "MASS" is already a key of doneParams.
https://gitlab.cern.ch/atlas/athena/-/blob/5e760ba3c00b6b4f561c30d11127e3aba6f4510f/Generators/MadGraphControl/python/MadGraphUtils.py#L2005
These changes should mean that if you're only adding new particle masses, you don't get a KeyError.
Originally reported in https://its.cern.ch/jira/browse/AGENE-2042
CC: @ewelina @gpanizzo @mcfayden @hmildner @zmarshal @cgutscho @jkretz
- Chrishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46075Powheg: fix b read problem, GeneratorFilters: fix bug in MultiCjetFilter2021-08-27T03:03:42+02:00Ewelina Maria LobodzinskaPowheg: fix b read problem, GeneratorFilters: fix bug in MultiCjetFilterPowheg: fix python3 problem with binary reading and writting
GeneratorFilters: fix bug in MultiCjetFilterPowheg: fix python3 problem with binary reading and writting
GeneratorFilters: fix bug in MultiCjetFilterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/46019GeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 version2021-08-25T03:03:40+02:00Ewelina Maria LobodzinskaGeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 versionGeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 versionGeneratorFilters : update XtoVVDecayFilterExtended.cxx to 21.6 versionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45975Syncronize the v HepMC3 and HepMC2 version of TTbarWToLeptonFilter filters in...2021-08-24T03:05:38+02:00Andrii VerbytskyiSyncronize the v HepMC3 and HepMC2 version of TTbarWToLeptonFilter filters in masterSyncronize the v HepMC3 and HepMC2 version of TTbarWToLeptonFilter filters in master
@ewelinaSyncronize the v HepMC3 and HepMC2 version of TTbarWToLeptonFilter filters in master
@ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45973SameParticleHardScatteringFilter2021-09-01T03:02:51+02:00Andrii VerbytskyiSameParticleHardScatteringFilterIn this MR:
- addopted SameParticleHardScatteringFilter from 21.6 for master
- remove stray code in ParentTwoChildrenFilter.cxx
Tag @ewelinaIn this MR:
- addopted SameParticleHardScatteringFilter from 21.6 for master
- remove stray code in ParentTwoChildrenFilter.cxx
Tag @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45925GeneratorFilters: add corrections for ParentChild and ParentTwoChildren...2021-08-25T03:04:00+02:00Ewelina Maria LobodzinskaGeneratorFilters: add corrections for ParentChild and ParentTwoChildren...GeneratorFilters: add corrections for ParentChild and ParentTwoChildren filters to make them in agreement with recent developments from 21.6GeneratorFilters: add corrections for ParentChild and ParentTwoChildren filters to make them in agreement with recent developments from 21.6https://gitlab.cern.ch/atlas/athena/-/merge_requests/45911PowhegControl: fix arguments for re.sub() in utility function2021-08-21T03:03:01+02:00Ewelina Maria LobodzinskaPowhegControl: fix arguments for re.sub() in utility functionsmall fix in PowhegControl:
fix arguments for re.sub() in utility functionsmall fix in PowhegControl:
fix arguments for re.sub() in utility functionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45841TruthConverters: Fix gcc11 warnings.2021-08-18T03:05:11+02:00Scott SnyderTruthConverters: Fix gcc11 warnings.Null pointer dereference.Null pointer dereference.https://gitlab.cern.ch/atlas/athena/-/merge_requests/45830Master: powheg log issues and ttj mi nnlops first implementation2021-08-18T03:04:56+02:00Timothee Theveneaux-PelzerMaster: powheg log issues and ttj mi nnlops first implementationThis MR is a cherry-pick of !45670 in which the changes were applied to 21.6. See the description of that MR and AGENE-2016, AGENE-2024, and AGENE-2055 for more details.This MR is a cherry-pick of !45670 in which the changes were applied to 21.6. See the description of that MR and AGENE-2016, AGENE-2024, and AGENE-2055 for more details.https://gitlab.cern.ch/atlas/athena/-/merge_requests/45786ComponentAccumulator-based configuration for Cavern Background and Cosmics Si...2021-09-07T15:40:18+02:00John Derek ChapmanComponentAccumulator-based configuration for Cavern Background and Cosmics SimulationNext step towards support for Cavern background and Cosmics simulation.
Most changes are in the ComponentAccumulator-based configuration, but old-style ConfiguredFactory-based module, `CosmicGenerator.CosmicGeneratorConfig`, is renamed ...Next step towards support for Cavern background and Cosmics simulation.
Most changes are in the ComponentAccumulator-based configuration, but old-style ConfiguredFactory-based module, `CosmicGenerator.CosmicGeneratorConfig`, is renamed to `CosmicGenerator.CosmicGeneratorConfigLegacy`. Once these changes are in, I will make some final checks before activating the corresponding ART tests (which are already in the release).https://gitlab.cern.ch/atlas/athena/-/merge_requests/45782Saving xsec info in hepmc event by passing pythia.info pointer2021-08-17T03:02:31+02:00Giancarlo PanizzoSaving xsec info in hepmc event by passing pythia.info pointerPythia8B_i is currently not saving the xsec info in the hepmc event, differently from Pythia8_i. This short MR fixes this behaviour. Rivet on-the-fly, crashing before, doesn't crash anymore.
FIX AGENE-2066
@cgutscho @jroggelPythia8B_i is currently not saving the xsec info in the hepmc event, differently from Pythia8_i. This short MR fixes this behaviour. Rivet on-the-fly, crashing before, doesn't crash anymore.
FIX AGENE-2066
@cgutscho @jroggelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45732ProtosLHEF_i: Fix gcc11 warnings.2021-08-12T03:05:36+02:00Scott SnyderProtosLHEF_i: Fix gcc11 warnings.Null pointer dereference.Null pointer dereference.https://gitlab.cern.ch/atlas/athena/-/merge_requests/45726Tweaks to CA-based Simulation Configuration2021-08-12T03:04:02+02:00John Derek ChapmanTweaks to CA-based Simulation ConfigurationThis merge request collects together three bits of clean-up of the CA-based Simulation configuration:
- Add CA-based configuration for AlgTools in TrackWriteFastSim package
- Make CA-based configuration of G4CosmicFilters more robust
- D...This merge request collects together three bits of clean-up of the CA-based Simulation configuration:
- Add CA-based configuration for AlgTools in TrackWriteFastSim package
- Make CA-based configuration of G4CosmicFilters more robust
- Drop obsolete RNG configuration from TracRecordGeneratorConfigNew.pyhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/45670Handling of log messages: AGENE-2016, AGENE-2024; Adding ttj MiNNLO: AGENE-20162021-08-17T03:07:20+02:00Timothee Theveneaux-PelzerHandling of log messages: AGENE-2016, AGENE-2024; Adding ttj MiNNLO: AGENE-2016This MR does 4 things in PowhegControl, in 21.6
- It adds the possibility to specify special messages produced by the external executables (powheg, madspin, openloops, etc.) which would be interpreted as error, info, or warning, regardle...This MR does 4 things in PowhegControl, in 21.6
- It adds the possibility to specify special messages produced by the external executables (powheg, madspin, openloops, etc.) which would be interpreted as error, info, or warning, regardless of if they are in stderr or stdout
- It uses this possibility to solve the problems reported in AGENE-2016: HOPPET info or warning messages were sent to stderr which caused an ERROR in the log, and would make athena crash
- It uses this possibility to hopefully catch silent MadSpin errors reported in AGENE-2024: there may be cases where MadSpin fails without causing an ERROR, but the job would not fail because the undecayed lhe file is still available
- It adds a first implementation of the ttbar MINNLOPS, requested in AGENE-2055; that process was affected by the above mentioned HOPPET problem. It still doesn't work because of another problem, related to OpenLoops (see the ticket)