Additiona changes for #99699: Code needed to run DPMJET with FLUKA for fragment produ...
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 11 Jan 2013 10:15:21 +0000 (10:15 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 11 Jan 2013 10:15:21 +0000 (10:15 +0000)
DPMJET/CMakelibdpmjet.pkg
DPMJET/dpmjet3.0-5F.f

index d3f62b4..de68624 100644 (file)
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for dpmjet                                                        #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -31,33 +32,24 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR dpmjetLinkDef.h)
 
-set ( FSRCS dpmjet3.0-5F.f phojet1.12-35c4.f user3.0-5F.f openfile.f) 
 
 set(FLUPRO $ENV{FLUPRO})
 
 if(FLUPRO)
 
+  set ( FSRCS dpmjet3.0-5F.f phojet1.12-35c4.f user3.0-5F.f openfile.f) 
   set ( ELIBS  libflukahp.a)
   set ( ELIBSDIR  ${FLUPRO})  
-  
+
+else(FLUPRO)
+
+  set ( FSRCS dpmjet3.0-5.f phojet1.12-35c3.f user3.0-5.f openfile.f)   
+
 endif(FLUPRO)
 
 if( ALICE_TARGET MATCHES "macosx")
                
-               set ( CSRCS ${CSRCS}  ../PYTHIA6/pythia6_common_address.c)
-
-    set ( FSRCS ${FSRCS}  ../PYTHIA6/pythia6_common_block_address.F ../PYTHIA6/tpythia6_called_from_cc.F ../PYTHIA6/pythia6214.f ../PYTHIA6/pydummy.f ../PYTHIA6/pdf_alice.F)
+  set ( CSRCS ${CSRCS}  ../PYTHIA6/pythia6_common_address.c)
+  set ( FSRCS ${FSRCS}  ../PYTHIA6/pythia6_common_block_address.F ../PYTHIA6/tpythia6_called_from_cc.F ../PYTHIA6/pythia6214.f ../PYTHIA6/pydummy.f ../PYTHIA6/pdf_alice.F)
 
 endif(ALICE_TARGET MATCHES "macosx")
-
-if( F77 STREQUAL "g95")
-       
-       string (REGEX REPLACE "-O[^ ]*" "" PACKFFLAGS ${FFLAGS})
-
-endif( F77 STREQUAL "g95")
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lmicrocern)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")
index d540f18..5bbcd3d 100644 (file)
       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
@@ -15800,7 +15800,7 @@ C     DO 1 I=NPOINT(5),NEND
      &                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)
@@ -16508,7 +16508,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),
@@ -27458,29 +27458,34 @@ C      IF (NCOMPO.GT.0) CALL DT_LTINI(ID,EPN,PPN,ECM)
       WRITE(LOUT,1000)
  1000 FORMAT(/,/,1X,'STATIS:',20X,'statistics of the run',/,
      &       28X,'---------------------')
+      IF (ICREQU.GT.0) THEN
       WRITE(LOUT,1001) ICREQU,ICSAMP,DBLE(ICSAMP)/DBLE(ICREQU)
  1001 FORMAT(/,1X,'number of events requested / sampled',13X,
      &       I8,' / ',I8,/,1X,'number of samp. evts per requested ',
      &       'event',11X,F9.1)
+      ENDIF
       IF (ICDIFF(1).NE.0) THEN
          WRITE(LOUT,1009) ICDIFF
  1009    FORMAT(/,1X,'diffractive events:    total   ',I8,/,49X,
      &          'low mass   high mass',/,24X,'single diffraction',
      &          7X,I8,4X,I8,/,24X,'double diffraction',7X,I8,4X,I8)
       ENDIF
-      IF (ICENTR.GT.0) THEN
+      IF (ICENTR.GT.0.AND.ICSAMP.GT.0.AND.ICCPRO.GT.0) THEN
          WRITE(LOUT,1002) DBLE(ICCPRO)/DBLE(ICSAMP),
      &                    DBLE(ICSAMP)/DBLE(ICCPRO)
  1002    FORMAT(/,1X,'central production:',/,2X,'mean number',
      &          ' of sampled Glauber-events per event',9X,F9.1,/,
      &          2X,'fraction of production cross section',21X,F10.6)
       ENDIF
+      IF (ICSAMP.GT.0) THEN
       WRITE(LOUT,1003) DBLE(ICDPR)/DBLE(ICSAMP),
      &                 DBLE(ICDTA)/DBLE(ICSAMP)
  1003 FORMAT(/,54X,'proj.    targ.',/,1X,'average number of wounded',
      &       ' nucleons after x-sampling',2(4X,F6.2))
