From bd378884ad7f6333e2abbedfb99034c792a090b1 Mon Sep 17 00:00:00 2001 From: morsch Date: Mon, 1 Sep 2008 12:43:26 +0000 Subject: [PATCH] Pythia 6.1 dependence removed. --- DPMJET/dpmjet3.0-5.f | 6 +++--- DPMJET/libdpmjet.pkg | 5 ++--- DPMJET/phojet1.12-35c3.f | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/DPMJET/dpmjet3.0-5.f b/DPMJET/dpmjet3.0-5.f index 9d10ca8ae36..5079da57901 100644 --- a/DPMJET/dpmjet3.0-5.f +++ b/DPMJET/dpmjet3.0-5.f @@ -169,7 +169,7 @@ * flags for activated histograms COMMON /DTHIS3/ IHISPP(50),IHISXS(50),IXSTBL COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) - COMMON/PYDAT3/MDCY(500,3),MDME(4000,2),BRAT(4000),KFDP(4000,5) + COMMON/PYDAT3/MDCY(500,3),MDME(8000,2),BRAT(8000),KFDP(8000,5) * LEPTO **LUND single / double precision REAL CUT,PARL,TMPX,TMPY,TMPW2,TMPQ2,TMPU @@ -15096,7 +15096,7 @@ C DO 1 I=NPOINT(5),NEND COMMON /DTEVT2/ IDRES(NMXHKK),IDXRES(NMXHKK),NOBAM(NMXHKK), & IDBAM(NMXHKK),IDCH(NMXHKK),NPOINT(10), & IHIST(2,NMXHKK) - COMMON/PYDAT3/MDCY(500,3),MDME(4000,2),BRAT(4000),KFDP(4000,5) + COMMON/PYDAT3/MDCY(500,3),MDME(8000,2),BRAT(8000),KFDP(8000,5) COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) PARAMETER (MAXLND=4000) COMMON/PYJETS/N,NPAD,K(MAXLND,5),P(MAXLND,5),V(MAXLND,5) @@ -15699,7 +15699,7 @@ C ISU = 4 COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200) COMMON/PYDAT2/KCHG(500,4),PMAS(500,4),PARF(2000),VCKM(4,4) - COMMON/PYDAT3/MDCY(500,3),MDME(4000,2),BRAT(4000),KFDP(4000,5) + COMMON/PYDAT3/MDCY(500,3),MDME(8000,2),BRAT(8000),KFDP(8000,5) * flags for particle decays COMMON /DTFRPA/ MSTUX(20),PARUX(20),MSTJX(20),PARJX(20), & IMSTU(20),IPARU(20),IMSTJ(20),IPARJ(20), diff --git a/DPMJET/libdpmjet.pkg b/DPMJET/libdpmjet.pkg index ca301446e1e..31fbd9d935c 100644 --- a/DPMJET/libdpmjet.pkg +++ b/DPMJET/libdpmjet.pkg @@ -10,10 +10,9 @@ DHDR:=dpmjetLinkDef.h FSRCS:= \ dpmjet3.0-5.f\ phojet1.12-35c3.f\ -pythia6115dpm3.f\ user3.0-5.f\ -openfile.f\ -pyqdummy.f +openfile.f + ifeq (g95,$(F77)) PACKFFLAGS := $(filter-out -O%,$(FFLAGS)) diff --git a/DPMJET/phojet1.12-35c3.f b/DPMJET/phojet1.12-35c3.f index c3bd70f62d7..c2e55ad7196 100644 --- a/DPMJET/phojet1.12-35c3.f +++ b/DPMJET/phojet1.12-35c3.f @@ -494,7 +494,7 @@ C hard cross sections and MC selection weights COMMON/PYDAT2/KCHG(500,4),PMAS(500,4),PARF(2000),VCKM(4,4) INTEGER MDCY,MDME,KFDP DOUBLE PRECISION BRAT - COMMON/PYDAT3/MDCY(500,3),MDME(4000,2),BRAT(4000),KFDP(4000,5) + COMMON/PYDAT3/MDCY(500,3),MDME(8000,2),BRAT(8000),KFDP(8000,5) INTEGER PYCOMP @@ -33870,7 +33870,7 @@ C input/output channels COMMON/PYDAT2/KCHG(500,4),PMAS(500,4),PARF(2000),VCKM(4,4) INTEGER MDCY,MDME,KFDP DOUBLE PRECISION BRAT - COMMON/PYDAT3/MDCY(500,3),MDME(4000,2),BRAT(4000),KFDP(4000,5) + COMMON/PYDAT3/MDCY(500,3),MDME(8000,2),BRAT(8000),KFDP(8000,5) INTEGER PYCOMP -- 2.43.0