Corrected opening of the data file (using the same way as in Pythia6)

diff --git a/DPMJET/dpmjet3.0-5.f b/DPMJET/dpmjet3.0-5.f
index 7c0a6230b01f56df1a9a8b8d3cb43947a12a8592..14671295bd848a4aae1f8598cdc2ff7adf87f12f 100644 (file)
--- a/DPMJET/dpmjet3.0-5.f
+++ b/DPMJET/dpmjet3.0-5.f
@@ -20665,7 +20665,7 @@ C     REWIND NBERTP
  1000 FORMAT(/,1X,'BERTTP:',4X,'Initialization of evaporation module',
      &       /,12X,'------------------------------------',/)
       NBERNW = 23
-      OPEN (UNIT=NBERNW,FILE='dpmjet.dat',STATUS='UNKNOWN')
+CPH      OPEN (UNIT=NBERNW,FILE='dpmjet.dat',STATUS='UNKNOWN')
 
 **sr 17.5.
 *!!!! changed to be able to read the ASCII !!!!

diff --git a/DPMJET/libdpmjet.pkg b/DPMJET/libdpmjet.pkg
index 9ca7c02481b03b86b344cdb592472a3c73b1476f..2556df52db55e9944c141b32b0bc845c293b9f33 100644 (file)
--- a/DPMJET/libdpmjet.pkg
+++ b/DPMJET/libdpmjet.pkg
@@ -1,3 +1,5 @@
+#-*- Mode: Makefile -*-
+
 SRCS:=AliDpmJetRndm.cxx
 
 HDRS= $(SRCS:.cxx=.h) 
@@ -10,3 +12,8 @@ phojet1.12-35c3.f\
 pythia6115dpm3.f\
 user3.0-5.f\
 openfile.f
+
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
+                         -lmicrocern
+endif

diff --git a/DPMJET/openfile.f b/DPMJET/openfile.f
index 2dbd952824c1b4a56f0eb45449ecb5aeb12df6c5..c39c038ce5c9fb57c4556e30f60880fefead3a7f 100644 (file)
--- a/DPMJET/openfile.f
+++ b/DPMJET/openfile.f
@@ -10,7 +10,31 @@
 *----------------------------------------------------------------------*
 *
       IMPLICIT NONE
+      LOGICAL EXISTS
+      INTEGER LNROOT
+      CHARACTER*1000 FILNAM
+      CHARACTER*1000 CHROOT
+      CHROOT=' '
+      CALL GETENVF('ALICE_ROOT',CHROOT)
+      LNROOT = LNBLNK(CHROOT)
+      IF(LNROOT.LE.0) THEN
+         FILNAM='dpmjet.dat'
+      ELSE
+         FILNAM=CHROOT(1:LNROOT)//'/DPMJET/dpmjet.dat'
+      ENDIF
+      INQUIRE(FILE=FILNAM,EXIST=EXISTS)
+      IF(.NOT.EXISTS) THEN
+         PRINT*,'***********************************'
+         PRINT*,'*           openfile              *'
+         PRINT*,'*        ---------------          *'
+         PRINT*,'*   File dpmjet.dat not found     *'
+         PRINT*,'*         Program STOP            *'
+         PRINT*,'*   Check ALICE_ROOT environment  *'
+         PRINT*,'*           variable              *'
+         PRINT*,'***********************************'
+         STOP
+      ENDIF
       OPEN (10, FILE="dpmjet.inp", STATUS="OLD")
-      OPEN (23, FILE="dpmjet.dat", STATUS="OLD")
+      OPEN (23, FILE=FILNAM, STATUS="OLD")
       RETURN
       END

diff --git a/build/module.dep b/build/module.dep
index 0b20604ef7b81aa3e8cb0abc46c5cd0b64a22084..ea5e77251e0380585d74d420be08042bda6633e3 100644 (file)
--- a/build/module.dep
+++ b/build/module.dep
@@ -67,6 +67,7 @@ $(LIBPATH)/libRAWDatarecOnline.$(SOEXT): $(LIBPATH)/libRAWDatarec.$(SOEXT)
 $(LIBPATH)/libSTEER.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libAOD.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT)
 $(LIBPATH)/libEVGEN.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libFASTSIM.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT)
 $(LIBPATH)/libpythia6.$(SOEXT): $(LIBPATH)/libmicrocern.$(SOEXT) $(LIBPATH)/liblhapdf.$(SOEXT)
+$(LIBPATH)/libdpmjet.$(SOEXT): $(LIBPATH)/libmicrocern.$(SOEXT)
 $(LIBPATH)/libAliPythia6.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libFASTSIM.$(SOEXT) $(LIBPATH)/libpythia6.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT) $(LIBPATH)/liblhapdf.$(SOEXT)
 $(LIBPATH)/libTHijing.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libhijing.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT)
 $(LIBPATH)/libTHerwig.$(SOEXT): $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libherwig.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT)