X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVGEN%2FAliGenExtFile.cxx;h=b1d0a38f88f5f9c174378a956ac9b469cc86d75d;hb=c4c7c02213ffd1aaed3e20d6a992be2fb998614c;hp=a2101984c562b32f62c06305dd4f2b26e038cb7a;hpb=dc1d768c88c7919a639e50ca5cd1638f54d2f81a;p=u%2Fmrichter%2FAliRoot.git diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx index a2101984c56..b1d0a38f88f 100644 --- a/EVGEN/AliGenExtFile.cxx +++ b/EVGEN/AliGenExtFile.cxx @@ -18,7 +18,7 @@ // Event generator that using an instance of type AliGenReader // reads particles from a file and applies cuts. // Example: In your Config.C you can include the following lines -// AliGenExtFile *gener = new AliGenExtFile(-1); +// AliGenExtFile *gener = new AliGenExtFile(-1); // gener->SetMomentumRange(0,999); // gener->SetPhiRange(-180.,180.); // gener->SetThetaRange(0,180); @@ -32,7 +32,11 @@ #include #include "AliGenExtFile.h" -#include "AliRun.h" +#include "AliRunLoader.h" +#include "AliHeader.h" +#include "AliStack.h" +#include "AliGenEventHeader.h" +#include "AliGenReader.h" #include #include @@ -42,30 +46,28 @@ ClassImp(AliGenExtFile) AliGenExtFile::AliGenExtFile() - :AliGenMC() + :AliGenMC(), + fFileName(0), + fReader(0), + fStartEvent(0) { // Constructor // // Read all particles - fNpart =- 1; - fReader = 0; + fNpart = -1; } AliGenExtFile::AliGenExtFile(Int_t npart) - :AliGenMC(npart) + :AliGenMC(npart), + fFileName(0), + fReader(0), + fStartEvent(0) { // Constructor fName = "ExtFile"; fTitle = "Primaries from ext. File"; - fReader = 0; } -AliGenExtFile::AliGenExtFile(const AliGenExtFile & ExtFile): - AliGenMC(ExtFile) -{ -// Copy constructor - ExtFile.Copy(*this); -} //____________________________________________________________ AliGenExtFile::~AliGenExtFile() { @@ -80,26 +82,34 @@ void AliGenExtFile::Init() if (fReader) fReader->Init(); } - +//___________________________________________________________ void AliGenExtFile::Generate() { // Generate particles - Float_t polar[3] = {0,0,0}; + Double_t polar[3] = {0,0,0}; // - Float_t origin[3] = {0,0,0}; - Float_t p[3]; + Double_t origin[3] = {0,0,0}; + Double_t time = 0.; + Double_t p[4]; Float_t random[6]; Int_t i = 0, j, nt; // - for (j=0;j<3;j++) origin[j]=fOrigin[j]; - if(fVertexSmear == kPerTrack) { - Rndm(random,6); - for (j = 0; j < 3; j++) { - origin[j] += fOsigma[j]*TMath::Cos(2*random[2*j]*TMath::Pi())* - TMath::Sqrt(-2*TMath::Log(random[2*j+1])); + // + if (fVertexSmear == kPerEvent) Vertex(); + + // Fast forward up to start Event + for (Int_t ie=0; ieNextEvent(); + if (nTracks == 0) { + // printf("\n No more events !!! !\n"); + Warning("AliGenExtFile::Generate","\nNo more events in external file!!!\nLast event may be empty or incomplete.\n"); + return; } - } + TParticle* iparticle = 0x0; + while ((iparticle=fReader->NextParticle()) ) ; + cout << "Skipping event " << ie << endl; + } while(1) { Int_t nTracks = fReader->NextEvent(); @@ -112,9 +122,9 @@ void AliGenExtFile::Generate() // // Particle selection loop // - // The selction criterium for the external file generator is as follows: + // The selection criterium for the external file generator is as follows: // - // 1) All tracks are subjects to the cuts defined by AliGenerator, i.e. + // 1) All tracks are subject 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 @@ -127,13 +137,12 @@ void AliGenExtFile::Generate() if(fCutOnChild) { // Count the selected children Int_t nSelected = 0; - while ( (iparticle=fReader->NextParticle()) ) { - ; - Int_t kf = CheckPDGCode(iparticle->GetPdgCode()); - kf = TMath::Abs(kf); - if (ChildSelected(kf) && KinematicSelection(iparticle, 1)) { - nSelected++; - } + while ((iparticle=fReader->NextParticle()) ) { + Int_t kf = CheckPDGCode(iparticle->GetPdgCode()); + kf = TMath::Abs(kf); + if (ChildSelected(kf) && KinematicSelection(iparticle, 1)) { + nSelected++; + } } if (!nSelected) continue; // No particle selected: Go to next event fReader->RewindEvent(); @@ -142,96 +151,70 @@ void AliGenExtFile::Generate() // // Stack filling loop // + fNprimaries = 0; for (i = 0; i < nTracks; i++) { - - TParticle* iparticle = fReader->NextParticle(); - Bool_t selected = KinematicSelection(iparticle,0); - if (!selected) { - Double_t pz = iparticle->Pz(); - Double_t e = iparticle->Energy(); - Double_t y; - if ((e-pz) == 0) { - y = 20.; - } else if ((e+pz) == 0.) { - y = -20.; + TParticle* jparticle = fReader->NextParticle(); + Bool_t selected = KinematicSelection(jparticle,0); + if (!selected) continue; + p[0] = jparticle->Px(); + p[1] = jparticle->Py(); + p[2] = jparticle->Pz(); + p[3] = jparticle->Energy(); + + Int_t idpart = jparticle->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])); + } + Rndm(random,2); + time = fTimeOrigin + fOsigma[2]/TMath::Ccgs()* + TMath::Cos(2*random[0]*TMath::Pi())* + TMath::Sqrt(-2*TMath::Log(random[1])); } else { - y = 0.5*TMath::Log((e+pz)/(e-pz)); + origin[0] = fVertex[0] + jparticle->Vx(); + origin[1] = fVertex[1] + jparticle->Vy(); + origin[2] = fVertex[2] + jparticle->Vz(); + time = fTime + jparticle->T(); } - printf("\n Not selected %d %f %f %f %f %f", i, - iparticle->Theta(), - iparticle->Phi(), - iparticle->P(), - iparticle->Pt(), - y); - //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])); - } - } - Int_t decayed = iparticle->GetFirstDaughter(); - Int_t doTracking = fTrackIt && (decayed < 0) && - (TMath::Abs(idpart) > 10) && selected; - // printf("*** pdg, first daughter, trk = %d, %d, %d\n", - // idpart,decayed, doTracking); - //PH PushTrack(doTracking,-1,idpart,p,origin,polar,0,kPPrimary,nt); - Int_t parent = iparticle->GetFirstMother(); - PushTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt); - KeepTrack(nt); + Int_t doTracking = fTrackIt && selected && (jparticle->TestBit(kTransportBit)); + Int_t parent = jparticle->GetFirstMother(); + + PushTrack(doTracking, parent, idpart, + p[0], p[1], p[2], p[3], origin[0], origin[1], origin[2], time, + polar[0], polar[1], polar[2], + kPPrimary, nt, 1., jparticle->GetStatusCode()); + + KeepTrack(nt); + fNprimaries++; } // track loop + // Generated event header + + AliGenEventHeader * header = new AliGenEventHeader(); + header->SetNProduced(fNprimaries); + header->SetPrimaryVertex(fVertex); + header->SetInteractionTime(fTime); + AddHeader(header); break; - + } // event loop - + SetHighWaterMark(nt); CdEventFile(); } +//___________________________________________________________ void AliGenExtFile::CdEventFile() { // CD back to the event file - TFile *pFile=0; - if (!gAlice) { - gAlice = (AliRun*)pFile->Get("gAlice"); - if (gAlice) printf("AliRun object found on file\n"); - if (!gAlice) gAlice = new AliRun("gAlice","Alice test program"); - } - TTree *fAli=gAlice->TreeK(); - if (fAli) pFile =fAli->GetCurrentFile(); - pFile->cd(); -} - - -AliGenExtFile& AliGenExtFile::operator=(const AliGenExtFile& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - - -void AliGenExtFile::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); + AliRunLoader::Instance()->CdGAFile(); } - -