Merge pull request #12 from amorsch/master

updates for DPMJET v19.1.2

Author: pzhristov

TDPMjet/DPMcommon.h

@@ -6,7 +6,7 @@
 #include "cfortran.h"
 //*KEND.
 #endif
-
+const Int_t NMXHKK=250000;
 extern "C" {
 /*========================================================*/
 /* COMMON/DTEVNO/NEVENT,ICASCA				  */
@@ -33,13 +33,13 @@ COMMON_BLOCK_DEF(DtevnoCommon,DTEVNO);
 typedef struct {
    Int_t    nhkk;
    Int_t    nevhkk;
-   Int_t    isthkk[200000];
-   Int_t    idhkk[200000];
-   Int_t    jmohkk[200000][2];
-   Int_t    jdahkk[200000][2];
-   Double_t  phkk[200000][5];
-   Double_t  vhkk[200000][4];
-   Double_t  whkk[200000][4];
+   Int_t    isthkk[NMXHKK];
+   Int_t    idhkk[NMXHKK];
+   Int_t    jmohkk[NMXHKK][2];
+   Int_t    jdahkk[NMXHKK][2];
+   Double_t  phkk[NMXHKK][5];
+   Double_t  vhkk[NMXHKK][4];
+   Double_t  whkk[NMXHKK][4];
 } Dtevt1Common;
 
 #define DTEVT1 COMMON_BLOCK(DTEVT1,dtevt1)
@@ -107,13 +107,13 @@ COMMON_BLOCK_DEF(Dtevt1Common,DTEVT1);
 /*               IHIST(2,NMXHKK)			  */
 /*--------------------------------------------------------*/
 typedef struct {
-   Int_t    idres[200000];
-   Int_t    idxres[200000];
-   Int_t    nobam[200000];
-   Int_t    idbam[200000];
-   Int_t    idch[200000];
+   Int_t    idres[NMXHKK];
+   Int_t    idxres[NMXHKK];
+   Int_t    nobam[NMXHKK];
+   Int_t    idbam[NMXHKK];
+   Int_t    idch[NMXHKK];
    Int_t    npoint[10];
-   Int_t    ihist[200000][2];
+   Int_t    ihist[NMXHKK][2];
 } Dtevt2Common;
 
 #define DTEVT2 COMMON_BLOCK(DTEVT2,dtevt2)
@@ -168,7 +168,7 @@ typedef struct {
    Double_t    bimin;
    Double_t    bimax;
    Double_t    xsfrac;
-   Double_t    icent;
+   Int_t       icent;
 } DtimpaCommon;
 
 #define DTIMPA COMMON_BLOCK(DTIMPA,dtimpa)
@@ -229,7 +229,7 @@ typedef struct {
    Int_t        idifr1;
    Int_t        idifr2;
    Int_t        iddpom;
-   Int_t        ipron[15][4];
+   Int_t        ipron[4][15];
 } PoprcsCommon;
 
 #define POPRCS COMMON_BLOCK(POPRCS,poprcs)
@@ -245,7 +245,7 @@ COMMON_BLOCK_DEF(PoprcsCommon,POPRCS);
      &                JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),
      &                VHEP(4,NMXHEP), NSD1, NSD2, NDD
 */
-const Int_t nmxhep = 4000;
+const Int_t nmxhep = 8000;
 
 typedef struct {
   Int_t    nevhep;

TDPMjet/TDPMjet.cxx

@@ -110,7 +110,7 @@ ClassImp(TDPMjet)
 	fEpn(0.),
 	fPpn(0.),
 	fCMEn(0.),
-	fIdp(0),
+	fIdp(1),
 	fBmin(0.),
 	fBmax(0.),
 	fFCentr(0),
@@ -134,7 +134,7 @@ TDPMjet::TDPMjet(DpmProcess_t  iproc, Int_t Ip=208, Int_t Ipz=82, Int_t It=208,
       fEpn(Epn),
       fPpn(0.),
       fCMEn(CMEn),
-      fIdp(0),
+      fIdp(1),
       fBmin(0.),
       fBmax(0.),
       fFCentr(0),
@@ -377,8 +377,11 @@ void TDPMjet::GenerateEvent()
    DTEVNO.nevent=fNEvent;
    Int_t kkmat=-1;
    Float_t Elab = fEpn;
-   Int_t irej=0;
-   Dt_Kkinc(fIp, fIpz, fIt, fItz, fIdp, Elab, kkmat, irej);
+   Int_t irej = 1;
+   while (irej) {
+     Dt_Kkinc(fIp, fIpz, fIt, fItz, fIdp, Elab, kkmat, irej);
+   }
+
 }
 //______________________________________________________________________________
 void TDPMjet::Dt_Dtuini(int nevts, double epn, int npmass, int npchar, 
@@ -402,7 +405,7 @@ void TDPMjet::Dt_Dtuini(int nevts, double epn, int npmass, int npchar,
 
 //______________________________________________________________________________
 void TDPMjet::Dt_Kkinc(int npmass, int npchar, int ntmass, int ntchar, 
-   		       int idp, double elab, int kkmat, int irej)
+   		       int idp, double elab, int kkmat, int& irej)
 {
   // Call dmpjet routine DT_KKINC passing the parameters 
   // in a way accepted by Fortran routines				   

TDPMjet/TDPMjet.h

@@ -115,7 +115,7 @@ class TDPMjet : public TGenerator {
    			  int ntmass, int ntchar, int idp, int iemu);
 
    virtual void Dt_Kkinc(int npmass, int npchar, int ntmass, int ntchar, 
-   			 int idp, double elab, int kkmat, int irej);
+   			 int idp, double elab, int kkmat, int& irej);
 
    virtual void Pho_Phist(int imode, double weight);