updates (Chiara B)

[u/mrichter/AliRoot.git] / TDPMjet / TDPMjet.cxx

diff --git a/TDPMjet/TDPMjet.cxx b/TDPMjet/TDPMjet.cxx
index aa3524960c9b63f39ddc534f0e1651b8ef929587..9a39afd622dd75726148814961b07ba4a50d224c 100644 (file)
--- a/TDPMjet/TDPMjet.cxx
+++ b/TDPMjet/TDPMjet.cxx
@@ -59,6 +59,7 @@
 # define dt_rndmin dt_rndmin_
 # define dt_rndmou dt_rndmou_
 # define dpmjet_openinp dpmjet_openinp_
+# define dt_evtout dt_evtout_
 # define type_of_call
 #else
 # define dt_dtuini DT_DTUINI
@@ -70,10 +71,12 @@
 # define dt_rndmst DT_RNDMST
 # define dt_rndmin DT_RNDMIN
 # define dt_rndmou DT_RNDMOU
+# define dt_evtout DT_EVTOUT_
 # define dpmjet_openinp DPMJET_OPENINP
 # define type_of_call _stdcall
 #endif
 
+
 #ifndef WIN32
 extern "C" void   type_of_call dt_dtuini(Int_t & , Double_t &, Int_t & , Int_t &, 
                        Int_t &, Int_t &, Int_t &, Int_t &);
@@ -82,6 +85,7 @@ extern "C" void   type_of_call dt_kkinc(Int_t &, Int_t &, Int_t &, Int_t &,
                                    Int_t &, Double_t &, Int_t &, Int_t &);
 extern "C" void   type_of_call pho_phist(Int_t &, Double_t &);
 extern "C" void   type_of_call dt_dtuout();
+extern "C" int    type_of_call dt_evtout(const Int_t &);
 extern "C" void   type_of_call dt_rndm(Int_t &);
 extern "C" void   type_of_call dt_rndmst(Int_t &, Int_t &, Int_t &, Int_t &);
 extern "C" void   type_of_call dt_rndmin(Int_t &, Int_t &, Int_t &, Int_t &, Int_t &, Int_t &);
@@ -111,6 +115,7 @@ ClassImp(TDPMjet)
        fBmax(0.),
        fFCentr(0),
        fPi0Decay(0),
+       fDecayAll(0),
        fProcess(kDpmMb)
 {
 // Default Constructor
@@ -133,6 +138,7 @@ TDPMjet::TDPMjet(DpmProcess_t  iproc, Int_t Ip=208, Int_t Ipz=82, Int_t It=208,
       fBmax(0.),
       fFCentr(0),
       fPi0Decay(0),
+      fDecayAll(0),
       fProcess(iproc)
 {  
     printf("TDPMJet Constructor %d %d %d %d \n", Ip, Ipz, It, Itz);
@@ -167,9 +173,6 @@ Int_t TDPMjet::ImportParticles(TClonesArray *particles, Option_t *option)
        entot += DTEVT1.phkk[i][3]; // PHKK[i][3] <-> PHKK(4,i)
      } 
   }
-  //printf("\n TDPMjet: DPMJET stack contains %d particles", numpart);
-  // printf("\n TDPMjet: Final not decayed particles: %d",    numStabpart);
-  //printf("\n TDPMjet: Total energy: %f GeV          \n",   entot);
   Int_t nump = 0;
   
   if(!strcmp(option,"") || !strcmp(option,"Final")){
@@ -221,6 +224,17 @@ Int_t TDPMjet::ImportParticles(TClonesArray *particles, Option_t *option)
              printf("\n        pc#%d -> A = %d, Z = %d -> PDGcode = %d\n",
                     i,DTEVT2.idres[i],DTEVT2.idxres[i],DTEVT1.idhkk[i]);
 */       
+/*
+         printf("%5d %5d %5d %5d %13.3f %13.3f %13.3f %13.3f \n", i,
+                DTEVT1.idhkk[i],
+                DTEVT1.isthkk[i],
+                iParent,  
+                DTEVT1.phkk[i][0],
+                DTEVT1.phkk[i][1],
+                DTEVT1.phkk[i][2],
+                DTEVT1.phkk[i][3]
+                );
+*/
          new(Particles[i]) TParticle(
              DTEVT1.idhkk[i],
              DTEVT1.isthkk[i],
@@ -241,6 +255,7 @@ Int_t TDPMjet::ImportParticles(TClonesArray *particles, Option_t *option)
       } // Particle loop  
   }
   return nump;
+  
 }
 
 
