athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2021-12-10T15:42:40+01:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/48975Particle Gun: fix energy units for HepMC32021-12-10T15:42:40+01:00Ewelina Maria LobodzinskaParticle Gun: fix energy units for HepMC3fix energy units in ParticleGun for HepMC3, remove printout from StoreGateBindings/Bindings, fix check in FixHepMCfix energy units in ParticleGun for HepMC3, remove printout from StoreGateBindings/Bindings, fix check in FixHepMChttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48974Herwig7.1.6 back to the old version2021-12-10T16:34:15+01:00Ewelina Maria LobodzinskaHerwig7.1.6 back to the old versionHerwig7.1.6 back to the old versionHerwig7.1.6 back to the old versionhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48925Fix syntax sugar for HepMC3/HePMC22021-12-09T15:42:21+01:00Andrii VerbytskyiFix syntax sugar for HepMC3/HePMC2See https://its.cern.ch/jira/browse/AGENE-2121
Hi @cgutscho,
could you, please, have a look?
Best regards,
AndriiSee https://its.cern.ch/jira/browse/AGENE-2121
Hi @cgutscho,
could you, please, have a look?
Best regards,
Andriihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48899Revert the introduced bug with the units. in Sherpa2021-12-08T15:42:36+01:00Andrii VerbytskyiRevert the introduced bug with the units. in SherpaRevert the introduced bug with the units.
See https://its.cern.ch/jira/browse/AGENE-2102
Tag @cgutscho @ewelina @jroggelRevert the introduced bug with the units.
See https://its.cern.ch/jira/browse/AGENE-2102
Tag @cgutscho @ewelina @jroggelhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48895GeneratorFilters: add TTbarWithJpsimumuFilter2021-12-09T15:42:45+01:00Ewelina Maria LobodzinskaGeneratorFilters: add TTbarWithJpsimumuFilterGeneratorFilters: add TTbarWithJpsimumuFilter
The filters is ported from 21.6GeneratorFilters: add TTbarWithJpsimumuFilter
The filters is ported from 21.6https://gitlab.cern.ch/atlas/athena/-/merge_requests/48877Rivet_i: remove SPG flag, patch on the fly2021-12-07T15:45:13+01:00Christian GutschowRivet_i: remove SPG flag, patch on the flySimilar treatment as in !48876
FYI @ewelinaSimilar treatment as in !48876
FYI @ewelinahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48876Generators: workaround for SPGs2021-12-08T13:06:17+01:00Christian GutschowGenerators: workaround for SPGsThe SPG produces events with exactly one particle in the truth record and it doesn't set a beam particle, which throws off Rivet when it's doing the beam checks.
This MR will, in events with exactly one particle, set that single particl...The SPG produces events with exactly one particle in the truth record and it doesn't set a beam particle, which throws off Rivet when it's doing the beam checks.
This MR will, in events with exactly one particle, set that single particle also as dummy beam particles. Together with the `IgnoreBeamCheck = True` setting, this will be sufficient to pass Rivet's beam checks.
Needed for AGENE-2077https://gitlab.cern.ch/atlas/athena/-/merge_requests/48864Powheg : update version, AthGeneration: update version2021-12-07T15:43:04+01:00Ewelina Maria LobodzinskaPowheg : update version, AthGeneration: update versionupdate to Powheg 5-02
and release AthGeneration 22.6.10update to Powheg 5-02
and release AthGeneration 22.6.10https://gitlab.cern.ch/atlas/athena/-/merge_requests/48845Squash 487232021-12-05T21:43:25+01:00Andrii VerbytskyiSquash 48723Squash !48723
Tag @tsulaiaSquash !48723
Tag @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48835CavernBkgGenerator: Fix cppcheck warnings.2021-12-07T15:44:17+01:00Scott SnyderCavernBkgGenerator: Fix cppcheck warnings.Prefer to initialize class members in an initialization list rather than
in a ctor body.Prefer to initialize class members in an initialization list rather than
in a ctor body.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48805EvgenJobTransforms: fix typo in debug mode setting2021-12-03T21:42:18+01:00Ewelina Maria LobodzinskaEvgenJobTransforms: fix typo in debug mode settingEvgenJobTransforms: fix typo in debug mode setting
(needed for AGENE-2102)EvgenJobTransforms: fix typo in debug mode setting
(needed for AGENE-2102)https://gitlab.cern.ch/atlas/athena/-/merge_requests/48785BeamHaloGenerator: Fix cppcheck warnings.2021-12-07T15:42:24+01:00Scott SnyderBeamHaloGenerator: Fix cppcheck warnings.Fix cppcheck warnings.Fix cppcheck warnings.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48742CavernBkgGenerator: Migrate from IAtRndmGenSvc to IAthRNGSvc.2023-05-24T19:46:41+02:00Scott SnyderCavernBkgGenerator: Migrate from IAtRndmGenSvc to IAthRNGSvc.Migrate from the deprecated IAtRndmGenSvc to IAthRNGSvc.Migrate from the deprecated IAtRndmGenSvc to IAthRNGSvc.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48735Remove commented code in sherpa interface2021-12-02T21:42:54+01:00Andrii VerbytskyiRemove commented code in sherpa interfaceRemove commented code in sherpa interface.
Cleanup.
Tag @fsiegert.Remove commented code in sherpa interface.
Cleanup.
Tag @fsiegert.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48733Better formating and removal of unused functions in TruthUtils2021-12-06T21:42:34+01:00Andrii VerbytskyiBetter formating and removal of unused functions in TruthUtilsBetter formating and removal of unused functions in TruthUtils.
In FixHepMC replaced three loops over all vertices with one loop.Better formating and removal of unused functions in TruthUtils.
In FixHepMC replaced three loops over all vertices with one loop.https://gitlab.cern.ch/atlas/athena/-/merge_requests/48730Herwig7: correct VBFNLO to OPENLOOPS for HepMC32021-12-02T21:43:12+01:00Ewelina Maria LobodzinskaHerwig7: correct VBFNLO to OPENLOOPS for HepMC3Herwig7: correct VBFNLO to OPENLOOPS for HepMC3Herwig7: correct VBFNLO to OPENLOOPS for HepMC3https://gitlab.cern.ch/atlas/athena/-/merge_requests/48723Changes in Cmake files related to HepMC3. Mostly cleanup.2021-12-05T09:58:22+01:00Andrii VerbytskyiChanges in Cmake files related to HepMC3. Mostly cleanup.Changes in Cmake files related to HepMC3. Mostly cleanup.
@akraszna , could you, please, have a look?
Meanwhile I mark it WIP.
Best regards,
AndriiChanges in Cmake files related to HepMC3. Mostly cleanup.
@akraszna , could you, please, have a look?
Meanwhile I mark it WIP.
Best regards,
Andriihttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48699Analysis HepMC CMake Update, master branch (2021.12.01.)2021-12-03T21:42:43+01:00Attila KrasznahorkayAnalysis HepMC CMake Update, master branch (2021.12.01.)Now that [HepMC](http://lcginfo.cern.ch/pkg/HepMC/) (or [hepmc3](http://lcginfo.cern.ch/pkg/hepmc3/)) is used through `AtlasHepMCLib`, [TruthUtils](Generators/TruthUtils) and [MCTruthClassifier](PhysicsAnalysis/MCTruthClassifier) should ...Now that [HepMC](http://lcginfo.cern.ch/pkg/HepMC/) (or [hepmc3](http://lcginfo.cern.ch/pkg/hepmc3/)) is used through `AtlasHepMCLib`, [TruthUtils](Generators/TruthUtils) and [MCTruthClassifier](PhysicsAnalysis/MCTruthClassifier) should no longer make decisions based on whether HepMC is available or not. As it would have to replicate the logic of [AtlasHepMC](Generators/AtlasHepMC) to do this correctly.
Instead, the decision whether or not to link against `AtlasHepMCLib` is now made purely based on `XAOD_STANDALONE`. Since it's only [AnalysisBase](Projects/AnalysisBase) that does not come with [AtlasHepMC](Generators/AtlasHepMC).
At the same time removed the optional usage of [HEPUtils](http://lcginfo.cern.ch/pkg/heputils/) and [MCUtils](http://lcginfo.cern.ch/pkg/mcutils/) in [TruthUtils](Generators/TruthUtils). Since both of those are always available, in all of the projects that we build. So it's an error if either of them is not found.
This is all to fix ATLASG-1616.
P.S. The usage of `TruthUtilsEnvironmentConfig.cmake` should be made a little nicer as well. But that will need some update in the [AtlasLCG](https://gitlab.cern.ch/atlas/atlasexternals/-/tree/master/Build/AtlasLCG) code, so let's leave that for a future MR. :wink:https://gitlab.cern.ch/atlas/athena/-/merge_requests/48689Squashed version of 486012021-12-01T09:43:42+01:00Andrii VerbytskyiSquashed version of 48601See !48601
Tag @tsulaiaSee !48601
Tag @tsulaiahttps://gitlab.cern.ch/atlas/athena/-/merge_requests/48680BeamHaloGenerator: Remove references to IAtRndmGenSvc.2021-12-01T15:42:33+01:00Scott SnyderBeamHaloGenerator: Remove references to IAtRndmGenSvc.Remove (unused) references to deprecated IAtRndmGenSvc.Remove (unused) references to deprecated IAtRndmGenSvc.