Hydjet++ 2.4.3 integration

Configuration/Applications/python/ConfigBuilder.py

@@ -2230,7 +2230,7 @@ def prepare(self, doChecking = False):
                 self.pythonCfgCode +=dumpPython(self.process,object)
 
         if self._options.pileup=='HiMixEmbGEN':
-            self.pythonCfgCode += "\nprocess.generator.embeddingMode=cms.bool(True)\n"
+            self.pythonCfgCode += "\nprocess.generator.embeddingMode=cms.int32(1)\n"
 
         # dump all paths
         self.pythonCfgCode += "\n# Path and EndPath definitions\n"

Configuration/Generator/python/Hydjet2_Quenched_MinBias_5020GeV_cfi.py

@@ -0,0 +1,24 @@
+import FWCore.ParameterSet.Config as cms
+
+from GeneratorInterface.Hydjet2Interface.hydjet2DefaultParameters_cff import *
+
+generator = cms.EDFilter("Hydjet2GeneratorFilter",
+                         collisionParameters5020GeV,
+                         qgpParametersLHC,
+                         hydjet2Parameters,
+                         fNhsel 	= cms.int32(2), # Flag to include jet (J)/jet quenching (JQ) and hydro (H) state production, fNhsel (0 H on & J off, 1 H/J on & JQ off, 2 H/J/HQ on, 3 J on & H/JQ off, 4 H off & J/JQ on)
+                         PythiaParameters = cms.PSet(PythiaDefaultBlock,
+                                                     parameterSets = cms.vstring(
+                                                         'ProQ2Otune',
+                                                         'hydjet2PythiaDefault',
+                                                     )
+                                                 ),
+
+                         maxEventsToPrint = cms.untracked.int32(0),
+                         pythiaPylistVerbosity = cms.untracked.int32(0),
+
+                         fIfb 	= cms.int32(1), 	# Flag of type of centrality generation, fBfix (=0 is fixed by fBfix, >0 distributed [fBfmin, fBmax])
+                         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)
+                     )

Configuration/Generator/python/Pyquen2015Settings_cff.py

@@ -27,7 +27,7 @@
 
 pyquenParameters  = cms.PSet(doIsospin = cms.bool(True),
                              angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum
-                             embeddingMode = cms.bool(False),
+                             embeddingMode = cms.int32(0),
                              )
 
 hydjetParameters = cms.PSet(sigmaInelNN = cms.double(70),
@@ -39,7 +39,7 @@
                             rotateEventPlane = cms.bool(True),
                             allowEmptyEvents = cms.bool(False),
                             angularSpectrumSelector = cms.int32(1), ## angular emitted gluon spectrum
-                            embeddingMode = cms.bool(False)
+                            embeddingMode = cms.int32(0)
                             )
 
 pyquenPythiaDefaultBlock = cms.PSet(

Configuration/Generator/python/PyquenDefaultSettings_cff.py

@@ -25,7 +25,7 @@
 
 pyquenParameters  = cms.PSet(doIsospin = cms.bool(True),
                              angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum :
-                             embeddingMode = cms.bool(False),
+                             embeddingMode = cms.int32(0),
                              )
 
 hydjetParameters = cms.PSet(sigmaInelNN = cms.double(58),
@@ -36,7 +36,7 @@
                             maxTransverseRapidity = cms.double(1.),
                             rotateEventPlane = cms.bool(True),
                             allowEmptyEvents = cms.bool(False),
-                            embeddingMode = cms.bool(False)                            
+                            embeddingMode = cms.int32(0)                            
                             )
 
 pyquenPythiaDefaultBlock = cms.PSet(

Configuration/Generator/python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py

@@ -19,8 +19,6 @@
                         bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0
                         )
 
-generator.embeddingMode = False
-
 configurationMetadata = cms.untracked.PSet(
     version = cms.untracked.string('$Revision: 1.2 $'),
     name = cms.untracked.string('$Source: /local/projects/CMSSW/rep/CMSSW/Configuration/Generator/python/Pyquen_DiJet_pt80to120_2760GeV_cfi.py,v $'),

Configuration/Generator/python/concurrentLumisDisable.py

@@ -5,6 +5,7 @@
     "CosMuoGenProducer",
     "Herwig7GeneratorFilter",
     "HydjetGeneratorFilter",
+    "Hydjet2GeneratorFilter",
     "PyquenGeneratorFilter",
     "Pythia6GeneratorFilter",
     "Pythia8EGun",

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -719,7 +719,7 @@
 workflows[159.2] = ['',['PhotonJets_Pt_10_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']]
 workflows[159.3] = ['',['ZMM_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']]
 workflows[159.4] = ['',['ZEE_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']]
-
+workflows[160] = ['',['Hydjet2Q_MinBias_5020GeV_2018_ppReco','DIGIHI2018PPRECO','RECOHI2018PPRECOMB','ALCARECOHI2018PPRECO','HARVESTHI2018PPRECO']]
 
 ### pp reference test ###
 workflows[149] = ['',['QCD_Pt_80_120_13_PPREF','DIGIPPREF2017','RECOPPREF2017','HARVESTPPREF2017']]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -985,6 +985,7 @@ def genS(fragment,howMuch):
 hiDefaults2018_ppReco=merge([hiAlca2018_ppReco,{'-n':2}])
 hiDefaults2021_ppReco=merge([hiAlca2021_ppReco,{'-n':2}])
 
+steps['Hydjet2Q_MinBias_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet2_Quenched_MinBias_5020GeV_cfi',U2000by1)])
 steps['HydjetQ_B12_5020GeV_2011']=merge([{'-n':1,'--beamspot':'RealisticHI2011Collision'},hiDefaults2011,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
 steps['HydjetQ_B12_5020GeV_2015']=merge([{'-n':1,'--beamspot':'RealisticHICollisionFixZ2015'},hiDefaults2015,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)])
 steps['HydjetQ_MinBias_XeXe_5442GeV_2017']=merge([{'-n':1},hiDefaults2017,gen2017('Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi',U2000by1)])

GeneratorInterface/Hydjet2Interface/BuildFile.xml

@@ -12,6 +12,7 @@
 <use name="CommonTools/UtilAlgos"/>
 <use name="pyquen"/>
 <use name="root"/>
+<use name="hydjet2"/>
 <use name="rootmath"/>
 <use name="rootcore"/>
 <export>