X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TDPMjet%2FTDPMjet.cxx;h=c4562887c28e014f8c39cc54faace26b19458c33;hb=39b3f8ba6b6ec3d5325774187a9a7b7efd1be6a5;hp=652c1c2dd513d66a20a29e35ec837c42603e5157;hpb=d38751f5743a8de652156df0223467b64d28d464;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TDPMjet/TDPMjet.cxx b/TDPMjet/TDPMjet.cxx
index 652c1c2dd51..c4562887c28 100644
--- a/TDPMjet/TDPMjet.cxx
+++ b/TDPMjet/TDPMjet.cxx
@@ -90,36 +90,47 @@ extern "C" void   type_of_call dt_rndmou(Int_t &, Int_t &, Int_t &, Int_t &, Int
 
 ClassImp(TDPMjet)
 
+
 //______________________________________________________________________________
-TDPMjet::TDPMjet() : TGenerator("dpmjet","dpmjet")
+    TDPMjet::TDPMjet() : 
+	TGenerator("dpmjet","dpmjet"),
+	fNEvent(0),
+	fIp(0),
+	fIpz(0),
+	fIt(0),
+	fItz(0),
+	fEpn(0.),
+	fPpn(0.),
+	fCMEn(0.),
+	fIdp(0),
+	fBmin(0.),
+	fBmax(0.),
+	fFCentr(0),
+	fPi0Decay(0),
+	fProcess(kDpmMb)
 {
-    fNEvent  = 0;
-    fIp      = 0;
-    fIpz     = 0;
-    fIt      = 0;
-    fItz     = 0;
-    fEpn     = 0;
-    fCMEn    = 0;
-    fIdp     = 0;
-    fProcess = kDpmMb;
+// Default Constructor
 }
 
 //______________________________________________________________________________
 TDPMjet::TDPMjet(DpmProcess_t  iproc, Int_t Ip=208, Int_t Ipz=82, Int_t It=208, Int_t Itz=82, 
-	Double_t Epn=2700., Double_t CMEn=5400.) 
-	: TGenerator("dpmjet","dpmjet")
+		 Double_t Epn=2700., Double_t CMEn=5400.) 
+    : TGenerator("dpmjet","dpmjet"),
+      fNEvent(0),
+      fIp(Ip),
+      fIpz(Ipz),
+      fIt(It),
+      fItz(Itz),
+      fEpn(Epn),
+      fCMEn(CMEn),
+      fIdp(0),
+      fBmin(0.),
+      fBmax(0.),
+      fFCentr(0),
+      fPi0Decay(0),
+      fProcess(iproc)
 {  
     printf("TDPMJet Constructor %d %d %d %d \n", Ip, Ipz, It, Itz);
-    
-   fNEvent  = 0;
-   fIp      = Ip;
-   fIpz     = Ipz;
-   fIt      = It;
-   fItz     = Itz;
-   fEpn     = Epn;
-   fCMEn    = CMEn;
-   fIdp     = 0;
-   fProcess = iproc;
 }
 
 
@@ -243,16 +254,24 @@ void TDPMjet::Initialize()
     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.);
-
+//  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.);    
 //
 //  PHOJET specific
     fprintf(out, "PHOINPUT\n");
     fprintf(out, "DEBUG      0 0 0 \n");
-    
+
     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");
+    } else if (fProcess == kDpmDiffr) {
+	fprintf(out, "PROCESS           0 0 0 0 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");
     }
     
     fprintf(out, "ENDINPUT\n");
@@ -446,7 +465,11 @@ Int_t TDPMjet::GetTargSpectators() const
 {
 	return DTGLCP.nwtbac;
 }
-
+//______________________________________________________________________________
+Int_t TDPMjet::GetProcessCode() const
+{
+		return POPRCS.iproce;
+}
 //______________________________________________________________________________
 void TDPMjet::Dt_Rndm(int idummy)
 {