X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenExtFile.cxx;h=7382b1950481632481b4812d75263ffe04cb0581;hb=88cb7938ca21d4a80991d4e7aa564008c29340f7;hp=f33c99bd0c7e4d8409a7d3872231793d2478f91a;hpb=b9d0a01d7a0723a09071b0b56200d72f59a9c2b6;p=u%2Fmrichter%2FAliRoot.git diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx index f33c99bd0c7..7382b195048 100644 --- a/EVGEN/AliGenExtFile.cxx +++ b/EVGEN/AliGenExtFile.cxx @@ -13,75 +13,23 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.20.4.1 2002/06/10 14:57:41 hristov -Merged with v3-08-02 - -Revision 1.22 2002/05/15 11:59:49 morsch -CdEventFile() method added. - -Revision 1.21 2002/04/26 10:39:31 morsch -AliGenExtFile derives from AliGenMC. Generate() uses methods from AliGenMC (N. Carrer) - -Revision 1.20 2002/03/22 09:43:28 morsch -Don't delete the TParticle. - -Revision 1.19 2002/02/08 16:50:50 morsch -Add name and title in constructor. - -Revision 1.18 2001/11/12 14:31:00 morsch -Memory leaks fixed. (M. Bondila) - -Revision 1.17 2001/11/09 09:12:58 morsch -Generalization by using AliGenReader object to read particles from file. - -Revision 1.16 2001/07/27 17:09:35 morsch -Use local SetTrack, KeepTrack and SetHighWaterMark methods -to delegate either to local stack or to stack owned by AliRun. -(Piotr Skowronski, A.M.) - -Revision 1.15 2001/01/23 13:29:37 morsch -Add method SetParticleCode and enum type Code_t to handle both PDG (new ntuples) -and GEANT3 codes (old ntuples) in input file. - -Revision 1.14 2000/12/21 16:24:06 morsch -Coding convention clean-up - -Revision 1.13 2000/11/30 07:12:50 alibrary -Introducing new Rndm and QA classes - -Revision 1.12 2000/10/27 13:54:45 morsch -Remove explicite reference to input file from constuctor. - -Revision 1.11 2000/10/02 21:28:06 fca -Removal of useless dependecies via forward declarations - -Revision 1.10 2000/07/11 18:24:55 fca -Coding convention corrections + few minor bug fixes - -Revision 1.9 2000/06/14 15:20:09 morsch -Include clean-up (IH) - -Revision 1.8 2000/06/09 20:36:44 morsch -All coding rule violations except RS3 corrected - -Revision 1.7 2000/02/16 14:56:27 morsch -Convert geant particle code into pdg code before putting particle on the stack. - -Revision 1.6 1999/11/09 07:38:48 fca -Changes for compatibility with version 2.23 of ROOT - -Revision 1.5 1999/09/29 09:24:12 fca -Introduction of the Copyright and cvs Log - -*/ - +/* $Id$ */ // Event generator that using an instance of type AliGenReader -// reads particles from a file and applies cuts. +// reads particles from a file and applies cuts. +// Example: In your Config.C you can include the following lines +// AliGenExtFile *gener = new AliGenExtFile(-1); +// gener->SetMomentumRange(0,999); +// gener->SetPhiRange(-180.,180.); +// gener->SetThetaRange(0,180); +// gener->SetYRange(-999,999); +// AliGenReaderTreeK * reader = new AliGenReaderTreeK(); +// reader->SetFileName("myFileWithTreeK.root"); +// gener->SetReader(reader); +// gener->Init(); + -#include +#include #include "AliGenExtFile.h" #include "AliRun.h" @@ -140,7 +88,7 @@ void AliGenExtFile::Generate() Float_t origin[3] = {0,0,0}; Float_t p[3]; Float_t random[6]; - Int_t i, j, nt; + Int_t i = 0, j, nt; // for (j=0;j<3;j++) origin[j]=fOrigin[j]; if(fVertexSmear == kPerTrack) { @@ -164,7 +112,7 @@ void AliGenExtFile::Generate() // // The selction criterium for the external file generator is as follows: // - // 1) All tracs are subjects to the cuts defined by AliGenerator, i.e. + // 1) All tracks are subjects to the cuts defined by AliGenerator, i.e. // fThetaMin, fThetaMax, fPhiMin, fPhiMax, fPMin, fPMax, fPtMin, fPtMax, // fYMin, fYMax. // If the particle does not satisfy these cuts, it is not put on the @@ -172,12 +120,13 @@ void AliGenExtFile::Generate() // 2) If fCutOnChild and some specific child is selected (e.g. if // fForceDecay==kSemiElectronic) the event is rejected if NOT EVEN ONE // child falls into the child-cuts. + TParticle* iparticle = 0x0; + if(fCutOnChild) { // Count the selected children Int_t nSelected = 0; - - for (i = 0; i < nTracks; i++) { - TParticle* iparticle = fReader->NextParticle(); + while ( (iparticle=fReader->NextParticle()) ) { + ; Int_t kf = CheckPDGCode(iparticle->GetPdgCode()); kf = TMath::Abs(kf); if (ChildSelected(kf) && KinematicSelection(iparticle, 1)) { @@ -194,7 +143,8 @@ void AliGenExtFile::Generate() for (i = 0; i < nTracks; i++) { TParticle* iparticle = fReader->NextParticle(); - if (!KinematicSelection(iparticle,0)) { + Bool_t selected = KinematicSelection(iparticle,0); + if (!selected) { Double_t pz = iparticle->Pz(); Double_t e = iparticle->Energy(); Double_t y; @@ -211,27 +161,30 @@ void AliGenExtFile::Generate() iparticle->P(), iparticle->Pt(), y); - delete iparticle; - continue; + //PH delete iparticle; + // continue; } p[0] = iparticle->Px(); p[1] = iparticle->Py(); p[2] = iparticle->Pz(); Int_t idpart = iparticle->GetPdgCode(); - if(fVertexSmear==kPerTrack) { - Rndm(random,6); - for (j = 0; j < 3; j++) { - origin[j]=fOrigin[j] - +fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())* - TMath::Sqrt(-2*TMath::Log(random[2*j+1])); - } + if(fVertexSmear==kPerTrack) + { + Rndm(random,6); + for (j = 0; j < 3; j++) { + origin[j]=fOrigin[j]+ + fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())* + TMath::Sqrt(-2*TMath::Log(random[2*j+1])); + } } Int_t decayed = iparticle->GetFirstDaughter(); Int_t doTracking = fTrackIt && (decayed < 0) && - (TMath::Abs(idpart) > 10); + (TMath::Abs(idpart) > 10) && selected; // printf("*** pdg, first daughter, trk = %d, %d, %d\n", // idpart,decayed, doTracking); - SetTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt); + //PH SetTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt); + Int_t parent = iparticle->GetFirstMother(); + SetTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt); KeepTrack(nt); } // track loop