Merge pull request #36918 from wouf/from-CMSSW_12_3_X_2022-02-08-1100

bug fixes for Hydjets and Pyquen
cms-sw · Feb 15, 2022 · 0cd52af · 0cd52af
2 parents 848ec52 + 4ed1ac9
commit 0cd52af
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 613 deletions.
diff --git a/Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py
@@ -12,17 +12,16 @@
                          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
-                         numQuarkFlavor = cms.int32(0), ## to be removed
-                          sigmaInelNN = cms.double(70),
+                         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),
+                         angularSpectrumSelector = cms.int32(1),
                          rotateEventPlane = cms.bool(True),
                          allowEmptyEvents = cms.bool(False),
-                         embeddingMode = cms.bool(False),
+                         embeddingMode = cms.int32(0),
                          hydjetMode = cms.string('kHydroQJets'),
 
                          PythiaParameters = cms.PSet(

diff --git a/Configuration/Generator/python/Pyquen2013Settings_cff.py b/Configuration/Generator/python/Pyquen2013Settings_cff.py
diff --git a/Configuration/Generator/python/Pyquen2015Settings_cff.py b/Configuration/Generator/python/Pyquen2015Settings_cff.py
@@ -22,7 +22,6 @@
                          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
-                         numQuarkFlavor = cms.int32(0) ## to be removed
                          )
 
 pyquenParameters  = cms.PSet(doIsospin = cms.bool(True),

diff --git a/Configuration/Generator/python/PyquenDefaultSettings_cff.py b/Configuration/Generator/python/PyquenDefaultSettings_cff.py
@@ -20,7 +20,6 @@
                          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 
-                         numQuarkFlavor = cms.int32(0) ## to be removed
                          )
 
 pyquenParameters  = cms.PSet(doIsospin = cms.bool(True),

diff --git a/Configuration/Generator/python/Pyquen_GammaJet_pt20_2760GeV_cfi.py b/Configuration/Generator/python/Pyquen_GammaJet_pt20_2760GeV_cfi.py
@@ -22,7 +22,7 @@
                          bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0
                          )
 
-generator.embeddingMode = False
+generator.embeddingMode = 0
 
 configurationMetadata = cms.untracked.PSet(
     version = cms.untracked.string('$Revision: 1.3 $'),

diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py
@@ -25,7 +25,7 @@
 from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter
 generator = ExternalGeneratorFilter(_generator)
 
-_generator.embeddingMode = False
+_generator.embeddingMode = 0
 
 configurationMetadata = cms.untracked.PSet(
     version = cms.untracked.string('$Revision: 1.3 $'),

diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py
@@ -22,7 +22,7 @@
                         bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0
                         )
 
-generator.embeddingMode = False
+generator.embeddingMode = 0
 
 configurationMetadata = cms.untracked.PSet(
     version = cms.untracked.string('$Revision: 1.3 $'),