Overlaps corrected, new shape of sectors

[u/mrichter/AliRoot.git] / EVGEN / AliGenReaderCwn.cxx

diff --git a/EVGEN/AliGenReaderCwn.cxx b/EVGEN/AliGenReaderCwn.cxx
index 8fce126da3b0d0b015e40de4ac818a4ef2ebd9cd..08444493f7e0789384f4dea67fd403af7c8c4687 100644 (file)
--- a/EVGEN/AliGenReaderCwn.cxx
+++ b/EVGEN/AliGenReaderCwn.cxx
@@ -24,6 +24,7 @@
 
 #include <TFile.h>
 #include <TParticle.h>
+#include <TDatabasePDG.h>
 #include <TTree.h>
 #include <TVirtualMC.h>
 
@@ -45,8 +46,12 @@ AliGenReaderCwn::AliGenReaderCwn():
     fE(0.)
 {
 // Default constructor
+    Int_t i;
+    for (i = 0; i <  6; i++) fRhead[i] = 0.;
+    for (i = 0; i < 12; i++) fIhead[i] = 0;
 }
 
+
 AliGenReaderCwn::AliGenReaderCwn(const AliGenReaderCwn &reader):
     AliGenReader(reader),
     fNcurrent(0),
@@ -62,6 +67,9 @@ AliGenReaderCwn::AliGenReaderCwn(const AliGenReaderCwn &reader):
     fE(0.)
 {
     // Copy constructor
+    Int_t i;
+    for (i = 0; i <  6; i++) fRhead[i] = 0.;
+    for (i = 0; i < 12; i++) fIhead[i] = 0;
     reader.Copy(*this);
 }
 
@@ -129,12 +137,12 @@ Int_t AliGenReaderCwn::NextEvent()
 
 TParticle* AliGenReaderCwn::NextParticle() 
 {
-//
+// Read next particle
 //  
     Float_t prwn;
     Float_t p[4];
 // Read the next particle
-    if (fCode == kGEANT3) fIdpart=gMC->PDGFromId(fIdpart);
+    if (fCode == kGEANT3) fIdpart=TVirtualMC::GetMC()->PDGFromId(fIdpart);
     Double_t amass = TDatabasePDG::Instance()->GetParticle(fIdpart)->Mass();
     if(fE<=amass) {
        Warning("Generate","Particle %d  E = %f mass = %f %f %f \n",