From e033748bd92072b7065ffb7cba5e5d5779f9c450 Mon Sep 17 00:00:00 2001 From: morsch Date: Fri, 14 Nov 2003 09:54:25 +0000 Subject: [PATCH] Coding rule violations corrected. --- EVGEN/AliGenMC.cxx | 24 ++++++++++++++---------- EVGEN/AliGenReader.cxx | 13 ++++++------- EVGEN/AliGenReader.h | 20 +++++++++++--------- EVGEN/AliGenReaderCwn.h | 1 + EVGEN/AliGenReaderEcalHijing.h | 1 + EVGEN/AliGenReaderEcalJets.h | 1 + 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx index 662a0e41da9..8db3df8a9b1 100644 --- a/EVGEN/AliGenMC.cxx +++ b/EVGEN/AliGenMC.cxx @@ -45,6 +45,8 @@ AliGenMC::AliGenMC() SetNumberOfAcceptedParticles(); SetTarget(); SetProjectile(); + fParentSelect.Set(8); + fChildSelect.Set(8); } AliGenMC::AliGenMC(Int_t npart) @@ -247,24 +249,26 @@ Bool_t AliGenMC::KinematicSelection(TParticle *particle, Int_t flag) const Bool_t AliGenMC::CheckAcceptanceGeometry(Int_t np, TClonesArray* particles) { - Bool_t Check ; // All fPdgCodeParticleforAcceptanceCut particles are in in the fGeometryAcceptance acceptance - Int_t NumberOfPdgCodeParticleforAcceptanceCut=0; - Int_t NumberOfAcceptedPdgCodeParticleforAcceptanceCut=0; +// Check the geometrical acceptance for particle. + + Bool_t check ; + Int_t numberOfPdgCodeParticleforAcceptanceCut = 0; + Int_t numberOfAcceptedPdgCodeParticleforAcceptanceCut = 0; TParticle * particle; Int_t i; - for (i=0; iAt(i); if( TMath::Abs( particle->GetPdgCode() ) == TMath::Abs( fPdgCodeParticleforAcceptanceCut ) ) { - NumberOfPdgCodeParticleforAcceptanceCut++; - if (fGeometryAcceptance->Impact(particle)) NumberOfAcceptedPdgCodeParticleforAcceptanceCut++; + numberOfPdgCodeParticleforAcceptanceCut++; + if (fGeometryAcceptance->Impact(particle)) numberOfAcceptedPdgCodeParticleforAcceptanceCut++; } } - if ( NumberOfAcceptedPdgCodeParticleforAcceptanceCut > (fNumberOfAcceptedParticles-1) ) - Check = kTRUE; + if ( numberOfAcceptedPdgCodeParticleforAcceptanceCut > (fNumberOfAcceptedParticles-1) ) + check = kTRUE; else - Check = kFALSE; + check = kFALSE; - return Check; + return check; } Int_t AliGenMC::CheckPDGCode(Int_t pdgcode) const diff --git a/EVGEN/AliGenReader.cxx b/EVGEN/AliGenReader.cxx index f1be717c361..3c1c69f0ca9 100644 --- a/EVGEN/AliGenReader.cxx +++ b/EVGEN/AliGenReader.cxx @@ -14,6 +14,12 @@ **************************************************************************/ /* $Id$ */ +// +// Interface for reading events from files. +// Realisations of this interface have to be used with AliGenExFile. +// NextEvent() loops over events +// and NextParticle() loops over particles. +// Author: andreas.morsch@cern.ch #include "AliGenReader.h" ClassImp(AliGenReader) @@ -26,13 +32,6 @@ AliGenReader& AliGenReader::operator=(const AliGenReader& rhs) return *this; } -void AliGenReader::RewindEvent() -{ - // Go back to the first particle of the event. - // Need to be implemented in the implementation classes. Interface dies. - Fatal("AliGenReader::RewindEvent","\nMethod RewindEvent not present in the implementation class.\n"); -} - void AliGenReader::Copy(AliGenReader&) const { // diff --git a/EVGEN/AliGenReader.h b/EVGEN/AliGenReader.h index b5f7ba4781e..3ccc9e82248 100644 --- a/EVGEN/AliGenReader.h +++ b/EVGEN/AliGenReader.h @@ -5,6 +5,10 @@ /* $Id$ */ +// Interface for reading events from files. +// Realisations of this interface have to be used with AliGenExFile. +// Author: andreas.morsch@cern.ch + #include "TObject.h" class TParticle; @@ -16,22 +20,20 @@ class AliGenReader : public TObject AliGenReader(const AliGenReader &reader) :TObject(reader), fFileName(NULL), fCode(kPDG){reader.Copy(*this);} virtual ~AliGenReader(){;} - // Initialise - virtual void Init() {} - // set file name of data file virtual void SetFileName(const Text_t *filname) {fFileName=filname;} - // Read - virtual Int_t NextEvent(){return 0;} + virtual void Init() = 0; + virtual Int_t NextEvent() = 0; + virtual TParticle* NextParticle() = 0; + virtual void RewindEvent() = 0; enum Code_t {kPDG, kGEANT3}; void SetParticleCode(Code_t code) {fCode = code;} - virtual TParticle* NextParticle(){return NULL;} - virtual void RewindEvent(); AliGenReader & operator=(const AliGenReader & rhs); - private: - void Copy(AliGenReader&) const; + protected: const Text_t *fFileName; // Name of file to read from Code_t fCode; // Particle code type + private: + void Copy(AliGenReader&) const; ClassDef(AliGenReader,1) //Generate particles from external file }; diff --git a/EVGEN/AliGenReaderCwn.h b/EVGEN/AliGenReaderCwn.h index a064488b0f0..25319262541 100644 --- a/EVGEN/AliGenReaderCwn.h +++ b/EVGEN/AliGenReaderCwn.h @@ -21,6 +21,7 @@ class AliGenReaderCwn : public AliGenReader // Read virtual Int_t NextEvent(); virtual TParticle* NextParticle(); + virtual void RewindEvent(){;} AliGenReaderCwn & operator=(const AliGenReaderCwn & rhs); private: void Copy(AliGenReaderCwn&) const; diff --git a/EVGEN/AliGenReaderEcalHijing.h b/EVGEN/AliGenReaderEcalHijing.h index e3567b02238..f07d23cc436 100644 --- a/EVGEN/AliGenReaderEcalHijing.h +++ b/EVGEN/AliGenReaderEcalHijing.h @@ -26,6 +26,7 @@ class AliGenReaderEcalHijing : public AliGenReader // Read virtual Int_t NextEvent(); virtual TParticle* NextParticle(); + virtual void RewindEvent(){;} AliGenReaderEcalHijing & operator=(const AliGenReaderEcalHijing & rhs); protected: diff --git a/EVGEN/AliGenReaderEcalJets.h b/EVGEN/AliGenReaderEcalJets.h index f02d9e3d7a5..eb8ca6c5b73 100644 --- a/EVGEN/AliGenReaderEcalJets.h +++ b/EVGEN/AliGenReaderEcalJets.h @@ -25,6 +25,7 @@ class AliGenReaderEcalJets : public AliGenReader // Read virtual Int_t NextEvent(); virtual TParticle* NextParticle(); + virtual void RewindEvent(){;} AliGenReaderEcalJets & operator=(const AliGenReaderEcalJets & rhs); protected: -- 2.43.0