From ab256e65ae0476ac301fa834bfc7a3bd5f406ccd Mon Sep 17 00:00:00 2001 From: alla Date: Thu, 6 Mar 2003 13:08:57 +0000 Subject: [PATCH] code according Convertions --- FMD/AliFMD.cxx | 92 +--------------------------------- FMD/AliFMD.h | 24 +++------ FMD/AliFMDDigitizer.cxx | 41 ++++++++------- FMD/AliFMDDigitizer.h | 7 +-- FMD/AliFMDReconstParticles.cxx | 7 --- FMD/AliFMDReconstParticles.h | 32 +++++++----- FMD/AliFMDhit.h | 42 +++++++--------- 7 files changed, 71 insertions(+), 174 deletions(-) diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx index 6094ab6548a..5c2d456e7b4 100644 --- a/FMD/AliFMD.cxx +++ b/FMD/AliFMD.cxx @@ -50,6 +50,7 @@ #include "AliFMDv1.h" #include "AliRun.h" #include "AliDetector.h" +#include #include #include "AliMagF.h" #include "AliFMDhit.h" @@ -68,7 +69,6 @@ AliFMD::AliFMD ():AliDetector () fIshunt = 0; fHits = 0; fDigits = 0; - fSDigits = 0; fReconParticles=0; } @@ -85,7 +85,6 @@ AliDetector (name, title) fHits = new TClonesArray ("AliFMDhit", 1000); // Digits for each Si disk fDigits = new TClonesArray ("AliFMDdigit", 1000); - fSDigits = new TClonesArray ("AliFMDdigit", 1000); fReconParticles=new TClonesArray("AliFMDReconstParticles",1000); gAlice->AddHitList (fHits); @@ -114,12 +113,6 @@ AliFMD::~AliFMD () delete fDigits; fDigits = 0; } - if (fSDigits) - { - fSDigits->Delete (); - delete fSDigits; - fSDigits = 0; - } if (fReconParticles) { fReconParticles->Delete (); @@ -148,15 +141,6 @@ void AliFMD::AddDigit (Int_t * digits) TClonesArray & ldigits = *fDigits; new (ldigits[fNdigits++]) AliFMDdigit (digits); -} -//_____________________________________________________________________________ -void AliFMD::AddSDigit (Int_t * digits) -{ - // add a real digit - as coming from data - - TClonesArray & ldigits = *fSDigits; - new (ldigits[fNdigits++]) AliFMDdigit (digits); - } //_____________________________________________________________________________ void AliFMD::BuildGeometry () @@ -274,14 +258,7 @@ void AliFMD::MakeBranch (Option_t * option, const char *file) AliDetector::MakeBranch (option, file); const char *cD = strstr(option,"D"); const char *cR = strstr(option,"R"); - const char *cS = strstr(option,"S"); - if (cS){ - - MakeBranchInTree(gAlice->TreeS(), - branchname,&fSDigits, - kBufferSize, file); - } if (cD){ MakeBranchInTree(gAlice->TreeD(), @@ -318,16 +295,8 @@ void AliFMD::SetTreeAddress () } } - if (fSDigits) - // fSDigits->Clear (); - - if (gAlice->TreeS () && fSDigits) - { - branch = gAlice->TreeS ()->GetBranch ("FMD"); - if (branch) - branch->SetAddress (&fSDigits); - } + if (gAlice->TreeR() && fReconParticles) { branch = gAlice->TreeR()->GetBranch("FMD"); @@ -356,41 +325,6 @@ void AliFMD::SetSectorsSi2(Int_t sectorsSi2) } //--------------------------------------------------------------------- -/* -void AliFMD::SDigits2Digits() -{ - cout<<"AliFMD::SDigits2Digits"<SetRingsSi1(fRingsSi1); - fMerger->SetRingsSi2(fRingsSi2); - fMerger ->SetSectorsSi1(fSectorsSi1); - fMerger ->SetSectorsSi2(fSectorsSi2); - - fMerger->Init(); - cout<<"AliFMD::SDigits2Digits Init"<Digitise(); - cout<<"AliFMD::SDigits2Digits Digitise() "< start...\n"; - //#endif - - char * fileSDigits = "FMD.SDigits.root"; - char * fileHeader = 0; - AliFMDSDigitizer * sd = new AliFMDSDigitizer(fileHeader,fileSDigits) ; - sd->SetRingsSi1(fRingsSi1); - sd->SetRingsSi2(fRingsSi2); - sd->SetSectorsSi1(fSectorsSi1); - sd->SetSectorsSi2(fSectorsSi2); - // sd->SetEventNumber(fEvNrSig); - sd->Exec("") ; - - delete sd ; - -} //----------------------------------------------------------------------- void AliFMD::Digits2Reco() diff --git a/FMD/AliFMD.h b/FMD/AliFMD.h index cad1c3d480b..311a3b9c51a 100644 --- a/FMD/AliFMD.h +++ b/FMD/AliFMD.h @@ -8,22 +8,16 @@ //////////////////////////////////////////////// #include "AliDetector.h" -#include "TString.h" -#include "TBranch.h" -//#include "AliFMDMerger.h" -#include "AliFMDSDigitizer.h" - class TFile; - class TTree; -// class AliFMDMerger; - class AliFMD : public AliDetector { + +class TClonesArray; +class AliFMD : public AliDetector { public: AliFMD(); AliFMD(const char *name, const char *title); virtual ~AliFMD(); - virtual void AddHit(Int_t, Int_t*, Float_t*); - virtual void AddDigit(Int_t*); - virtual void AddSDigit(Int_t*); + virtual void AddHit(Int_t track, Int_t * vol, Float_t * hits); + virtual void AddDigit(Int_t* digits); virtual void BuildGeometry(); virtual void CreateGeometry() {} virtual void CreateMaterials()=0; @@ -44,13 +38,11 @@ public: virtual void SetSectorsSi2(Int_t sectorsSi2=40); void SetEventNumber(Int_t i) {fEvNrSig = i;} - void Eta2Radius(Float_t, Float_t, Float_t*); - void Hits2SDigits();// + void Eta2Radius(Float_t eta, Float_t zDisk, Float_t * radius); void Digits2Reco(); virtual void SetHitsAddressBranch(TBranch *b){b->SetAddress(&fHits);} // Digitisation - TClonesArray *SDigits() const {return fSDigits;} TClonesArray *ReconParticles() const {return fReconParticles;} protected: @@ -68,9 +60,7 @@ public: Int_t fNevents ; // Number of events to digitize Int_t fEvNrSig; // signal event number - // AliFMDMerger *fMerger; // ! pointer to merger - TClonesArray *fSDigits ; // List of summable digits - TClonesArray *fReconParticles; + TClonesArray *fReconParticles; // list of reconstructed particles ClassDef(AliFMD,4) //Class for the FMD detector }; diff --git a/FMD/AliFMDDigitizer.cxx b/FMD/AliFMDDigitizer.cxx index 0cadf32f937..673c0fa8eb6 100644 --- a/FMD/AliFMDDigitizer.cxx +++ b/FMD/AliFMDDigitizer.cxx @@ -64,19 +64,25 @@ AliFMDDigitizer::~AliFMDDigitizer() } //------------------------------------------------------------------------ -Bool_t AliFMDDigitizer::Init() +/* +Bool_t AliFMDDigitizer::Init() { -// Initialization cout<<"AliFMDDigitizer::Init"<GetDetector("FMD") ; @@ -117,15 +122,15 @@ void AliFMDDigitizer::Exec(Option_t* option) if (fFMD) { TClonesArray *FMDhits = fFMD->Hits (); - TH = fManager->GetInputTreeH(inputFile); - brHits = TH->GetBranch("FMD"); + tH = fManager->GetInputTreeH(inputFile); + brHits = tH->GetBranch("FMD"); if (brHits) { fFMD->SetHitsAddressBranch(brHits); }else{ cerr<<"EXEC Branch FMD hit not found"<GetEntries(); + Int_t ntracks = (Int_t) tH->GetEntries(); for (Int_t track = 0; track < ntracks; track++) { @@ -148,14 +153,14 @@ void AliFMDDigitizer::Exec(Option_t* option) // Put noise and make ADC signal - Float_t I = 1.664 * 0.04 * 2.33 / 22400; // = 0.69e-6; + Float_t iP = 1.664 * 0.04 * 2.33 / 22400; // = 0.69e-6; for ( ivol=1; ivol<=5; ivol++){ - for ( iSector=1; iSector<=NumberOfSectors[ivol-1]; iSector++){ - for ( iRing=1; iRing<=NumberOfRings[ivol-1]; iRing++){ + for ( iSector=1; iSector<=numberOfSector[ivol-1]; iSector++){ + for ( iRing=1; iRing<=numberOfRings[ivol-1]; iRing++){ digit[0]=ivol; digit[1]=iSector; digit[2]=iRing; - charge = Int_t (de[ivol][iSector][iRing] / I); + charge = Int_t (de[ivol][iSector][iRing] / iP); digit[3]=PutNoise(charge); if(digit[3]<= 500) digit[3]=500; //dynamic range from MIP(0.155MeV) to 30MIP(4.65MeV) diff --git a/FMD/AliFMDDigitizer.h b/FMD/AliFMDDigitizer.h index a95f6ac97f6..2c1b292603b 100644 --- a/FMD/AliFMDDigitizer.h +++ b/FMD/AliFMDDigitizer.h @@ -4,18 +4,15 @@ * See cxx source for full Copyright notice */ #include "AliDigitizer.h" - +class TClonesArray; class AliRunDigitizer; -//class AliFMD; -class AliFMDdigit; -class AliFMDhit; class AliFMDDigitizer : public AliDigitizer { public: AliFMDDigitizer(); AliFMDDigitizer(AliRunDigitizer * manager); virtual ~AliFMDDigitizer(); - virtual Bool_t Init(); + virtual Bool_t Init() {return kTRUE;} ///??????????? // Do the main work diff --git a/FMD/AliFMDReconstParticles.cxx b/FMD/AliFMDReconstParticles.cxx index 42bb48254d6..216d2a97765 100644 --- a/FMD/AliFMDReconstParticles.cxx +++ b/FMD/AliFMDReconstParticles.cxx @@ -20,10 +20,3 @@ AliFMDReconstParticles::AliFMDReconstParticles(Int_t *RecParticles) fNumOfMaxRing=RecParticles[4]; fNumOfReconstParticles=RecParticles[5]; } -Int_t AliFMDReconstParticles::GetVolume(){return fNumOfDet;} -Int_t AliFMDReconstParticles::GetNumberOfMinSector() {return fNumOfMinSector;} -Int_t AliFMDReconstParticles::GetNumberOfMaxSector() {return fNumOfMaxSector;} -Int_t AliFMDReconstParticles::GetNumberOfMinRing() {return fNumOfMinRing;} -Int_t AliFMDReconstParticles::GetNumberOfMaxRing() {return fNumOfMaxRing;} -Int_t AliFMDReconstParticles::GetNumberOfReconstParticles() {return fNumOfReconstParticles;} - diff --git a/FMD/AliFMDReconstParticles.h b/FMD/AliFMDReconstParticles.h index 1f1f4ec82a7..a47dee6092c 100644 --- a/FMD/AliFMDReconstParticles.h +++ b/FMD/AliFMDReconstParticles.h @@ -1,11 +1,29 @@ #ifndef AliFMDReconstParticles_h #define AliFMDReconstParticles_h -#include #include +class TClonesArray; + class AliFMDReconstParticles: public TObject { - //Reconstracted Particles Class + /* + Reconstracted Particles Class: + has number of reconstructed particles in + sectors from NumOfMinSector to NumberOfMaxSector() + rings from NumOfMinRing to NumOfMaxRing for each FMDvolume + */ + + + public: + AliFMDReconstParticles(); + AliFMDReconstParticles (Int_t *RecParticles); + virtual ~AliFMDReconstParticles(){}; + Int_t GetVolume() const {return fNumOfDet;} //number of volume + Int_t GetNumberOfMinSector() const {return fNumOfMinSector;} //number of min sector + Int_t GetNumberOfMaxSector() const {return fNumOfMaxSector;} // number of max sector + Int_t GetNumberOfMinRing() const {return fNumOfMinRing;} //number of min ring + Int_t GetNumberOfMaxRing() const {return fNumOfMaxRing;} //number of max ring + Int_t GetNumberOfReconstParticles()const {return fNumOfReconstParticles;} //number of reconstructed particles private: Int_t fNumOfDet; //Number of FMD disk; Int_t fNumOfMinSector; //Number of min sector @@ -14,16 +32,6 @@ class AliFMDReconstParticles: public TObject Int_t fNumOfMaxRing; //Number of max ring Int_t fNumOfReconstParticles; //Number of reconstructed particles - public: - AliFMDReconstParticles(); - AliFMDReconstParticles (Int_t *RecParticles); - virtual ~AliFMDReconstParticles(){}; - Int_t GetVolume(); //Return the number of volume - Int_t GetNumberOfMinSector(); //Return the number of min sector - Int_t GetNumberOfMaxSector(); //Return the number of max sector - Int_t GetNumberOfMinRing(); //Return the number of min ring - Int_t GetNumberOfMaxRing(); //Return the number of max ring - Int_t GetNumberOfReconstParticles(); //Returnthe the number of reconstructed particles ClassDef(AliFMDReconstParticles,2) }; #endif diff --git a/FMD/AliFMDhit.h b/FMD/AliFMDhit.h index 90faa38f807..9db5671555c 100644 --- a/FMD/AliFMDhit.h +++ b/FMD/AliFMDhit.h @@ -71,39 +71,31 @@ class AliFMDhit : public AliHit { // original particle (if this particle is a daughter). The units // are those determined by the Monte Carlo. + +public: + AliFMDhit() {} + AliFMDhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits); + virtual ~AliFMDhit() {} + Int_t Volume() const {return fVolume;} + Int_t NumberOfSector() const {return fNumberOfSector;} + Int_t NumberOfRing() const {return fNumberOfRing;} + Float_t Particle() const {return fParticle;} + Float_t Edep() const {return fEdep;} + Float_t Px() const {return fPx;} + Float_t Py() const {return fPy;} + Float_t Pz() const {return fPz;} + Float_t Time() const {return fTime;} private: Int_t fVolume; //Volume copy identifier - Int_t fNumberOfSector; - Int_t fNumberOfRing; + Int_t fNumberOfSector; //number of sector of hitted pad + Int_t fNumberOfRing; //number of ring of hitted pad Int_t fParticle; //Particle identificator Float_t fEdep; //Energy deposition Float_t fPx; // Particle's momentum X Float_t fPy; // Particle's momentum Y Float_t fPz; // Particle's momentum Z Float_t fTime; // Particle's time of flight - -public: - AliFMDhit() {} - AliFMDhit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits); - virtual ~AliFMDhit() {} - Int_t Volume(); - Int_t NumberOfSector(); - Int_t NumberOfRing(); - Float_t Particle(); - Float_t Edep(); - Float_t Px(); - Float_t Py(); - Float_t Pz(); - Float_t Time(); + ClassDef(AliFMDhit,1) //Hits for detector FMD }; -inline Int_t AliFMDhit::Volume(){return fVolume;} -inline Int_t AliFMDhit::NumberOfSector(){return fNumberOfSector;} -inline Int_t AliFMDhit::NumberOfRing(){return fNumberOfRing;} -inline Float_t AliFMDhit::Particle(){return fParticle;} -inline Float_t AliFMDhit::Edep(){return fEdep;} -inline Float_t AliFMDhit::Px(){return fPx;} -inline Float_t AliFMDhit::Py(){return fPy;} -inline Float_t AliFMDhit::Pz(){return fPz;} -inline Float_t AliFMDhit::Time(){return fTime;} #endif -- 2.43.0