corrected initialisation of NCP, NCT
authormorsch <andreas.morsch@cern.ch>
Tue, 13 Jan 2015 07:45:48 +0000 (08:45 +0100)
committermorsch <andreas.morsch@cern.ch>
Tue, 13 Jan 2015 07:46:52 +0000 (08:46 +0100)
DPMJET/dpmjet3.0-5.f

index 440c85d..cbd4318 100644 (file)
@@ -2203,6 +2203,9 @@ C     ENDIF
       LOGICAL LPROD
       CHARACTER*8 CGLB
       COMMON /DTGLGP/ JSTATB,JBINSB,CGLB,IOGLB,LPROD
+      COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 
       DIMENSION WHAT(6)
 
@@ -2302,6 +2305,7 @@ C        IF (LFZC) CALL DT_DECAY1
 
 C     IF (NEVHKK.EQ.5) CALL DT_EVTOUT(4)
       RETURN
+
  9999 CONTINUE
       IREJ = 1
 
@@ -3498,7 +3502,8 @@ C #include "dtu_dtevtp.inc"
       COMMON /DTLTSU/ BGX,BGY,BGZ,GAM
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 * flags for diffractive interactions (DTUNUC 1.x)
       COMMON /DTFLG3/ ISINGD,IDOUBD,IFLAGD,IDIFF
 * statistics: double-Pomeron exchange
@@ -5195,9 +5200,7 @@ C           ENDIF
       IREJ   = 0
       ICREQU = ICREQU+1
       NC     = 0
-      NCP    = 0
-      NCT    = 0
-
     1 CONTINUE
       ICSAMP = ICSAMP+1
       NC     = NC+1
@@ -5236,15 +5239,19 @@ C           ENDIF
          ITOLD  = IT
          JJPOLD = JJPROJ
          EPROLD = EPROJ
+         NCP    = 0
+         NCT    = 0
+
         DO 8 I=1, IP
            NCP = NCP+JSSH(I)
 *          WRITE(6,*)' PROJ.NUCL. ',I,' NCOLL = ',NCP 
     8 CONTINUE
+      write(6,*) "why this (1)", NCP, NCT
         DO 9 I=1, IT
-           NCT = NCT+JTSH(I)
-*          WRITE(6,*)' TAR.NUCL. ',I,' NCOLL = ',NCT 
+           NCT = NCT +JTSH(I)
+*          WRITE(6,*)' TAR.NUCL. ',I,' NCOLL = ',NCT
     9 CONTINUE
-      ENDIF
+       ENDIF
 
 * force diffractive particle production in h-K interactions
       IF (((ABS(ISINGD).GT.1).OR.(ABS(IDOUBD).GT.1)).AND.
@@ -5500,7 +5507,8 @@ C           ENDIF
      &                IICH(210),IIBAR(210),K1(210),K2(210)
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 * flavors of partons (DTUNUC 1.x)
       COMMON /DTDPMF/ IPVQ(MAXVQU),IPPV1(MAXVQU),IPPV2(MAXVQU),
      &                ITVQ(MAXVQU),ITTV1(MAXVQU),ITTV2(MAXVQU),
@@ -5739,7 +5747,8 @@ C        ENDIF
      &                IICH(210),IIBAR(210),K1(210),K2(210)
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 **temporary
 * statistics: Glauber-formalism
       COMMON /DTSTA3/ ICWP,ICWT,NCSY,ICWPG,ICWTG,ICIG,IPGLB,ITGLB,NGLB
@@ -8718,8 +8727,8 @@ C     PA2(3) = SIGN(SQRT(PZ2NSQ),PA2(3))
      &                IREXCI(3),IRDIFF(2),IRINC
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
-
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
       DIMENSION R(3),PIN(4),POUT(4),DEV(4)
 
       DO 1 K=1,4
@@ -8826,7 +8835,8 @@ C              PHKK(K,I) = PHKK(K,I)-DEV(K)/DBLE(NVAL)
      &                IREXCI(3),IRDIFF(2),IRINC
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 * various options for treatment of partons (DTUNUC 1.x)
 * (chain recombination, Cronin,..)
       LOGICAL LCO2CR,LINTPT
@@ -10709,7 +10719,8 @@ C                    ENDIF
       COMMON /DTGPRO/ VIRT,PGAMM(4),PLEPT0(4),PLEPT1(4),PNUCL(4),IDIREC
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 * Glauber formalism: flags and parameters for statistics
       LOGICAL LPROD
       CHARACTER*8 CGLB
@@ -16059,7 +16070,8 @@ C           QARJ(I) = PARJ(I)
       COMMON /DTPRTA/ IT,ITZ,IP,IPZ,IJPROJ,IBPROJ,IJTARG,IBTARG
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 * flags for input different options
       LOGICAL LEMCCK,LHADRO,LSEADI,LEVAPO
       COMMON /DTFLG1/ IFRAG(2),IRESCO,IMSHL,IRESRJ,IOULEV(6),
@@ -16247,7 +16259,8 @@ C9990 CONTINUE
      &                IICH(210),IIBAR(210),K1(210),K2(210)
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 * nuclear potential
       LOGICAL LFERMI
       COMMON /DTNPOT/ PFERMP(2),PFERMN(2),FERMOD,