]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Count number of diffractive collisions
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 28 Sep 2012 19:52:23 +0000 (19:52 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 28 Sep 2012 19:52:23 +0000 (19:52 +0000)
DPMJET/dpmjet3.0-5.f
DPMJET/phojet1.12-35c3.f

index b6c53bea2c920fc9b51aa89942fbe4686b3d651b..027d9b816ee8f73a7a93dfc9d9a3b2944a69ec45 100644 (file)
@@ -2166,6 +2166,12 @@ C     ENDIF
       LOGICAL LFZC
 
 * event history
+      
+      PARAMETER (NMXHEP=4000)
+      COMMON /POEVT1/ NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
+     &                JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),
+     &                VHEP(4,NMXHEP), NSD1, NSD2, NDD
+      
       PARAMETER (NMXHKK=200000)
       COMMON /DTEVT1/ NHKK,NEVHKK,ISTHKK(NMXHKK),IDHKK(NMXHKK),
      &                JMOHKK(2,NMXHKK),JDAHKK(2,NMXHKK),
@@ -2202,6 +2208,9 @@ C     ENDIF
 
       IREJ  = 0
       ILOOP = 0
+      NSD1  = 0
+      NSD2  = 0
+      NDD   = 0
   100 CONTINUE
       IF (ILOOP.EQ.4) THEN
          WRITE(LOUT,1000) NEVHKK
@@ -2292,10 +2301,10 @@ C        IF (LFZC) CALL DT_DECAY1
       IF (IPI0.EQ.1) CALL DT_DECPI0
 
 C     IF (NEVHKK.EQ.5) CALL DT_EVTOUT(4)
-
       RETURN
  9999 CONTINUE
       IREJ = 1
+
       RETURN
       END
 
@@ -2631,10 +2640,11 @@ C     CSEA   = 0.3D0
      &                NCOMPO,IEMUL
 * event flag
       COMMON /DTEVNO/ NEVENT,ICASCA
-
       CHARACTER*8 DATE,HHMMSS
       DIMENSION IDMNYR(3)
-
+      NSD1 = 0
+      NSD2 = 0
+      NDD  = 0
       KKMAT  = 1
       NMSG   = MAX(NEVTS/100,1)
 
@@ -2688,13 +2698,14 @@ C1000       FORMAT(1X,I8,' events sampled')
          CALL DT_KKINC(NPMASS,NPCHAR,NTMASS,NTCHAR,IDP,EPN,KKMAT,IREJ)
 
          CALL PHO_PHIST(2000,DUM)
+         
+         write(6,*) "Diffractive collisions", NSD1, NSD2, NDD
 
     2 CONTINUE
 
 * print run-statistics and histograms to output-unit 6
       CALL PHO_PHIST(3000,DUM)
       CALL DT_STATIS(2)
-
       RETURN
       END
 
@@ -4218,7 +4229,7 @@ C  standard particle data interface
       DOUBLE PRECISION PHEP,VHEP
       COMMON /POEVT1/ NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
      &                JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),
-     &                VHEP(4,NMXHEP)
+     &                VHEP(4,NMXHEP), NSD1, NSD2, NDD
 C  extension to standard particle data interface (PHOJET specific)
       INTEGER IMPART,IPHIST,ICOLOR
       COMMON /POEVT2/ IMPART(NMXHEP),IPHIST(2,NMXHEP),ICOLOR(2,NMXHEP)
@@ -28652,7 +28663,7 @@ C  standard particle data interface
       DOUBLE PRECISION PHEP,VHEP
       COMMON /POEVT1/ NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
      &                JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),
-     &                VHEP(4,NMXHEP)
+     &                VHEP(4,NMXHEP),NSD1, NSD2, NDD
 C  extension to standard particle data interface (PHOJET specific)
       INTEGER IMPART,IPHIST,ICOLOR
       COMMON /POEVT2/ IMPART(NMXHEP),IPHIST(2,NMXHEP),ICOLOR(2,NMXHEP)
index e60a10cff166108e3f0b633b2aeec89230029a57..8e793debb6f5c67991f5e2501701059436051443 100644 (file)
@@ -2496,7 +2496,7 @@ C  standard particle data interface
       DOUBLE PRECISION PHEP,VHEP
       COMMON /POEVT1/ NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
      &                JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),
-     &                VHEP(4,NMXHEP)
+     &                VHEP(4,NMXHEP), NSD1, NSD2, NDD
 C  extension to standard particle data interface (PHOJET specific)
       INTEGER IMPART,IPHIST,ICOLOR
       COMMON /POEVT2/ IMPART(NMXHEP),IPHIST(2,NMXHEP),ICOLOR(2,NMXHEP)
@@ -11836,6 +11836,11 @@ C  event debugging information
      &        KHLOO,KSDPO,KHDPO,KEVENT,KSOFT,KHARD
       COMMON /PODEBG/ IDEB(NMAXD),KSPOM,KHPOM,KSREG,KHDIR,KACCEP,KSTRG,
      &                KHTRG,KSLOO,KHLOO,KSDPO,KHDPO,KEVENT,KSOFT,KHARD
+      PARAMETER (NMXHEP=4000)
+      COMMON /POEVT1/ NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
+     &                JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),
+     &                VHEP(4,NMXHEP), NSD1, NSD2, NDD
+
 C  model switches and parameters
       CHARACTER*8 MDLNA
       INTEGER ISWMDL,IPAMDL
@@ -12204,10 +12209,18 @@ C  sample strings to prepare fragmentation
           CALL PHO_PREVNT(-1)
           RETURN
         ENDIF
-        IF(IPROC.EQ.5) ID1A = ID1A+1
-        IF(IPROC.EQ.6) ID2A = ID2A+1
-        IF(IPROC.EQ.7) ID3A = ID3A+1
-
+        IF(IPROC.EQ.5) THEN 
+           ID1A = ID1A+1
+           NSD1 = NSD1 +1
+           ENDIF
+        IF(IPROC.EQ.6) THEN
+           ID2A = ID2A+1
+           NSD2 = NSD2 + 1
+        ENDIF
+        IF(IPROC.EQ.7) THEN
+           ID3A = ID3A+1
+           NDD = NDD + 1
+        ENDIF
 C-----------------------------------------------------------------------
 C  single / double direct processes
 
@@ -12260,9 +12273,18 @@ C  sample strings to prepare fragmentation
           CALL PHO_PREVNT(-1)
           RETURN
         ENDIF
-        IF(IPROC.EQ.5) ID1A = ID1A+1
-        IF(IPROC.EQ.6) ID2A = ID2A+1
-        IF(IPROC.EQ.7) ID3A = ID3A+1
+        IF(IPROC.EQ.5) THEN 
+           ID1A = ID1A+1
+           NSD1 = NSD1 +1
+        ENDIF
+        IF(IPROC.EQ.6) THEN
+           ID2A = ID2A+1
+           NSD2 = NSD2 + 1
+        ENDIF
+        IF(IPROC.EQ.7) THEN
+           ID3A = ID3A+1
+           NDD = NDD + 1
+        ENDIF
         IDIA = IDIA+MHDIR
 
 C-----------------------------------------------------------------------