Use ParticlesImport with TParticle instead than TMCParticle

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index 1a2db61284876ba6c0020c0471b9117310ffcc9a..cafe5933b82b73c1912161fb5f82e605c3b7ea59 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -145,7 +145,9 @@ void AliGenParam::Generate()
   Int_t i, nt, j;
   Float_t  wgtp, wgtch;
   Double_t dummy;
   Int_t i, nt, j;
   Float_t  wgtp, wgtch;
   Double_t dummy;

+  static TClonesArray *particles;

   //
   //

+  if(!particles) particles=new TClonesArray("TParticle",1000);

   //
   Float_t random[6];
   for (j=0;j<3;j++) origin0[j]=fOrigin[j];
   //
   Float_t random[6];
   for (j=0;j<3;j++) origin0[j]=fOrigin[j];


@@ -215,7 +217,7 @@ void AliGenParam::Generate()
          
 //
 // select muons
          
 //
 // select muons

-         TObjArray* particles = fPythia->ImportParticles() ;
+         fPythia->ImportParticles(particles) ;

          Int_t np = particles->GetEntriesFast();
          for (Int_t i = 0; i<np; i++) {
              TParticle *  iparticle = (TParticle *) particles->At(i);
          Int_t np = particles->GetEntriesFast();
          for (Int_t i = 0; i<np; i++) {
              TParticle *  iparticle = (TParticle *) particles->At(i);

diff --git a/EVGEN/AliGenPythia.cxx b/EVGEN/AliGenPythia.cxx
index 1e91ee98417dd5d887e2174a05c8510caf3dc4c4..2329c4dcc7eaf84338ce4866fddc27bec8f8f722 100644 (file)
--- a/EVGEN/AliGenPythia.cxx
+++ b/EVGEN/AliGenPythia.cxx
@@ -117,6 +117,7 @@ void AliGenPythia::Generate()
     Float_t origin_p[3]= {0,0,0};
     Float_t origin0[3]=  {0,0,0};
     Float_t p[3], p_p[4], random[6];
     Float_t origin_p[3]= {0,0,0};
     Float_t origin0[3]=  {0,0,0};
     Float_t p[3], p_p[4], random[6];

+    static TClonesArray *particles;

 //  converts from mm/c to s
     const Float_t kconv=0.001/2.999792458e8;
     
 //  converts from mm/c to s
     const Float_t kconv=0.001/2.999792458e8;
     


@@ -126,6 +127,8 @@ void AliGenPythia::Generate()
     Int_t nt_p=0;
     Int_t jev=0;
     Int_t j;
     Int_t nt_p=0;
     Int_t jev=0;
     Int_t j;

+
+    if(!particles) particles=new TClonesArray("TParticle",1000);

     
     fTrials=0;
     for (j=0;j<3;j++) origin0[j]=fOrigin[j];
     
     fTrials=0;
     for (j=0;j<3;j++) origin0[j]=fOrigin[j];


@@ -146,7 +149,7 @@ void AliGenPythia::Generate()
     {
        fPythia->PyEvnt();
        fTrials++;
     {
        fPythia->PyEvnt();
        fTrials++;

-       TObjArray* particles = fPythia->ImportParticles();
+       fPythia->ImportParticles(particles);

        Int_t np = particles->GetEntriesFast();
        printf("\n **************************************************%d\n",np);
        Int_t nc=0;
        Int_t np = particles->GetEntriesFast();
        printf("\n **************************************************%d\n",np);
        Int_t nc=0;