Don't overwrite user settings for particle decays.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 Jan 2009 15:56:48 +0000 (15:56 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 Jan 2009 15:56:48 +0000 (15:56 +0000)
DPMJET/dpmjet3.0-5.f
DPMJET/phojet1.12-35c3.f

index 5079da5..3c45db6 100644 (file)
@@ -14568,11 +14568,12 @@ C  model switches and parameters
       COMMON /POMDLS/ MDLNA(50),ISWMDL(50),PARMDL(400),IPAMDL(400)
 * jetset
       COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200)
+      COMMON/PYDAT3/MDCY(500,3),MDME(8000,2),BRAT(8000),KFDP(8000,5)
       PARAMETER (MAXLND=4000)
       COMMON/PYJETS/N,NPAD,K(MAXLND,5),P(MAXLND,5),V(MAXLND,5)
       INTEGER PYK
       DIMENSION IJOIN(MXJOIN),ISJOIN(MXJOIN),IHISMO(8000),IFLG(4000)
-
+      INTEGER PYCOMP
       MODE = KMODE
       ISTSTG = 7
       IF (MODE.NE.1) ISTSTG = 8
@@ -15757,13 +15758,13 @@ C                 ELSEIF (I.EQ.4) THEN
 C                    MDCY(KC,1) = 1
 **
                   ELSE
-                     MDCY(KC,1) = 0
+C AM                     MDCY(KC,1) = 0
                   ENDIF
                ENDIF
             ELSEIF (((I.EQ.34).OR.(I.EQ.35)).AND.(ISIG0.EQ.0)) THEN
                KC = PYCOMP(IDXSTA(I))
                IF (KC.GT.0) THEN
-                  MDCY(KC,1) = 0
+C AM                 MDCY(KC,1) = 0
                ENDIF
             ENDIF
     1    CONTINUE
index c2e55ad..e60a10c 100644 (file)
@@ -33889,7 +33889,7 @@ C  defaults
       DEF21 = PARJ(21)
 
 C  declare stable particles
-      IF(IDEFAB.GE.2) MSTJ(22) = 2
+c     IF(IDEFAB.GE.2) MSTJ(22) = 2
 
 C  load optimized parameters
       IF(IDEFAB.GE.3) THEN