Revert "Merge branch 'removegeneratorutils' into 'main'"

This reverts merge request !71707

Generators/EvgenProdTools/examples/jobOption.Pythia8_FixHepMC.py

 ## Example job option script to run an event generator with FixHepMC filtering
 ## Author: Andy Buckley <andy.buckley@cern.ch>
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 ## Configure and add an event generator to the alg seq

Generators/GeneratorModules/examples/example_evgenanalysis.py

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdAnalysisSetup.py")
+include("GeneratorUtils/StdAnalysisSetup.py")
 
 class MyAna(EvgenAnalysisAlg):
 

Generators/GeneratorUtils/CMakeLists.txt

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name:
+atlas_subdir( GeneratorUtils )
+
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )

Generators/EvgenProdTools/share/common/StdAnalysisSetup.py → Generators/GeneratorUtils/share/StdAnalysisSetup.py

 ## Generic JO header for use in all (evgen) analysis job options
 
 ## Pull in *really* generic stuff shared with StdEvgenSetup.py
-include("EvgenProdTools/StdJOSetup.py")
+include("GeneratorUtils/StdJOSetup.py")
 
 ## Enable reading in from POOL evgen files, from INFILE if set
 import AthenaPoolCnvSvc.ReadAthenaPool

Generators/EvgenProdTools/share/common/StdEvgenSetup.py → Generators/GeneratorUtils/share/StdEvgenSetup.py

 ## Generic JO header for use in all evgen job options
 
 ## Pull in *really* generic stuff shared with StdAnalysisSetup.py
-include("EvgenProdTools/StdJOSetup.py")
+include("GeneratorUtils/StdJOSetup.py")
 
 ## Provide a special evgen logger
 evgenLog = logging.getLogger("Evgen")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_constenergy_flateta.py

@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -12,6 +12,6 @@ pg.sampler.pid = {11,-11,211,111}
 pg.sampler.mom = PG.EEtaMPhiSampler(energy=10000, eta=[-2,2])
 topSeq += pg
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_correlated.py

@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -29,6 +29,6 @@ topSeq += PG.ParticleGun()
 topSeq.ParticleGun.randomSeed = 123456
 topSeq.ParticleGun.sampler = MyParticleSampler()
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_corrhist.py

@@ -5,7 +5,7 @@
 ## ROOT 2D histogram sampling alg (in ParticleGun.histsampling) by Andy Buckley
 ## Thanks to Alejandro Alonso for the initial Athena example on which this is based.
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -36,6 +36,6 @@ topSeq += PG.ParticleGun()
 topSeq.ParticleGun.randomSeed = 123456
 topSeq.ParticleGun.sampler = PtEtaHistParticleSampler(11, "data_histos_el_1470pt.root")
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_flatcurvature_flatip.py

@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -36,6 +36,6 @@ topSeq += PG.ParticleGun()
 topSeq.ParticleGun.randomSeed = 123456
 topSeq.ParticleGun.sampler = MyParticleSampler()
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_flatpt_2particle.py

@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -15,6 +15,6 @@ pg.samplers[1].pid = (13, -13) # cycle mu-+
 pg.samplers[1].mom = PG.PtEtaMPhiSampler(pt=[4000, 100000], eta=[-3.2, -1.0]) # flat in pt and -ve eta
 topSeq += pg
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_fwd_sequence.py

@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -14,6 +14,6 @@ pg.sampler.mom = PG.EThetaMPhiSampler(energy=(1360000, 500000, 1360000, 500000),
 pg.sampler.pos = PG.PosSampler(x=[-120,-100], y=[-10,10], z=203950)
 topSeq += pg
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/ParticleGun/share/examples/jobOption.ParticleGun_vtx.py

@@ -2,7 +2,7 @@
 
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 theApp.EvtMax = 100
 
 import ParticleGun as PG
@@ -13,6 +13,6 @@ pg.sampler.pos = PG.PosSampler(x=3140.0, y=[-154.134,154.134], z=[4938.76,5121.2
 pg.sampler.mom = PG.EEtaMPhiSampler(energy=100000, eta=1.25, phi=0.0)
 topSeq += pg
 
-include("EvgenProdTools/postJO.CopyWeights.py")
-include("EvgenProdTools/postJO.PoolOutput.py")
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.CopyWeights.py")
+include("GeneratorUtils/postJO.PoolOutput.py")
+include("GeneratorUtils/postJO.DumpMC.py")

Generators/Pythia8_i/share/example/jobOptions.pythia8.py

-include("EvgenProdTools/StdEvgenSetup.py")
+include("GeneratorUtils/StdEvgenSetup.py")
 
 svcMgr.MessageSvc.OutputLevel = INFO
 
@@ -7,4 +7,4 @@ topAlg += Pythia8_i()
 topAlg.Pythia8_i.CollisionEnergy = 7000
 topAlg.Pythia8_i.Commands += ['HardQCD:all = on']
 
-include("EvgenProdTools/postJO.DumpMC.py")
+include("GeneratorUtils/postJO.DumpMC.py")