+      ENDIF
 
       IF (MCGENE.EQ.1) THEN
+         IF (ICSAMP.GT.0) THEN
          WRITE(LOUT,1004) DBLE(ICRJSS)/DBLE(ICSAMP)
  1004    FORMAT(/,1X,'mean number of sea-sea chain rejections per',
      &          ' event',3X,F9.1)
@@ -27489,6 +27494,8 @@ C      IF (NCOMPO.GT.0) CALL DT_LTINI(ID,EPN,PPN,ECM)
  1005       FORMAT(/,1X,'Reggeon contribution:',/,1X,'mean number ',
      &             'of single chains  per event',13X,F9.1)
          ENDIF
+         ENDIF
+         IF (ICSAMP.GT.0.AND.ICREQU.GT.0) THEN
          WRITE(LOUT,1006)
  1006    FORMAT(/,1X,'chain system statistics:  (per event)',/,
      &       23X,'mean number of chains      mean number of chains',/,
@@ -27535,6 +27542,7 @@ C      IF (NCOMPO.GT.0) CALL DT_LTINI(ID,EPN,PPN,ECM)
      &       'Treatment of final nucleon conf.',10X,'IREXCI(1)/NEVT = '
      &       ,F7.2,/,43X,'IREXCI(2)/NEVT = ',F7.2,/,48X,
      &       'IREXCI(3) = ',I5,/)
+         ENDIF
       ELSEIF (MCGENE.EQ.2) THEN
          WRITE(LOUT,1010) ELOJET
  1010    FORMAT(/,/,1X,'PHOJET-treatment of chain systems above  ',
@@ -27569,6 +27577,7 @@ C      IF (NCOMPO.GT.0) CALL DT_LTINI(ID,EPN,PPN,ECM)
  1013    FORMAT(/,1X,'2. chain system statistics -',
      &          ' mean numbers per evt:',/,30X,'---------------------',
      &          /,/,16X,'s-s',7X,'d-s',7X,'s-d')
+         IF (ICSAMP.GT.0) THEN
          WRITE(LOUT,1014)
      &                 ((DBLE(ICEVTG(I,J))/DBLE(ICSAMP),I=1,3),J=0,1),
      &                 (DBLE(ICCHAI(2,I))/(2.0D0*DBLE(ICSAMP)),I=1,3),
@@ -27583,8 +27592,10 @@ C      IF (NCOMPO.GT.0) CALL DT_LTINI(ID,EPN,PPN,ECM)
      &          ' dbl-dir    ',3E10.2,/,' s-Pom.     ',3E10.2,/,
      &          ' h-Pom.     ',3E10.2,/,' s-Reg.     ',3E10.2,/,
      &          ' enh-trg    ',3E10.2,/,' enh-log    ',3E10.2)
+         ENDIF
          WRITE(LOUT,1015)
  1015    FORMAT(/,16X,'s-v',7X,'d-v',7X,'v-s',7X,'v-d',7X,'v-v')
+         IF (ICSAMP.GT.0) THEN
          WRITE(LOUT,1016)
      &                 ((DBLE(ICEVTG(I,J))/DBLE(ICSAMP),I=4,8),J=0,1),
      &                 (DBLE(ICCHAI(2,I))/(2.0D0*DBLE(ICSAMP)),I=4,8),
@@ -27599,6 +27610,7 @@ C      IF (NCOMPO.GT.0) CALL DT_LTINI(ID,EPN,PPN,ECM)
      &          ' dbl-dir    ',5E10.2,/,' s-Pom.     ',5E10.2,/,
      &          ' h-Pom.     ',5E10.2,/,' s-Reg.     ',5E10.2,/,
      &          ' enh-trg    ',5E10.2,/,' enh-log    ',5E10.2)
+         ENDIF
 
       ENDIF
       CALL DT_CHASTA(1)
 *
       DIMENSION XX(61),YY(61),LL(101,10)
       DIMENSION X(N),Y(N),L(40),LOV(40,10)
+      INTEGER*4 LL, L, LOV
       DATA  L/
      11H*,1H2,1H3,1H4,1H5,1H6,1H7,1H8,1H9,1HZ,
      21H+,1HA,1HO,1HB,1HC,1HD,1HE,1HF,1HG,1HH,