IAP GITLAB

Commit 8b0ed138 authored by Tanguy Pierog's avatar Tanguy Pierog

update qgsjet-II-04.f to be exactly the same as in CORSIKA


git-svn-id: https://devel-ik.fzk.de/svn/mc/crmc/trunk@3182 c7a5e08c-de06-0410-9364-b41cf42a0b17
parent 6d1e1260
......@@ -1896,7 +1896,7 @@ c-----------------------------------------------------------------------
c------------------------------------------------------------------------------
integer function idtrafo(code1,code2,idi)
c------------------------------------------------------------------------------
c.....tranforms id of code1 (=idi) into id of code2 (=idtrafocx)
c.....tranforms id of code1 (=idi) into id of code2 (=idtrafo)
c.....supported codes:
c.....'nxs' = epos
c.....'pdg' = PDG 1996
......@@ -2005,7 +2005,7 @@ c nxs|pdg|qgs|cor|sib
* , 20,310,5,16,12 !kshort
* , -20,130,-5,10,11 !klong
* , 330,331,99,99,24 !etaprime
* , 111,113,99,51,27 !rho0
* , 111,113,19,51,27 !rho0
* , 121,213,99,52,25 !rho+
* , -121,-213,99,53,26 !rho-
* , 221,223,99,50,32 !omega
......@@ -2017,7 +2017,7 @@ c nxs|pdg|qgs|cor|sib
* , -140,421,8,116,99 !D0(1.864)
* , 140,-421,8,119,99 !D0b(1.864)
* , -240,411,7,117,99 !D(1.869)+
* , 240,-411,7,118,99 !Db(1.869)-
* , 240,-411,7,118,99 !Db(1.869)-
* , 1120,2212,2,14,13 !proton
* , 1220,2112,3,13,14 !neutron
* , 2130,3122,6,18,39 !lambda
......@@ -2326,6 +2326,7 @@ c print *,'idtrafo',' ',code1,' ',code2,idi
i=2
elseif(code1.eq.'qgs')then
i=3
if(id1.eq.-10)id1=19
elseif(code1.eq.'cor')then
i=4
elseif(code1.eq.'sib')then
......@@ -2452,6 +2453,8 @@ c print *,'idtrafo',' ',code1,' ',code2,idi
else
idtrafo=iadtr
endif
elseif(idtrafo.eq.19.and.j.eq.3)then
idtrafo=-10
endif
if(j.ne.ji)goto 100
return
......
......@@ -54,7 +54,7 @@ C C
C last modification: 26.06.2012 C
C Version qgsjet-II-04 (for CONEX) C
C C
C small corrections to adapt to CORSIKA : 29.06.2012 by T.Pierog C
C small corrections to adapt to CORSIKA : 25.07.2012 by T.Pierog C
C=======================================================================
......@@ -14684,7 +14684,7 @@ c add low mass excitations if no particles produced before
dmass1=dmmin(2)
elseif(izp.eq.0)then !rho0
dmass1=dmmin(1)
izp=9
izp=-10
else
dmass1=am(icz)
endif
......@@ -16442,7 +16442,7 @@ c-----------------------------------------------------------------------
do i=1,4
ep(i)=ep0(i)
enddo
c call qgtran(ep,ey0,1)
call qgtran(ep,ey0,1)
if(iab.eq.7.or.iab.eq.8)then !delta++(-)
call qgdec2(ep,ep1,ep2,dmmin(2)**2,amn**2,am0**2)
......@@ -16454,7 +16454,7 @@ c call qgtran(ep,ey0,1)
nsh=nsh+1
ich(nsh)=15*ic/iab-2*ic
ctp elseif(iab.eq.9)then !rho0 -> pi+ + pi-
ctp elseif(iab.eq.-10)then !rho0 -> pi+ + pi-
ctp call qgdec2(ep,ep1,ep2,dmmin(1)**2,am0**2,am0**2)
ctp ich(nsh)=2*int(.5d0+qgran(b10))-1
ctp do i=1,4
......
......@@ -59,6 +59,8 @@ c QGSJET-II Common
call iclass(idtarg,icltar)
icp=idtrafo('nxs','qgs',idproj)
if(icp.eq.0)icp=1-2*int(rangen()+0.5) !pi0=pi+ or p-
if(abs(icp).gt.5)
& call utstop('Projectile not allowed in QGSJET-II !&')
e0=dble(elab)
call qgini(e0,icp,maproj,matarg)
call qgini(e0,icp,maproj,matarg) !again to set bm properly
......@@ -292,6 +294,9 @@ c k0l
tivptl(2,nptl)=0.
idptl(nptl)=id
c boost in CMS frame
call utlob5(yhaha, pptl(1,nptl), pptl(2,nptl)
. , pptl(3,nptl), pptl(4,nptl), pptl(5,nptl))
if(ish.ge.5)write(ifch,'(a,i5,a,i5,a,4(e10.4,1x),f6.3)')
$ ' particle from qgsjet ',nptl,' id :',idptl(nptl)
......@@ -488,16 +493,14 @@ c------------------------------------------------------------------------------
c--------------------------------------------------------------------
double precision function qgran(b10)
c--------------------------------------------------------------------
c random number generator
c Random number generator
c--------------------------------------------------------------------
double precision b10,drangen
include 'epos.inc'
double precision b10,drangen
qgran=drangen(b10)
if(irandm.eq.1)write(ifch,*)'qgran()= ',qgran
return
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment