From 09e2e187aaeee75ac901d9667e47553ae139d472 Mon Sep 17 00:00:00 2001 From: morsch Date: Mon, 24 Mar 2003 15:58:27 +0000 Subject: [PATCH] FinishRun() implemented. --- EVGEN/AliGenCocktail.cxx | 41 +++++++++++++++++++--------------------- EVGEN/AliGenCocktail.h | 1 + 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx index b9edd43873c..079835aa075 100644 --- a/EVGEN/AliGenCocktail.cxx +++ b/EVGEN/AliGenCocktail.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.16 2003/01/14 10:50:18 alibrary +Cleanup of STEER coding conventions + Revision 1.15 2003/01/07 14:13:22 morsch Communication between generators provising and requesting collision geometries. @@ -68,6 +71,7 @@ Introduction of the Copyright and cvs Log #include "AliGenCocktail.h" #include "AliGenCocktailEntry.h" +#include "AliCollisionGeometry.h" #include "AliRun.h" ClassImp(AliGenCocktail) @@ -138,6 +142,18 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp) } } + void AliGenCocktail::FinishRun() +{ +// Initialisation + TIter next(fEntries); + AliGenCocktailEntry *entry; + // + // Loop over generators and initialize + while((entry = (AliGenCocktailEntry*)next())) { + entry->Generator()->FinishRun(); + } +} + void AliGenCocktail::Generate() { // @@ -146,9 +162,7 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp) AliGenCocktailEntry *entry = 0; AliGenCocktailEntry *preventry = 0; AliGenerator* gen = 0; - -// AliGenCocktailEntry *e1; -// AliGenCocktailEntry *e2; + TObjArray *partArray = gAlice->Particles(); // // Loop over generators and generate events @@ -169,6 +183,8 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp) { if (preventry && preventry->Generator()->ProvidesCollisionGeometry()) { + (preventry->Generator()->CollisionGeometry())->NN()); + gen->SetCollisionGeometry(preventry->Generator()->CollisionGeometry()); } else { Fatal("Generate()", "No Collision Geometry Provided"); @@ -180,25 +196,6 @@ AddGenerator(AliGenerator *Generator, char* Name, Float_t RateExp) preventry = entry; } next.Reset(); -/* - while((entry = (AliGenCocktailEntry*)next())) { - entry->PrintInfo(); - } - for (entry=FirstGenerator(); - entry; - entry=NextGenerator() - ) { - entry->PrintInfo(); - } - for (FirstGeneratorPair(e1,e2); - (e1&&e2); - NextGeneratorPair(e1,e2) - ){ - printf("\n -----------------------------"); - e1->PrintInfo(); - e2->PrintInfo(); - } -*/ } AliGenCocktailEntry * AliGenCocktail::FirstGenerator() diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h index ff41853d2ba..efde3b8bc02 100644 --- a/EVGEN/AliGenCocktail.h +++ b/EVGEN/AliGenCocktail.h @@ -23,6 +23,7 @@ class AliGenCocktail : public AliGenerator virtual ~AliGenCocktail(); virtual void Init(); + virtual void FinishRun(); virtual void Generate(); // // Add a new generator to the list -- 2.39.3