Fixed a memory leak (TObjArray::Clear was missing)

The event weight is set to the number of times STARLIGHT generated an event until it fulfills kinematical constraints

diff --git a/STARLIGHT/AliGenStarLight.cxx b/STARLIGHT/AliGenStarLight.cxx
index a9351b18caf377a6cfb4fff54b940f137ca8a75a..0fd2e78b4aadd171bcc8465d10260c16b2d4521f 100644 (file)
--- a/STARLIGHT/AliGenStarLight.cxx
+++ b/STARLIGHT/AliGenStarLight.cxx
@@ -27,13 +27,11 @@ ClassImp(AliGenStarLight);
 
 AliGenStarLight::AliGenStarLight()
   : AliGenMC()
-  , fTrials(0)
   , fSLgenerator(NULL) {
 }
 //----------------------------------------------------------------------
 AliGenStarLight::AliGenStarLight(Int_t npart)
   : AliGenMC(npart)
-  , fTrials(0)
   , fSLgenerator(new TStarLight("TStarLight",
                                "StarLight UPC Event Generator",
                                ""))  // no config file name  
@@ -77,11 +75,10 @@ void AliGenStarLight::Generate() {
     vpos[3] = fTime;
   }
 
-  Int_t   nt(0);  // number of tracks
-  Float_t weight(1);
+  Int_t   nt(0);     // number of tracks
   Bool_t  genOK(kFALSE);  
   // generate events until all constraints are fulfilled
-  for (fTrials=0; !genOK && fTrials < 100*1000; ++fTrials) {
+  for (Int_t trials=0; !genOK && trials < 100*1000; ++trials) {
     fSLgenerator->GenerateEvent();
     fSLgenerator->BoostEvent();
     fSLgenerator->ImportParticles(&fParticles, "ALL");
@@ -109,19 +106,21 @@ void AliGenStarLight::Generate() {
        AliFatal("NULL == part");
        return;
       }
-      Int_t   iparent(-1);
-      Float_t polar[3] = { 0, 0, 0 };
+      const Int_t   iparent(-1);
+      const Float_t polar[3] = { 0, 0, 0 };
+      const Float_t weight(trials+1);
       PushTrack(fTrackIt, iparent, part->GetPdgCode(), 
                part->Px(), part->Py(), part->Pz(), part->Energy(),
                vpos[0],    vpos[1],    vpos[2],    vpos[3],
                polar[0],   polar[1],   polar[2], 
                kPPrimary, nt, weight, part->GetStatusCode());
-      AliInfo(Form("fTrials=%d nt=%d fTrackIt=%d statusCode=%d",
-                  fTrials, nt, fTrackIt, part->GetStatusCode()));
+      AliInfo(Form("weight=%.0f nt=%d fTrackIt=%d statusCode=%d",
+                  weight, nt, fTrackIt, part->GetStatusCode()));
       part->Print();
       KeepTrack(nt);
       ++fNprimaries;
     }
+    fParticles.Clear();
   }
   if (kFALSE == genOK)
     AliFatal("Maximum number of trials reached");

diff --git a/STARLIGHT/AliGenStarLight.h b/STARLIGHT/AliGenStarLight.h
index fa1873adf42bae828063ad1a320749a2586f86be..249a62e347bdf506c35f02b265ca740b6a8ddb1f 100644 (file)
--- a/STARLIGHT/AliGenStarLight.h
+++ b/STARLIGHT/AliGenStarLight.h
@@ -42,10 +42,9 @@ public:
   AliGenStarLight(const AliGenStarLight &p);
   AliGenStarLight& operator=(const AliGenStarLight &p);
 
-  Int_t                       fTrials;          //  Number of times the STARlight generate has been called to get one event to pass trigger/cuts.
   TStarLight                 *fSLgenerator;     //! Pointer to StarLight Generator.
 
-  ClassDef(AliGenStarLight,2); // STARlight parameterisation generator
+  ClassDef(AliGenStarLight,3); // STARlight parameterisation generator
 } ;
 
 #endif

diff --git a/STARLIGHT/AliStarLightLinkDef.h b/STARLIGHT/AliStarLightLinkDef.h
index 68a34a7fc95a6b592edc26ced286ef04ca742f05..7acf8581468acb3d25a4aa813cd2a70efd92de4b 100644 (file)
--- a/STARLIGHT/AliStarLightLinkDef.h
+++ b/STARLIGHT/AliStarLightLinkDef.h
@@ -4,14 +4,4 @@
 #pragma link off all functions;
 #pragma link C++ class TStarLight+;
 #pragma link C++ class AliGenStarLight+;
-/* #pragma link C++ class AliGenStarLightEventHeader+; */
-/* #pragma link C++ class parameterbase+; */
-/* #pragma link C++ class parameter<unsigned int,1>+; */
-/* #pragma link C++ class parameter<double,1>+; */
-/* #pragma link C++ class parameter<bool,1>+; */
-/* #pragma link C++ class parameter<unsigned int,0>+; */
-/* #pragma link C++ class parameter<string,0>+; */
-/* #pragma link C++ class parameter<bool,0>+; */
-/* //#pragma link C++ class inputParser+; */
-/* #pragma link C++ class inputParameters+; */
 #endif

diff --git a/STARLIGHT/test/Config.C b/STARLIGHT/test/Config.C
index 1634f243f15d077169637def732b5832e546e761..a694f272917e1e6da8787429baba7ef06ec01a5d 100644 (file)
--- a/STARLIGHT/test/Config.C
+++ b/STARLIGHT/test/Config.C
@@ -229,7 +229,7 @@ void Config()
     gener->SetCutVertexZ(1.);     // Truncate at 1 sigma
     gener->SetVertexSmear(kPerEvent); 
     gener->SetTrackingFlag(1);
-//     gener->SetYRange(-0.9, 0.9);
+    gener->SetYRange(-0.9, 0.9);
     gener->Init();
   }