From: morsch Date: Fri, 28 Sep 2012 19:52:23 +0000 (+0000) Subject: Count number of diffractive collisions X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=09b429a435b8cd3d937727954cc356b25f179e15;hp=4193eda95ad166adaf2c75efc7ecd492e3253073;p=u%2Fmrichter%2FAliRoot.git Count number of diffractive collisions --- diff --git a/DPMJET/dpmjet3.0-5.f b/DPMJET/dpmjet3.0-5.f index b6c53bea2c9..027d9b816ee 100644 --- a/DPMJET/dpmjet3.0-5.f +++ b/DPMJET/dpmjet3.0-5.f @@ -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) diff --git a/DPMJET/phojet1.12-35c3.f b/DPMJET/phojet1.12-35c3.f index e60a10cff16..8e793debb6f 100644 --- a/DPMJET/phojet1.12-35c3.f +++ b/DPMJET/phojet1.12-35c3.f @@ -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-----------------------------------------------------------------------