IAP GITLAB

Commit daab5c86 authored by Colin Baus's avatar Colin Baus

updated version numbers and added the line that was forgotten in the last...

updated version numbers and added the line that was forgotten in the last commit to disable the MDCY decays

git-svn-id: https://devel-ik.fzk.de/svn/mc/crmc/trunk@4941 c7a5e08c-de06-0410-9364-b41cf42a0b17
parent 89aa2496
......@@ -10,7 +10,7 @@ OPTION (__QGSJET01__ "Build with model" OFF)
OPTION (__GHEISHA__ "Build with model" OFF)
OPTION (__PYTHIA__ "Build with model" OFF)
OPTION (__HIJING__ "Build with model" OFF)
OPTION (__SIBYLL__ "Build with model" OFF)
OPTION (__SIBYLL__ "Build with model" ON)
OPTION (__PHOJET__ "Build with model" OFF)
OPTION (__DPMJET__ "Build with model" OFF)
OPTION (__QGSJETII03__ "Build with model" OFF)
......@@ -30,7 +30,7 @@ MESSAGE(STATUS "build ${CMAKE_BINARY_DIR}")
## The version number. Only nummeric PLEASE!
SET (CRMC_VERSION_MAJOR 1)
SET (CRMC_VERSION_MINOR 5)
SET (CRMC_VERSION_PATCH 3)
SET (CRMC_VERSION_PATCH 6)
##Compiler options
# hotfix for lxbatch not sure why he selects wrong compiler
......@@ -75,7 +75,7 @@ SET (CRMC_SOURCES src/crmcMain.cc src/CRMC.cc src/CRMCinterface.cc src/CRMCoptio
FIND_PACKAGE (Root)
if (Root_FOUND)
if (Root_FOUND)
INCLUDE_DIRECTORIES ("${ROOT_INCLUDE_DIR}")
LIST(APPEND CRMC_SOURCES src/OutputPolicyROOT.cc)
add_definitions(-DWITH_ROOT)
......
CRMC v1.5.5 Last modifications 2015/09/11
CRMC v1.5.6 Last modifications 2015/10/02
**********************************************************
The Program "crmc"
......
......@@ -97,10 +97,12 @@ c don't touch decays with too small width
go to 100
endif
c because epos var ifrade is not 0 it will automatically use epos to decay when switched off in pythia
if(ish.ge.2) write(ifch,*)
+ "CF Id:",i, PMAS(i,1),PMAS(i,2),KCHG(I,4),
+ "Width ok:", PMAS(i,2).GE.PARP(41),
+ "decay in epos"
+ "CF Id:",i,PMAS(i,1),PMAS(i,2),
+ "PDG ID:",KCHG(I,4),
+ "(decay in epos)"
MDCY(i,1)=0
100 enddo !loop over 100-500 particle ids
c initialize cross-sections by calling epos-bas.f function -> models.F -> dpmjet-crmc.f
......@@ -488,13 +490,13 @@ c in dpmjet the control card xs-table starts to calculate the table and then qui
c it calls subroutine dt_xstabl with the 6 parameters for binning and energy and binning and q
c in this subroutine the actual table COMMON/DTPART/ is filled
c this happens with dt_xsglau. emulsion is off? at least ncompo is 0 => no loops over table
c instead always (1,1,1) contians the value
c instead always (1,1,1) contains the value
c xprod seems to be prod + quasi-ela. this is why we subtract it again
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
include 'epos.inc'
integer niter !input
real stot,sine,sela,stotaa,sineaa,selaaa !subroutine return values
real stotaa,sineaa,selaaa !subroutine return values
PARAMETER (TINY10=1.0D-10,TINY2=1.0D-2,ZERO=0.0D0,DLARGE=1.0D10,
& OHALF=0.5D0,ONE=1.0D0,TWO=2.0D0)
......
......@@ -1653,7 +1653,7 @@ c-c tauz=amax1(.2,tauz)
c-----------------------------------------------------------------------
subroutine idtau(id,p4,p5,taugm)
c wrapper function for idtaustatus that also checks wether IDs exist
c wrapper function for idtaustatus that also checks whether IDs exist
c returns lifetime(c*tau(fm))*gamma for id with energy p4, mass p5
c fails when index out of range. idtaustatus will return negative
c-----------------------------------------------------------------------
......
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