diff --git a/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py b/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py deleted file mode 100644 index 6e65e6b357683..0000000000000 --- a/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py +++ /dev/null @@ -1,57 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -_generator = cms.EDFilter("AMPTGeneratorFilter", - diquarky = cms.double(0.0), - diquarkx = cms.double(0.0), - diquarkpx = cms.double(7.0), - ntmax = cms.int32(1000), - dpcoal = cms.double(1000000.0), - diquarkembedding = cms.int32(0), - maxmiss = cms.int32(1000), - ktkick = cms.int32(1), - mu = cms.double(3.2264), - quenchingpar = cms.double(2.0), - popcornpar = cms.double(1.0), - drcoal = cms.double(1000000.0), - amptmode = cms.int32(1), - izpc = cms.int32(0), - popcornmode = cms.bool(True), - minijetpt = cms.double(-7.0), - ks0decay = cms.bool(False), - alpha = cms.double(0.47140452), - dt = cms.double(0.2), - rotateEventPlane = cms.bool(True), - shadowingmode = cms.bool(True), - diquarkpy = cms.double(0.0), - deuteronfactor = cms.int32(5), - stringFragB = cms.double(0.9),#default value in Hijing. Good for pA - quenchingmode = cms.bool(False), - stringFragA = cms.double(0.5), - deuteronmode = cms.int32(0), - doInitialAndFinalRadiation = cms.int32(3), - phidecay = cms.bool(True), - deuteronxsec = cms.int32(1), - pthard = cms.double(2.0), - firstRun = cms.untracked.uint32(1), - frame = cms.string('CMS'), - targ = cms.string('P'), - izp = cms.int32(82), - bMin = cms.double(0), - firstEvent = cms.untracked.uint32(1), - izt = cms.int32(1), - proj = cms.string('A'), - comEnergy = cms.double(5020.0), - iat = cms.int32(1), - bMax = cms.double(15), - iap = cms.int32(208) -) - -from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = ExternalGeneratorFilter(_generator) - -configurationMetadata = cms.untracked.PSet( - version = cms.untracked.string('$Revision$'), - name = cms.untracked.string('$Source$'), - annotation = cms.untracked.string('AMPT PPb 5020 GeV Minimum Bias') -) - diff --git a/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_cfi.py b/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_cfi.py index cc2ba039bd3b4..3da0011063422 100644 --- a/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_cfi.py +++ b/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = cms.EDFilter("AMPTGeneratorFilter", +generator = ExternalGeneratorFilter(cms.EDFilter("AMPTGeneratorFilter", diquarky = cms.double(0.0), diquarkx = cms.double(0.0), diquarkpx = cms.double(7.0), @@ -44,7 +45,7 @@ iat = cms.int32(1), bMax = cms.double(15), iap = cms.int32(208) -) +)) configurationMetadata = cms.untracked.PSet( version = cms.untracked.string('$Revision$'), diff --git a/Configuration/Generator/python/Hijing_PPb_MinimumBias_cfi.py b/Configuration/Generator/python/Hijing_PPb_MinimumBias_cfi.py index 948dc444f3ed0..7c2e06e7b794d 100644 --- a/Configuration/Generator/python/Hijing_PPb_MinimumBias_cfi.py +++ b/Configuration/Generator/python/Hijing_PPb_MinimumBias_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = cms.EDFilter("HijingGeneratorFilter", +generator = ExternalGeneratorFilter(cms.EDFilter("HijingGeneratorFilter", rotateEventPlane = cms.bool(True), frame = cms.string('CMS '), targ = cms.string('P '), @@ -12,7 +13,7 @@ iat = cms.int32(1), bMax = cms.double(15), iap = cms.int32(208) - ) + )) configurationMetadata = cms.untracked.PSet( version = cms.untracked.string('$Revision: 1.3 $'), diff --git a/Configuration/Generator/python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py b/Configuration/Generator/python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py index a5d66af397edc..e7a6d172d0927 100644 --- a/Configuration/Generator/python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py @@ -1,8 +1,9 @@ import FWCore.ParameterSet.Config as cms from GeneratorInterface.Hydjet2Interface.hydjet2DefaultParameters_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = cms.EDFilter("Hydjet2GeneratorFilter", +generator = ExternalGeneratorFilter(cms.EDFilter("Hydjet2GeneratorFilter", collisionParameters5020GeV, qgpParametersLHC, hydjet2Parameters, @@ -21,4 +22,4 @@ fBmin = cms.double(0.), # Minimal impact parameter, fBmin (fm) fBmax = cms.double(21.), # Maximal impact parameter, fBmax (fm) fBfix = cms.double(0.), # Fixed impact parameter, fBfix (fm) - ) + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py deleted file mode 100644 index 70fa8abe87ecc..0000000000000 --- a/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py +++ /dev/null @@ -1,31 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Generator.Pyquen2015Settings_cff import * - -_generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5020GeV, - qgpParameters, - hydjetParameters, - hydjetMode = cms.string('kHydroQJets'), - PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, - # Quarkonia and Weak Bosons added back upon dilepton group's request. - parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', - 'myParameters', - 'pythiaJets', - 'pythiaPromptPhotons', - 'pythiaZjets', - 'pythiaBottomoniumNRQCD', - 'pythiaCharmoniumNRQCD', - 'pythiaQuarkoniaSettings', - 'pythiaWeakBosons' - ) - ), - cFlag = cms.int32(0), - bMin = cms.double(0), - bMax = cms.double(30), - bFixed = cms.double(12) - ) - -from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = ExternalGeneratorFilter(_generator) diff --git a/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_cfi.py index 47bf2cdd5f6fb..6857244ac9c66 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_cfi.py @@ -1,16 +1,20 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.Pyquen2015Settings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5020GeV, - qgpParameters, - hydjetParameters, +hjenergy = os.getenv("HJENERGY", "5020") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', @@ -23,6 +27,6 @@ ), cFlag = cms.int32(0), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(12) - ) + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_B12_5362GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_B12_5362GeV_cfi.py index c0d4ac6424dd9..08218c18056ee 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_B12_5362GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_B12_5362GeV_cfi.py @@ -1,16 +1,20 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.Pyquen2015Settings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5362GeV, - qgpParameters2023, - hydjetParameters2023, +hjenergy = os.getenv("HJENERGY", "5362") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', @@ -23,6 +27,6 @@ ), cFlag = cms.int32(0), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(12) - ) + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_2760GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_2760GeV_cfi.py index cebaa709f800f..7d81c632a7bc9 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_MinBias_2760GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_MinBias_2760GeV_cfi.py @@ -1,16 +1,21 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters, - qgpParameters, - hydjetParameters, +hjenergy = os.getenv("HJENERGY", "2760") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO + 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', 'pythiaZjets', @@ -22,7 +27,6 @@ ), cFlag = cms.int32(1), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(0) - ) - + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5020GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5020GeV_cfi.py index b02fd4867dc6f..505aaca1e6293 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5020GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5020GeV_cfi.py @@ -1,16 +1,20 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.Pyquen2015Settings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5020GeV, - qgpParameters, - hydjetParameters, +hjenergy = os.getenv("HJENERGY", "5020") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', @@ -23,6 +27,6 @@ ), cFlag = cms.int32(1), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(0) - ) + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5362GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5362GeV_cfi.py index 5ef8494782357..ac43f9d84ac10 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5362GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5362GeV_cfi.py @@ -1,16 +1,20 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.Pyquen2015Settings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5362GeV, - qgpParameters2023, - hydjetParameters2023, +hjenergy = os.getenv("HJENERGY", "5362") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', @@ -23,6 +27,6 @@ ), cFlag = cms.int32(1), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(0) - ) + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py index 9df061003cb9d..266df1e1e6a42 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py @@ -1,16 +1,20 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.Pyquen2015Settings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5519GeV, - qgpParameters2023, - hydjetParameters2023, +hjenergy = os.getenv("HJENERGY", "5519") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', @@ -23,6 +27,6 @@ ), cFlag = cms.int32(1), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(0) - ) + )) diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py index b0bfae6eddf76..6c1be7f467f0b 100644 --- a/Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py +++ b/Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py @@ -1,138 +1,32 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.Pyquen2015Settings_cff import * -from Configuration.Generator.PythiaUESettings_cfi import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("HydjetGeneratorFilter", - aBeamTarget = cms.double(129.0), ## beam/target atomic number - comEnergy = cms.double(5442.0), - qgpInitialTemperature = cms.double(1.), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; - qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; - hadronFreezoutTemperature = cms.double(0.125), - doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss - doCollisionalEnLoss = cms.bool(True), - qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 - sigmaInelNN = cms.double(70), - shadowingSwitch = cms.int32(1), - nMultiplicity = cms.int32(18545), - fracSoftMultiplicity = cms.double(1.), - maxLongitudinalRapidity = cms.double(3.75), - maxTransverseRapidity = cms.double(1.16), - angularSpectrumSelector = cms.int32(1), - rotateEventPlane = cms.bool(True), - allowEmptyEvents = cms.bool(False), - embeddingMode = cms.int32(0), +hjenergy = os.getenv("HJENERGY", "5442") + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), - - PythiaParameters = cms.PSet( - pythiaUESettingsBlock, - hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes', - 'CKIN(3)=9.2',# ! ptMin - 'MSTP(81)=1' - ), - myParameters = cms.vstring('MDCY(310,1)=0'), - pythiaJets = cms.vstring('MSUB(11)=1', # q+q->q+q - 'MSUB(12)=1', # q+qbar->q+qbar - 'MSUB(13)=1', # q+qbar->g+g - 'MSUB(28)=1', # q+g->q+g - 'MSUB(53)=1', # g+g->q+qbar - 'MSUB(68)=1' # g+g->g+g + PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, + # Quarkonia and Weak Bosons added back upon dilepton group's request. + parameterSets = cms.vstring('pythiaUESettings', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO + 'myParameters', + 'pythiaJets', + 'pythiaPromptPhotons', + 'pythiaZjets', + 'pythiaBottomoniumNRQCD', + 'pythiaCharmoniumNRQCD', + 'pythiaQuarkoniaSettings', + 'pythiaWeakBosons' + ) ), - pythiaPromptPhotons = cms.vstring('MSUB(14)=1', # q+qbar->g+gamma - 'MSUB(18)=1', # q+qbar->gamma+gamma - 'MSUB(29)=1', # q+g->q+gamma - 'MSUB(114)=1', # g+g->gamma+gamma - 'MSUB(115)=1' # g+g->g+gamma - ), - pythiaZjets = cms.vstring('MSUB(15)=1', - 'MSUB(30)=1'), - pythiaCharmoniumNRQCD = cms.vstring('MSUB(421) = 1', - 'MSUB(422) = 1', - 'MSUB(423) = 1', - 'MSUB(424) = 1', - 'MSUB(425) = 1', - 'MSUB(426) = 1', - 'MSUB(427) = 1', - 'MSUB(428) = 1', - 'MSUB(429) = 1', - 'MSUB(430) = 1', - 'MSUB(431) = 1', - 'MSUB(432) = 1', - 'MSUB(433) = 1', - 'MSUB(434) = 1', - 'MSUB(435) = 1', - 'MSUB(436) = 1', - 'MSUB(437) = 1', - 'MSUB(438) = 1', - 'MSUB(439) = 1' - ), - - pythiaBottomoniumNRQCD = cms.vstring('MSUB(461) = 1', - 'MSUB(462) = 1', - 'MSUB(463) = 1', - 'MSUB(464) = 1', - 'MSUB(465) = 1', - 'MSUB(466) = 1', - 'MSUB(467) = 1', - 'MSUB(468) = 1', - 'MSUB(469) = 1', - 'MSUB(470) = 1', - 'MSUB(471) = 1', - 'MSUB(472) = 1', - 'MSUB(473) = 1', - 'MSUB(474) = 1', - 'MSUB(475) = 1', - 'MSUB(476) = 1', - 'MSUB(477) = 1', - 'MSUB(478) = 1', - 'MSUB(479) = 1', - ), - pythiaWeakBosons = cms.vstring('MSUB(1)=1', - 'MSUB(2)=1'), - pythiaQuarkoniaSettings = cms.vstring('PARP(141)=1.16', # Matrix Elements - 'PARP(142)=0.0119', - 'PARP(143)=0.01', - 'PARP(144)=0.01', - 'PARP(145)=0.05', - 'PARP(146)=9.28', - 'PARP(147)=0.15', - 'PARP(148)=0.02', - 'PARP(149)=0.02', - 'PARP(150)=0.085', - # Meson spin - 'PARJ(13)=0.60', - 'PARJ(14)=0.162', - 'PARJ(15)=0.018', - 'PARJ(16)=0.054', - # Polarization - 'MSTP(145)=0', - 'MSTP(146)=0', - 'MSTP(147)=0', - 'MSTP(148)=1', - 'MSTP(149)=1', - # Chi_c branching ratios - 'BRAT(861)=0.202', - 'BRAT(862)=0.798', - 'BRAT(1501)=0.013', - 'BRAT(1502)=0.987', - 'BRAT(1555)=0.356', - 'BRAT(1556)=0.644' - ), - # Quarkonia and Weak Bosons added back upon dilepton group's request. - parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', - 'myParameters', - 'pythiaJets', - 'pythiaPromptPhotons', - 'pythiaZjets', - 'pythiaBottomoniumNRQCD', - 'pythiaCharmoniumNRQCD', - 'pythiaQuarkoniaSettings', - 'pythiaWeakBosons' - ) - ), cFlag = cms.int32(1), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(0) - ) + )) diff --git a/Configuration/Generator/python/Pyquen2015Settings_cff.py b/Configuration/Generator/python/Pyquen2025Settings_cff.py similarity index 60% rename from Configuration/Generator/python/Pyquen2015Settings_cff.py rename to Configuration/Generator/python/Pyquen2025Settings_cff.py index 74e30bda5d5bc..08df052733072 100644 --- a/Configuration/Generator/python/Pyquen2015Settings_cff.py +++ b/Configuration/Generator/python/Pyquen2025Settings_cff.py @@ -1,78 +1,152 @@ -#Default Pythia Paramters for Hydjet & Pyquen - import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PythiaUESettings_cfi import * +#Default Pythia Paramters for Hydjet & Pyquen +#from Configuration.Generator.PythiaUESettings_cfi import * +from Configuration.Generator.PythiaUEProQ20Settings_cfi import * +#from Configuration.Generator.PythiaUEP11noCRSettings_cfi import * -collisionParameters4TeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(4000.0) - ) +source = cms.Source("EmptySource") + +collisionParameters200GeV = cms.PSet(aBeamTarget = cms.double(197.0), ## beam/target atomic number + comEnergy = cms.double(200.0) + ) collisionParameters2760GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(2760.0) - ) + comEnergy = cms.double(2760.0) + ) collisionParameters5020GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(5020.0) - ) + comEnergy = cms.double(5020.0) + ) collisionParameters5362GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(5362.0) - ) + comEnergy = cms.double(5362.0) + ) +collisionParametersF5362GeV = collisionParameters5362GeV.clone() + +collisionParameters5442GeV = cms.PSet(aBeamTarget = cms.double(129.0), ## beam/target atomic number + comEnergy = cms.double(5442.0) + ) collisionParameters5519GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(5519.0) - ) - -qgpParameters = cms.PSet(qgpInitialTemperature = cms.double(1.1), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; - qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; - hadronFreezoutTemperature = cms.double(0.125), - doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss - doCollisionalEnLoss = cms.bool(True), - qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 - ) - -qgpParameters2023 = cms.PSet(qgpInitialTemperature = cms.double(1.0), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; - qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; - hadronFreezoutTemperature = cms.double(0.125), - doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss - doCollisionalEnLoss = cms.bool(True), - qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 - ) + comEnergy = cms.double(5519.0) + ) + +qgpParameters200GeV = cms.PSet(qgpInitialTemperature = cms.double(0.3), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; + qgpProperTimeFormation = cms.double(0.4), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; + hadronFreezoutTemperature = cms.double(0.100), + doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss + doCollisionalEnLoss = cms.bool(True), + qgpNumQuarkFlavor = cms.int32(2), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 + ) + +qgpParameters2760GeV = cms.PSet(qgpInitialTemperature = cms.double(1.), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; + qgpProperTimeFormation = cms.double(0.4), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; + hadronFreezoutTemperature = cms.double(0.160), + doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss + doCollisionalEnLoss = cms.bool(True), + qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 + ) + +qgpParameters5020GeV = qgpParameters2760GeV.clone(qgpInitialTemperature = cms.double(1.2), + hadronFreezoutTemperature = cms.double(0.170) + ) + +qgpParameters5362GeV = qgpParameters5020GeV.clone(hadronFreezoutTemperature = cms.double(0.174)) + +qgpParametersF5362GeV = qgpParameters5362GeV.clone(qgpInitialTemperature = cms.double(1.), + qgpProperTimeFormation = cms.double(0.1), + hadronFreezoutTemperature = cms.double(0.125) + ) + +qgpParameters5442GeV = qgpParameters5020GeV.clone(hadronFreezoutTemperature = cms.double(0.176)) + +qgpParameters5519GeV = qgpParameters5020GeV.clone(qgpInitialTemperature = cms.double(1.3), + hadronFreezoutTemperature = cms.double(0.176) + ) + +hydjetParameters200GeV = cms.PSet(sigmaInelNN = cms.double(41.6), + shadowingSwitch = cms.int32(1), + nMultiplicity = cms.int32(6640), + fracSoftMultiplicity = cms.double(1.), + maxLongitudinalRapidity = cms.double(3.), + maxTransverseRapidity = cms.double(1.1), + rotateEventPlane = cms.bool(True), + allowEmptyEvents = cms.bool(False), + angularSpectrumSelector = cms.int32(1), ## angular emitted gluon spectrum + embeddingMode = cms.int32(0) + ) + +hydjetParameters2760GeV = cms.PSet(sigmaInelNN = cms.double(61.8), + shadowingSwitch = cms.int32(1), + nMultiplicity = cms.int32(15400), + fracSoftMultiplicity = cms.double(1.), + maxLongitudinalRapidity = cms.double(3.9), + maxTransverseRapidity = cms.double(1.), + rotateEventPlane = cms.bool(True), + allowEmptyEvents = cms.bool(False), + angularSpectrumSelector = cms.int32(1), ## angular emitted gluon spectrum + embeddingMode = cms.int32(0) + ) + +hydjetParameters5020GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(67.6), + nMultiplicity = cms.int32(18600) + ) + +hydjetParameters5362GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(68.13), + nMultiplicity = cms.int32(19125) + ) + +hydjetParametersF5362GeV = hydjetParameters5362GeV.clone(nMultiplicity = cms.int32(18670), + maxLongitudinalRapidity = cms.double(4.), + maxTransverseRapidity = cms.double(0.8), + angularSpectrumSelector = cms.int32(1) + ) + +hydjetParameters5442GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(68.4), + nMultiplicity = cms.int32(21700), + maxLongitudinalRapidity = cms.double(4.2), + maxTransverseRapidity = cms.double(1.2) + ) + +hydjetParameters5519GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(70.9), + nMultiplicity = cms.int32(19306), + maxLongitudinalRapidity = cms.double(4.) + ) pyquenParameters = cms.PSet(doIsospin = cms.bool(True), angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum - embeddingMode = cms.int32(0), + embeddingMode = cms.int32(0) ) -hydjetParameters = cms.PSet(sigmaInelNN = cms.double(70), - shadowingSwitch = cms.int32(1), - nMultiplicity = cms.int32(25000), - fracSoftMultiplicity = cms.double(1.), - maxLongitudinalRapidity = cms.double(4.5), - maxTransverseRapidity = cms.double(1.25), - rotateEventPlane = cms.bool(True), - allowEmptyEvents = cms.bool(False), - angularSpectrumSelector = cms.int32(1), ## angular emitted gluon spectrum - embeddingMode = cms.int32(0) - ) - -hydjetParameters2023 = cms.PSet(sigmaInelNN = cms.double(70), - shadowingSwitch = cms.int32(1), - nMultiplicity = cms.int32(9000), - fracSoftMultiplicity = cms.double(1.), - maxLongitudinalRapidity = cms.double(2.3), - maxTransverseRapidity = cms.double(1.15), - rotateEventPlane = cms.bool(True), - allowEmptyEvents = cms.bool(False), - angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum - embeddingMode = cms.int32(0) - ) - pyquenPythiaDefaultBlock = cms.PSet( pythiaUESettingsBlock, - hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes', - 'CKIN(3)=10.',# ! ptMin + hydjetPythiaDefault200 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=3.55',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault2760 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=7.2',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5020 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=9.',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5362 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=9.',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefaultF5362 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=8.5',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5442 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=11.',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5519 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=9.2',# ! ptMin 'MSTP(81)=1' ), ppDefault = cms.vstring('MSEL=1 ! QCD hight pT processes (only jets)', diff --git a/Configuration/Generator/python/PyquenDefaultSettings_cff.py b/Configuration/Generator/python/PyquenDefaultSettings_cff.py deleted file mode 100644 index 6090bba91177f..0000000000000 --- a/Configuration/Generator/python/PyquenDefaultSettings_cff.py +++ /dev/null @@ -1,254 +0,0 @@ -#Default Pythia Paramters for Hydjet & Pyquen - -import FWCore.ParameterSet.Config as cms - -from Configuration.Generator.PythiaUESettings_cfi import * - -collisionParameters4TeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(4000.0) - ) - -collisionParameters2760GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(2760.0) - ) - -collisionParameters5362GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(5362.0) - ) - -collisionParameters = collisionParameters2760GeV.clone() - -qgpParameters = cms.PSet(qgpInitialTemperature = cms.double(1.0), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; - qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; - hadronFreezoutTemperature = cms.double(0.14), - doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss - doCollisionalEnLoss = cms.bool(False), - qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 - ) - -pyquenParameters = cms.PSet(doIsospin = cms.bool(True), - angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum : - embeddingMode = cms.int32(0), - ) - -hydjetParameters = cms.PSet(sigmaInelNN = cms.double(58), - shadowingSwitch = cms.int32(0), - nMultiplicity = cms.int32(21500), - fracSoftMultiplicity = cms.double(1.), - maxLongitudinalRapidity = cms.double(4.5), - maxTransverseRapidity = cms.double(1.), - rotateEventPlane = cms.bool(True), - allowEmptyEvents = cms.bool(False), - embeddingMode = cms.int32(0) - ) - -pyquenPythiaDefaultBlock = cms.PSet( - pythiaUESettingsBlock, - hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes', - 'CKIN(3)=6.',# ! ptMin - 'MSTP(81)=0' - ), - ppDefault = cms.vstring('MSEL=1 ! QCD hight pT processes (only jets)', - 'CKIN(3)=6.',# ! ptMin - 'MSTP(81)=0' - ), - pythiaHirootDefault = cms.vstring('MSEL=0', # ! Only user defined processes, - 'MSTU(21)=1', # ! to avoid stopping run', - 'PARU(14)=1.', # ! tolerance parameter to adjust fragmentation', - 'MSTP(81)=0', # ! pp multiple scattering off', - 'PMAS(5,1)=4.8', # ! b quark mass', - 'PMAS(6,1)=175.0', # ! t quark mass' - 'CKIN(3)=7.',# ! ptMin - 'MSTJ(22)=2', - 'PARJ(71)=10.', # Decays only if life time < 10mm - 'PARP(67)=1.', - 'PARP(82)=1.9', - 'PARP(85)=0.33', - 'PARP(86)=0.66', - 'PARP(89)=1000.', - 'PARP(91)=1.0', - 'MSTJ(11)=3', - 'MSTJ(22)=2' - ), - ppJets = cms.vstring('MSEL=1 ! QCD hight pT processes'), - customProcesses = cms.vstring('MSEL=0 ! User processes'), - pythiaJets = cms.vstring('MSUB(11)=1', # q+q->q+q - 'MSUB(12)=1', # q+qbar->q+qbar - 'MSUB(13)=1', # q+qbar->g+g - 'MSUB(28)=1', # q+g->q+g - 'MSUB(53)=1', # g+g->q+qbar - 'MSUB(68)=1' # g+g->g+g - ), - pythiaPromptPhotons = cms.vstring('MSUB(14)=1', # q+qbar->g+gamma - 'MSUB(18)=1', # q+qbar->gamma+gamma - 'MSUB(29)=1', # q+g->q+gamma - 'MSUB(114)=1', # g+g->gamma+gamma - 'MSUB(115)=1' # g+g->g+gamma - ), - - pythiaWeakBosons = cms.vstring('MSUB(1)=1', - 'MSUB(2)=1'), - - pythiaZjets = cms.vstring('MSUB(15)=1', - 'MSUB(30)=1'), - - pythiaCharmoniumNRQCD = cms.vstring('MSUB(421) = 1', - 'MSUB(422) = 1', - 'MSUB(423) = 1', - 'MSUB(424) = 1', - 'MSUB(425) = 1', - 'MSUB(426) = 1', - 'MSUB(427) = 1', - 'MSUB(428) = 1', - 'MSUB(429) = 1', - 'MSUB(430) = 1', - 'MSUB(431) = 1', - 'MSUB(432) = 1', - 'MSUB(433) = 1', - 'MSUB(434) = 1', - 'MSUB(435) = 1', - 'MSUB(436) = 1', - 'MSUB(437) = 1', - 'MSUB(438) = 1', - 'MSUB(439) = 1' - ), - - pythiaBottomoniumNRQCD = cms.vstring('MSUB(461) = 1', - 'MSUB(462) = 1', - 'MSUB(463) = 1', - 'MSUB(464) = 1', - 'MSUB(465) = 1', - 'MSUB(466) = 1', - 'MSUB(467) = 1', - 'MSUB(468) = 1', - 'MSUB(469) = 1', - 'MSUB(470) = 1', - 'MSUB(471) = 1', - 'MSUB(472) = 1', - 'MSUB(473) = 1', - 'MSUB(474) = 1', - 'MSUB(475) = 1', - 'MSUB(476) = 1', - 'MSUB(477) = 1', - 'MSUB(478) = 1', - 'MSUB(479) = 1', - ), - - pythiaQuarkoniaSettings = cms.vstring('PARP(141)=1.16', # Matrix Elements - 'PARP(142)=0.0119', - 'PARP(143)=0.01', - 'PARP(144)=0.01', - 'PARP(145)=0.05', - 'PARP(146)=9.28', - 'PARP(147)=0.15', - 'PARP(148)=0.02', - 'PARP(149)=0.02', - 'PARP(150)=0.085', - # Meson spin - 'PARJ(13)=0.60', - 'PARJ(14)=0.162', - 'PARJ(15)=0.018', - 'PARJ(16)=0.054', - # Polarization - 'MSTP(145)=0', - 'MSTP(146)=0', - 'MSTP(147)=0', - 'MSTP(148)=1', - 'MSTP(149)=1', - # Chi_c branching ratios - 'BRAT(861)=0.202', - 'BRAT(862)=0.798', - 'BRAT(1501)=0.013', - 'BRAT(1502)=0.987', - 'BRAT(1555)=0.356', - 'BRAT(1556)=0.644' - ), - - pythiaZtoMuons = cms.vstring("MDME(174,1)=0", # !Z decay into d dbar, - "MDME(175,1)=0", # !Z decay into u ubar, - "MDME(176,1)=0", # !Z decay into s sbar, - "MDME(177,1)=0", # !Z decay into c cbar, - "MDME(178,1)=0", # !Z decay into b bbar, - "MDME(179,1)=0", # !Z decay into t tbar, - "MDME(182,1)=0", # !Z decay into e- e+, - "MDME(183,1)=0", # !Z decay into nu_e nu_ebar, - "MDME(184,1)=1", # !Z decay into mu- mu+, - "MDME(185,1)=0", # !Z decay into nu_mu nu_mubar, - "MDME(186,1)=0", # !Z decay into tau- tau+, - "MDME(187,1)=0" # !Z decay into nu_tau nu_taubar - ), - - - pythiaZtoElectrons = cms.vstring("MDME(174,1)=0", # !Z decay into d dbar, - "MDME(175,1)=0", # !Z decay into u ubar, - "MDME(176,1)=0", # !Z decay into s sbar, - "MDME(177,1)=0", # !Z decay into c cbar, - "MDME(178,1)=0", # !Z decay into b bbar, - "MDME(179,1)=0", # !Z decay into t tbar, - "MDME(182,1)=1", # !Z decay into e- e+, - "MDME(183,1)=0", # !Z decay into nu_e nu_ebar, - "MDME(184,1)=0", # !Z decay into mu- mu+, - "MDME(185,1)=0", # !Z decay into nu_mu nu_mubar, - "MDME(186,1)=0", # !Z decay into tau- tau+, - "MDME(187,1)=0" # !Z decay into nu_tau nu_taubar - ), - - pythiaZtoMuonsAndElectrons = cms.vstring("MDME(174,1)=0", # !Z decay into d dbar, - "MDME(175,1)=0", # !Z decay into u ubar, - "MDME(176,1)=0", # !Z decay into s sbar, - "MDME(177,1)=0", # !Z decay into c cbar, - "MDME(178,1)=0", # !Z decay into b bbar, - "MDME(179,1)=0", # !Z decay into t tbar, - "MDME(182,1)=1", # !Z decay into e- e+, - "MDME(183,1)=0", # !Z decay into nu_e nu_ebar, - "MDME(184,1)=1", # !Z decay into mu- mu+, - "MDME(185,1)=0", # !Z decay into nu_mu nu_mubar, - "MDME(186,1)=0", # !Z decay into tau- tau+, - "MDME(187,1)=0" # !Z decay into nu_tau nu_taubar - ), - - pythiaUpsilonToMuons = cms.vstring('BRAT(1034) = 0 ', # switch off', - 'BRAT(1035) = 1 ', # switch on', - 'BRAT(1036) = 0 ', # switch off', - 'BRAT(1037) = 0 ', # switch off', - 'BRAT(1038) = 0 ', # switch off', - 'BRAT(1039) = 0 ', # switch off', - 'BRAT(1040) = 0 ', # switch off', - 'BRAT(1041) = 0 ', # switch off', - 'BRAT(1042) = 0 ', # switch off', - 'MDME(1034,1) = 0 ', # switch off', - 'MDME(1035,1) = 1 ', # switch on', - 'MDME(1036,1) = 0 ', # switch off', - 'MDME(1037,1) = 0 ', # switch off', - 'MDME(1038,1) = 0 ', # switch off', - 'MDME(1039,1) = 0 ', # switch off', - 'MDME(1040,1) = 0 ', # switch off', - 'MDME(1041,1) = 0 ', # switch off', - 'MDME(1042,1) = 0 ', # switch off' - ), - - pythiaJpsiToMuons = cms.vstring('BRAT(858) = 0 ', # switch off', - 'BRAT(859) = 1 ', # switch on', - 'BRAT(860) = 0 ', # switch off', - 'MDME(858,1) = 0 ', # switch off', - 'MDME(859,1) = 1 ', # switch on', - 'MDME(860,1) = 0 ', # switch off' - ), - - pythiaMuonCandidates = cms.vstring( - 'CKIN(3)=20', - 'MSTJ(22)=2', - 'PARJ(71)=40.' - ), - myParameters = cms.vstring( - ) - -) - -# This one is not to be used -impactParameters = cms.PSet(cFlag = cms.int32(1), - bFixed = cms.double(0), - bMin = cms.double(0), - bMax = cms.double(30) - ) - diff --git a/Configuration/Generator/python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py b/Configuration/Generator/python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py index bc7c2320d285f..50a39326f3ef5 100644 --- a/Configuration/Generator/python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py +++ b/Configuration/Generator/python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py @@ -1,23 +1,27 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters, - qgpParameters, - pyquenParameters, - doQuench = cms.bool(True), - bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 - PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, - parameterSets = cms.vstring('pythiaUESettings','ppJets','kinematics'), - kinematics = cms.vstring ("CKIN(3)=80", #min pthat - "CKIN(4)=120" #max pthat - ) - ), - cFlag = cms.int32(0), ## centrality flag - bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 - bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) +hjenergy = os.getenv("HJENERGY", "2760") + +generator = ExternalGeneratorFilter(cms.EDFilter("PyquenGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + pyquenParameters, + doQuench = cms.bool(True), + bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 + PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, + parameterSets = cms.vstring('pythiaUESettings','ppJets','kinematics'), + kinematics = cms.vstring ("CKIN(3)=80", #min pthat + "CKIN(4)=120" #max pthat + ) + ), + cFlag = cms.int32(0), ## centrality flag + bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 + bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 + )) configurationMetadata = cms.untracked.PSet( version = cms.untracked.string('$Revision: 1.2 $'), diff --git a/Configuration/Generator/python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py b/Configuration/Generator/python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py index f7adf91a210cf..42c724ff94479 100644 --- a/Configuration/Generator/python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py +++ b/Configuration/Generator/python/Pyquen_DiJet_pt80to120_5362GeV_cfi.py @@ -1,23 +1,27 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters5362GeV, - qgpParameters, - pyquenParameters, - doQuench = cms.bool(True), - bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 - PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, - parameterSets = cms.vstring('pythiaUESettings','ppJets','kinematics'), - kinematics = cms.vstring ("CKIN(3)=80", #min pthat - "CKIN(4)=120" #max pthat - ) - ), - cFlag = cms.int32(0), ## centrality flag - bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 - bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) +hjenergy = os.getenv("HJENERGY", "5362") + +generator = ExternalGeneratorFilter(cms.EDFilter("PyquenGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + pyquenParameters, + doQuench = cms.bool(True), + bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 + PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, + parameterSets = cms.vstring('pythiaUESettings','ppJets','kinematics'), + kinematics = cms.vstring ("CKIN(3)=80", #min pthat + "CKIN(4)=120" #max pthat + ) + ), + cFlag = cms.int32(0), ## centrality flag + bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 + bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 + )) configurationMetadata = cms.untracked.PSet( version = cms.untracked.string('$Revision: 1.2 $'), diff --git a/Configuration/Generator/python/Pyquen_GammaJet_pt20_2760GeV_cfi.py b/Configuration/Generator/python/Pyquen_GammaJet_pt20_2760GeV_cfi.py index 622e3ae2b1cb9..02a9f125455cb 100644 --- a/Configuration/Generator/python/Pyquen_GammaJet_pt20_2760GeV_cfi.py +++ b/Configuration/Generator/python/Pyquen_GammaJet_pt20_2760GeV_cfi.py @@ -1,10 +1,14 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters, - qgpParameters, +hjenergy = os.getenv("HJENERGY", "2760") + +generator = ExternalGeneratorFilter(cms.EDFilter("PyquenGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO pyquenParameters, doQuench = cms.bool(True), bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 @@ -20,7 +24,7 @@ cFlag = cms.int32(0), ## centrality flag bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) + )) generator.embeddingMode = 0 diff --git a/Configuration/Generator/python/Pyquen_GammaJet_pt20_5362GeV_cfi.py b/Configuration/Generator/python/Pyquen_GammaJet_pt20_5362GeV_cfi.py index 881de2c7fe94c..e4581e84d90d3 100644 --- a/Configuration/Generator/python/Pyquen_GammaJet_pt20_5362GeV_cfi.py +++ b/Configuration/Generator/python/Pyquen_GammaJet_pt20_5362GeV_cfi.py @@ -1,10 +1,14 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters5362GeV, - qgpParameters, +hjenergy = os.getenv("HJENERGY", "5362") + +generator = ExternalGeneratorFilter(cms.EDFilter("PyquenGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO pyquenParameters, doQuench = cms.bool(True), bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 @@ -20,7 +24,7 @@ cFlag = cms.int32(0), ## centrality flag bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) + )) generator.embeddingMode = 0 diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py deleted file mode 100644 index 21db9e60212bf..0000000000000 --- a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py +++ /dev/null @@ -1,36 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Generator.PyquenDefaultSettings_cff import * - -_generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters, - qgpParameters, - pyquenParameters, - doQuench = cms.bool(True), - bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 - PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, - parameterSets = cms.vstring('pythiaUESettings','customProcesses','pythiaZjets','pythiaZtoMuonsAndElectrons','kinematics'), - kinematics = cms.vstring ("CKIN(3)=10", #min pthat - "CKIN(4)=9999", #max pthat - "CKIN(7)=-2.", #min rapidity - "CKIN(8)=2." #max rapidity - ) - - ), - cFlag = cms.int32(0), ## centrality flag - bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 - bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) - -from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = ExternalGeneratorFilter(_generator) - -_generator.embeddingMode = 0 - -configurationMetadata = cms.untracked.PSet( - version = cms.untracked.string('$Revision: 1.3 $'), - name = cms.untracked.string('$Source: /local/projects/CMSSW/rep/CMSSW/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py,v $'), - annotation = cms.untracked.string('PYQUEN Z->mumu and Z->ee (pt-hat > 10 GeV) at sqrt(s) = 2.76TeV') - ) - -ProductionFilterSequence = cms.Sequence(generator) diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py index 5a65e6f782e0c..d1dc0862f958b 100644 --- a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py +++ b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py @@ -1,10 +1,14 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters, - qgpParameters, +hjenergy = os.getenv("HJENERGY", "2760") + +generator = ExternalGeneratorFilter(cms.EDFilter("PyquenGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO pyquenParameters, doQuench = cms.bool(True), bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 @@ -20,7 +24,7 @@ cFlag = cms.int32(0), ## centrality flag bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) + )) generator.embeddingMode = 0 diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py index 8e72c5a775b42..c51f9b0da38e7 100644 --- a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py +++ b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_5362GeV_cfi.py @@ -1,10 +1,14 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PyquenDefaultSettings_cff import * +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os -generator = cms.EDFilter("PyquenGeneratorFilter", - collisionParameters5362GeV, - qgpParameters, +hjenergy = os.getenv("HJENERGY", "5362") + +generator = ExternalGeneratorFilter(cms.EDFilter("PyquenGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO pyquenParameters, doQuench = cms.bool(True), bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 @@ -20,7 +24,7 @@ cFlag = cms.int32(0), ## centrality flag bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 - ) + )) generator.embeddingMode = 0 diff --git a/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py b/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py deleted file mode 100644 index 6a9a9ab542139..0000000000000 --- a/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py +++ /dev/null @@ -1,17 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -_generator = cms.EDFilter("ReggeGribovPartonMCGeneratorFilter", - - bmin = cms.double(0), #impact parameter min in fm - bmax = cms.double(10000),#impact parameter max in fm - paramFileName = cms.untracked.string("Configuration/Generator/data/ReggeGribovPartonMC.param"), #file with more parameters specific to crmc interface - skipNuclFrag = cms.bool(True), #in HI collisions nuclear fragments with pt=0 can be in the hep event. to skip those activate this option - beammomentum = cms.double(4080), - targetmomentum = cms.double(-4080), - beamid = cms.int32(208), - targetid = cms.int32(1), - model = cms.int32(0), - ) - -from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = ExternalGeneratorFilter(_generator) diff --git a/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_cfi.py b/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_cfi.py index 7c1a4ab5dc265..3c0b4c5ff8784 100644 --- a/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_cfi.py +++ b/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_cfi.py @@ -1,6 +1,8 @@ import FWCore.ParameterSet.Config as cms +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter -generator = cms.EDFilter("ReggeGribovPartonMCGeneratorFilter", + +generator = ExternalGeneratorFilter(cms.EDFilter("ReggeGribovPartonMCGeneratorFilter", bmin = cms.double(0), #impact parameter min in fm bmax = cms.double(10000),#impact parameter max in fm @@ -11,4 +13,4 @@ beamid = cms.int32(208), targetid = cms.int32(1), model = cms.int32(0), - ) + )) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 0129aacd2050c..8f32e22f12e51 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1714,10 +1714,10 @@ def identityFS(wf): steps['BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen']=genvalid('BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen_cfi',step1GenDefaults) steps['ZTTFS_ExtGen']=genvalid('ZTT_Tauola_OneLepton_OtherHadrons_8TeV_TuneCUETP8M1_ExtGen_cfi',step1GenDefaults) steps['sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen']=genvalid('sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen_cff',merge([{'-n':'50'},step1GenDefaults])) -steps['HydjetQ_B12_5020GeV_2018_ExtGen']=genvalid('Hydjet_Quenched_B12_5020GeV_ExtGen_cfi',step1GenDefaults) -steps['AMPT_PPb_5020GeV_MinimumBias_ExtGen']=genvalid('AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi',step1GenDefaults) -steps['EPOS_PPb_8160GeV_MinimumBias_ExtGen']=genvalid('ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi',step1GenDefaults) -steps['Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen']=genvalid('Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi',step1GenDefaults) +steps['HydjetQ_B12_5020GeV_2018_ExtGen']=genvalid('Hydjet_Quenched_B12_5020GeV_cfi',step1GenDefaults) +steps['AMPT_PPb_5020GeV_MinimumBias_ExtGen']=genvalid('AMPT_PPb_5020GeV_MinimumBias_cfi',step1GenDefaults) +steps['EPOS_PPb_8160GeV_MinimumBias_ExtGen']=genvalid('ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_cfi',step1GenDefaults) +steps['Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen']=genvalid('Pyquen_ZeemumuJets_pt10_2760GeV_cfi',step1GenDefaults) # Generator Hadronization (Hadronization of LHE) steps['WJetsLNu_13TeV_madgraph-pythia8']=genvalid('Hadronizer_MgmMatchTuneCUETP8M1_13TeV_madgraph_pythia8_cff',step1GenDefaults,dataSet='/WJetsToLNu_13TeV-madgraph/Fall13wmLHE-START62_V1-v1/GEN') diff --git a/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h b/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h index 1f782e66cec3c..fb7e212917290 100644 --- a/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h +++ b/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h @@ -4,7 +4,7 @@ /** \class HydjetHadronizer \brief Interface to the HYDJET generator (since core v. 1.9.1), produces HepMC events - \version 2.0 + \version 2.1 \authors Camelia Mironov, Yetkin Yilmaz, Andrey Belyaev */ @@ -137,6 +137,21 @@ namespace gen { Return the nuclear radius derived from the beam/target atomic mass number. */ - double HydjetHadronizer::nuclear_radius() const { return 1.15 * pow((double)abeamtarget_, 1. / 3.); } + double HydjetHadronizer::nuclear_radius() const { + if (fabs((double)abeamtarget_ - 208.0) < 0.0001) + return 6.624; + else if (fabs((double)abeamtarget_ - 197.0) < 0.0001) + return 6.38; + else if (fabs((double)abeamtarget_ - 129.0) < 0.0001) + return 5.36; + else if (fabs((double)abeamtarget_ - 63.0) < 0.0001) + return 4.20; + else if (fabs((double)abeamtarget_ - 20.0) < 0.0001) + return 2.992; + else if (fabs((double)abeamtarget_ - 16.0) < 0.0001) + return 2.608; + else + return 1.15 * pow((double)abeamtarget_, 1. / 3.); + } } // namespace gen #endif diff --git a/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py b/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py index e1f6267972746..30243e3d1e069 100644 --- a/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py +++ b/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py @@ -1,44 +1,150 @@ -#Default Pythia Paramters for Hydjet & Pyquen - import FWCore.ParameterSet.Config as cms -from Configuration.Generator.PythiaUESettings_cfi import * +#from Configuration.Generator.PythiaUESettings_cfi import * +from Configuration.Generator.PythiaUEProQ20Settings_cfi import * +#from Configuration.Generator.PythiaUEP11noCRSettings_cfi import * -collisionParameters4TeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(4000.0) - ) +source = cms.Source("EmptySource") + +collisionParameters200GeV = cms.PSet(aBeamTarget = cms.double(197.0), ## beam/target atomic number + comEnergy = cms.double(200.0) + ) collisionParameters2760GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(2760.0) - ) + comEnergy = cms.double(2760.0) + ) collisionParameters5020GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(5020.0) - ) - -qgpParameters = cms.PSet(qgpInitialTemperature = cms.double(1.), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; - qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; - hadronFreezoutTemperature = cms.double(0.125), - doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss - doCollisionalEnLoss = cms.bool(True), - qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 - ) - -hydjetParameters = cms.PSet(sigmaInelNN = cms.double(70), - shadowingSwitch = cms.int32(1), - nMultiplicity = cms.int32(18545), - fracSoftMultiplicity = cms.double(1.), - maxLongitudinalRapidity = cms.double(3.75), - maxTransverseRapidity = cms.double(1.160), - rotateEventPlane = cms.bool(True), - allowEmptyEvents = cms.bool(False), - angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum : - embeddingMode = cms.int32(0) - ) + comEnergy = cms.double(5020.0) + ) + +collisionParameters5362GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number + comEnergy = cms.double(5362.0) + ) +collisionParametersF5362GeV = collisionParameters5362GeV.clone() + +collisionParameters5442GeV = cms.PSet(aBeamTarget = cms.double(129.0), ## beam/target atomic number + comEnergy = cms.double(5442.0) + ) + +collisionParameters5519GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number + comEnergy = cms.double(5519.0) + ) + +qgpParameters200GeV = cms.PSet(qgpInitialTemperature = cms.double(0.3), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; + qgpProperTimeFormation = cms.double(0.4), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; + hadronFreezoutTemperature = cms.double(0.100), + doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss + doCollisionalEnLoss = cms.bool(True), + qgpNumQuarkFlavor = cms.int32(2), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 + ) + +qgpParameters2760GeV = cms.PSet(qgpInitialTemperature = cms.double(1.), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; + qgpProperTimeFormation = cms.double(0.4), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; + hadronFreezoutTemperature = cms.double(0.160), + doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss + doCollisionalEnLoss = cms.bool(True), + qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 + ) + +qgpParameters5020GeV = qgpParameters2760GeV.clone(qgpInitialTemperature = cms.double(1.2), + hadronFreezoutTemperature = cms.double(0.170) + ) + +qgpParameters5362GeV = qgpParameters5020GeV.clone(hadronFreezoutTemperature = cms.double(0.174)) + +qgpParametersF5362GeV = qgpParameters5362GeV.clone(qgpInitialTemperature = cms.double(1.), + qgpProperTimeFormation = cms.double(0.1), + hadronFreezoutTemperature = cms.double(0.125) + ) + +qgpParameters5442GeV = qgpParameters5020GeV.clone(hadronFreezoutTemperature = cms.double(0.176)) + +qgpParameters5519GeV = qgpParameters5020GeV.clone(qgpInitialTemperature = cms.double(1.3), + hadronFreezoutTemperature = cms.double(0.176) + ) + +hydjetParameters200GeV = cms.PSet(sigmaInelNN = cms.double(41.6), + shadowingSwitch = cms.int32(1), + nMultiplicity = cms.int32(6640), + fracSoftMultiplicity = cms.double(1.), + maxLongitudinalRapidity = cms.double(3.), + maxTransverseRapidity = cms.double(1.1), + rotateEventPlane = cms.bool(True), + allowEmptyEvents = cms.bool(False), + angularSpectrumSelector = cms.int32(1), ## angular emitted gluon spectrum + embeddingMode = cms.int32(0) + ) + +hydjetParameters2760GeV = cms.PSet(sigmaInelNN = cms.double(61.8), + shadowingSwitch = cms.int32(1), + nMultiplicity = cms.int32(15400), + fracSoftMultiplicity = cms.double(1.), + maxLongitudinalRapidity = cms.double(3.9), + maxTransverseRapidity = cms.double(1.), + rotateEventPlane = cms.bool(True), + allowEmptyEvents = cms.bool(False), + angularSpectrumSelector = cms.int32(1), ## angular emitted gluon spectrum + embeddingMode = cms.int32(0) + ) + +hydjetParameters5020GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(67.6), + nMultiplicity = cms.int32(18600) + ) + +hydjetParameters5362GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(68.13), + nMultiplicity = cms.int32(19125) + ) + +hydjetParametersF5362GeV = hydjetParameters5362GeV.clone(nMultiplicity = cms.int32(18670), + maxLongitudinalRapidity = cms.double(4.), + maxTransverseRapidity = cms.double(0.8), + angularSpectrumSelector = cms.int32(1) + ) + +hydjetParameters5442GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(68.4), + nMultiplicity = cms.int32(21700), + maxLongitudinalRapidity = cms.double(4.2), + maxTransverseRapidity = cms.double(1.2) + ) + +hydjetParameters5519GeV = hydjetParameters2760GeV.clone(sigmaInelNN = cms.double(70.9), + nMultiplicity = cms.int32(19306), + maxLongitudinalRapidity = cms.double(4.) + ) + +pyquenParameters = cms.PSet(doIsospin = cms.bool(True), + angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum + embeddingMode = cms.int32(0) + ) pyquenPythiaDefaultBlock = cms.PSet( pythiaUESettingsBlock, - hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes', + hydjetPythiaDefault200 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=3.55',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault2760 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=7.2',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5020 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=9.',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5362 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=9.',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefaultF5362 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=8.5',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5442 = cms.vstring('MSEL=0 ! user processes', + 'CKIN(3)=11.',# ! ptMin + 'MSTP(81)=1' + ), + hydjetPythiaDefault5519 = cms.vstring('MSEL=0 ! user processes', 'CKIN(3)=9.2',# ! ptMin 'MSTP(81)=1' ), diff --git a/GeneratorInterface/HydjetInterface/python/hydjetDefault_cfi.py b/GeneratorInterface/HydjetInterface/python/hydjetDefault_cfi.py index b4acf35dc8070..5e798352f4ac0 100644 --- a/GeneratorInterface/HydjetInterface/python/hydjetDefault_cfi.py +++ b/GeneratorInterface/HydjetInterface/python/hydjetDefault_cfi.py @@ -1,18 +1,28 @@ import FWCore.ParameterSet.Config as cms -source = cms.Source("EmptySource") +from Configuration.Generator.Pyquen2025Settings_cff import * +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +import os +import FWCore.ParameterSet.VarParsing as VarParsing -from GeneratorInterface.HydjetInterface.hydjetDefaultParameters_cff import * +hjenergy = os.getenv("HJENERGY", "0") -generator = cms.EDFilter("HydjetGeneratorFilter", - collisionParameters5020GeV, - qgpParameters, - hydjetParameters, +if hjenergy in "0": + options = VarParsing.VarParsing("analysis") + options.register("hjenergy", "999", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Beam energy") + options.parseArguments() + hjenergy = options.hjenergy + + +generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter", + locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO + locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO + locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO hydjetMode = cms.string('kHydroQJets'), PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, # Quarkonia and Weak Bosons added back upon dilepton group's request. parameterSets = cms.vstring('pythiaUESettings', - 'hydjetPythiaDefault', + 'hydjetPythiaDefault'+hjenergy, #tune CELLO 'myParameters', 'pythiaJets', 'pythiaPromptPhotons', @@ -25,6 +35,6 @@ ), cFlag = cms.int32(1), bMin = cms.double(0), - bMax = cms.double(30), + bMax = cms.double(22), bFixed = cms.double(0) - ) + )) diff --git a/GeneratorInterface/HydjetInterface/test/testHydjet.py b/GeneratorInterface/HydjetInterface/test/testHydjet.py index 4f7a63d3e663f..dd0dae735c2a4 100644 --- a/GeneratorInterface/HydjetInterface/test/testHydjet.py +++ b/GeneratorInterface/HydjetInterface/test/testHydjet.py @@ -1,4 +1,17 @@ import FWCore.ParameterSet.Config as cms +import FWCore.ParameterSet.VarParsing as VarParsing +import os + +hjenergy = os.getenv("HJENERGY", "0") + +if hjenergy in "0": + options = VarParsing.VarParsing("analysis") + options.register("hjenergy", "999", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Beam energy") + options.parseArguments() + hjenergy = options.hjenergy + +if hjenergy in "999": + raise RuntimeError("Stopping cmsRun testHydjet.py: this macro needs hjenergy=5362 command line parameter") process = cms.Process("ANA") @@ -14,7 +27,7 @@ ) process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(100) + input = cms.untracked.int32(-1) ) process.ana = cms.EDAnalyzer('HydjetAnalyzer', @@ -64,7 +77,7 @@ #process.generator.signalVtx = cms.untracked.vdouble(0.,0.,0.,0.) # Signal event vertex option, to set it by hand (instead of smearing) process.TFileService = cms.Service('TFileService', - fileName = cms.string('Hydjet1_MB_5020GeV.root') + fileName = cms.string('Hydjet.root') ) process.p = cms.Path(process.generator*process.ana)