IAP GITLAB

Commit 5016ca38 authored by Colin Baus's avatar Colin Baus

dpmjet: properly read fitpar file location

git-svn-id: https://devel-ik.fzk.de/svn/mc/crmc/trunk@4144 c7a5e08c-de06-0410-9364-b41cf42a0b17
parent 9b60a7ba
......@@ -12,7 +12,7 @@ OPTION (__PYTHIA__ "Build with model" OFF)
OPTION (__HIJING__ "Build with model" OFF)
OPTION (__SIBYLL__ "Build with model" ON)
OPTION (__PHOJET__ "Build with model" OFF)
OPTION (__DPMJET__ "Build with model" OFF)
OPTION (__DPMJET__ "Build with model" ON)
OPTION (__QGSJETII03__ "Build with model" ON)
OPTION (__QGSJETII04__ "Build with model" ON)
######################################ONLY EDIT THIS######################################
......@@ -155,6 +155,7 @@ ENDIF (__PHOJET__)
IF (__DPMJET__)
LIST(APPEND TABS dpmjet.dat)
LIST(APPEND TABS phojet_fitpar.dat)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.0-6")
SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet)
get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS)
......
......@@ -31,6 +31,7 @@ nodecay -19 !uncomment not to decay antialpha
MinDecayLength 1. !minimum c.Tau to define stable particles (cm)
fdpmjetpho dat @CRMCROOT@/tabs/phojet_fitpar.dat
fdpmjet dat @CRMCROOT@/tabs/dpmjet.dat
fqgsjet dat @CRMCROOT@/tabs/qgsjet.dat
fqgsjet ncs @CRMCROOT@/tabs/qgsjet.ncs
......
......@@ -263,7 +263,6 @@ c LIST is the code of final particle, P - its 4-momentum and mass.
$ , ' momentum :',(sngl(PHKK(i,k)),i=1,5)
imaxhepstatus = MAX(1,MIN(ISTMAX,2))
print*,imaxhepstatus
IF(ISTHKK(k).GE.1 .AND. ISTHKK(k).LE.imaxhepstatus)THEN !! if final particle
nptl=nptl+1 !! add 1 particle to stack
nptlhep(k)=nptl
......@@ -306,8 +305,8 @@ c treatment of mothers and daughters
jorptl(nptl)=nptlhep(JMOHKK(2,k))
endif
print*,istmax,k,JMOHKK(1,k),nptlhep(k),iorptl(nptl),
$ nptlhep(JMOHKK(1,k))
C print*,istmax,k,JMOHKK(1,k),nptlhep(k),iorptl(nptl),
C $ nptlhep(JMOHKK(1,k))
if(ish.ge.5)write(ifch,'(a,i5,a,i5,a,i5,a,4(e10.4,1x),f6.3)')
$ ' particle from DPMJET ',nptl,' id :',idptl(nptl)
......
......@@ -7654,6 +7654,10 @@ C parameters of 2x2 channel model
REAL XDPtab
INTEGER IDPtab
CHARACTER*500 fndpmjet,fndpmjetpho
COMMON/DPMJETFNAME/ fndpmjet,fndpmjetpho
C parameter set for 2212 (GRV94 LO) 2212 (GRV94 LO)
DATA (IDPtab(k, 1),k=1,8) /
& 2212, 5, 6, 0, 2212, 5, 6, 0 /
......@@ -7968,8 +7972,7 @@ C get parameters of soft cross sections from fitpar.dat
WRITE(LO,'(/1X,A)')
& 'PHO_FITPAR: loading parameter set from file fitpar.dat'
OPEN(12,FILE='fitpar.dat',ERR=1010,STATUS='OLD')
OPEN(12,FILE=fndpmjetpho,ERR=1010,STATUS='OLD')
100 CONTINUE
READ(12,'(A8)',ERR=1020,END=1010) CNAME8
IF(CNAME8.EQ.'STOP') GOTO 1010
......@@ -12,8 +12,8 @@ c-----------------------------------------------------------------------
common/cfacmss/facmss /cr3pomi/r3pomi,r4pomi/cifset/ifset
common /ems12/iodiba,bidiba ! defaut iodiba=0. if iodiba=1, study H-Dibaryon
character*500 fndat,fnncs,fnIIdat,fnIIncs,fnII03dat,fnII03ncs,
&fndpmjet !qgs-II????????
common/dpmjetfname/ fndpmjet
&fndpmjet,fndpmjetpho !qgs-II????????
common/dpmjetfname/ fndpmjet,fndpmjetpho
common/qgsfname/ fndat, fnncs, ifdat, ifncs
common/qgsIIfname/fnIIdat, fnIIncs, ifIIdat, ifIIncs !qgs-II????????
common/qgsII03fname/fnII03dat, fnII03ncs, ifII03dat, ifII03ncs !qgs-II????????
......@@ -3328,8 +3328,8 @@ c---------------------------------------------------------------------
common/cfacmss/facmss /cr3pomi/r3pomi,r4pomi
common /ems12/iodiba,bidiba ! defaut iodiba=0. if iodiba=1, study H-Dibaryon
character*500 fndat,fnncs,fnIIdat,fnIIncs,fnII03dat,fnII03ncs,
&fndpmjet
common/dpmjetfname/ fndpmjet
&fndpmjet,fndpmjetpho
common/dpmjetfname/ fndpmjet,fndpmjetpho
common/qgsfname/ fndat, fnncs, ifdat, ifncs
common/qgsIIfname/fnIIdat, fnIIncs, ifIIdat, ifIIncs !qgs-II
common/qgsII03fname/fnII03dat, fnII03ncs, ifII03dat, ifII03ncs !qgs-II03
......@@ -3594,6 +3594,21 @@ c if(line(i:j).eq.'xEmsPx')call xEmsPxNo(2,0.,0.,0,0)
call utword(line,i,j,0)
if(linex(ix:jx).eq.'dat')fndpmjet(1:j-i+1)=line(i:j)
if(linex(ix:jx).eq.'dat')nfndat=j-i+1 !length of dpmjet.dat path
if(nfndat.gt.1)ifdat=1
elseif(line(i:j).eq.'fdpmjetpho')then !DPMJET phojet fitpar file
call utworn(line,j,ne)
if(ne.eq.0.and.iprmpt.gt.0)write(ifmt,'(a)')'file-type file-name?'
call utword(line,i,j,0)
linex=line
ix=i
jx=j
call utworn(line,j,ne)
if(ne.eq.0.and.iprmpt.gt.0)write(ifmt,'(a)')'file-name?'
call utword(line,i,j,0)
if(linex(ix:jx).eq.'dat')fndpmjetpho(1:j-i+1)=line(i:j)
if(linex(ix:jx).eq.'dat')nfndat=j-i+1 !length of dpmjet.dat path
if(nfndat.gt.1)ifdat=1
elseif(line(i:j).eq.'fqgsjet')then !QGSJet
......
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