Skip to content

Commit a18a727

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47838 from wouf/from-CMSSW_15_1_X_2025-04-10-1100
2025 update of heavy-ion generator configurations
2 parents 4ab2a66 + b08fb61 commit a18a727

23 files changed

+507
-596
lines changed

‎Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_cfi.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import FWCore.ParameterSet.Config as cms
2+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
23

3-
generator = cms.EDFilter("AMPTGeneratorFilter",
4+
generator = ExternalGeneratorFilter(cms.EDFilter("AMPTGeneratorFilter",
45
diquarky = cms.double(0.0),
56
diquarkx = cms.double(0.0),
67
diquarkpx = cms.double(7.0),
@@ -44,7 +45,7 @@
4445
iat = cms.int32(1),
4546
bMax = cms.double(15),
4647
iap = cms.int32(208)
47-
)
48+
))
4849

4950
configurationMetadata = cms.untracked.PSet(
5051
version = cms.untracked.string('$Revision$'),

‎Configuration/Generator/python/Hijing_PPb_MinimumBias_cfi.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import FWCore.ParameterSet.Config as cms
2+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
23

3-
generator = cms.EDFilter("HijingGeneratorFilter",
4+
generator = ExternalGeneratorFilter(cms.EDFilter("HijingGeneratorFilter",
45
rotateEventPlane = cms.bool(True),
56
frame = cms.string('CMS '),
67
targ = cms.string('P '),
@@ -12,7 +13,7 @@
1213
iat = cms.int32(1),
1314
bMax = cms.double(15),
1415
iap = cms.int32(208)
15-
)
16+
))
1617

1718
configurationMetadata = cms.untracked.PSet(
1819
version = cms.untracked.string('$Revision: 1.3 $'),

‎Configuration/Generator/python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

33
from GeneratorInterface.Hydjet2Interface.hydjet2DefaultParameters_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
45

5-
generator = cms.EDFilter("Hydjet2GeneratorFilter",
6+
generator = ExternalGeneratorFilter(cms.EDFilter("Hydjet2GeneratorFilter",
67
collisionParameters5020GeV,
78
qgpParametersLHC,
89
hydjet2Parameters,
@@ -21,4 +22,4 @@
2122
fBmin = cms.double(0.), # Minimal impact parameter, fBmin (fm)
2223
fBmax = cms.double(21.), # Maximal impact parameter, fBmax (fm)
2324
fBfix = cms.double(0.), # Fixed impact parameter, fBfix (fm)
24-
)
25+
))

‎Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_cfi.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Generator.Pyquen2015Settings_cff import *
3+
from Configuration.Generator.Pyquen2025Settings_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
5+
import os
46

5-
generator = cms.EDFilter("HydjetGeneratorFilter",
6-
collisionParameters5020GeV,
7-
qgpParameters,
8-
hydjetParameters,
7+
hjenergy = os.getenv("HJENERGY", "5020")
8+
9+
generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter",
10+
locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO
11+
locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO
12+
locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO
913
hydjetMode = cms.string('kHydroQJets'),
1014
PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock,
1115
# Quarkonia and Weak Bosons added back upon dilepton group's request.
1216
parameterSets = cms.vstring('pythiaUESettings',
13-
'hydjetPythiaDefault',
17+
'hydjetPythiaDefault'+hjenergy, #tune CELLO
1418
'myParameters',
1519
'pythiaJets',
1620
'pythiaPromptPhotons',
@@ -23,6 +27,6 @@
2327
),
2428
cFlag = cms.int32(0),
2529
bMin = cms.double(0),
26-
bMax = cms.double(30),
30+
bMax = cms.double(22),
2731
bFixed = cms.double(12)
28-
)
32+
))

‎Configuration/Generator/python/Hydjet_Quenched_B12_5362GeV_cfi.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Generator.Pyquen2015Settings_cff import *
3+
from Configuration.Generator.Pyquen2025Settings_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
5+
import os
46

5-
generator = cms.EDFilter("HydjetGeneratorFilter",
6-
collisionParameters5362GeV,
7-
qgpParameters2023,
8-
hydjetParameters2023,
7+
hjenergy = os.getenv("HJENERGY", "5362")
8+
9+
generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter",
10+
locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO
11+
locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO
12+
locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO
913
hydjetMode = cms.string('kHydroQJets'),
1014
PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock,
1115
# Quarkonia and Weak Bosons added back upon dilepton group's request.
1216
parameterSets = cms.vstring('pythiaUESettings',
13-
'hydjetPythiaDefault',
17+
'hydjetPythiaDefault'+hjenergy, #tune CELLO
1418
'myParameters',
1519
'pythiaJets',
1620
'pythiaPromptPhotons',
@@ -23,6 +27,6 @@
2327
),
2428
cFlag = cms.int32(0),
2529
bMin = cms.double(0),
26-
bMax = cms.double(30),
30+
bMax = cms.double(22),
2731
bFixed = cms.double(12)
28-
)
32+
))

‎Configuration/Generator/python/Hydjet_Quenched_MinBias_2760GeV_cfi.py‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Generator.PyquenDefaultSettings_cff import *
3+
from Configuration.Generator.Pyquen2025Settings_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
5+
import os
46

