IAP GITLAB

Commit 06c0246b authored by Tanguy Pierog's avatar Tanguy Pierog

update SIbyll to version 2.3c and DPMJET-III to version 2017-1


git-svn-id: https://devel-ik.fzk.de/svn/mc/crmc/trunk@6176 c7a5e08c-de06-0410-9364-b41cf42a0b17
parent eded0c1c
...@@ -12,7 +12,7 @@ OPTION (__PYTHIA__ "Build with model" OFF) ...@@ -12,7 +12,7 @@ OPTION (__PYTHIA__ "Build with model" OFF)
OPTION (__HIJING__ "Build with model" OFF) OPTION (__HIJING__ "Build with model" OFF)
OPTION (__SIBYLL__ "Build with model" ON) OPTION (__SIBYLL__ "Build with model" ON)
OPTION (__PHOJET__ "Build with model" OFF) OPTION (__PHOJET__ "Build with model" OFF)
OPTION (__DPMJET__ "Build with model" OFF) OPTION (__DPMJET__ "Build with model" ON)
OPTION (__QGSJETII03__ "Build with model" OFF) OPTION (__QGSJETII03__ "Build with model" OFF)
OPTION (__QGSJETII04__ "Build with model" ON) OPTION (__QGSJETII04__ "Build with model" ON)
######################################ONLY EDIT THIS###################################### ######################################ONLY EDIT THIS######################################
...@@ -139,9 +139,17 @@ FILE(READ ${PROJECT_SOURCE_DIR}/src/hijing/hipyset1.35.f-HEPMC-TEMPLATE template ...@@ -139,9 +139,17 @@ FILE(READ ${PROJECT_SOURCE_DIR}/src/hijing/hipyset1.35.f-HEPMC-TEMPLATE template
STRING( REGEX REPLACE "HEPEVT_SIZE_REPLACE" "${Replace_String}" template12 "${template11}") STRING( REGEX REPLACE "HEPEVT_SIZE_REPLACE" "${Replace_String}" template12 "${template11}")
FILE(WRITE ${PROJECT_SOURCE_DIR}/src/hijing/hipyset1.35.f "${template12}") FILE(WRITE ${PROJECT_SOURCE_DIR}/src/hijing/hipyset1.35.f "${template12}")
FILE(READ ${PROJECT_SOURCE_DIR}/src/dpmjet/3.0-6/pythia6115dpm3v1.f-HEPMCTEMPLATE template13) FILE(READ ${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1/pythia-6427_cors.f-HEPMCTEMPLATE template13)
STRING( REGEX REPLACE "HEPEVT_SIZE_REPLACE" "${Replace_String}" template14 "${template13}") STRING( REGEX REPLACE "HEPEVT_SIZE_REPLACE" "${Replace_String}" template14 "${template13}")
FILE(WRITE ${PROJECT_SOURCE_DIR}/src/dpmjet/3.0-6/pythia6115dpm3v1.f "${template14}") FILE(WRITE ${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1/pythia-6427_cors.f "${template14}")
FILE(READ ${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1/phojet.f-HEPMCTEMPLATE template15)
STRING( REGEX REPLACE "HEPEVT_SIZE_REPLACE" "${Replace_String}" template16 "${template15}")
FILE(WRITE ${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1/phojet.f "${template16}")
FILE(READ ${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1/dpmjet.f-HEPMCTEMPLATE template17)
STRING( REGEX REPLACE "HEPEVT_SIZE_REPLACE" "${Replace_String}" template18 "${template17}")
FILE(WRITE ${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1/dpmjet.f "${template18}")
...@@ -213,9 +221,11 @@ set_property(SOURCE src/models.F PROPERTY COMPILE_FLAGS "${HELPER} -D __PHOJET__ ...@@ -213,9 +221,11 @@ set_property(SOURCE src/models.F PROPERTY COMPILE_FLAGS "${HELPER} -D __PHOJET__
ENDIF (__PHOJET__) ENDIF (__PHOJET__)
IF (__DPMJET__) IF (__DPMJET__)
LIST(APPEND TABS dpmjet.dat) LIST(APPEND TABS dpmjpar.dat)
LIST(APPEND TABS phojet_fitpar.dat) LIST(APPEND TABS dpmCT14LL.pds)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.0-6") LIST(APPEND TABS glaubint.glb)
LIST(APPEND TABS glaubtar.glb)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1")
SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet) SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet)
get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS) get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS)
set_property(SOURCE src/models.F PROPERTY COMPILE_FLAGS "${HELPER} -D __DPMJET__") set_property(SOURCE src/models.F PROPERTY COMPILE_FLAGS "${HELPER} -D __DPMJET__")
......
...@@ -100,7 +100,7 @@ CRMCoptions::ParseOptions(int argc, char** argv) ...@@ -100,7 +100,7 @@ CRMCoptions::ParseOptions(int argc, char** argv)
<< ", 5=Hijing_1.38" << ", 5=Hijing_1.38"
#endif #endif
#ifdef __SIBYLL__ #ifdef __SIBYLL__
<< ", 6=Sibyll_2.3" << ", 6=Sibyll_2.3c"
#endif #endif
#ifdef __QGSJETII04__ #ifdef __QGSJETII04__
<< ", 7=QGSJETII-04" << ", 7=QGSJETII-04"
...@@ -112,7 +112,7 @@ CRMCoptions::ParseOptions(int argc, char** argv) ...@@ -112,7 +112,7 @@ CRMCoptions::ParseOptions(int argc, char** argv)
<< ", 11=QGSJETII-03" << ", 11=QGSJETII-03"
#endif #endif
#ifdef __DPMJET__ #ifdef __DPMJET__
<< ", 12=DPMJet 3.0-6" << ", 12=DPMJet-III_2017.1"
#endif #endif
<< "]"; << "]";
...@@ -385,11 +385,11 @@ CRMCoptions::DumpConfig() const ...@@ -385,11 +385,11 @@ CRMCoptions::DumpConfig() const
case 3: cout << " (Gheisha)\n "; break; case 3: cout << " (Gheisha)\n "; break;
case 4: cout << " (Pythia)\n "; break; case 4: cout << " (Pythia)\n "; break;
case 5: cout << " (Hijing)\n "; break; case 5: cout << " (Hijing)\n "; break;
case 6: cout << " (Sibyll 2.3)\n "; break; case 6: cout << " (Sibyll 2.3c)\n "; break;
case 7: cout << " (QGSJETII-04) \n"; break; case 7: cout << " (QGSJETII-04) \n"; break;
case 8: cout << " (Phojet) \n"; break; case 8: cout << " (Phojet) \n"; break;
case 11: cout << " (QGSJETII-03) \n"; break; case 11: cout << " (QGSJETII-03) \n"; break;
case 12: cout << " (DPMJet 3.0-6) \n"; break; case 12: cout << " (DPMJet-III 2017.1) \n"; break;
default: default:
cerr << " (unknown model) \n"; cerr << " (unknown model) \n";
exit(1); exit(1);
......
...@@ -234,9 +234,9 @@ c----------------------------------------------------------------------- ...@@ -234,9 +234,9 @@ c-----------------------------------------------------------------------
!which is calculated in crmc_f. !which is calculated in crmc_f.
model=max(1,iModel) ! epos = 0,1 / qgsjet01 = 2 / gheisha = 3 model=max(1,iModel) ! epos = 0,1 / qgsjet01 = 2 / gheisha = 3
! / pythia = 4 / hijing = 5 / sibyll 2.1 ! / pythia = 4 / hijing = 5 / sibyll 2.3c
! = 6 / qgsjetII.04 = 7 / phojet = 8 ! = 6 / qgsjetII.04 = 7 / phojet = 8
! qgsjetII.03 = 11 / dpmjet = 12 ! qgsjetII.03 = 11 / dpmjetIII = 12
if(iModel.eq.0)then if(iModel.eq.0)then
call LHCparameters !LHC tune for EPOS call LHCparameters !LHC tune for EPOS
isigma=1 !use analytic cross section for nuclear xs isigma=1 !use analytic cross section for nuclear xs
......
...@@ -33,8 +33,7 @@ nodecay -19 !uncomment not to decay antialpha ...@@ -33,8 +33,7 @@ nodecay -19 !uncomment not to decay antialpha
MinDecayLength 1. !minimum c.Tau to define stable particles (cm) MinDecayLength 1. !minimum c.Tau to define stable particles (cm)
fdpmjetpho dat @CRMCROOT@/tabs/phojet_fitpar.dat fdpmjet path @CRMCROOT@/tabs/
fdpmjet dat @CRMCROOT@/tabs/dpmjet.dat
fqgsjet dat @CRMCROOT@/tabs/qgsjet.dat fqgsjet dat @CRMCROOT@/tabs/qgsjet.dat
fqgsjet ncs @CRMCROOT@/tabs/qgsjet.ncs fqgsjet ncs @CRMCROOT@/tabs/qgsjet.ncs
fqgsjetII03 dat @CRMCROOT@/tabs/qgsdat-II-03.lzma fqgsjetII03 dat @CRMCROOT@/tabs/qgsdat-II-03.lzma
......
INCLUDE_DIRECTORIES ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1")
FILE(GLOB files *.f)
set_source_files_properties( dpmjet.f dpmjet_epos.f phojet.f pythia-6427_cors.f build.f ../../crmc-aaa.f ../../models.F PROPERTIES COMPILE_FLAGS "-D __DPMJET__")
IF (__CRMCSTATIC__)
add_library(Dpmjet STATIC dpmjet.f dpmjet_epos.f phojet.f pythia-6427_cors.f build.f ../../crmc-aaa.f ../../models.F)
ELSE (__CRMCSTATIC__)
add_library(Dpmjet SHARED dpmjet.f dpmjet_epos.f phojet.f pythia-6427_cors.f build.f ../../crmc-aaa.f ../../models.F)
target_link_libraries(Dpmjet CrmcBasic)
ENDIF (__CRMCSTATIC__)
INSTALL (TARGETS Dpmjet
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static
)
DPMJET3 license, 5 Nov 2008
Copyright statement and license conditions
Copyright: European Organization for Nuclear Research (CERN),
Forschungszentrum Karlsruhe and Universitaet Siegen (the DPMJET-III
Copyright Holders) 1995-2008.
All rights not expressly granted under this license are reserved.
This software results from work performed by Ralph Engel, Johannes Ranft
and Stefan Roesler (the Authors).
The Authors are the exclusive source of distribution of the code, bug
fixes and documentation of the DPMJET-III software. Each official
version of DPMJET-III is identified by a numbering scheme specifying
major and minor releases.
The Authors are able to grant any of the permissions noted in this
License Agreement as requiring a specific consent. Any such consent
may only be granted in writing.
DPMJET-III contains PHOJET and PYTHIA Version 6.1 as integral parts.
The license conditions given below apply also to PHOJET and PYTHIA
Version 6.1. Torbjorn Sjostrand (Lund University) is the copright holder
of the PYTHIA subpackage.
1. Installation, use, reproduction, display of the DPMJET-III
software in source and binary forms, are permitted free of charge on a
non-exclusive basis for internal scientific, non-commercial and
non-weapon-related use by non-profit organizations only. Any exercise of
these rights is subject to the following conditions:
Insertion of the DPMJET-III code, in whole or in part, into other
codes, or its translation into any other computer language are
possible only after obtaining prior written permission. Modifications
of the DPMJET-III code are permitted for use by the licensee only,
unless authorized in written.
2. DPMJET-III is non-transferable, non-sub-licensable and may
not be distributed in any way, without express written consent,
whether in original or modified form, Site-wise or collaboration-wise
conditions can be agreed with the Authors.
3. Notwithstanding the above, the licensee may modify and
sub-license DPMJET-III User Routines to third parties in so far
as their purpose is limited to the adaptation of input and output
interfaces of DPMJET-III and their modification does not circumvent,
replace, add to or modify any of the functions of DPMJET-III,
or extract specific isolated results from any of the individual
internal physics models embedded within DPMJET-III.
4. The licensee shall forthwith license all its modifications of
DPMJET-III to the DPMJET-III Authors, at no cost and with no
limitation of use. The licensee acknowledges that the DPMJET-III
Authors may insert such modifications into future releases of
DPMJET-III, subject to appropriate acknowledgment of
the licensees contribution.
5. Any publication by the licensee with respect to DPMJET-III
or results obtained from it shall explicitly acknowledge DPMJET-III,
PHOJET and PYTHIA by quoting its set of references and the DPMJET-III
Authors. The licensee shall not without prior written permission
publish documents or results based on a modified form of DPMJET-III,
unless the modification exclusively concerns User Routines for the
adaptation of its input and output interfaces which comply with the
same restrictions, as defined in section 3) as those which apply
to sub-licensing. Any publication of documents or results shall be
based only on official DPMJET-III versions as obtained from the
Authors. Publication here implies any legal publication to any third
party, whether verbal, electronic, visual, in writing or otherwise.
6. The licensee shall ensure that the DPMJET-III, PHOJET and PYTHIA
references, copyright statement and license conditions are not
altered or removed from DPMJET-III. Any integration of
any portion of DPMJET-III in modified or in
unmodified form, into any other software package must preserve the
internal copyright notices in those portions of DPMJET-III
that have been employed, and must reproduce such notices
within any additional global notices included along or embedded
within the software into which DPMJET-III has been integrated.
Any portion of DPMJET-III so integrated, whether modified or
unmodified shall continue to be subject to these license conditions.
7. Versions or parts of the DPMJET-III source code,
entrusted to individuals or groups prior to the formulation of this
license are subject to this License Agreement in addition to any
other restrictions on the scope of use that may have been part of
the initial use grant.
8. Commercial use of DPMJET-III, outside the
scope of this license, must be negotiated with the Authors.
9. DISCLAIMER
THIS SOFTWARE IS PROVIDED BY THE DPMJET-III COPYRIGHT HOLDERS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
IMPLIED WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND
FITNESS FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE DPMJET-III
COPYRIGHT HOLDERS AND THE AUTHORS MAKE NO REPRESENTATION THAT THE
SOFTWARE AND MODIFICATIONS THEREOF, WILL NOT INFRINGE ANY PATENT,
COPYRIGHT, TRADE SECRET OR OTHER PROPRIETARY RIGHT.
10. LIMITATION OF LIABILITY
THE DPMJET-III COPYRIGHT HOLDERS AND THE AUTHORS SHALL HAVE NO
LIABILITY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL,
EXEMPLARY, OR PUNITIVE DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
LIMITATION, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF USE,
DATA OR PROFITS, OR BUSINESS INTERRUPTION, HOWEVER CAUSED AND ON
ANY THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE),
PRODUCT LIABILITY OR OTHERWISE, ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
Users should address any request of consent to one of the
DPMJET-III Authors:
Ralph Engel Ralph.Engel@ik.fzk.de
Johannes Ranft Johannes.Ranft@cern.ch
Stefan Roesler Stefan.Roesler@cern.ch
DPMJET version 3.2017.1 (Apr. 2017)
________________________________
This directory contains the following files:
dpmjet.f DPMJET-III code version 2017.1 without interface to FLUKA
phojet.f PHOJET code version 1.20
pythia-6427_cors.f PYTHIA code version 6.427
build.f complementary code
dpmCT14LL.pds, glaubint.glb , glaubtar.glb
dpmjpar.dat data-files read by the program during initialization
License2.txt license conditions
Please note:
All parts of the program code should be used only in the framework of
DPMJET. Any separate use of parts requires the agreement of the authors.
Please send suggestions / bug reports /questions to
anatoli.fedynitch@desy.de
The use of the software is subject to the enclosed license.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -483,6 +483,8 @@ c------------------------------------------------------------------------ ...@@ -483,6 +483,8 @@ c------------------------------------------------------------------------
common/mod9incs/fluincs common/mod9incs/fluincs
real urqincs real urqincs
common/mod10incs/urqincs common/mod10incs/urqincs
real dpmincs
common/mod12incs/dpmincs
real antot,ansh,ansf,pp4max,pp4ini,andropl,anstrg0 real antot,ansh,ansf,pp4max,pp4ini,andropl,anstrg0
*,anshf,ansff,antotf *,anshf,ansff,antotf
*,anstrg1,anreso0,anreso1,anghadr,antotre *,anstrg1,anreso0,anreso1,anghadr,antotre
......
...@@ -11,9 +11,9 @@ c----------------------------------------------------------------------- ...@@ -11,9 +11,9 @@ c-----------------------------------------------------------------------
common/record/maxrec(2),irecty(30,2) common/record/maxrec(2),irecty(30,2)
common/cfacmss/facmss /cr3pomi/r3pomi,r4pomi/cifset/ifset common/cfacmss/facmss /cr3pomi/r3pomi,r4pomi/cifset/ifset
common /ems12/iodiba,bidiba ! defaut iodiba=0. if iodiba=1, study H-Dibaryon common /ems12/iodiba,bidiba ! defaut iodiba=0. if iodiba=1, study H-Dibaryon
character*500 fndat,fnncs,fnIIdat,fnIIncs,fnII03dat,fnII03ncs, character*500 fndat,fnncs,fnIIdat,fnIIncs,fnII03dat,fnII03ncs
&fndpmjet,fndpmjetpho !qgs-II???????? c &,fndpmjet,fndpmjetpho,fndpmpath !qgs-II????????
common/dpmjetfname/ fndpmjet,fndpmjetpho c common/dpmjetfname/ fndpmjet,fndpmjetpho,fndpmpath
common/qgsfname/ fndat, fnncs, ifdat, ifncs common/qgsfname/ fndat, fnncs, ifdat, ifncs
common/qgsIIfname/fnIIdat, fnIIncs, ifIIdat, ifIIncs !qgs-II???????? common/qgsIIfname/fnIIdat, fnIIncs, ifIIdat, ifIIncs !qgs-II????????
common/qgsII03fname/fnII03dat, fnII03ncs, ifII03dat, ifII03ncs !qgs-II???????? common/qgsII03fname/fnII03dat, fnII03ncs, ifII03dat, ifII03ncs !qgs-II????????
...@@ -2886,7 +2886,7 @@ c boost in lab frame ...@@ -2886,7 +2886,7 @@ c boost in lab frame
if(model.eq.3)call alistf('GHEISHA&') if(model.eq.3)call alistf('GHEISHA&')
if(model.eq.4)call alistf('PYTHIA&') if(model.eq.4)call alistf('PYTHIA&')
if(model.eq.5)call alistf('HIJING&') if(model.eq.5)call alistf('HIJING&')
if(model.eq.6)call alistf('SIBYLL 2.1&') if(model.eq.6)call alistf('SIBYLL 2.3c&')
if(model.eq.7.or.model.eq.11)call alistf('QGSJET II&') if(model.eq.7.or.model.eq.11)call alistf('QGSJET II&')
if(model.eq.8)call alistf('PHOJET&') if(model.eq.8)call alistf('PHOJET&')
if(model.eq.9)call alistf('FLUKA&') if(model.eq.9)call alistf('FLUKA&')
...@@ -3067,12 +3067,12 @@ c update file names ...@@ -3067,12 +3067,12 @@ c update file names
if(model.eq.3)iversn=100 !'GHEISHA ' if(model.eq.3)iversn=100 !'GHEISHA '
if(model.eq.4)iversn=611 !'PYTHIA ' if(model.eq.4)iversn=611 !'PYTHIA '
if(model.eq.5)iversn=138 !'HIJING ' if(model.eq.5)iversn=138 !'HIJING '
if(model.eq.6)iversn=210 !'SIBYLL ' if(model.eq.6)iversn=233 !'SIBYLL '
if(model.eq.7)iversn=400 !'QGSJETII-04' if(model.eq.7)iversn=400 !'QGSJETII-04'
if(model.eq.8)iversn=112 !'PHOJET ' if(model.eq.8)iversn=112 !'PHOJET '
if(model.eq.9)iversn=201125 !'FLUKA ' if(model.eq.9)iversn=201125 !'FLUKA '
if(model.eq.11)iversn=300 !'QGSJETII-03' if(model.eq.11)iversn=300 !'QGSJETII-03'
if(model.eq.12)iversn=306 !'DPMJET ' if(model.eq.12)iversn=3171 !'DPMJET-III 2017.1 '
if(model.ne.1)iverso=iversn if(model.ne.1)iverso=iversn
call IniModel(model) call IniModel(model)
endif endif
...@@ -3494,9 +3494,12 @@ c--------------------------------------------------------------------- ...@@ -3494,9 +3494,12 @@ c---------------------------------------------------------------------
common/record/maxrec(2),irecty(30,2) common/record/maxrec(2),irecty(30,2)
common/cfacmss/facmss /cr3pomi/r3pomi,r4pomi common/cfacmss/facmss /cr3pomi/r3pomi,r4pomi
common /ems12/iodiba,bidiba ! defaut iodiba=0. if iodiba=1, study H-Dibaryon common /ems12/iodiba,bidiba ! defaut iodiba=0. if iodiba=1, study H-Dibaryon
character*500 fndat,fnncs,fnIIdat,fnIIncs,fnII03dat,fnII03ncs, character*500 fndat,fnncs,fnIIdat,fnIIncs,fnII03dat,fnII03ncs
&fndpmjet,fndpmjetpho c &,fndpmjet,fndpmjetpho,fndpmpath
common/dpmjetfname/ fndpmjet,fndpmjetpho c common/dpmjetfname/ fndpmjet,fndpmjetpho,fndpmpath
cdh datadir for path to the data sets to be read in by dpmjet/phojet
COMMON /DATADIR/ DATADIR
CHARACTER*132 DATADIR
common/qgsfname/ fndat, fnncs, ifdat, ifncs common/qgsfname/ fndat, fnncs, ifdat, ifncs
common/qgsIIfname/fnIIdat, fnIIncs, ifIIdat, ifIIncs !qgs-II common/qgsIIfname/fnIIdat, fnIIncs, ifIIdat, ifIIncs !qgs-II
common/qgsII03fname/fnII03dat, fnII03ncs, ifII03dat, ifII03ncs !qgs-II03 common/qgsII03fname/fnII03dat, fnII03ncs, ifII03dat, ifII03ncs !qgs-II03
...@@ -3759,24 +3762,9 @@ c if(line(i:j).eq.'xEmsPx')call xEmsPxNo(2,0.,0.,0,0) ...@@ -3759,24 +3762,9 @@ c if(line(i:j).eq.'xEmsPx')call xEmsPxNo(2,0.,0.,0,0)
call utworn(line,j,ne) call utworn(line,j,ne)
if(ne.eq.0.and.iprmpt.gt.0)write(ifmt,'(a)')'file-name?' if(ne.eq.0.and.iprmpt.gt.0)write(ifmt,'(a)')'file-name?'
call utword(line,i,j,0) call utword(line,i,j,0)
if(linex(ix:jx).eq.'dat')fndpmjet(1:j-i+1)=line(i:j) c if(linex(ix:jx).eq.'dat')fndpmjet(1:j-i+2)=line(i:j)//' '
if(linex(ix:jx).eq.'dat')nfndat=j-i+1 !length of dpmjet.dat path c if(linex(ix:jx).eq.'pho')fndpmjetpho(1:j-i+2)=line(i:j)//' '
if(nfndat.gt.1)ifdat=1 if(linex(ix:jx).eq.'path')DATADIR(1:j-i+2)=line(i:j)//' '
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 elseif(line(i:j).eq.'fqgsjet')then !QGSJet
...@@ -6596,7 +6584,12 @@ c GDD - double diffractive cross section ...@@ -6596,7 +6584,12 @@ c GDD - double diffractive cross section
sigineaa=urqincs sigineaa=urqincs
elseif(model.eq.12)then !for DPMJet elseif(model.eq.12)then !for DPMJet
call dpmjetSIGMA(sigtot,sigine,sigela) call dpmjetSIGMA(stot,sine,sela)
sigtot=stot
sigine=sine
sigcut=sigine
sigela=sela
sigineaa=sigine
endif endif
if(isigma.ge.1)then !===============! if(isigma.ge.1)then !===============!
......
...@@ -50,12 +50,11 @@ c entry ...@@ -50,12 +50,11 @@ c entry
c skip nuclei c skip nuclei
if(idptl(i).gt.1000000000)return
if(idptl(i).gt.1e9)return
c small droplet decay c small droplet decay
if(iabs(idptl(i)).gt.1e8)then if(iabs(idptl(i)).gt.100000000)then
stop'hdecas: no longer supported (2). ' stop'hdecas: no longer supported (2). '
endif endif
......
...@@ -555,7 +555,7 @@ C cross sections ...@@ -555,7 +555,7 @@ C cross sections
#ifndef __DPMJET__ #ifndef __DPMJET__
stop'please compile with requested model' stop'please compile with requested model'
print *, stot,sine,sela,stotaa,sineaa,selaaa !get rid of unused warning print *, stot,sine,sela !get rid of unused warning
#else #else
call GetDPMJETSigma(stot,sine,sela) call GetDPMJETSigma(stot,sine,sela)
#endif #endif
...@@ -805,4 +805,30 @@ C...Format for error printout. ...@@ -805,4 +805,30 @@ C...Format for error printout.
RETURN RETURN
END END
c--------------------------------------------------------------------
subroutine PHO_PHIST(idum,dum)
c--------------------------------------------------------------------
c random number generator
c--------------------------------------------------------------------
double precision dum,dum2
dum2=dum
idum2=idum
return
end
c--------------------------------------------------------------------
subroutine PHO_LHIST(idum,dum)
c--------------------------------------------------------------------
c random number generator
c--------------------------------------------------------------------
double precision dum,dum2
dum2=dum
idum2=idum
return
end
#endif #endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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