IAP GITLAB

Commit b1e0b614 authored by Tanguy Pierog's avatar Tanguy Pierog

DPMJETIII.2019-1 now compiling and running and consistent with git repository

parent 2f1a425e
CRMC v1.8.0 Last modifications 2020/11/13 CRMC v1.8.0 Last modifications 2020/12/01
********************************************************** **********************************************************
The Program "crmc" The Program "crmc"
...@@ -51,6 +51,8 @@ SIBYLL2.3d (-m6) : F. Riehn, R. Engel, A. Fedynitch, T.K. Gaisser, and T. Stanev ...@@ -51,6 +51,8 @@ SIBYLL2.3d (-m6) : F. Riehn, R. Engel, A. Fedynitch, T.K. Gaisser, and T. Stanev
DPMJETIII 2017-1 : Fedynitch at al. DPMJETIII 2017-1 : Fedynitch at al.
DPMJETIII 2019-1 : Fedynitch at al.
* Pre LHC : * Pre LHC :
DPMJET 3.06 : 10.1103/PhysRevC.77.014904 (not linked any more) DPMJET 3.06 : 10.1103/PhysRevC.77.014904 (not linked any more)
......
...@@ -4,7 +4,7 @@ FILE(GLOB filesDum DPMJET-19.1/common/*.f) ...@@ -4,7 +4,7 @@ FILE(GLOB filesDum DPMJET-19.1/common/*.f)
FILE(GLOB filesDpm DPMJET-19.1/src/dpmjet/*.f) FILE(GLOB filesDpm DPMJET-19.1/src/dpmjet/*.f)
FILE(GLOB filesPho DPMJET-19.1/src/phojet/*.f) FILE(GLOB filesPho DPMJET-19.1/src/phojet/*.f)
FILE(GLOB filesPyt DPMJET-19.1/src/pythia/*.f) FILE(GLOB filesPyt DPMJET-19.1/src/pythia/*.f)
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" ) 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 " )
IF (__CRMCSTATIC__) IF (__CRMCSTATIC__)
add_library(Dpmjet19 STATIC ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files}) add_library(Dpmjet19 STATIC ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files})
......
*.o *.o
*.so *.so
*.a *.pyd
\ No newline at end of file *.a
bin/*.exe
## DPMJET-III-XX.X
Version 19.1.1:
- Makefiles can build libraries with MinGW gfortran on Windows
- Executables don't work (yet) on Windows.
\ No newline at end of file
...@@ -4,69 +4,95 @@ ...@@ -4,69 +4,95 @@
# #
####################################################################### #######################################################################
#choose gnu, intel or g95 #choose gnu, intel or g95
COMP_TYPE=gfortran CVendor = "GNU"
COMP_MODE=release Config?="Release"
# Extension for PYTHON library
LIBEXT = .so
# Version
# BUILD_VERSION = 19.1.0
# BUILD_DATE = 2019/09/02
# CPPFLAGS =
#-DFOR_FLUKA
####################################################################### #######################################################################
# #
# handling of different compilers # compiler
# #
####################################################################### #######################################################################
ifeq ($(COMP_TYPE),g95)
FC = g95 ifeq ($(CVendor),"GNU")
CC = c++ # GNU
F2PY_COMP='--fcompiler=g95' FC := $(or $(FC), gfortran)
ifeq ($(COMP_MODE),debug) F2PY_C = gnu95
FOPT = -Wall -fbounds-check -Wno-unused -O0 -g \ ifeq ($(OS),Windows_NT)
-ftrace=full -ftrapping-math -pedantic -standard=legacy F2PY_CCONF = --compiler=mingw32 --fcompiler=$(F2PY_C)
else else
FOPT = -O3 -g -fmultiple-save -fexpensive-optimizations -funroll-loops F2PY_CCONF = --compiler=unix --fcompiler=$(F2PY_C)
endif endif
F90FLAGS = -cpp -ffree-form -Wobsolescent -fno-second-underscore
else ifeq ($(COMP_TYPE),gfortran)
FC = gfortran
CC = g++
# Make sure the flags are selected according to OS
F2PY_COMP = --fcompiler=gnu95
ifeq ($(COMP_MODE),debug)
FOPT = -fPIC -Wall -Wno-maybe-uninitialized \
-fbounds-check -O0 -g -ffpe-trap=invalid,zero,overflow \
-Wno-unused-dummy-argument
else
FOPT = -fPIC -mtune=native -Og -Wno-uninitialized -Wno-unused-dummy-argument -std=legacy
endif
F90FLAGS = -xf77-cpp-input -ffree-form -fno-second-underscore
else else
# Intel
FC = ifort FC = ifort
CC = icc F2PY_C = intelem
F2PY_COMP='--fcompiler=intelem' endif
ifeq ($(COMP_MODE),debug)
FOPT = -stand f90 -traceback -gen-interfaces -warn all -O0 -g \ #######################################################################
-fpe:0 -diag-disable 6717 -module ./src/mod -I ./src/mod #
# compiler options for different platforms
#
#######################################################################
ifeq ($(CVendor),"GNU")
ifeq ($(Config),"Debug")
# GNU Debug
OPT = -fPIC -Wall -fbounds-check -O0 -g \
-ffpe-trap=invalid,zero,overflow -Wuninitialized
OPTF90 = -fPIC -Wall -fbounds-check -O0 -g \
-ffpe-trap=invalid,zero,overflow -Wuninitialized \
-fno-second-underscore
#OPT = -fPIC -Wall -Wno-uninitialized -Wno-unused-variable -O3 -g -ffpe-trap=invalid,zero,overflow
else else
FOPT = -fast -g -module ./src/mod -I ./src/mod -no-ipo # GNU Release
OPT = -O3 -Wno-uninitialized -fPIC
OPTF90 = -O3 -Wno-uninitialized -fPIC -fno-second-underscore
endif
else
ifeq ($(Config),"Debug")
# Intel Debug (-gen-interfaces -warn interfaces)
OPT = -check bounds -O0 -g -check pointer -fpe0 -traceback
OPTF90 = -check bounds -O0 -g -check pointer -fpe0 -traceback \
-cpp -ffree-form -Wobsolescent -fno-second-underscore
else
# Intel Release
OPTF90 = -fast -fpe0 \
-cpp -ffree-form -Wobsolescent -fno-second-underscore
OPT = -fast -fpe0
endif endif
F90FLAGS = -fpp -free
endif endif
#######################################################################
#
# F2PY
#
#######################################################################
#general version for signature file extraction and linking
PYTHON_EXE := $(or $(PYTHON_EXE), python3)
#general version for signature file extraction and linking
ifeq ($(Config),"Debug")
F2PY = $(PYTHON_EXE) -m numpy.f2py
else
F2PY = $(PYTHON_EXE) -m numpy.f2py --quiet
endif
#Linker #Linker
LD = $(FC) LD = $(FC)
#additional flags for linker
F2PY_L = $(F2PY)
# Directories
WORK_DIR = $(CURDIR)
LIB_DIR?="$(WORK_DIR)/lib"
# New line define
define \n
# Files
endef
#######################################################################
#
# Files
#
#######################################################################
PHOJET_INCS = ./include/phojet PHOJET_INCS = ./include/phojet
PHOJET_SRCS :=$(wildcard ./src/phojet/*.f) PHOJET_SRCS :=$(wildcard ./src/phojet/*.f)
PHOJET_OBJS :=$(PHOJET_SRCS:.f=.o) PHOJET_OBJS :=$(PHOJET_SRCS:.f=.o)
...@@ -86,6 +112,44 @@ APP_EXE :=$(subst ./src/exe/,,$(APP_EXE)) ...@@ -86,6 +112,44 @@ APP_EXE :=$(subst ./src/exe/,,$(APP_EXE))
DUMMY_SRCS :=$(wildcard ./common/*.f) DUMMY_SRCS :=$(wildcard ./common/*.f)
DUMMY_OBJS :=$(DUMMY_SRCS:.f=.o) DUMMY_OBJS :=$(DUMMY_SRCS:.f=.o)
# Portability (I know that this is insane...)
ifeq ($(OS),Windows_NT)
DEL_COMMAND = del /q /f
MKDIR_COMMAND = if not exist "$(LIB_DIR)" mkdir
COPY_COMMAND = copy /b
COPY_DUMP = > nul 2>&1
CAT_COMMAND = type
EXESUFX = .exe
PATHSEP2=\\
PATHSEP=$(strip $(PATHSEP2))
# Shared library suffix
LEXT?=$(shell $(PYTHON_EXE) -c "import sysconfig; print('.cp' + sysconfig.get_config_var('py_version_nodot') + '-' + sysconfig.get_platform().replace('-','_') + sysconfig.get_config_var('EXT_SUFFIX'))")
space := $(null) #
comma := ,
PHOJET_SRCS_CMMA := $(subst $(space),$(comma),$(strip $(PHOJET_SRCS)))
DPMJET_SRCS_CMMA := $(subst $(space),$(comma),$(strip $(DPMJET_SRCS)))
PYTHIA_SRCS_CMMA := $(subst $(space),$(comma),$(strip $(PYTHIA_SRCS)))
DUMMY_SRCS_CMMA := $(subst $(space),$(comma),$(strip $(DUMMY_SRCS)))
PHOJET_SRCS_CMMA := $(subst /,\,$(strip $(PHOJET_SRCS_CMMA)))
DPMJET_SRCS_CMMA := $(subst /,\,$(strip $(DPMJET_SRCS_CMMA)))
PYTHIA_SRCS_CMMA := $(subst /,\,$(strip $(PYTHIA_SRCS_CMMA)))
DUMMY_SRCS_CMMA := $(subst /,\,$(strip $(DUMMY_SRCS_CMMA)))
PYF_SRCS := $(PHOJET_SRCS_CMMA) $(PYTHIA_SRCS_CMMA) $(DPMJET_SRCS_CMMA) $(DUMMY_SRCS_CMMA)
else
DEL_COMMAND = rm -rf
MKDIR_COMMAND = mkdir -p
COPY_COMMAND = cp
COPY_DUMP =
CAT_COMMAND = cat
EXESUFX =
PATHSEP=/
LEXT?=$(shell python -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
PYF_SRCS := $(PHOJET_SRCS) $(PYTHIA_SRCS) $(DPMJET_SRCS) $(DUMMY_SRCS)
endif
DPMJET_FUNCS = pho_event dt_init dt_kkinc \ DPMJET_FUNCS = pho_event dt_init dt_kkinc \
idt_icihad dt_xsglau pycomp dt_initjs dt_rndmst dt_rndm dt_inucas idt_ipdgha dt_evtout idt_icihad dt_xsglau pycomp dt_initjs dt_rndmst dt_rndm dt_inucas idt_ipdgha dt_evtout
DPMJET_FUNCS += pho_init pho_setpar poevt1 poevt2 pho_pname pho_pmass pho_setmdl \ DPMJET_FUNCS += pho_init pho_setpar poevt1 poevt2 pho_pname pho_pmass pho_setmdl \
...@@ -96,9 +160,7 @@ dt_phoxs dt_xshn dt_flahad dt_title pho_ghhias ...@@ -96,9 +160,7 @@ dt_phoxs dt_xshn dt_flahad dt_title pho_ghhias
INCLU = -I$(PYTHIA_INCS) -I$(PHOJET_INCS) -I$(DPMJET_INCS) -I$(DPMJET_FLUKA_INCS) INCLU = -I$(PYTHIA_INCS) -I$(PHOJET_INCS) -I$(DPMJET_INCS) -I$(DPMJET_FLUKA_INCS)
pylib = lib/dpmjetIII191$(LIBEXT) pylib = dpmjetIII191$(LEXT)
F2PY = python -m numpy.f2py
all: exe all: exe
...@@ -106,37 +168,38 @@ all: exe ...@@ -106,37 +168,38 @@ all: exe
pylib: $(pylib) pylib: $(pylib)
$(pylib): lib/libDPMJET.a common/dpmjetIII191.pyf $(pylib): lib/libDPMJET.a common/dpmjetIII191.pyf
$(F2PY) -c $(F2PY_COMP) --opt="$(FOPT)" \ $(F2PY) -c $(F2PY_CCONF) --opt="$(OPT)" \
$(INCLU) common/dpmjetIII191.pyf -Llib -lDPMJET $(INCLU) common/dpmjetIII191.pyf $(DPMJET_OBJS) $(PHOJET_OBJS) $(PYTHIA_OBJS) $(DUMMY_OBJS)
mv dpmjetIII191*$(LIBEXT) lib
.PHONY: install
install: $(pylib)
$(COPY_COMMAND) *$(LEXT) $(LIB_DIR)
.PHONY: exe .PHONY: exe
exe: $(APP_OBJS) lib/libDPMJET.a exe: $(APP_OBJS) lib/libDPMJET.a
for exec in $(APP_EXE) ; do \ $(foreach a, $(APP_EXE), $(LD) -o bin/$(a) ./src/exe/$(a).o -Llib -lDPMJET ${\n})
$(LD) -o bin/$$exec ./src/exe/$$exec.o -Llib -lDPMJET ; \
done
common/dpmjetIII191.pyf: common/dpmjetIII191.pyf:
cat $(PHOJET_SRCS) $(PYTHIA_SRCS) $(DPMJET_SRCS) $(DUMMY_SRCS) > f2pytemp.f $(CAT_COMMAND) $(PYF_SRCS) > f2pytemp.f
gfortran -E -cpp f2pytemp.f > f2py_cpp.f gfortran -E -cpp f2pytemp.f > f2py_cpp.f
$(F2PY) -m dpmjetIII191 -h common/dpmjetIII191.pyf \ $(F2PY) -m dpmjetIII191 -h common/dpmjetIII191.pyf \
--include-paths $(DPMJET_INCS):$(PHOJET_INCS):$(PYTHIA_INCS):$(DPMJET_FLUKA_INCS) \ --include-paths $(DPMJET_INCS):$(PHOJET_INCS):$(PYTHIA_INCS):$(DPMJET_FLUKA_INCS) \
--overwrite-signature only: $(DPMJET_FUNCS) : f2py_cpp.f --overwrite-signature only: $(DPMJET_FUNCS) : f2py_cpp.f
rm -f f2pytemp.f f2py_cpp.f f2pytemp.s $(DEL_COMMAND) f2pytemp.f f2py_cpp.f f2pytemp.s
lib/libDPMJET.a: $(PHOJET_OBJS) $(PYTHIA_OBJS) $(DPMJET_OBJS) $(DUMMY_OBJS) lib/libDPMJET.a: $(PHOJET_OBJS) $(PYTHIA_OBJS) $(DPMJET_OBJS) $(DUMMY_OBJS)
ar -cr lib/libDPMJET.a $(DPMJET_OBJS) $(PHOJET_OBJS) $(PYTHIA_OBJS) $(DUMMY_OBJS) ar -crs lib/libDPMJET.a $(DPMJET_OBJS) $(PHOJET_OBJS) $(PYTHIA_OBJS) $(DUMMY_OBJS)
.f.o: .f.o:
$(FC) -c -cpp $(CPPFLAGS) $(FOPT) $(INCLU) -o $@ $< $(FC) -c -cpp $(CPPFLAGS) $(OPT) $(INCLU) -o $@ $<
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf lib/* *.so common/*.o *.dSYM $(DEL_COMMAND) lib$(PATHSEP)libDPMJET.a *.so *.pyd common$(PATHSEP)*.o *.dSYM $(COPY_DUMP)
rm -f *.o src/pythia/*.o src/phojet/*.o src/dpmjet/*.o src/exe/*.o $(DEL_COMMAND) *.o src$(PATHSEP)pythia$(PATHSEP)*.o src$(PATHSEP)phojet$(PATHSEP)*.o src$(PATHSEP)dpmjet$(PATHSEP)*.o src$(PATHSEP)exe$(PATHSEP)*.o $(COPY_DUMP)
rm -f *.s src/pythia/*.s src/phojet/*.s src/dpmjet/*.s src/exe/*.s $(DEL_COMMAND) *.s src$(PATHSEP)pythia$(PATHSEP)*.s src$(PATHSEP)phojet$(PATHSEP)*.s src$(PATHSEP)dpmjet$(PATHSEP)*.s src$(PATHSEP)exe$(PATHSEP)*.s $(COPY_DUMP)
rm -f bin/* $(DEL_COMMAND) $(addprefix bin$(PATHSEP),$(addsuffix $(EXESUFX), $(APP_EXE))) $(COPY_DUMP)
.PHONY: distclean .PHONY: distclean
distclean: clean distclean: clean
rm -rf common/dpmjetIII191.pyf $(DEL_COMMAND) common$(PATHSEP)dpmjetIII191.pyf
# DPMJET-III and PHOJET # DPMJET-III and PHOJET
### Version: 19.1.0 ### Version: 19.1.1
### Status: release ### Status: development
### [Official releases](https://github.com/afedynitch/dpmjet/releases)
## Description: ## Description:
...@@ -53,9 +54,9 @@ We are in the process of compiling more documentation and/or examples. For now, ...@@ -53,9 +54,9 @@ We are in the process of compiling more documentation and/or examples. For now,
## Authors: ## Authors:
[Anatoli Fedynitch]* [Anatoli Fedynitch]*
Dept. of Physics ICRR - Institute for Cosmic Ray Research
University of Alberta The University of Tokyo
T6G 2E1 Edmonton, Alberta, Canada Kashiwanoha 5-1-5, Kashiwa, Chiba, Japan
Stefan Roesler Stefan Roesler
CERN, DGS-RP CERN, DGS-RP
...@@ -68,6 +69,14 @@ We are in the process of compiling more documentation and/or examples. For now, ...@@ -68,6 +69,14 @@ We are in the process of compiling more documentation and/or examples. For now,
*[maintainer](mailto:af.gh179@outlook.com) *[maintainer](mailto:af.gh179@outlook.com)
This code is part of the heritage of
Johannes Ranft
Dept. of Physics
University of Siegen
D-57068 Siegen, Germany
who inspired this one and the many predecessor codes.
# Literature and references # Literature and references
......
This source diff could not be displayed because it is too large. You can view the blob instead.
SUBROUTINE OAUXFI ( FILE, IONUMB, CHSTTS, IERR ) SUBROUTINE OAUXFI ( FILE, IONUMB, CHSTTS, IERR )
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)'
* *
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
* * * *
...@@ -26,8 +22,19 @@ ...@@ -26,8 +22,19 @@
* * * *
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
* *
#ifdef FOR_FLUKA
INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)'
INCLUDE '(COMPUT)' INCLUDE '(COMPUT)'
#else
INCLUDE 'DBLPRC'
INCLUDE 'DIMPAR'
INCLUDE 'IOUNIT'
INCLUDE 'COMPUT'
#endif #endif
* *
CHARACTER FILE*(*), CHSTTS*(*), CARD*132, FSTATS*10, FFORM*12, CHARACTER FILE*(*), CHSTTS*(*), CARD*132, FSTATS*10, FFORM*12,
& FACCSS*10 & FACCSS*10
......
...@@ -38,13 +38,18 @@ C ...@@ -38,13 +38,18 @@ C
C IMPLICIT DOUBLE PRECISION (A-H,O-Z) C IMPLICIT DOUBLE PRECISION (A-H,O-Z)
C SAVE C SAVE
#ifdef FOR_CMAKE #ifdef FOR_FLUKA
INCLUDE '(DBLPRC)' INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)' INCLUDE '(IOUNIT)'
INCLUDE '(BEAMCM)' INCLUDE '(BEAMCM)'
INCLUDE '(IOIOCM)' INCLUDE '(IOIOCM)'
#else
INCLUDE 'DBLPRC'
INCLUDE 'DIMPAR'
INCLUDE 'IOUNIT'
INCLUDE 'BEAMCM'
INCLUDE 'IOIOCM'
#endif #endif
DOUBLE PRECISION epn , Pinp , xdumb , xlim1 , xlim2 , xlim3 DOUBLE PRECISION epn , Pinp , xdumb , xlim1 , xlim2 , xlim3
......
...@@ -16,11 +16,13 @@ C ...@@ -16,11 +16,13 @@ C
INTEGER Iap , Iat , idp , IDPmev , IHEhad , IHEnuc , IHIjpr , INTEGER Iap , Iat , idp , IDPmev , IHEhad , IHEnuc , IHIjpr ,
& IHMapr , IHMata , Ijdpm , irej , Izp , Izt , kkmat & IHMapr , IHMata , Ijdpm , irej , Izp , Izt , kkmat
SAVE SAVE
#ifdef FOR_CMAKE #ifdef FOR_FLUKA
INCLUDE '(IOUNIT)' INCLUDE '(IOUNIT)'
#else
INCLUDE 'IOUNIT'
#endif #endif
C event flag C event flag
INCLUDE 'inc/dtevno' INCLUDE 'inc/dtevno'
C histogram indices for Fluka-interface related statistics C histogram indices for Fluka-interface related statistics
......
...@@ -11,11 +11,17 @@ C = 2 target residual nucleus * ...@@ -11,11 +11,17 @@ C = 2 target residual nucleus *
C This version dated 19.04.95 is written by S. Roesler. * C This version dated 19.04.95 is written by S. Roesler. *
C*********************************************************************** C***********************************************************************
IMPLICIT DOUBLE PRECISION (A-H,O-Z) IMPLICIT DOUBLE PRECISION (A-H,O-Z)
#ifdef FOR_CMAKE
#ifdef FOR_FLUKA
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(GENSTK)' INCLUDE '(GENSTK)'
INCLUDE '(RESNUC)' INCLUDE '(RESNUC)'
INCLUDE '(FHEAVY)' INCLUDE '(FHEAVY)'
#else
INCLUDE 'DIMPAR'
INCLUDE 'GENSTK'
INCLUDE 'RESNUC'
INCLUDE 'FHEAVY'
#endif #endif
DOUBLE PRECISION am , dum , Eexcf , pe , px , py , pz , TINY10 , DOUBLE PRECISION am , dum , Eexcf , pe , px , py , pz , TINY10 ,
......
...@@ -53,11 +53,17 @@ C flags for input different options ...@@ -53,11 +53,17 @@ C flags for input different options
INCLUDE 'inc/dtflg1' INCLUDE 'inc/dtflg1'
C particle properties (BAMJET index convention) C particle properties (BAMJET index convention)
INCLUDE 'inc/dtpart' INCLUDE 'inc/dtpart'
#ifdef FOR_CMAKE #ifdef FOR_FLUKA
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(GENSTK)' INCLUDE '(GENSTK)'
INCLUDE '(RESNUC)' INCLUDE '(RESNUC)'
#else
INCLUDE 'DIMPAR'
INCLUDE 'GENSTK'
INCLUDE 'RESNUC'
#endif
PARAMETER (EMVGEV=1.0D-03) PARAMETER (EMVGEV=1.0D-03)
PARAMETER (AMUGEV=0.93149432D+00) PARAMETER (AMUGEV=0.93149432D+00)
PARAMETER (AMPRTN=0.93827231D+00) PARAMETER (AMPRTN=0.93827231D+00)
...@@ -71,9 +77,14 @@ C particle properties (BAMJET index convention) ...@@ -71,9 +77,14 @@ C particle properties (BAMJET index convention)
PARAMETER (BEXC12=FERTHO*72.40715579499394D+00) PARAMETER (BEXC12=FERTHO*72.40715579499394D+00)
PARAMETER (AMUNMU=HLFHLF*AMELCT-BEXC12/12.D+00) PARAMETER (AMUNMU=HLFHLF*AMELCT-BEXC12/12.D+00)
PARAMETER (AMUC12=AMUGEV-AMUNMU) PARAMETER (AMUC12=AMUGEV-AMUNMU)
#ifdef FOR_FLUKA
INCLUDE '(NUCDAT)' INCLUDE '(NUCDAT)'
INCLUDE '(PAREVT)' INCLUDE '(PAREVT)'
INCLUDE '(FHEAVY)' INCLUDE '(FHEAVY)'
#else
INCLUDE 'NUCDAT'
INCLUDE 'PAREVT'
INCLUDE 'FHEAVY'
#endif #endif
C event flag C event flag
......
...@@ -36,13 +36,18 @@ C statistics: residual nuclei ...@@ -36,13 +36,18 @@ C statistics: residual nuclei
C parameter for intranuclear cascade C parameter for intranuclear cascade
INCLUDE 'inc/dtfoti' INCLUDE 'inc/dtfoti'
#ifdef FOR_CMAKE #ifdef FOR_FLUKA
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(PAREVT)' INCLUDE '(PAREVT)'
INCLUDE '(FRBKCM)'
INCLUDE '(EVAFLG)' INCLUDE '(EVAFLG)'
INCLUDE '(FRBKCM)'
#else
INCLUDE 'DIMPAR'
INCLUDE 'PAREVT'
INCLUDE 'EVAFLG'
INCLUDE 'FRBKCM'
#endif #endif
C temporary storage for one final state particle C temporary storage for one final state particle
INCLUDE 'inc/dtfspa' INCLUDE 'inc/dtfspa'
C event flag used for histograms C event flag used for histograms
......
...@@ -35,12 +35,16 @@ C particle properties (BAMJET index convention)