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 e90c8b1b1eb1d..b0bfae6eddf76 100644 --- 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 deleted file mode 100644 index 21d44f40a5e7c..0000000000000 --- a/Configuration/Generator/python/Pyquen2013Settings_cff.py +++ /dev/null @@ -1,244 +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) - ) - -collisionParameters5020GeV = cms.PSet(aBeamTarget = cms.double(208.0), ## beam/target atomic number - comEnergy = cms.double(5020.0) - ) - -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.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 - numQuarkFlavor = cms.int32(0) ## to be removed - ) - -pyquenParameters = cms.PSet(doIsospin = cms.bool(True), - angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum : - embeddingMode = cms.bool(False), - ) - -hydjetParameters = cms.PSet(sigmaInelNN = cms.double(64), - shadowingSwitch = cms.int32(1), - nMultiplicity = cms.int32(18500), - fracSoftMultiplicity = cms.double(1.), - maxLongitudinalRapidity = cms.double(4.5), - maxTransverseRapidity = cms.double(1.15), - rotateEventPlane = cms.bool(True), - allowEmptyEvents = cms.bool(False), - embeddingMode = cms.bool(False) - ) - -pyquenPythiaDefaultBlock = cms.PSet( - pythiaUESettingsBlock, - hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes', - 'CKIN(3)=7.5',# ! ptMin - 'MSTP(81)=1' - ), - ppDefault = cms.vstring('MSEL=1 ! QCD hight pT processes (only jets)', - 'CKIN(3)=7.5',# ! ptMin - 'MSTP(81)=1' - ), - 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('MDCY(310,1)=0') - -) diff --git a/Configuration/Generator/python/Pyquen2015Settings_cff.py b/Configuration/Generator/python/Pyquen2015Settings_cff.py index 97aabf752c94e..8fb424f03a539 100644 --- 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 index a78df54006988..0aeafaeaacc61 100644 --- 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 index 44277edc5353a..622e3ae2b1cb9 100644 --- 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 index b81f6578e004a..21db9e60212bf 100644 --- 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 index 87603a9c987d4..5a65e6f782e0c 100644 --- 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 $'), diff --git a/Configuration/Generator/python/hydjet2DefaultParameters2015_cff.py b/Configuration/Generator/python/hydjet2DefaultParameters2015_cff.py deleted file mode 100644 index 44bbed1804be0..0000000000000 --- a/Configuration/Generator/python/hydjet2DefaultParameters2015_cff.py +++ /dev/null @@ -1,306 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Configuration.Generator.PythiaUESettings_cfi import * - -collisionParameters2760GeV = cms.PSet( - fAw = cms.double(208.0), # beam/target atomic number - fSqrtS = cms.double(2760.0), # - fUmax = cms.double(1.265), # Maximal transverse flow rapidity at thermal freeze-out for central collisions, fUmax - fPtmin = cms.double(8.2), # Minimal pt of parton-parton scattering in PYTHIA event, fPtmin [GeV/c] - fT0 = cms.double(1.), # Initial QGP temperature for central Pb+Pb collisions in mid-rapidity, fT0 [GeV]; allowed range [0.2,2.0]GeV; - - ### Volume parameters at thermal freeze-out ### - fTau = cms.double(12.2), # Proper time proper at thermal freeze-out for central collisions, fTau [fm/c] - fR = cms.double(13.45), # Maximal transverse radius at thermal freeze-out for central collisions, fR [fm] -) - -collisionParameters5020GeV = cms.PSet( - fAw = cms.double(208.0), ## beam/target atomic number - fSqrtS = cms.double(5020.0), - fUmax = cms.double(1.35), # Maximal transverse flow rapidity at thermal freeze-out for central collisions, fUmax - fPtmin = cms.double(10.), # Minimal pt of parton-parton scattering in PYTHIA event, fPtmin [GeV/c] - fT0 = cms.double(1.1), # Initial QGP temperature for central Pb+Pb collisions in mid-rapidity, fT0 [GeV]; allowed range [0.2,2.0]GeV; - - ### Volume parameters at thermal freeze-out ### - fTau = cms.double(13.2), # Proper time proper at thermal freeze-out for central collisions, fTau [fm/c] - fR = cms.double(13.9), # Maximal transverse radius at thermal freeze-out for central collisions, fR [fm] -) - -qgpParameters = cms.PSet( - fTau0 = cms.double(0.1), # Proper QGP formation time in fm/c, fTau0 (0.010 calculated) - fT = cms.double(0.165), # Temperature at chemical freeze-out, fT [GeV] - fMuB = cms.double(0.), # Chemical baryon potential per unit charge, fMuB [GeV] - fMuS = cms.double(0.), # Chemical strangeness potential per unit charge, fMuS [GeV] - fMuC = cms.double(0.), # Chemical charm potential per unit charge, fMuC [GeV] (used if charm production is turned on) - fMuI3 = cms.double(0.), # Chemical isospin potential per unit charge, fMuI3 [GeV] - - ### Thermodinamic parameters at thermal freez-out ### - fThFO = cms.double(0.105), # Temperature at thermal freeze-out, fTthFO [GeV] - fMu_th_pip = cms.double(0.), # Chemical potential of pi+ at thermal freeze-out, fMu_th_pip [GeV] - - ### Volume parameters at thermal freeze-out ### - fSigmaTau = cms.double(3.5), # Duration of emission at thermal freeze-out for central collisions, fSigmaTau [fm/c] - - ### Strangeness suppression factor ### - fCorrS = cms.double(1.), # Strangeness supression factor gamma_s with fCorrS value (0=1 calculated) - fDelta = cms.double(0.1), # Momentum azimuthal anizotropy parameter at thermal freeze-out, fDelta - fEpsilon = cms.double(0.05), # Spatial azimuthal anisotropy parameter at thermal freeze-out, fEpsilon - - ### Decays ### - fDecay = cms.int32(1), # Flag to switch on/off hadron decays, fDecay (=0 decays off, >=1 decays on) - fWeakDecay = cms.double(0.000000000000001), # Low decay width threshold fWeakDecay[GeV]: width=fDecayWidth decay on; can be used to switch off weak decays - - ### Charm ### - fCharmProd = cms.int32(1), # Flag to include thermal charm production, fIcharm (=0 no charm production, >=1 charm production) - fCorrC = cms.double(-1.), # Charmness enhancement factor gamma_c with fCorrC value (fCorrC >0, if fCorrC<0 then it is calculated) - fEtaType = cms.double(1.), # Flag to choose longitudinal flow rapidity distribution, fEtaType (=0 uniform, >0 Gaussian with the dispersion Ylmax) - fIshad = cms.int32(1), # Flag to switch on/off nuclear shadowing, fIshad (0 shadowing off, 1 shadowing on) - fPyhist = cms.int32(0), # Flag to suppress the output of particle history from PYTHIA, fPyhist (=1 only final state particles; =0 full particle history from PYTHIA) - fIenglu = cms.int32(0), # Flag to fix type of partonic energy loss, fIenglu (0 radiative and collisional loss, 1 radiative loss only, 2 collisional loss only) - fIanglu = cms.int32(1), # Flag to fix type of angular distribution of in-medium emitted gluons, fIanglu (0 small-angular, 1 wide-angular, 2 collinear). - embeddingMode = cms.bool(False), - rotateEventPlane = cms.bool(True) -) - -PythiaDefaultBlock = cms.PSet( - pythiaUESettingsBlock, - TDB = cms.vstring( - 'PARJ(14)=0.' # ! replacing the same parametr from pythiaQuarkoniaSettings block to avoid producing h'_1 (pdg - 10333) - ), - hydjet2PythiaDefault = cms.vstring( - 'MSEL=1', # ! type of hard QCD production process - 'MSTU(21) = 1', # ! controle parameter to avoid stopping run - 'PARU(14)=1.', # ! tolerance parameter to adjust fragmentation' - 'MSTJ(21) = 1', # ! hadron decays on (if off - decays by FASTMC decayer) - 'MSTP(2) = 1', # ! which order running alphaS - 'MSTJ(22)=2', # ! particle decays if lifetime < parj(71) - 'PARJ(71)=10.', # ! ctau=10 mm - 'MSTP(52) = 1', # ! NO LAPDF - 'mstp(122)=0' # ! no printout of Pythia initialization information hereinafter - ), - ProQ2Otune = cms.vstring( - 'mstp(51)=7', # ! PDF set: structure function chosen - CTEQ5M pdf - 'mstp(3)=2', # ! QCD switch for choice of LambdaQCD - 'parp(62)=2.9', # ! ISR IR cutoff - 'parp(64)=0.14',# ! ISR renormalization scale prefactor - 'parp(67)=2.65',# ! ISR Q2max factor - 'mstp(68)=3', # ! ISR phase space choice & ME corrections - 'parp(71)=4.', # ! FSR Q2max factor for non-s-channel procs - 'parj(81)=0.29',# ! FSR Lambda_QCD scale - 'parj(82)=1.65',# ! FSR IR cutoff - 'mstp(33)=0', # ! "K" switch for K-factor on/off & type - 'mstp(81)=1', # ! UE model - 'parp(82)=1.9', # ! UE IR cutoff at reference ecm - 'parp(89)=1800.',# ! UE IR cutoff reference ecm - 'parp(90)=0.22',# ! UE IR cutoff ecm scaling power - 'mstp(82)=4', # ! UE hadron transverse mass distribution - 'parp(83)=0.83',# ! UE mass distribution parameter - 'parp(84)=0.6', # ! UE mass distribution parameter - 'parp(85)=0.86',# ! UE gg colour correlated fraction - 'parp(86)=0.93',# ! UE total gg fraction - 'mstp(91)=1', # ! BR primordial kT distribution - 'parp(91)=2.1', # ! BR primordial kT width <|kT|> - 'parp(93)=5.', # ! BR primordial kT UV cutoff - 'mstj(11)=5', # ! HAD choice of fragmentation function(s) - 'parj(1)=0.073',# ! HAD diquark suppression - 'parj(2)=0.2', # ! HAD strangeness suppression - 'parj(3)=0.94', # ! HAD strange diquark suppression - 'parj(4)=0.032',# ! HAD vector diquark suppression - 'parj(11)=0.31',# ! HAD P(vector meson), u and d only - 'parj(12)=0.4', # ! HAD P(vector meson), contains s - 'parj(13)=0.54',# ! HAD P(vector meson), heavy quarks - 'parj(21)=0.325',# ! HAD fragmentation pT - 'parj(25)=0.63',# ! HAD eta0 suppression - 'parj(26)=0.12',# ! HAD eta0' suppression - 'parj(41)=0.5', # ! HAD string parameter a - 'parj(42)=0.6', # ! HAD string parameter b - 'parj(46)=1.', # ! HAD Lund(=0)-Bowler(=1) rQ (rc) - 'parj(47)=0.67' # ! HAD Lund(=0)-Bowler(=1) rb - - ), - 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('MDCY(310,1)=0') -) diff --git a/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h b/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h index 527a6552d2f3b..50e56d80f2306 100644 --- a/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h +++ b/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h @@ -73,9 +73,15 @@ namespace gen { static const std::vector theSharedResources; inline double nuclear_radius() const; + + int convertStatusForComponents(int, int); + int convertStatus(int); + InitialParamsHydjet_t fParams; Hydjet2 *hj2; + bool ev = false; + bool separateHydjetComponents_; bool rotate_; // Switch to rotate event plane HepMC::GenEvent *evt; int nsub_; // number of sub-events diff --git a/GeneratorInterface/Hydjet2Interface/src/Hydjet2Hadronizer.cc b/GeneratorInterface/Hydjet2Interface/src/Hydjet2Hadronizer.cc index 56ae20f938082..6261ae91fd2ed 100644 --- a/GeneratorInterface/Hydjet2Interface/src/Hydjet2Hadronizer.cc +++ b/GeneratorInterface/Hydjet2Interface/src/Hydjet2Hadronizer.cc @@ -1,6 +1,6 @@ /** * \brief Interface to the HYDJET++ (Hydjet2) generator (since core v. 2.4.3), produces HepMC events - * \version 1.0 + * \version 1.1 * \author Andrey Belyaev */ @@ -40,38 +40,33 @@ using namespace edm; using namespace std; using namespace gen; -bool ev = false; -bool separateHydjetComponents_; - -namespace { - int convertStatusForComponents(int sta, int typ) { - if (sta == 1 && typ == 0) - return 6; - if (sta == 1 && typ == 1) - return 7; - if (sta == 2 && typ == 0) - return 16; - if (sta == 2 && typ == 1) - return 17; - - else - return sta; - } +int Hydjet2Hadronizer::convertStatusForComponents(int sta, int typ) { + if (sta == 1 && typ == 0) + return 6; + if (sta == 1 && typ == 1) + return 7; + if (sta == 2 && typ == 0) + return 16; + if (sta == 2 && typ == 1) + return 17; + + else + return sta; +} - int convertStatus(int st) { - if (!separateHydjetComponents_) { - if (st <= 0) - return 0; - if (st <= 10) - return 1; - if (st <= 20) - return 2; - if (st <= 30) - return 3; - } - return st; +int Hydjet2Hadronizer::convertStatus(int st) { + if (!separateHydjetComponents_) { + if (st <= 0) + return 0; + if (st <= 10) + return 1; + if (st <= 20) + return 2; + if (st <= 30) + return 3; } -} // namespace + return st; +} const std::vector Hydjet2Hadronizer::theSharedResources = {edm::SharedResourceNames::kPythia6}; @@ -408,7 +403,9 @@ bool Hydjet2Hadronizer::get_particles(HepMC::GenEvent *evt) { while (ihy < hj2->GetNtot()) { if ((hj2->GetiJet().at(ihy)) != isub_l) { sub_vertices = new HepMC::GenVertex(HepMC::FourVector(0, 0, 0, 0), hj2->GetiJet().at(ihy)); + evt->add_vertex(sub_vertices); + if (!evt->signal_process_vertex()) evt->set_signal_process_vertex(sub_vertices); isub_l = hj2->GetiJet().at(ihy); @@ -457,11 +454,12 @@ bool Hydjet2Hadronizer::get_particles(HepMC::GenEvent *evt) { } prod_vertex->add_particle_out(particle.at(ihy)); LogDebug("Hydjet_array") << " ---" << mid + 1 << "---> " << ihy + 1 << std::endl; - if (prods) - delete prods; + delete prods; } ihy++; } + delete sub_vertices; + LogDebug("Hydjet_array") << " MULTin ev.:" << hj2->GetNtot() << ", last index: " << ihy - 1 << ", stable particles: " << stab << std::endl; return kTRUE; diff --git a/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h b/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h index 0e6b8bde80ce7..2de79fcad653c 100644 --- a/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h +++ b/GeneratorInterface/HydjetInterface/interface/HydjetHadronizer.h @@ -71,6 +71,7 @@ namespace gen { bool hydjet_init(const edm::ParameterSet& pset); inline double nuclear_radius() const; void rotateEvtPlane(); + int convertStatus(int st); HepMC::GenEvent* evt; edm::ParameterSet pset_; diff --git a/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py b/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py index 4ec9f08aadd67..e1f6267972746 100644 --- a/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_cff.py +++ b/GeneratorInterface/HydjetInterface/python/hydjetDefaultParameters_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 ) hydjetParameters = cms.PSet(sigmaInelNN = cms.double(70), @@ -34,7 +33,7 @@ rotateEventPlane = cms.bool(True), allowEmptyEvents = cms.bool(False), angularSpectrumSelector = cms.int32(0), ## angular emitted gluon spectrum : - embeddingMode = cms.int32(False) + embeddingMode = cms.int32(0) ) pyquenPythiaDefaultBlock = cms.PSet( diff --git a/GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc b/GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc index c220a565c35b1..0bdec1702a413 100644 --- a/GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc +++ b/GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc @@ -35,20 +35,18 @@ using namespace edm; using namespace std; using namespace gen; -namespace { - int convertStatus(int st) { - if (st <= 0) - return 0; - if (st <= 10) - return 1; - if (st <= 20) - return 2; - if (st <= 30) - return 3; - else - return st; - } -} // namespace +int HydjetHadronizer::convertStatus(int st) { + if (st <= 0) + return 0; + if (st <= 10) + return 1; + if (st <= 20) + return 2; + if (st <= 30) + return 3; + else + return st; +} const std::vector HydjetHadronizer::theSharedResources = {edm::SharedResourceNames::kPythia6, gen::FortranInstance::kFortranInstance}; @@ -399,12 +397,11 @@ bool HydjetHadronizer::get_particles(HepMC::GenEvent* evt) { prod_vertex->add_particle_out(particle[ihy]); LogDebug("Hydjet_array") << " ---" << mid + 1 << "---> " << ihy + 1 << std::endl; - - if (prods) - delete prods; + delete prods; } ihy++; } + delete sub_vertices; LogDebug("Hydjet_array") << " MULTin ev.:" << hyjets.nhj << ", last index: " << ihy - 1 << ", Sub events: " << isub + 1 << ", stable particles: " << stab << std::endl; diff --git a/GeneratorInterface/PyquenInterface/python/Pyquen_Zmumu_2760GeV_dimuonAcc_cfi.py b/GeneratorInterface/PyquenInterface/python/Pyquen_Zmumu_2760GeV_dimuonAcc_cfi.py index 00510bb5e78d9..f3ce9c09bb48a 100644 --- a/GeneratorInterface/PyquenInterface/python/Pyquen_Zmumu_2760GeV_dimuonAcc_cfi.py +++ b/GeneratorInterface/PyquenInterface/python/Pyquen_Zmumu_2760GeV_dimuonAcc_cfi.py @@ -29,4 +29,4 @@ bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 ) -hiSignal.embeddingMode = True +hiSignal.embeddingMode = 0 diff --git a/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py b/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py index 5485539bbf7e1..41a9c176117ca 100644 --- a/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py +++ b/GeneratorInterface/PyquenInterface/python/pyquenEcalTrig_cfi.py @@ -29,7 +29,7 @@ maxEventsToPrint = cms.untracked.int32(0), ## events to print if pythiaPylistVerbosit aBeamTarget = cms.double(208.0), ## beam/target atomic number doCollisionalEnLoss = cms.bool(True), ## if true, perform partonic collisional en loss - embeddingMode = cms.bool(False), + embeddingMode = cms.int32(0), backgroundLabel = cms.InputTag("generator","unsmeared") ) diff --git a/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc b/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc index 7b22611efd67e..4abaebc675d62 100644 --- a/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc +++ b/GeneratorInterface/PyquenInterface/src/PyquenHadronizer.cc @@ -220,6 +220,7 @@ bool PyquenHadronizer::generatePartonsAndHadronize() { if (!evt->signal_process_vertex()) evt->set_signal_process_vertex(sub_vertices); + delete sub_vertices; evt->set_signal_process_id(pypars.msti[0]); // type of the process evt->set_event_scale(pypars.pari[16]); // Q^2