From 0b73602e4a917a0976c481043edeffc22215a07f Mon Sep 17 00:00:00 2001 From: alla Date: Thu, 23 Oct 2003 09:43:04 +0000 Subject: [PATCH] Clean up coding convention violations --- START/AliSTARTDigitizer.cxx | 8 +++---- START/AliSTARTLoader.cxx | 11 ++++++++- START/AliSTARTLoader.h | 15 ++++++------ START/AliSTARTdigit.cxx | 28 +++++++++++++++++----- START/AliSTARTdigit.h | 2 +- START/AliSTARThit.cxx | 48 +++++++++++++++++++++++++++++++++++++ START/AliSTARThit.h | 15 ++++++++---- 7 files changed, 103 insertions(+), 24 deletions(-) diff --git a/START/AliSTARTDigitizer.cxx b/START/AliSTARTDigitizer.cxx index b9b4b6ea3e5..1241418b0d5 100644 --- a/START/AliSTARTDigitizer.cxx +++ b/START/AliSTARTDigitizer.cxx @@ -195,10 +195,10 @@ void AliSTARTDigitizer::Exec(Option_t* /*option*/) // cout<<" brHits hits "<UncheckedAt(hit); - pmt=startHit->fPmt; - volume = startHit->fVolume; + pmt=startHit->Pmt(); + volume = startHit->Volume(); if(volume==1){ - timeright[pmt] = startHit->fTime; + timeright[pmt] = startHit->Time(); if(timeright[pmt]thresholdAmpl) { @@ -206,7 +206,7 @@ void AliSTARTDigitizer::Exec(Option_t* /*option*/) } //timeright }//time for right shoulder if(volume==2){ - timeleft[pmt] = startHit->fTime; + timeleft[pmt] = startHit->Time(); if(timeleft[pmt]thresholdAmpl) { diff --git a/START/AliSTARTLoader.cxx b/START/AliSTARTLoader.cxx index c62135062c6..2da2419d2b9 100644 --- a/START/AliSTARTLoader.cxx +++ b/START/AliSTARTLoader.cxx @@ -1,3 +1,12 @@ +////////////////////////////////////////////////////////////////////////////// +// // +// Loader for START digits and RecPoints inherit from AliBaseDataLoader // +// STARTDigits is TObject consists time flight signal from each PMTtube, // +// mean time right and left array (start signal) and time differnce // +// (vertex z position) // +// START RecPoints is TObject with mean time (start signal) // +// and evrtex position (cm) // +///////////////////////////////////////////////////////////////////////////// #include "AliSTARTLoader.h" #include #include "AliDataLoader.h" @@ -30,7 +39,7 @@ AliSTARTLoader::AliSTARTLoader(const Char_t *name,TFolder *topfolder): { //ctor - cout<<" My AliDTARTLoader!!!!! "< #include "AliDataLoader.h" -#include #include "AliSTARTdigit.h" #include "AliSTARTvertex.h" - +class AliSTART; class AliSTARTLoader: public AliLoader { public: @@ -42,13 +41,13 @@ class AliSTARTLoader: public AliLoader Int_t PostRecPoints(){return fVertexDataLoader.GetBaseDataLoader()->Post();} - // DATA - AliDataLoader fDigitsDataLoader; - - AliDataLoader fVertexDataLoader; - + // DATA + AliDataLoader fDigitsDataLoader; //digits loader + + AliDataLoader fVertexDataLoader; // RecPoints (vertex position) loader + public: - ClassDef(AliSTARTLoader,1) + ClassDef(AliSTARTLoader,1) }; #endif diff --git a/START/AliSTARTdigit.cxx b/START/AliSTARTdigit.cxx index 584090b6874..3230ba19d27 100644 --- a/START/AliSTARTdigit.cxx +++ b/START/AliSTARTdigit.cxx @@ -14,7 +14,20 @@ **************************************************************************/ /* $Id$ */ +///////////////////////////////////////////////////////////////////////// +// Class AliSTARTdigit for START digits +// fTimeRight - right side TOF signal +// fTimeLeft - left side TOF signal +// fTimeBestRight - TOF first particle on the right side +// TimeBestLeft - TOF first particle on the left side +// fTimeAverage = (fTimeBestRight + TimeBestLeft ) /2. START signal +// fTimeDiff = fTimeBestRight - TimeBestLeft +// +/////////////////////////////////////////////////////////////////////// + + + #include #include "AliSTARTdigit.h" #include @@ -24,6 +37,7 @@ ClassImp(AliSTARTdigit) //------------------------------------ AliSTARTdigit::AliSTARTdigit() : TObject() { + //ctor fTimeAverage=9999; fTimeDiff=9999; fTimeBestRight=9999; @@ -37,6 +51,7 @@ ClassImp(AliSTARTdigit) //----------------------------------- void AliSTARTdigit::SetTimeRight (TArrayI &o) { + //////////////////////////////////////// fTimeRight = new TArrayI(12); Int_t i; @@ -49,7 +64,7 @@ void AliSTARTdigit::SetTimeRight (TArrayI &o) //-------------------------------------------- void AliSTARTdigit::SetTimeLeft (TArrayI &o) { - + // fTimeLeft = new TArrayI(12); Int_t i; for (i=0; i<12; i++) @@ -61,7 +76,7 @@ void AliSTARTdigit::SetTimeLeft (TArrayI &o) //-------------------------------------------- void AliSTARTdigit::GetTimeLeft (TArrayI &o) { - + // Int_t i; for (i=0; i<12; i++) { @@ -71,7 +86,7 @@ void AliSTARTdigit::GetTimeLeft (TArrayI &o) //-------------------------------------------- void AliSTARTdigit::GetTimeRight (TArrayI &o) { - + // Int_t i; for (i=0; i<12; i++) { @@ -81,7 +96,7 @@ void AliSTARTdigit::GetTimeRight (TArrayI &o) //-------------------------------------------- void AliSTARTdigit::GetADCLeft (TArrayI &o) { - + // Int_t i; for (i=0; i<12; i++) { @@ -91,7 +106,7 @@ void AliSTARTdigit::GetADCLeft (TArrayI &o) //-------------------------------------------- void AliSTARTdigit::GetADCRight (TArrayI &o) { - + // Int_t i; for (i=0; i<12; i++) { @@ -101,7 +116,7 @@ void AliSTARTdigit::GetADCRight (TArrayI &o) //-------------------------------------------- void AliSTARTdigit::SetADCLeft (TArrayI &o) { - + // fADCLeft = new TArrayI(12); Int_t i; // Float_t fProcessKoef=1; // for pb 0.001 @@ -127,6 +142,7 @@ void AliSTARTdigit::SetADCRight (TArrayI &o) //------------------------------------------------------ void AliSTARTdigit::Print() { + // printf("AliSTARTdigit: fTimeAverage=%d, fTimeDiff=%d\n", fTimeAverage, fTimeDiff); cout<<" BestTimeRigh "< -#include +class TArrayI; //___________________________________________ class AliSTARTdigit: public TObject { diff --git a/START/AliSTARThit.cxx b/START/AliSTARThit.cxx index d5b0c0e78e9..badbccee80d 100644 --- a/START/AliSTARThit.cxx +++ b/START/AliSTARThit.cxx @@ -14,6 +14,54 @@ **************************************************************************/ /* $Id$ */ +// AliSTARThit is the hit class for the START. Hits are the information +// that comes from a Monte Carlo at each step as a particle mass through +// sensitive detector elements as particles are transported through a +// detector. +// +// Data members: +// +// Int_t fTrack +// See AliHit for a full description. The track number of the track +// that made this hit. +// +// Float_t fX +// See AliHit for a full description. The global x position of the +// hit (in the standard units of the Monte Carlo). +// +// Float_t fY +// See AliHit for a full description. The global y position of the +// hit (in the standard units of the Monte Carlo). +// +// Float_t fZ +// See AliHit for a full description. The global z position of the +// hit (in the standard units of the Monte Carlo). +// +// Int_t fStatus +// The track status flag. This flag indicates the track status +// at the time of creating this hit. It is made up of the following 8 +// status bits from highest order to lowest order bits +// 0 : IsTrackAlive(): IsTrackStop():IsTrackDisappeared(): +// IsTrackOut():IsTrackExiting():IsTrackEntering():IsTrackInside() . +// See AliMC for a description of these functions. If the function is +// true then the bit is set to one, otherwise it is zero. +// +// Int_t fVolume +// The number of the START detector that contains this hit. +// 0 - right array; 1 - left array +// Int_t fPmt +// the number of PMT tube that contains hit +// Float_t fEdep +// The energy lost by the particle during the step ending in this +// hit. The units are those determined by the Monte Carlo. +// +// Float_t fTime +// The time of flight associated with the particle in this +// hit. The time is typically measured from the point of creation of the +// original particle (if this particle is a daughter). The units +// are those determined by the Monte Carlo. +/////////////////////////////////////////////////////////////////////// + #include "AliSTARThit.h" diff --git a/START/AliSTARThit.h b/START/AliSTARThit.h index acbca3ff252..706712e8570 100644 --- a/START/AliSTARThit.h +++ b/START/AliSTARThit.h @@ -12,6 +12,17 @@ class AliSTARThit : public AliHit { public: + AliSTARThit(){}//Empty ctor + AliSTARThit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits); + virtual ~AliSTARThit(){}//Empty virtual dtor + Int_t Volume() const {return fVolume;} + Int_t Pmt() const {return fPmt;} + Float_t Particle() const {return fParticle;} + Float_t Edep() const {return fEdep;} + Float_t Etot() const {return fEtot;} + Float_t Time() const {return fTime;} + +private: Int_t fVolume; //T0 arm mark Int_t fPmt; //PMT number in the arm Int_t fParticle; //Primary particle ID @@ -19,10 +30,6 @@ public: Float_t fEtot; //Energy of primary particle at the entrance to radiator Float_t fTime; //Primary particle TOF -public: - AliSTARThit(){}//Empty ctor - AliSTARThit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits); - virtual ~AliSTARThit(){}//Empty virtual dtor ClassDef(AliSTARThit,1) //Hits for detector START }; -- 2.43.0