@@ -272,10 +287,13 @@ void TDPMjet::Initialize()
 //  Beam energy and crossing-angle
     fprintf(out, "BEAM      %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n",fEpn, fEpn, 0., 0., 0., 0.);
 //  Centrality
-    fprintf(out, "CENTRAL   %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n",-1., fBmin, fBmax, 0., 0., 0.);
+    if (fIp > 1. && fIt > 1) 
+       fprintf(out, "CENTRAL   %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n",-1., fBmin, fBmax, 0., 0., 0.);
 //  Particle decays
     if (fPi0Decay) 
-    fprintf(out, "PARDECAY  %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n", 2., 0., 0., 0., 0., 0.);    
+       fprintf(out, "PARDECAY  %10.1f%10.1f%10.1f%10.1f%10.1f%10.1f\n", 2., 0., 0., 0., 0., 0.);    
+
+    
 //
 //  PHOJET specific
     fprintf(out, "PHOINPUT\n");
@@ -284,15 +302,37 @@ void TDPMjet::Initialize()
     if (fProcess == kDpmMb) {
        fprintf(out, "PROCESS           1 0 1 1 1 1 1 1\n");
     } else if (fProcess == kDpmMbNonDiffr) {
-       fprintf(out, "PROCESS           1 0 1 1 0 0 0 1\n");
+       fprintf(out, "PROCESS           1 0 1 0 0 0 0 1\n");
     } else if (fProcess == kDpmDiffr) {
-       fprintf(out, "PROCESS           0 0 0 0 1 1 1 0\n");
+       fprintf(out, "PROCESS           0 0 0 1 1 1 1 0\n");
     }else if (fProcess == kDpmSingleDiffr) {
         fprintf(out, "PROCESS           0 0 0 0 1 1 0 0\n");
     }else if (fProcess == kDpmDoubleDiffr) {
         fprintf(out, "PROCESS           0 0 0 0 0 0 1 0\n");
+    } else if (fProcess == kDpmCentralDiffr){
+        fprintf(out, "PROCESS           0 0 0 1 0 0 0 0\n");
     }
     
+    Int_t iPDG[18] = 
+       {
+//          K0s   pi0  lam   sig+  sig-  tet0
+       310,  111, 3122, 3222, 3112, 3322,
+//          tet- om-    D+      D0     Ds+
+       3312, 3334,  411,  421,  431,
+//          etac lamc+ sigc++ sigc+ sigc0 Ksic+
+        441, 4122, 4222, 4212, 4112, 4232,
+//         Ksic0 sig0 
+       4132
+       };
+    
+    
+    Int_t iON = (fDecayAll) ? 1:0;
+    for (Int_t i = 0; i < 8; i++) {
+       fprintf(out, "LUND-DECAY%5d %5d\n",  iPDG[i], iON);    
+    }
+       
+    fprintf(out, "LUND-MSTJ %5d %5d\n",   22, 1);    
+
     fprintf(out, "ENDINPUT\n");
 //
 //  START card
@@ -319,7 +359,6 @@ void TDPMjet::GenerateEvent()
    Float_t Elab = fEpn;
    Int_t irej=0;
    Dt_Kkinc(fIp, fIpz, fIt, fItz, fIdp, Elab, kkmat, irej);
-   if(irej!=0) return;
 }
 //______________________________________________________________________________
 void TDPMjet::Dt_Dtuini(int nevts, double epn, int npmass, int npchar, 
@@ -476,13 +515,14 @@ Int_t TDPMjet::GetTargWounded() const
 {
        return DTGLCP.nwbsam;
 }
+
 //______________________________________________________________________________
-Int_t TDPMjet::GetProjSpectators() const
+Int_t TDPMjet::GetProjParticipants() const
 {
        return DTGLCP.nwtaac;
 }
 //______________________________________________________________________________
-Int_t TDPMjet::GetTargSpectators() const
+Int_t TDPMjet::GetTargParticipants() const
 {
        return DTGLCP.nwtbac;
 }
@@ -515,3 +555,9 @@ void TDPMjet::Dt_Rndmou(int u, int c, int cd, int cm, int i, int j)
        dt_rndmou(u, c, cd, cm, i, j);
 }
 
+
+Int_t TDPMjet::NHEP()                      const {return POEVT1.nhep;}
+Int_t TDPMjet::ISTHEP(Int_t i)             const {return POEVT1.isthep[i];}
+Int_t TDPMjet::IDHEP(Int_t i)              const {return POEVT1.idhep[i];}
+Double_t TDPMjet::PHEP(Int_t i, Int_t j)   const {return POEVT1.phep[i][j];}
+