diff --git a/Gen/LbHijing/options/Hijing.py b/Gen/LbHijing/options/Hijing.py index 8cd97f5406f38e2352e7dc5cba10fa5dce04057b..cf49cdac5bca4480b920a905a340114095503f4d 100644 --- a/Gen/LbHijing/options/Hijing.py +++ b/Gen/LbHijing/options/Hijing.py @@ -1,5 +1,14 @@ from Configurables import Generation, Special, HijingProduction, MinimumBias, Inclusive, SignalPlain, SignalRepeatedHadronization +# Tuning for pPb/Pbp collisions +hijingTune = [ + "hiparnt hipr1 2 0.65", + "hiparnt hipr1 6 0.12", + + "hijinginit bmin 0", #default 0. + "hijinginit bmax 20" #default 0. +] + gen = Generation() gen.addTool( Special ) gen.addTool( MinimumBias ) @@ -12,3 +21,15 @@ gen.MinimumBias.ProductionTool = "HijingProduction" gen.Inclusive.ProductionTool = "HijingProduction" gen.SignalPlain.ProductionTool = "HijingProduction" gen.SignalRepeatedHadronization.ProductionTool = "HijingProduction" + +gen.Special.addTool( HijingProduction ) +gen.MinimumBias.addTool( HijingProduction ) +gen.Inclusive.addTool( HijingProduction ) +gen.SignalPlain.addTool( HijingProduction ) +gen.SignalRepeatedHadronization.addTool( HijingProduction ) + +gen.Special.HijingProduction.Commands += hijingTune +gen.MinimumBias.HijingProduction.Commands += hijingTune +gen.Inclusive.HijingProduction.Commands += hijingTune +gen.SignalPlain.HijingProduction.Commands += hijingTune +gen.SignalRepeatedHadronization.HijingProduction.Commands += hijingTune diff --git a/Gen/LbHijing/options/Hijing_Ap.py b/Gen/LbHijing/options/Hijing_Ap.py deleted file mode 100644 index 106de987c360e308968b5f35fca189156ef49912..0000000000000000000000000000000000000000 --- a/Gen/LbHijing/options/Hijing_Ap.py +++ /dev/null @@ -1,17 +0,0 @@ -from Gaudi.Configuration import * -from Configurables import Generation, MinimumBias, HijingProduction -from Configurables import ToolSvc, EvtGenDecay - -Generation().addTool( MinimumBias ) -Generation().MinimumBias.addTool( HijingProduction ) -# Configuration for pA collisions -Generation().MinimumBias.HijingProduction.Commands += [ - "hijinginit frame CMS", - "hijinginit proj A", - "hijinginit targ P", - "hijinginit beam1", - "hijinginit iap 208", - "hijinginit izp 82", - "hijinginit iat 1", - "hijinginit izt 1" -] diff --git a/Gen/LbHijing/options/Hijing_pA.py b/Gen/LbHijing/options/Hijing_pA.py deleted file mode 100644 index ebb3e97bcb12905b4d42d00e86a169716840a4d7..0000000000000000000000000000000000000000 --- a/Gen/LbHijing/options/Hijing_pA.py +++ /dev/null @@ -1,17 +0,0 @@ -from Gaudi.Configuration import * -from Configurables import Generation, MinimumBias, HijingProduction -from Configurables import ToolSvc, EvtGenDecay - -Generation().addTool( MinimumBias ) -Generation().MinimumBias.addTool( HijingProduction ) -# Configuration for pA collisions -Generation().MinimumBias.HijingProduction.Commands += [ - "hijinginit frame CMS", - "hijinginit proj P", - "hijinginit targ A", - "hijinginit beam1", - "hijinginit iap 1", - "hijinginit izp 1", - "hijinginit iat 208", - "hijinginit izt 82" -] diff --git a/Sim/Gauss/python/Gauss/Configuration.py b/Sim/Gauss/python/Gauss/Configuration.py index cf9fbc705e741fa3a938802a36157d453698553a..e3f6cc48af8613d738f367338a4dde5c2ff196a2 100755 --- a/Sim/Gauss/python/Gauss/Configuration.py +++ b/Sim/Gauss/python/Gauss/Configuration.py @@ -2057,18 +2057,31 @@ class Gauss(LHCbConfigurableUser): gen_t0.addTool(FixedNInteractions,name="FixedNInteractions") gen_t0.FixedNInteractions.NInteractions = 1 - # or with Hijing - pInGeV = beamMom*SystemOfUnits.GeV/SystemOfUnits.TeV - txtP = "hijinginit efrm "+str(pInGeV) - gen_t0.addTool(MinimumBias,name="MinimumBias") - gen_t0.MinimumBias.addTool(HijingProduction,name="HijingProduction") - gen_t0.MinimumBias.HijingProduction.Commands += [ txtP ] - - ## handle the information for HI generation (EPOS or HIJING) ## Is it a fixed target generation ? isFixedTarget = ( ( beamMom == 0. ) or (b2Mom == 0. ) ) + ## pass collision energy to Hijing (must be in CMS and in GeV) + if ( isFixedTarget ): + if ( b2Mom == 0 ): + pInGeV = beamMom*SystemOfUnits.GeV/SystemOfUnits.TeV + else: + pInGeV = b2Mom*SystemOfUnits.GeV/SystemOfUnits.TeV + else: + p1InGeV = beamMom*SystemOfUnits.GeV/SystemOfUnits.TeV + p2InGeV = b2Mom*SystemOfUnits.GeV/SystemOfUnits.TeV + ## beam energies in CMS for pPb collision system + import math + massProton = 0.938272046 #in GeV + e1InGeV = math.sqrt( p1InGeV**2 + massProton**2 ) + e2InGeV = math.sqrt( p2InGeV**2 + massProton**2 ) + pInGeV = math.sqrt( ( e1InGeV + e2InGeV )**2 - ( p1InGeV + p2InGeV )**2 ) + + txtP = "hijinginit efrm "+str(pInGeV) + gen_t0.addTool(MinimumBias,name="MinimumBias") + gen_t0.MinimumBias.addTool(HijingProduction,name="HijingProduction") + gen_t0.MinimumBias.HijingProduction.Commands += [ txtP ] + ## Setup EPOS particle type gen_t0.MinimumBias.addTool(CRMCProduction,name="CRMCProduction") if ( B1Particle not in self.__ion_pdg_id__.keys() ):