athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2024-02-13T20:23:21+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/68821Generators/Sherpa_i fix typo2024-02-13T20:23:21+01:00Christian GutschowGenerators/Sherpa_i fix typo... d'oh :face_palm:
cc @ewelina @fsiegert... d'oh :face_palm:
cc @ewelina @fsiegerthttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68775Generators / Sherpa_i: add support for almalinux92024-02-12T19:32:53+01:00Christian GutschowGenerators / Sherpa_i: add support for almalinux9Removes a few hard-coded `centos7` instances and replaces the brittle gcc version determination with an environment-variable lookup.
Also needed for AGENE-2217
cc @ewelina @fsiegert @yharrisRemoves a few hard-coded `centos7` instances and replaces the brittle gcc version determination with an environment-variable lookup.
Also needed for AGENE-2217
cc @ewelina @fsiegert @yharrishttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68732Minimal working version of CA skeleton for evgen2024-02-20T20:10:15+01:00Spyros ArgyropoulosMinimal working version of CA skeleton for evgenAdding a minimal working version (producing a filled `EVNT.root` file from a ParticleGun jO).
## Changes
- Add new `EvgenConfig` class in `EvgenJobTransforms.EvgenCAConfig` module
- Added necessary changes to CA-based skeleton in orde...Adding a minimal working version (producing a filled `EVNT.root` file from a ParticleGun jO).
## Changes
- Add new `EvgenConfig` class in `EvgenJobTransforms.EvgenCAConfig` module
- Added necessary changes to CA-based skeleton in order to run a minimal jO and save the output in a root file
- `checkJOConsistency` function added in `GenConfig.GenConfigHelpers` module
## Layout of sequences
![Screenshot_2024-02-09_at_11.11.57](/uploads/19b10842176450a79fc780af1e79327e/Screenshot_2024-02-09_at_11.11.57.png)
## JobOption content
```python
# Translation of 950555/mc.PG_single_nu_valid.py into CA mode
from EvgenJobTransforms.EvgenCAConfig import EvgenConfig
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
class Sample(EvgenConfig):
def setupFlags(self, runArgs, flags):
self.description = ["Single neutrinos with fixed eta and E: purely for pile-up/lumi testing"]
self.keywords = ["singleParticle", "neutrino"]
self.contact = ["dhirsch@mail.cern.ch"]
self.nEventsPerJob = 100
self.generators += ["ParticleGun"]
def setupProcess(self, flags):
sampleConfig = ComponentAccumulator()
import ParticleGun as PG
pg = PG.ParticleGun(randomStream = "SINGLE", randomSeed = flags.Random.SeedOffset)
pg.sampler.pid = 12
pg.sampler.mom = PG.EEtaMPhiSampler(energy=50000, eta=0)
sampleConfig.addEventAlgo(pg)
return sampleConfig
```
## How to run
`Gen_tf.py --CA --outputEVNTFile="EVNT.root" --jobConfig=./950555 --maxEvents=10`
cc @tadej @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68709Generators: check momentum unit is correct in Rivet interface2024-02-09T19:21:31+01:00Christian GutschowGenerators: check momentum unit is correct in Rivet interfaceThis is to protect against cases where, when running over an EVNT file and retrieving the `HepMC3::GenEvent` from the store, the `GenEvent` claims its unit is GeV when it's actually MeV, sigh.
cc @ewelinaThis is to protect against cases where, when running over an EVNT file and retrieving the `HepMC3::GenEvent` from the store, the `GenEvent` claims its unit is GeV when it's actually MeV, sigh.
cc @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68700Pythia8_i add back the by mistake reverted changes2024-02-09T10:23:22+01:00Ewelina Maria LobodzinskaPythia8_i add back the by mistake reverted changesthis MR brings back the changes from https://gitlab.cern.ch/atlas/athena/-/merge_requests/68205
which were removed later by mistakethis MR brings back the changes from https://gitlab.cern.ch/atlas/athena/-/merge_requests/68205
which were removed later by mistakehttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68691Add python as default executable for PMG systematics tools2024-02-09T13:22:41+01:00Louie Dartmoor CorpeAdd python as default executable for PMG systematics toolsThe component tools of the PMGSystematicsTools did not have python set as default executable, and so couldn't really be called easily. This fixes that and up[dates the setup script too to use the recommended way to setup Rivet.The component tools of the PMGSystematicsTools did not have python set as default executable, and so couldn't really be called easily. This fixes that and up[dates the setup script too to use the recommended way to setup Rivet.ATLAS RobotATLAS Robothttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68686Adding draft GENtoEVGEN_Skeleton module and cleanup of unused arguments for G...2024-02-08T15:49:45+01:00Spyros ArgyropoulosAdding draft GENtoEVGEN_Skeleton module and cleanup of unused arguments for Gen_tf- Removed following unused arguments from `Gen_tf`. If the user provides these `Gen_tf.py` will immediately crash saying that these arguments are not recognised
- `--inputGenConfFile`
- `--runNumber`
- Added `skeletonCA` options in...- Removed following unused arguments from `Gen_tf`. If the user provides these `Gen_tf.py` will immediately crash saying that these arguments are not recognised
- `--inputGenConfFile`
- `--runNumber`
- Added `skeletonCA` options in `evgenExecutor`
- Added dummy file for `GENtoEVGEN_Skeleton.py` that will be later populated (see !67233)
Tested on 421007 that runs on the CI also the new `Gen_tf.py --CA` option and it runs
cc @ewelina @tadej
PS: we can also take this opportunity to maybe do a bit of cleanup including some stylistic fixes in `Gen_tf.py`? (or in a separate MR)https://gitlab.cern.ch/atlas/athena/-/merge_requests/68683Draft: Reproducer for ParticleGun merge issue in CA2024-02-19T11:12:22+01:00John Derek ChapmanDraft: Reproducer for ParticleGun merge issue in CADuring the process of migrating Generators configuration to ComponentAccumulator it was noticed that currently it is not possible to merge/de-duplicate two PyAthena components with the same name. This merge request contains a simple repr...During the process of migrating Generators configuration to ComponentAccumulator it was noticed that currently it is not possible to merge/de-duplicate two PyAthena components with the same name. This merge request contains a simple reproducer using the ParticleGun PyAthena Algorithm.
Example error message from running `ParticleGunConfig_test.py`
```
Traceback (most recent call last):
File "/home/jchapman/athena/Generators/ParticleGun/test/ParticleGunConfig_test.py", line 29, in <module>
cfg.merge(ParticleGunBaseCfg(flags))
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 895, in merge
mergeSequences(ourSeq, otherSeq)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/ComponentAccumulator.py", line 864, in mergeSequences
deduplicateOne(self._algorithms[c.name], c)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/Deduplication.py", line 56, in deduplicateOne
raiseWithCurrentContext(exception)
File "/cvmfs/atlas-nightlies.cern.ch/repo/sw/main_Athena_x86_64-el9-gcc13-opt/2024-02-07T2101/Athena/24.0.23/InstallArea/x86_64-el9-gcc13-opt/python/AthenaConfiguration/DebuggingContext.py", line 48, in raiseWithCurrentContext
raise type(exception)(str(exception) + '\nWith the context:\n{}'.format(Context.complete()) )
AttributeError: '<class 'ParticleGun.ParticleGun'>' object has no attribute 'merge'
With the context:
While merging sequences adding incoming algorithm : ParticleGun : Unknown context (enable it with ComponentAccumulator.debugMode = "trackCA trackEventAlgo etc. see ComponentAccumulator documentation")
While merging sequences adding to existing algorithm : ParticleGun : Unknown context (enable it with ComponentAccumulator.debugMode = "trackCA trackEventAlgo etc. see ComponentAccumulator documentation")
```https://gitlab.cern.ch/atlas/athena/-/merge_requests/68637Pythia8B_i, Pythia8_i further corrections in the UserHooks setup2024-02-07T15:35:00+01:00Ewelina Maria LobodzinskaPythia8B_i, Pythia8_i further corrections in the UserHooks setupPythia8B_i, Pythia8_i further corrections in the UserHooks setup
move the configuration of SuppressSmallPT UserHook from Pythia8B_i to Pythia8_iPythia8B_i, Pythia8_i further corrections in the UserHooks setup
move the configuration of SuppressSmallPT UserHook from Pythia8B_i to Pythia8_ihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68612Adding python CA configuration files for TruthIO and EvgenProdTools and helpe...2024-02-08T09:16:16+01:00Spyros ArgyropoulosAdding python CA configuration files for TruthIO and EvgenProdTools and helper functions- Adding CA configuration files for `TruthIO` and `EvgenProdTools` (these will be needed later when developing the CA version of `EvgenConfig` - see !67233)
- Extracting helper functions used for manipulations of generator names from `Ev...- Adding CA configuration files for `TruthIO` and `EvgenProdTools` (these will be needed later when developing the CA version of `EvgenConfig` - see !67233)
- Extracting helper functions used for manipulations of generator names from `EvgenJobTransforms/python/EvgenConfig.py` into `GeneratorConfig/python/GenConfigHelpers.py`
- Replace paths in the `EvgenJobTransforms` package to point to new `GenConfigHelpers` module
cc @tadej @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68585Add Generator config flags to prepare move to CA configuration. See !672332024-02-05T16:29:47+01:00Spyros ArgyropoulosAdd Generator config flags to prepare move to CA configuration. See !67233- Introduce `GeneratorConfigFlags` in `GeneratorConfig` package to prepare the move to CA configuration (splitting from !67233)
- Add function to call `createGeneratorConfigFlags()` in `AllConfigFlags`
cc @ewelina @tadej- Introduce `GeneratorConfigFlags` in `GeneratorConfig` package to prepare the move to CA configuration (splitting from !67233)
- Add function to call `createGeneratorConfigFlags()` in `AllConfigFlags`
cc @ewelina @tadejhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68584Particle gun documentation2024-02-06T12:22:53+01:00Andrii VerbytskyiParticle gun documentationParticle gun documentation
@abuckley @ewelinaParticle gun documentation
@abuckley @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68572Superchic 5.02024-02-20T11:12:20+01:00Andrii VerbytskyiSuperchic 5.0Add documentation for Superchic 5.0+ to the Athena.
@ewelina @jchapmanAdd documentation for Superchic 5.0+ to the Athena.
@ewelina @jchapmanAndrii VerbytskyiAndrii Verbytskyihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68566Print warning and error thresholds in TestHepMC so that they can be used down...2024-02-06T10:38:28+01:00Spyros ArgyropoulosPrint warning and error thresholds in TestHepMC so that they can be used downstream- Add printouts of `TestHepMC` warning and efficiency thresholds so that they can be used downstream (`logParser`)
- Clarify unclear printout statements in `TestHepMC`
@ewelina should I also add the alsoTargeting:21.6 label?- Add printouts of `TestHepMC` warning and efficiency thresholds so that they can be used downstream (`logParser`)
- Clarify unclear printout statements in `TestHepMC`
@ewelina should I also add the alsoTargeting:21.6 label?https://gitlab.cern.ch/atlas/athena/-/merge_requests/68512remove InDetRecExample to avoid warnings2024-02-02T11:45:51+01:00Ewelina Maria Lobodzinskaremove InDetRecExample to avoid warningsremove InDetRecExample to avoid warningsremove InDetRecExample to avoid warningshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68493Adding JO example in Pythai8 for the new UserHook2024-02-01T16:44:39+01:00Safa Gaidsafa.gaid@cern.chAdding JO example in Pythai8 for the new UserHookI Added a new JO example for Pythia8 using the new UserHook mergingDJRsI Added a new JO example for Pythia8 using the new UserHook mergingDJRshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68488GeneratorFilters/DiPhotonFilter: Added a cut-off on the angle deltaR_yy betwe...2024-02-01T16:30:19+01:00Romain Van Den BrouckeGeneratorFilters/DiPhotonFilter: Added a cut-off on the angle deltaR_yy between the two photonsA selection on the angle deltaR_yy between the two photons has been added to DiPhotonFilter, allowing for selecting photons separated by an angle in a given range (min, max).A selection on the angle deltaR_yy between the two photons has been added to DiPhotonFilter, allowing for selecting photons separated by an angle in a given range (min, max).Ewelina Maria LobodzinskaEwelina Maria Lobodzinskahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68482TruthUtils: Fix cppcheck warnings.2024-02-01T16:34:43+01:00Scott SnyderTruthUtils: Fix cppcheck warnings.Pass containers by const reference, not by value.Pass containers by const reference, not by value.https://gitlab.cern.ch/atlas/athena/-/merge_requests/68374Pythia8_i: fix UserHooks setup2024-01-26T19:16:21+01:00Ewelina Maria LobodzinskaPythia8_i: fix UserHooks setupfix UserHooks setup to make it work for Pythia8B setting up SuppressSmallPt UserHookfix UserHooks setup to make it work for Pythia8B setting up SuppressSmallPt UserHookhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/68261main-coverity-Pythia8_i2024-01-23T09:32:59+01:00Shaun Roemain-coverity-Pythia8_icoverity defect 19718: check return code of setupcoverity defect 19718: check return code of setup