5-
generator = cms.EDFilter("HydjetGeneratorFilter",
6-
collisionParameters,
7-
qgpParameters,
8-
hydjetParameters,
7+
hjenergy = os.getenv("HJENERGY", "2760")
8+
9+
generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter",
10+
locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO
11+
locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO
12+
locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO
913
hydjetMode = cms.string('kHydroQJets'),
1014
PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock,
1115
# Quarkonia and Weak Bosons added back upon dilepton group's request.
1216
parameterSets = cms.vstring('pythiaUESettings',
13-
'hydjetPythiaDefault',
17+
'hydjetPythiaDefault'+hjenergy, #tune CELLO
18+
'myParameters',
1419
'pythiaJets',
1520
'pythiaPromptPhotons',
1621
'pythiaZjets',
@@ -22,7 +27,6 @@
2227
),
2328
cFlag = cms.int32(1),
2429
bMin = cms.double(0),
25-
bMax = cms.double(30),
30+
bMax = cms.double(22),
2631
bFixed = cms.double(0)
27-
)
28-
32+
))

‎Configuration/Generator/python/Hydjet_Quenched_MinBias_5020GeV_cfi.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Generator.Pyquen2015Settings_cff import *
3+
from Configuration.Generator.Pyquen2025Settings_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
5+
import os
46

5-
generator = cms.EDFilter("HydjetGeneratorFilter",
6-
collisionParameters5020GeV,
7-
qgpParameters,
8-
hydjetParameters,
7+
hjenergy = os.getenv("HJENERGY", "5020")
8+
9+
generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter",
10+
locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO
11+
locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO
12+
locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO
913
hydjetMode = cms.string('kHydroQJets'),
1014
PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock,
1115
# Quarkonia and Weak Bosons added back upon dilepton group's request.
1216
parameterSets = cms.vstring('pythiaUESettings',
13-
'hydjetPythiaDefault',
17+
'hydjetPythiaDefault'+hjenergy, #tune CELLO
1418
'myParameters',
1519
'pythiaJets',
1620
'pythiaPromptPhotons',
@@ -23,6 +27,6 @@
2327
),
2428
cFlag = cms.int32(1),
2529
bMin = cms.double(0),
26-
bMax = cms.double(30),
30+
bMax = cms.double(22),
2731
bFixed = cms.double(0)
28-
)
32+
))

‎Configuration/Generator/python/Hydjet_Quenched_MinBias_5362GeV_cfi.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Generator.Pyquen2015Settings_cff import *
3+
from Configuration.Generator.Pyquen2025Settings_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
5+
import os
46

5-
generator = cms.EDFilter("HydjetGeneratorFilter",
6-
collisionParameters5362GeV,
7-
qgpParameters2023,
8-
hydjetParameters2023,
7+
hjenergy = os.getenv("HJENERGY", "5362")
8+
9+
generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter",
10+
locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO
11+
locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO
12+
locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO
913
hydjetMode = cms.string('kHydroQJets'),
1014
PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock,
1115
# Quarkonia and Weak Bosons added back upon dilepton group's request.
1216
parameterSets = cms.vstring('pythiaUESettings',
13-
'hydjetPythiaDefault',
17+
'hydjetPythiaDefault'+hjenergy, #tune CELLO
1418
'myParameters',
1519
'pythiaJets',
1620
'pythiaPromptPhotons',
@@ -23,6 +27,6 @@
2327
),
2428
cFlag = cms.int32(1),
2529
bMin = cms.double(0),
26-
bMax = cms.double(30),
30+
bMax = cms.double(22),
2731
bFixed = cms.double(0)
28-
)
32+
))

‎Configuration/Generator/python/Hydjet_Quenched_MinBias_5519GeV_cfi.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
from Configuration.Generator.Pyquen2015Settings_cff import *
3+
from Configuration.Generator.Pyquen2025Settings_cff import *
4+
from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
5+
import os
46

5-
generator = cms.EDFilter("HydjetGeneratorFilter",
6-
collisionParameters5519GeV,
7-
qgpParameters2023,
8-
hydjetParameters2023,
7+
hjenergy = os.getenv("HJENERGY", "5519")
8+
9+
generator = ExternalGeneratorFilter(cms.EDFilter("HydjetGeneratorFilter",
10+
locals()[f"collisionParameters{hjenergy}GeV"], #tune CELLO
11+
locals()[f"qgpParameters{hjenergy}GeV"], #tune CELLO
12+
locals()[f"hydjetParameters{hjenergy}GeV"], #tune CELLO
913
hydjetMode = cms.string('kHydroQJets'),
1014
PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock,
1115
# Quarkonia and Weak Bosons added back upon dilepton group's request.
1216
parameterSets = cms.vstring('pythiaUESettings',
13-
'hydjetPythiaDefault',
17+
'hydjetPythiaDefault'+hjenergy, #tune CELLO
1418
'myParameters',
1519
'pythiaJets',
1620
'pythiaPromptPhotons',
@@ -23,6 +27,6 @@
2327
),
2428
cFlag = cms.int32(1),
2529
bMin = cms.double(0),
26-
bMax = cms.double(30),
30+
bMax = cms.double(22),
2731
bFixed = cms.double(0)
28-
)
32+
))

0 commit comments

Comments
 (0)