IAP GITLAB

Commit 6ee7c4b6 authored by Tanguy Pierog's avatar Tanguy Pierog

DPMJETIII.19-1 now compiling but not yet properly running

parent 00241123
......@@ -227,8 +227,9 @@ ENDIF (__PHOJET__)
IF (__DPMJET17__)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1")
LIST(APPEND TABS dpmjpar.dat)
LIST(APPEND TABS dpmCT14LL.pds)
LIST(APPEND TABS DPMJET-17.1/dpmjet.dat)
LIST(APPEND TABS DPMJET-17.1/dpmjpar.dat)
LIST(APPEND TABS DPMJET-17.1/dpmCT14LL.pds)
LIST(APPEND TABS conextar.glb)
SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet17)
get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS)
......@@ -237,10 +238,10 @@ ENDIF (__DPMJET17__)
IF (__DPMJET19__)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2019-1")
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmjpar.dat_higher_diff)
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmjpar.dat)
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmCT14LL.pds)
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmjet.dat)
LIST(APPEND TABS DPMJET-19.1/dpmjpar.dat_higher_diff)
LIST(APPEND TABS DPMJET-19.1/dpmjpar.dat)
LIST(APPEND TABS DPMJET-19.1/CT14LL.pds)
LIST(APPEND TABS DPMJET-19.1/dpmjet.dat)
LIST(APPEND TABS conextar.glb)
SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet19)
get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS)
......
......@@ -4,8 +4,7 @@ FILE(GLOB filesDum DPMJET-19.1/common/*.f)
FILE(GLOB filesDpm DPMJET-19.1/src/dpmjet/*.f)
FILE(GLOB filesPho DPMJET-19.1/src/phojet/*.f)
FILE(GLOB filesPyt DPMJET-19.1/src/pythia/*.f)
include_directories(DPMJET-19.1/include/dpmjet DPMJET-19.1/include/phojet DPMJET-19.1/include/pythia DPMJET-19.1/include/flinclude)
set_source_files_properties( ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files} PROPERTIES COMPILE_FLAGS "-xf77-cpp-input -D __DPMJET__")
set_source_files_properties( ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files} PROPERTIES COMPILE_FLAGS "-cpp -mtune=native -Og -Wno-uninitialized -Wno-unused-dummy-argument -std=legacy -D __DPMJET__ -D FOR_CORSIKA -D FOR_CMAKE" )
IF (__CRMCSTATIC__)
add_library(Dpmjet19 STATIC ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files})
......@@ -14,6 +13,8 @@ add_library(Dpmjet19 SHARED ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${fi
target_link_libraries(Dpmjet19 CrmcBasic)
ENDIF (__CRMCSTATIC__)
target_include_directories( Dpmjet19 PUBLIC DPMJET-19.1/include/pythia PUBLIC DPMJET-19.1/include/phojet PUBLIC DPMJET-19.1/include/dpmjet PUBLIC DPMJET-19.1/include/flinclude )
INSTALL (TARGETS Dpmjet19
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
......
SUBROUTINE OAUXFI ( FILE, IONUMB, CHSTTS, IERR )
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)'
......@@ -26,6 +27,7 @@
*----------------------------------------------------------------------*
*
INCLUDE '(COMPUT)'
#endif
*
CHARACTER FILE*(*), CHSTTS*(*), CARD*132, FSTATS*10, FFORM*12,
& FACCSS*10
......
......@@ -38,12 +38,14 @@ C
C IMPLICIT DOUBLE PRECISION (A-H,O-Z)
C SAVE
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)'
INCLUDE '(BEAMCM)'
INCLUDE '(IOIOCM)'
#endif
DOUBLE PRECISION epn , Pinp , xdumb , xlim1 , xlim2 , xlim3
INTEGER ibin , idp , IDPmev , Idpmfs , Idpmhk , Idpmvr , Ifdpm ,
......
......@@ -17,7 +17,9 @@ C
& IHMapr , IHMata , Ijdpm , irej , Izp , Izt , kkmat
SAVE
#ifdef FOR_CMAKE
INCLUDE '(IOUNIT)'
#endif
C event flag
INCLUDE 'inc/dtevno'
......
......@@ -11,10 +11,12 @@ C = 2 target residual nucleus *
C This version dated 19.04.95 is written by S. Roesler. *
C***********************************************************************
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)'
INCLUDE '(GENSTK)'
INCLUDE '(RESNUC)'
INCLUDE '(FHEAVY)'
#endif
DOUBLE PRECISION am , dum , Eexcf , pe , px , py , pz , TINY10 ,
& TINY3
......
......@@ -53,7 +53,8 @@ C flags for input different options
INCLUDE 'inc/dtflg1'
C particle properties (BAMJET index convention)
INCLUDE 'inc/dtpart'
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)'
INCLUDE '(GENSTK)'
INCLUDE '(RESNUC)'
......@@ -73,6 +74,7 @@ C particle properties (BAMJET index convention)
INCLUDE '(NUCDAT)'
INCLUDE '(PAREVT)'
INCLUDE '(FHEAVY)'
#endif
C event flag
INCLUDE 'inc/dtevno'
......
......@@ -36,10 +36,12 @@ C statistics: residual nuclei
C parameter for intranuclear cascade
INCLUDE 'inc/dtfoti'
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)'
INCLUDE '(PAREVT)'
INCLUDE '(FRBKCM)'
INCLUDE '(EVAFLG)'
#endif
C temporary storage for one final state particle
INCLUDE 'inc/dtfspa'
......
......@@ -36,10 +36,12 @@ C particle properties (BAMJET index convention)
C names of hadrons used in input-cards
INCLUDE 'inc/dtpain'
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)'
INCLUDE '(PAREVT)'
INCLUDE '(EVAFLG)'
INCLUDE '(FRBKCM)'
#endif
C emulsion treatment
INCLUDE 'inc/dtcomp'
......
......@@ -23,8 +23,10 @@ C***********************************************************************
LOGICAL lfirst , lfirdt , lfirph
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)'
INCLUDE '(PART)'
#endif
INCLUDE 'inc/pydat1'
......
SUBROUTINE DT_RESNCL(Epn,Nloop,Mode)
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)'
#endif
SAVE
DOUBLE PRECISION aip , aipz , ait , aitz , amsec , AMUAMU ,
......
#ifndef FOR_CORSIKA
DOUBLE PRECISION FUNCTION DT_RNDM(Vdummy)
C***********************************************************************
......@@ -92,3 +93,4 @@ C uncomment if needed
C IRNCT0 = IRNCT0+1
END FUNCTION
#endif
#ifndef FOR_CORSIKA
C**********************************************************************
C
......@@ -10,3 +11,4 @@ C**********************************************************************
DIMENSION Param(20) , Value(20)
CHARACTER*20 Param
END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
SUBROUTINE PHO_LHIST(I,X)
......@@ -9,3 +10,4 @@ C*
SAVE
END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
SUBROUTINE PHO_PHIST(Imode,Weight)
......@@ -43,3 +44,4 @@ C & ' Sigma = ',XSPRO(1,1,1),' mb used for normalization'
END IF
END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
DOUBLE PRECISION FUNCTION PYR(Idummy)
......@@ -9,3 +10,4 @@
dummy = DBLE(Idummy)
PYR = DT_RNDM(dummy)
END FUNCTION
#endif
#ifndef FOR_CORSIKA
SUBROUTINE STRUCTM(Xi,Scale2,Uv,Dv,Us,Ds,Ss,Cs,Bs,Ts,Gl)
IMPLICIT NONE
DOUBLE PRECISION Bs , Cs , Ds , Dv , Gl , Scale2 , Ss , Ts , Us ,
& Uv , Xi
END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
SUBROUTINE STRUCTP(Xi,Scale2,P2,Ip2,Uv,Dv,Us,Ds,Ss,Cs,Bs,Ts,Gl)
IMPLICIT NONE
......@@ -5,3 +6,4 @@
& Us , Uv , Xi
INTEGER Ip2
END SUBROUTINE
#endif
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
************************** DPMJET-III lower diffraction ********************
NEXTDATA
2212 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.279 1.279
0.572 0.967 10.697 10.697 0.370 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-2212 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 33.756 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
-2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 10.697 33.756 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-2212 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 33.756 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
-2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 10.697 33.756 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
************************** neutrons ************************************
NEXTDATA
2112 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.661 0.967 5.946 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.661 0.967 10.697 5.946 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.572 0.967 10.697 10.697 0.370 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-2112 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 33.756 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
-2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 10.697 33.756 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-2112 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 33.756 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
-2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.402 0.967 10.697 33.756 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
************************** lambdap 3122 ********************************
NEXTDATA
3122 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 6.350 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
3122 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 10.697 6.350 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
3122 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 6.350 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
3122 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 10.697 6.350 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-3122 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 6.350 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
-3122 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 10.697 6.350 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-3122 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 6.350 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
-3122 CT14-LO 2 1 0
1.113 0.250 5.636 5.636 1.248 1.248
0.450 0.967 10.697 6.350 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
************************** sigmamp 3112 ********************************
NEXTDATA
3112 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.445 5.636 1.248 1.248
-0.024 0.967 34.871 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
3112 CT14-LO 2 1 0
1.113 0.250 5.636 5.445 1.248 1.248
-0.024 0.967 10.697 34.871 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
3112 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.445 5.636 1.248 1.248
-0.024 0.967 34.871 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
3112 CT14-LO 2 1 0
1.113 0.250 5.636 5.445 1.248 1.248
-0.024 0.967 10.697 34.871 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-3112 CT14-LO 2 1 0
2212 CT14-LO 2 1 0
1.113 0.250 5.445 5.636 1.248 1.248
-0.024 0.967 34.871 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
-3112 CT14-LO 2 1 0
1.113 0.250 5.636 5.445 1.248 1.248
-0.024 0.967 10.697 34.871 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
-3112 CT14-LO 2 1 0
2112 CT14-LO 2 1 0
1.113 0.250 5.445 5.636 1.248 1.248
-0.024 0.967 34.871 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
-3112 CT14-LO 2 1 0
1.113 0.250 5.636 5.445 1.248 1.248
-0.024 0.967 10.697 34.871 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 1.100 3.000
************************** Pions ************************************
NEXTDATA
211 GRV-PiLO 5 2 0
2212 CT14-LO 2 1 0
1.113 0.250 2.408 5.636 5.100 1.248
0.477 0.967 4.797 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
0.500 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
211 GRV-PiLO 5 2 0
1.113 0.250 5.636 2.408 1.248 5.100
0.477 0.967 10.697 4.797 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 0.500 3.000
NEXTDATA
-211 GRV-PiLO 5 2 0
2212 CT14-LO 2 1 0
1.113 0.250 2.408 5.636 5.100 1.248
0.500 0.967 5.681 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
0.500 1.100 3.000
NEXTDATA
2212 CT14-LO 2 1 0
-211 GRV-PiLO 5 2 0
1.113 0.250 5.636 2.408 1.248 5.100
0.500 0.967 10.697 5.681 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 0.500 3.000
NEXTDATA
211 GRV-PiLO 5 2 0
2112 CT14-LO 2 1 0
1.113 0.250 2.408 5.636 5.100 1.248
0.477 0.967 4.797 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
0.500 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
211 GRV-PiLO 5 2 0
1.113 0.250 5.636 2.408 1.248 5.100
0.477 0.967 10.697 4.797 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 0.500 3.000
NEXTDATA
-211 GRV-PiLO 5 2 0
2112 CT14-LO 2 1 0
1.113 0.250 2.408 5.636 5.100 1.248
0.500 0.967 5.681 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
0.500 1.100 3.000
NEXTDATA
2112 CT14-LO 2 1 0
-211 GRV-PiLO 5 2 0
1.113 0.250 5.636 2.408 1.248 5.100
0.500 0.967 10.697 5.681 0.370 2.389
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000
1.500
2.000
0.600 0.600
1.100 0.500 3.000
************************** Pi0 ************************************
NEXTDATA
111 GRV-PiLO 5 2 0
2212 CT14-LO 2 1 0
1.113 0.250 2.408 5.636 5.100 1.248
0.477 0.967 4.797 10.697 2.389 0.370
0.150 0.372 0.612 0.300
1.00000 0.00000 1.00000 0.00000