Merge branch 'master-qgsjet' into 'master'

correct QGSJet in analoguos way to Epos and move Pythia8B common fragments to correct location

See merge request atlas/athena!40623

Generators/Pythia8B_i/CMakeLists.txt

@@ -31,5 +31,5 @@ atlas_add_component( Pythia8B_i
                      LINK_LIBRARIES ${Boost_LIBRARIES} ${PYTHIA8_LIBRARIES} ${LHAPDF_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel Pythia8_iLib GeneratorObjects Pythia8B_iLib )
 
 # Install files from the package:
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/common/*.py )
 

Generators/Pythia8B_i/share/common/Pythia8B_A14_CTEQ6L1_Common.py

+## Config for Py8B tune A14 with CTEQ6L1
+include("Pythia8B_i/Pythia8B_Base_Fragment.py")
+
+ver =  os.popen("cmt show versions External/Pythia8").read()
+print "Pythia8 version: " + ver
+if 'Pythia8-01' in ver[:50]:
+  genSeq.Pythia8B.Commands += [
+    "Tune:ee = 7", 
+    "Tune:pp = 14",
+    "PDF:useLHAPDF = on",
+    "PDF:LHAPDFset = cteq6ll",
+    "SpaceShower:rapidityOrder = on",
+    "SigmaProcess:alphaSvalue = 0.144",
+    "SpaceShower:pT0Ref = 1.30",
+    "SpaceShower:pTmaxFudge = 0.95",
+    "SpaceShower:pTdampFudge = 1.21",
+    "SpaceShower:alphaSvalue = 0.125",
+    "TimeShower:alphaSvalue = 0.126",
+    "BeamRemnants:primordialKThard = 1.72",
+    "MultipartonInteractions:pT0Ref = 1.98",
+    "MultipartonInteractions:alphaSvalue = 0.118",
+    "BeamRemnants:reconnectRange = 2.08"]
+else:
+  genSeq.Pythia8B.Commands += [
+    "Tune:ee = 7", 
+    "Tune:pp = 14",
+    "PDF:pSet=LHAPDF6:cteq6l1",
+    "SpaceShower:rapidityOrder = on",
+    "SigmaProcess:alphaSvalue = 0.144",
+    "SpaceShower:pT0Ref = 1.30",
+    "SpaceShower:pTmaxFudge = 0.95",
+    "SpaceShower:pTdampFudge = 1.21",
+    "SpaceShower:alphaSvalue = 0.125",
+    "TimeShower:alphaSvalue = 0.126",
+    "BeamRemnants:primordialKThard = 1.72",
+    "MultipartonInteractions:pT0Ref = 1.98",
+    "MultipartonInteractions:alphaSvalue = 0.118",
+    "ColourReconnection:range = 2.08"]
+
+evgenConfig.tune = "A14 CTEQ6L1"

Generators/Pythia8B_i/share/common/Pythia8B_A14_CTEQ6L1_EvtGen_Common.py

+## Config for Py8B tune A14 with CTEQ6L1 
+## The default version of this tune fragment include EvtGen for standardised b fragmentation
+
+# Reference the non-standard version without EvtGen
+include("Pythia8B_i/Pythia8B_A14_CTEQ6L1_Common.py")
+
+# Add EvtGen for b fragmentation as default.  No EvtGen is available in "nonStandard"
+include("Pythia8B_i/Pythia8B_EvtGen.py")
+

Generators/Pythia8B_i/share/common/Pythia8B_A14_NNPDF23LO_Common.py

+## Config for Py8B tune A14 with NNPDF23LO
+## This is the version without EvtGen, and as such is not the standard.  
+## The default version is available in common/Pythia8B/Pythia8B_A14_NNPDF23LO_EvtGen_Common.py
+
+include("Pythia8B_i/Pythia8B_Base_Fragment.py")
+
+# todo - replace BeamRemnants with new ColourReconnection syntax once Pythia 8.201 is in place
+ver =  os.popen("cmt show versions External/Pythia8").read()
+print "Pythia8 version: " + ver
+if 'Pythia8-01' in ver[:50]:
+  genSeq.Pythia8B.Commands += [
+    "Tune:ee = 7", 
+    "Tune:pp = 14",
+    "PDF:useLHAPDF = on",
+    "PDF:LHAPDFset = NNPDF23_lo_as_0130_qed",
+    "SpaceShower:rapidityOrder = on",
+    "SigmaProcess:alphaSvalue = 0.140",
+    "SpaceShower:pT0Ref = 1.56",
+    "SpaceShower:pTmaxFudge = 0.91",
+    "SpaceShower:pTdampFudge = 1.05",
+    "SpaceShower:alphaSvalue = 0.127",
+    "TimeShower:alphaSvalue = 0.127",
+    "BeamRemnants:primordialKThard = 1.88",
+    "MultipartonInteractions:pT0Ref = 2.09",
+    "MultipartonInteractions:alphaSvalue = 0.126",
+    "BeamRemnants:reconnectRange  = 1.71"]
+else:
+  genSeq.Pythia8B.Commands += [
+    "Tune:ee = 7",
+    "Tune:pp = 14",
+    "PDF:pSet=LHAPDF6:NNPDF23_lo_as_0130_qed",
+    "SpaceShower:rapidityOrder = on",
+    "SigmaProcess:alphaSvalue = 0.140",
+    "SpaceShower:pT0Ref = 1.56",
+    "SpaceShower:pTmaxFudge = 0.91",
+    "SpaceShower:pTdampFudge = 1.05",
+    "SpaceShower:alphaSvalue = 0.127",
+    "TimeShower:alphaSvalue = 0.127",
+    "BeamRemnants:primordialKThard = 1.88",
+    "MultipartonInteractions:pT0Ref = 2.09",
+    "MultipartonInteractions:alphaSvalue = 0.126",
+    "ColourReconnection:range = 1.71"]
+
+evgenConfig.tune = "A14 NNPDF23LO"

Generators/Pythia8B_i/share/common/Pythia8B_A14_NNPDF23LO_EvtGen_Common.py

+## Config for Py8B tune A14 with NNPDF23LO
+## The default version of this tune fragment include EvtGen for standardised b fragmentation
+
+# Reference the non-standard version without EvtGen
+include("Pythia8B_i/Pythia8B_A14_NNPDF23LO_Common.py")
+
+# Add EvtGen for b fragmentation as default.  No EvtGen is available in "nonStandard"
+include("Pythia8B_i/Pythia8B_EvtGen.py")
+

Generators/Pythia8B_i/share/common/Pythia8B_BPDGCodes.py

+######################################################
+# BPDGCodes.py
+# List of B-species PDG codes
+######################################################
+
+genSeq.Pythia8B.BPDGCodes = [511,521,531,541,5122,5132,5232,5332,-511,-521,-531,-541,-5122,-5132,-5232,-5332]

Generators/Pythia8B_i/share/common/Pythia8B_Base_Fragment.py

+## Base config for Pythia8B
+from Pythia8B_i.Pythia8B_iConf import Pythia8B_i
+genSeq += Pythia8B_i("Pythia8B")
+evgenConfig.generators += ["Pythia8B"]
+
+genSeq.Pythia8B.Commands += [
+    "Main:timesAllowErrors = 500",
+    "6:m0 = 172.5",
+    "23:m0 = 91.1876",
+    "23:mWidth = 2.4952",
+    "24:m0 = 80.399",
+    "24:mWidth = 2.085",
+    "StandardModel:sin2thetaW = 0.23113",
+    "StandardModel:sin2thetaWbar = 0.23146",
+    "ParticleDecays:limitTau0 = on",
+    "ParticleDecays:tau0Max = 10.0"]

Generators/Pythia8B_i/share/common/Pythia8B_Bottomonium_Common.py

+##############################################################
+# Pythia8B_Bottomonium_Common.py
+#
+# Common job options for direct bottomonium production using
+# Pythia8B.
+##############################################################
+
+# Hard process
+genSeq.Pythia8B.Commands += ['PhaseSpace:pTHatMin = 1.'] # Equivalent of CKIN3
+genSeq.Pythia8B.Commands += ['ParticleDecays:mixB = off']
+genSeq.Pythia8B.Commands += ['HadronLevel:all = off']
+
+# Quarkonia production mode
+genSeq.Pythia8B.Commands += ['Bottomonium:all = on']
+genSeq.Pythia8B.Commands += ['PhaseSpace:pTHatMinDiverge = 0.5']
+genSeq.Pythia8B.SuppressSmallPT = True
+genSeq.Pythia8B.pT0timesMPI = 1.
+genSeq.Pythia8B.numberAlphaS = 3.
+genSeq.Pythia8B.useSameAlphaSasMPI = False
+genSeq.Pythia8B.SelectBQuarks = False
+genSeq.Pythia8B.SelectCQuarks = False
+genSeq.Pythia8B.VetoDoubleBEvents = False
+genSeq.Pythia8B.VetoDoubleCEvents = False
+
+# Number of repeat-hadronization loops
+genSeq.Pythia8B.NHadronizationLoops = 1
+
+# List of B-species - for counting purposes (no effect on generation)
+include("Pythia8B_i/Pythia8B_BPDGCodes.py")

Generators/Pythia8B_i/share/common/Pythia8B_Charmonium_Common.py

+##############################################################
+# Common job options for direct Pythia8B charmonium production
+##############################################################
+
+# Hard process
+genSeq.Pythia8B.Commands += ['PhaseSpace:pTHatMin = 1.'] # Equivalent of CKIN3
+genSeq.Pythia8B.Commands += ['ParticleDecays:mixB = off']
+genSeq.Pythia8B.Commands += ['HadronLevel:all = off']
+
+# Quarkonia production mode
+genSeq.Pythia8B.Commands += ['Charmonium:all = on']
+genSeq.Pythia8B.Commands += ['PhaseSpace:pTHatMinDiverge = 0.5']
+genSeq.Pythia8B.SuppressSmallPT = True
+genSeq.Pythia8B.pT0timesMPI = 1.
+genSeq.Pythia8B.numberAlphaS = 3.
+genSeq.Pythia8B.useSameAlphaSasMPI = False
+genSeq.Pythia8B.SelectBQuarks = False
+genSeq.Pythia8B.SelectCQuarks = False
+genSeq.Pythia8B.VetoDoubleBEvents = False
+genSeq.Pythia8B.VetoDoubleCEvents = False
+
+# Number of repeat-hadronization loops
+genSeq.Pythia8B.NHadronizationLoops = 1
+
+# List of B-species - for counting purposes (no effect on generation)
+#include("Pythia8B_i/BPDGCodes.py") NB: Not working in MC15, is it a problem??
+

Generators/Pythia8B_i/share/common/Pythia8B_CloseAntiBDecays.py

+######################################################
+# CloseAntiBDecays.py
+# Pythia8_i commands to switch off decays of B 
+# Should be used when exclusive decays are needed from 
+# the anti-B-hadron but not the B-hadron
+######################################################
+
+genSeq.Pythia8B.Commands += ['511:onMode = 2']
+genSeq.Pythia8B.Commands += ['521:onMode = 2']
+genSeq.Pythia8B.Commands += ['531:onMode = 2']
+genSeq.Pythia8B.Commands += ['541:onMode = 2']
+genSeq.Pythia8B.Commands += ['5122:onMode = 3']
+genSeq.Pythia8B.Commands += ['5132:onMode = 3']
+genSeq.Pythia8B.Commands += ['5232:onMode = 3']
+genSeq.Pythia8B.Commands += ['5332:onMode = 3']

Generators/Pythia8B_i/share/common/Pythia8B_CloseBDecays.py

+######################################################
+# CloseBDecays.py
+# Pythia8_i commands to switch off decays of anti-B 
+# Should be used when exclusive decays are needed from 
+# the B-hadron but not the anti-B-hadron
+######################################################
+
+genSeq.Pythia8B.Commands += ['511:onMode = 3']
+genSeq.Pythia8B.Commands += ['521:onMode = 3']
+genSeq.Pythia8B.Commands += ['531:onMode = 3']
+genSeq.Pythia8B.Commands += ['541:onMode = 3']
+genSeq.Pythia8B.Commands += ['5122:onMode = 2']
+genSeq.Pythia8B.Commands += ['5132:onMode = 2']
+genSeq.Pythia8B.Commands += ['5232:onMode = 2']
+genSeq.Pythia8B.Commands += ['5332:onMode = 2']

Generators/Pythia8B_i/share/common/Pythia8B_EvtGen.py

+## Run EvtGen afterburner on top of Pythia 8B
+assert hasattr(genSeq, "Pythia8B")
+include("EvtGen_i/EvtGen_Fragment.py")
+evgenConfig.auxfiles += ['inclusiveP8DsDPlus.pdt']
+#genSeq.EvtInclusiveDecay.pdtFile = "inclusiveP8.pdt"
+genSeq.EvtInclusiveDecay.pdtFile = "inclusiveP8DsDPlus.pdt"
+
+# FHerwig has problems with omega b* (5334), so not present in the base EvtGen fragment.  Add it here.
+genSeq.EvtInclusiveDecay.whiteList+=[-5334, 5334]
+
+

Generators/Pythia8B_i/share/common/Pythia8B_OpenBJpsiDecays.py

+########################################################
+# OpenBJpsiDecays.py
+# Opens all B->charmonium decays
+# i.e. B->J/psi, psi(2S), chi_c0,1,2,h_c
+########################################################
+
+# B0
+genSeq.Pythia8B.Commands += ['511:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['511:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['511:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['511:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['511:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['511:onIfAny = 20443']
+# B+/-
+genSeq.Pythia8B.Commands += ['521:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['521:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['521:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['521:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['521:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['521:onIfAny = 20443']
+# Bs
+genSeq.Pythia8B.Commands += ['531:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['531:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['531:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['531:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['531:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['531:onIfAny = 20443']
+# Bc
+genSeq.Pythia8B.Commands += ['541:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['541:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['541:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['541:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['541:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['541:onIfAny = 20443']
+# LambdaB
+genSeq.Pythia8B.Commands += ['5122:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['5122:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['5122:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['5122:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['5122:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['5122:onIfAny = 20443']
+# Xb+/-
+genSeq.Pythia8B.Commands += ['5132:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['5132:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['5132:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['5132:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['5132:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['5132:onIfAny = 20443']
+# Xb
+genSeq.Pythia8B.Commands += ['5232:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['5232:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['5232:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['5232:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['5232:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['5232:onIfAny = 20443']
+# Omega_b+/-
+genSeq.Pythia8B.Commands += ['5332:onIfAny = 443']
+genSeq.Pythia8B.Commands += ['5332:onIfAny = 100443']
+genSeq.Pythia8B.Commands += ['5332:onIfAny = 445']
+genSeq.Pythia8B.Commands += ['5332:onIfAny = 10441']
+genSeq.Pythia8B.Commands += ['5332:onIfAny = 10443']
+genSeq.Pythia8B.Commands += ['5332:onIfAny = 20443']

Generators/Pythia8B_i/share/common/Pythia8B_Photospp.py

+## Photos++ QED config for Pythia8B
+
+## Disable native QED FSR
+assert hasattr(genSeq, "Pythia8B")
+genSeq.Pythia8B.Commands += ["TimeShower:QEDshowerByL = off"]
+
+## Enable Photos++
+include("Photospp_i/Photospp_Fragment.py")