]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - DPMJET/dpmjet3.0-5F.f
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into TPCdev
[u/mrichter/AliRoot.git] / DPMJET / dpmjet3.0-5F.f
diff --git a/DPMJET/dpmjet3.0-5F.f b/DPMJET/dpmjet3.0-5F.f
index 388b0c79b24132678074b2fa31de7df4d041b2ce..863d66b1cb5727cc72f4110cf021a7a5f1bab754 100644 (file)
--- a/DPMJET/dpmjet3.0-5F.f
+++ b/DPMJET/dpmjet3.0-5F.f
@@ -3592,8 +3592,12 @@ C     STOP
       IF (LBEAM) THEN
          IF ( (NPOINT(4).EQ.0).OR.(NHKK.LT.NPOINT(4)) ) RETURN
          DO 20 I=NPOINT(4),NHKK
-            IF ((ABS(ISTHKK(I)).EQ.1).OR.(ISTHKK(I).EQ.1000).OR.
-     &                                   (ISTHKK(I).EQ.1001)) THEN
+
+            IF ((ABS(ISTHKK(I)).EQ.1)  .OR.
+     &           (ABS(ISTHKK(I)).EQ.2) .OR.
+     &           (ISTHKK(I).EQ.1000)   .OR.
+     &           (ISTHKK(I).EQ.1001)) THEN
+
                CALL DT_MYTRAN(1,PHKK(1,I),PHKK(2,I),PHKK(3,I),
      &                     COD,SID,COF,SIF,PXCMS,PYCMS,PZCMS)
                PECMS = PHKK(4,I)
@@ -3746,8 +3750,8 @@ C #include "dtu_dtevtp.inc"
 
 * 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
 
@@ -5532,7 +5536,8 @@ C           ENDIF
 
 * Glauber formalism: collision properties
       COMMON /DTGLCP/ RPROJ,RTARG,BIMPAC,
-     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC
+     &                NWTSAM,NWASAM,NWBSAM,NWTACC,NWAACC,NWBACC,
+     &                NCP,NCT
 
 * central particle production, impact parameter biasing
       COMMON /DTIMPA/ BIMIN,BIMAX,XSFRAC,ICENTR
@@ -5547,6 +5552,8 @@ C           ENDIF
       IREJ   = 0
       ICREQU = ICREQU+1
       NC     = 0
+      NCP    = 0
+      NCT    = 0
 
     1 CONTINUE
       ICSAMP = ICSAMP+1
@@ -5586,6 +5593,14 @@ C           ENDIF
          ITOLD  = IT
          JJPOLD = JJPROJ
          EPROLD = EPROJ
+      DO 8 I=1, IP
+        NCP = NCP+JSSH(I)
+*        WRITE(6,*)' PROJ.NUCL. ',I,' NCOLL = ',NCP
+    8 CONTINUE
+      DO 9 I=1, IT
+        NCT = NCT+JTSH(I)
+*        WRITE(6,*)' TAR.NUCL. ',I,' NCOLL = ',NCT
+    9 CONTINUE
       ENDIF
 
 * force diffractive particle production in h-K interactions
@@ -5858,7 +5873,8 @@ C           ENDIF
 
 * 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),
@@ -6110,7 +6126,8 @@ C        ENDIF
 
 * 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
@@ -9188,8 +9205,8 @@ C     PA2(3) = SIGN(SQRT(PZ2NSQ),PA2(3))
 
 * 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
@@ -9299,7 +9316,8 @@ C              PHKK(K,I) = PHKK(K,I)-DEV(K)/DBLE(NVAL)
 
 * 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,..)
@@ -11240,8 +11258,8 @@ C                    ENDIF
 
 * 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
@@ -16896,7 +16914,8 @@ C           QARJ(I) = PARJ(I)
 
 * 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
@@ -17095,8 +17114,8 @@ C9990 CONTINUE
 
 * 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,
@@ -18839,37 +18858,37 @@ C     EPOT(2,8) = PFERMN(2)**2/(2.0D0*AAM(8)) + EBINDN(2)
 
 * correction of projectile 4-momentum for effective target pot.
 * and Coulomb-energy (in case of hadron-nucleus interaction only)
-      IF ((IP.EQ.1).AND.(IT.GT.1).AND.LFERMI) THEN
-         EPNI = EPN
+*      IF ((IP.EQ.1).AND.(IT.GT.1).AND.LFERMI) THEN
+*         EPNI = EPN
 *   Coulomb-energy:
 *     positively charged hadron - check energy for Coloumb pot.
-         IF (IICH(IJPROJ).EQ.1) THEN
-            THRESH = ETACOU(2)+AAM(IJPROJ)
-            IF (EPNI.LE.THRESH) THEN
-               WRITE(LOUT,1000)
- 1000          FORMAT(/,1X,'KKINC:  WARNING!  projectile energy',
-     &                ' below Coulomb threshold - event rejected',/)
-               ISTHKK(1) = 1
-               RETURN
-            ENDIF
+*         IF (IICH(IJPROJ).EQ.1) THEN
+*            THRESH = ETACOU(2)+AAM(IJPROJ)
+*            IF (EPNI.LE.THRESH) THEN
+*               WRITE(LOUT,1000)
+* 1000          FORMAT(/,1X,'KKINC:  WARNING!  projectile energy',
+*     &                ' below Coulomb threshold - event rejected',/)
+*               ISTHKK(1) = 1
+*               RETURN
+*            ENDIF
 *     negatively charged hadron - increase energy by Coulomb energy
-         ELSEIF (IICH(IJPROJ).EQ.-1) THEN
-            EPNI = EPNI+ETACOU(2)
-         ENDIF
-         IF ((IJPROJ.EQ.1).OR.(IJPROJ.EQ.8)) THEN
+*         ELSEIF (IICH(IJPROJ).EQ.-1) THEN
+*            EPNI = EPNI+ETACOU(2)
+*         ENDIF
+*         IF ((IJPROJ.EQ.1).OR.(IJPROJ.EQ.8)) THEN
 *   Effective target potential
 *sr 6.6. binding energy only (to avoid negative exc. energies)
 C           EPNI = EPNI+EPOT(2,IJPROJ)
-            EBIPOT = EBINDP(2)
-            IF ((IJPROJ.NE.1).AND.(ABS(EPOT(2,IJPROJ)).GT.5.0D-3))
-     &         EBIPOT = EBINDN(2)
-            EPNI = EPNI+ABS(EBIPOT)
+*            EBIPOT = EBINDP(2)
+*            IF ((IJPROJ.NE.1).AND.(ABS(EPOT(2,IJPROJ)).GT.5.0D-3))
+*     &         EBIPOT = EBINDN(2)
+*            EPNI = EPNI+ABS(EBIPOT)
 * re-initialization of DTLTRA
-            DUM1 = ZERO
-            DUM2 = ZERO
-            CALL DT_LTINI(IJPROJ,IJTARG,EPNI,DUM1,DUM2,0)
-         ENDIF
-      ENDIF
+*            DUM1 = ZERO
+*            DUM2 = ZERO
+*            CALL DT_LTINI(IJPROJ,IJTARG,EPNI,DUM1,DUM2,0)
+*         ENDIF
+*      ENDIF
 
 * projectile in n-n cms
       IF ((IP.LE.1).AND.(IT.GT.1)) THEN