From e1e6896fe8cd06cc7ba6e2ad6bfbd8441491614d Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 26 Apr 2006 07:32:37 +0000 Subject: [PATCH] Coding conventions, clean-up and related changes --- ITS/AliITSpidESD.cxx | 4 +++- JETAN/AliJetESDReader.cxx | 6 +++++- PHOS/AliPHOSGammaJet.cxx | 12 ++++++++---- RICH/AliRICH.cxx | 5 ++++- RICH/AliRICHTracker.cxx | 5 ++++- STEER/AliAlignObj.cxx | 36 ++++++++++++++++++++++++++++-------- STEER/AliAlignObj.h | 20 ++++++-------------- STEER/AliCDBManager.h | 5 +++-- STEER/AliESDTrdTrack.cxx | 6 +++++- STEER/AliESDTrdTrack.h | 32 ++++++++++++++++---------------- STEER/AliESDtrack.cxx | 2 +- STEER/AliESDtrack.h | 30 +++++++++++++----------------- TRD/AliTRDtrack.cxx | 1 + 13 files changed, 97 insertions(+), 67 deletions(-) diff --git a/ITS/AliITSpidESD.cxx b/ITS/AliITSpidESD.cxx index 141c86307d6..2d4a26a1490 100644 --- a/ITS/AliITSpidESD.cxx +++ b/ITS/AliITSpidESD.cxx @@ -19,6 +19,8 @@ // Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch //----------------------------------------------------------------- +#include + #include "AliITSpidESD.h" #include "AliESDtrack.h" @@ -39,7 +41,7 @@ Double_t AliITSpidESD::Bethe(Double_t bg) { /*if (bg<3.5) bethe=(1.+ bg2)/bg2*(log(5940*bg2) - bg2/(1.+ bg2)); else*/ // not 100% clear why... - bethe=(1.+ bg2)/bg2*(log(3.5*5940*bg) - bg2/(1.+ bg2)); + bethe=(1.+ bg2)/bg2*(TMath::Log(3.5*5940*bg) - bg2/(1.+ bg2)); return bethe/11.091; } diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx index a2988d26ee1..fbc81fa7a65 100755 --- a/JETAN/AliJetESDReader.cxx +++ b/JETAN/AliJetESDReader.cxx @@ -121,7 +121,11 @@ void AliJetESDReader::FillMomentumArray(Int_t event) for (Int_t it = 0; it < nt; it++) { AliESDtrack *track = fESD->GetTrack(it); UInt_t status = track->GetStatus(); - p3 = track->P3(); + + Double_t mom[3]; + track->GetPxPyPz(mom); + + p3.SetXYZ(mom[0],mom[1],mom[2]); pt = p3.Pt(); if (((status & AliESDtrack::kITSrefit) == 0) || ((status & AliESDtrack::kTPCrefit) == 0)) continue; // quality check diff --git a/PHOS/AliPHOSGammaJet.cxx b/PHOS/AliPHOSGammaJet.cxx index 5be2356ef2b..abee14de0db 100644 --- a/PHOS/AliPHOSGammaJet.cxx +++ b/PHOS/AliPHOSGammaJet.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.12 2006/03/10 13:23:36 hristov + * Using AliESDCaloCluster instead of AliESDtrack + * * Revision 1.11 2006/01/31 20:30:52 hristov * Including TFile.h * @@ -894,10 +897,11 @@ void AliPHOSGammaJet::CreateParticleListFromESD(TClonesArray * pl, AliESDtrack * track = esd->GetTrack(npar) ; // retrieve track from esd Double_t en = track ->GetTPCsignal() ; - TVector3 mom = track->P3() ; - Double_t px = mom.Px(); - Double_t py = mom.Py(); - Double_t pz = mom.Pz(); //Check with TPC people if this is correct. + Double_t mom[3]; + track->GetPxPyPz(mom) ; + Double_t px = mom[0]; + Double_t py = mom[1]; + Double_t pz = mom[2]; //Check with TPC people if this is correct. //cout<<"TPC signal "<GetTrack(iTrackN);// get next reconstructed track - AliRICHHelix helix(pTrack->X3(),pTrack->P3(),(Int_t)pTrack->GetSign(),-0.1*pESD->GetMagneticField()); + Double_t mom[3], pos[3]; + pTrack->GetPxPyPz(mom); TVector3 mom3(mom[0],mom[1],mom[2]); + pTrack->GetXYZ(pos); TVector3 pos3(pos[0],pos[1],pos[2]); + AliRICHHelix helix(pos3,mom3,(Int_t)pTrack->GetSign(),-0.1*pESD->GetMagneticField()); Int_t iChamberOnRICH=helix.RichIntersect(AliRICHParam::Instance()); if(iChamberOnRICH==iChamber) { TMarker *trackImpact = new TMarker(helix.PosPc().X(),helix.PosPc().Y(),kStar); diff --git a/RICH/AliRICHTracker.cxx b/RICH/AliRICHTracker.cxx index ca731514b31..d675541d007 100644 --- a/RICH/AliRICHTracker.cxx +++ b/RICH/AliRICHTracker.cxx @@ -64,7 +64,10 @@ Int_t AliRICHTracker::PropagateBack(AliESD *pESD) for(Int_t iTrk=0;iTrkGetTrack(iTrk);// get next reconstructed track - AliRICHHelix helix(pTrack->X3(),pTrack->P3(),(Int_t)pTrack->GetSign(),-0.1*GetBz()); //construct helix out of track running parameters + Double_t mom[3], pos[3]; + pTrack->GetPxPyPz(mom); TVector3 mom3(mom[0],mom[1],mom[2]); + pTrack->GetXYZ(pos); TVector3 pos3(pos[0],pos[1],pos[2]); + AliRICHHelix helix(pos3,mom3,(Int_t)pTrack->GetSign(),-0.1*GetBz()); //construct helix out of track running parameters //Printf(" magnetic field %f charged %f\n",GetBz(),pTrack->GetSign()); helix.Print("Track"); Int_t iChamber=helix.RichIntersect(AliRICHParam::Instance()); if(!iChamber) continue; //no intersection with chambers, ignore this track go after the next one diff --git a/STEER/AliAlignObj.cxx b/STEER/AliAlignObj.cxx index 83ebbede468..29a09232b8a 100644 --- a/STEER/AliAlignObj.cxx +++ b/STEER/AliAlignObj.cxx @@ -270,6 +270,8 @@ void AliAlignObj::Transform(AliTrackPoint &p) const //_____________________________________________________________________________ void AliAlignObj::Transform(AliTrackPointArray &array) const { + // This method is used to transform all the track points + // from the input AliTrackPointArray AliTrackPoint p; for (Int_t i = 0; i < array.GetNPoints(); i++) { array.GetPoint(p,i); @@ -545,9 +547,18 @@ void AliAlignObj::InitAlignObjFromGeometry() } +//_____________________________________________________________________________ +AliAlignObj* AliAlignObj::GetAlignObj(UShort_t voluid) { + // Returns the alignment object for given volume ID + Int_t modId; + ELayerID layerId = VolUIDToLayer(voluid,modId); + return GetAlignObj(layerId,modId); +} + //_____________________________________________________________________________ AliAlignObj* AliAlignObj::GetAlignObj(ELayerID layerId, Int_t modId) { + // Returns pointer to alignment object givent its layer and module ID if(modId<0 || modId>=fgLayerSize[layerId-kFirstLayer]){ AliWarningClass(Form("Module number %d not in the valid range (0->%d) !",modId,fgLayerSize[layerId-kFirstLayer]-1)); return NULL; @@ -555,9 +566,18 @@ AliAlignObj* AliAlignObj::GetAlignObj(ELayerID layerId, Int_t modId) return fgAlignObjs[layerId-kFirstLayer][modId]; } +//_____________________________________________________________________________ +const char* AliAlignObj::GetVolPath(UShort_t voluid) { + // Returns the volume path for given volume ID + Int_t modId; + ELayerID layerId = VolUIDToLayer(voluid,modId); + return GetVolPath(layerId,modId); +} + //_____________________________________________________________________________ const char* AliAlignObj::GetVolPath(ELayerID layerId, Int_t modId) { + // Returns volume path to alignment object givent its layer and module ID if(modId<0 || modId>=fgLayerSize[layerId-kFirstLayer]){ AliWarningClass(Form("Module number %d not in the valid range (0->%d) !",modId,fgLayerSize[layerId-kFirstLayer]-1)); return NULL; @@ -729,20 +749,20 @@ void AliAlignObj::InitVolPaths() Int_t modnum = 0; TString str1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_"; TString str2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_"; - TString str_in = "/TPC_IROC_1"; + TString strIn = "/TPC_IROC_1"; TString volpath; for(Int_t cnt=1; cnt<=18; cnt++){ volpath = str1; volpath += cnt; - volpath += str_in; + volpath += strIn; fgVolPath[kTPC1-kFirstLayer][modnum] = volpath.Data(); modnum++; } for(Int_t cnt=1; cnt<=18; cnt++){ volpath = str2; volpath += cnt; - volpath += str_in; + volpath += strIn; fgVolPath[kTPC1-kFirstLayer][modnum] = volpath.Data(); modnum++; } @@ -753,20 +773,20 @@ void AliAlignObj::InitVolPaths() Int_t modnum = 0; TString str1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_"; TString str2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_"; - TString str_out = "/TPC_OROC_1"; + TString strOut = "/TPC_OROC_1"; TString volpath; for(Int_t cnt=1; cnt<=18; cnt++){ volpath = str1; volpath += cnt; - volpath += str_out; + volpath += strOut; fgVolPath[kTPC2-kFirstLayer][modnum] = volpath.Data(); modnum++; } for(Int_t cnt=1; cnt<=18; cnt++){ volpath = str2; volpath += cnt; - volpath += str_out; + volpath += strOut; fgVolPath[kTPC2-kFirstLayer][modnum] = volpath.Data(); modnum++; } @@ -853,7 +873,7 @@ void AliAlignObj::InitVolPaths() TString zeroStr = "0"; TString volpath; - Int_t TRDlayId[6] = {kTRD1, kTRD2, kTRD3, kTRD4, kTRD5, kTRD6}; + Int_t arTRDlayId[6] = {kTRD1, kTRD2, kTRD3, kTRD4, kTRD5, kTRD6}; for(Int_t layer=0; layer<6; layer++){ Int_t modnum=0; @@ -864,7 +884,7 @@ void AliAlignObj::InitVolPaths() if(chnum<10) volpath += zeroStr; volpath += chnum; volpath += strPost; - fgVolPath[TRDlayId[layer]-kFirstLayer][modnum] = volpath.Data(); + fgVolPath[arTRDlayId[layer]-kFirstLayer][modnum] = volpath.Data(); modnum++; } } diff --git a/STEER/AliAlignObj.h b/STEER/AliAlignObj.h index c8c54a6b57f..3a5578bde37 100644 --- a/STEER/AliAlignObj.h +++ b/STEER/AliAlignObj.h @@ -80,22 +80,14 @@ class AliAlignObj : public TObject { static ELayerID VolUIDToLayer(UShort_t voluid, Int_t &modId); static ELayerID VolUIDToLayer(UShort_t voluid); - static const char* GetVolPath(UShort_t voluid) { - Int_t modId; - ELayerID layerId = VolUIDToLayer(voluid,modId); - return GetVolPath(layerId,modId); - } + static const char* GetVolPath(UShort_t voluid); static const char* GetVolPath(ELayerID layerId, Int_t modId); Bool_t ApplyToGeometry(); static Bool_t GetFromGeometry(const char *path, AliAlignObj &alobj); static void InitAlignObjFromGeometry(); - static AliAlignObj* GetAlignObj(UShort_t voluid) { - Int_t modId; - ELayerID layerId = VolUIDToLayer(voluid,modId); - return GetAlignObj(layerId,modId); - } + static AliAlignObj* GetAlignObj(UShort_t voluid); static AliAlignObj* GetAlignObj(ELayerID layerId, Int_t modId); protected: @@ -109,12 +101,12 @@ class AliAlignObj : public TObject { TString fVolPath; // Volume path inside TGeo geometry UShort_t fVolUID; // Unique volume ID - static Int_t fgLayerSize[kLastLayer - kFirstLayer]; - static const char* fgLayerName[kLastLayer - kFirstLayer]; + static Int_t fgLayerSize[kLastLayer - kFirstLayer]; // Size of layers + static const char* fgLayerName[kLastLayer - kFirstLayer]; // Name of layers - static TString* fgVolPath[kLastLayer - kFirstLayer]; + static TString* fgVolPath[kLastLayer - kFirstLayer]; // Volume path - static AliAlignObj** fgAlignObjs[kLastLayer - kFirstLayer]; + static AliAlignObj** fgAlignObjs[kLastLayer - kFirstLayer]; // Alignment objects ClassDef(AliAlignObj, 2) }; diff --git a/STEER/AliCDBManager.h b/STEER/AliCDBManager.h index 4c9d208a189..a9c1336fe17 100644 --- a/STEER/AliCDBManager.h +++ b/STEER/AliCDBManager.h @@ -77,10 +77,10 @@ class AliCDBManager: public TObject { Bool_t Put(AliCDBEntry* entry); void SetCacheFlag(Bool_t cacheFlag) {fCache=cacheFlag;} - Bool_t GetCacheFlag() {return fCache;} + Bool_t GetCacheFlag() const {return fCache;} void SetRun(Long64_t run); - Long64_t GetRun() {return fRun;} + Long64_t GetRun() const {return fRun;} // AliCDBEntry* Get(const char* path); @@ -135,6 +135,7 @@ class AliCDBStorageFactory: public TObject { friend class AliCDBManager; public: + virtual ~AliCDBStorageFactory(){} virtual Bool_t Validate(const char* dbString) = 0; virtual AliCDBParam* CreateParameter(const char* dbString) = 0; diff --git a/STEER/AliESDTrdTrack.cxx b/STEER/AliESDTrdTrack.cxx index 0c9449cde25..1f075aacbdc 100644 --- a/STEER/AliESDTrdTrack.cxx +++ b/STEER/AliESDTrdTrack.cxx @@ -15,7 +15,11 @@ /////////////////////////////////////////////////////////////////////////////// // -// The TRD trigger stores the found tracks as ESDTrdTrack objects in the ESD +// Tracks from the TRD Global Tracking Unit (GTU, trigger) +// The TRD trigger stores the found tracks +// as ESDTrdTrack objects in the ESD object +// Related classes: AliTRDReconstructor, AliESD +// Author: B.Vulpescu // /////////////////////////////////////////////////////////////////////////////// diff --git a/STEER/AliESDTrdTrack.h b/STEER/AliESDTrdTrack.h index 248f85fe175..e224829087e 100644 --- a/STEER/AliESDTrdTrack.h +++ b/STEER/AliESDTrdTrack.h @@ -1,9 +1,9 @@ #ifndef ALIESDTRDTRACK_H #define ALIESDTRDTRACK_H -// // Tracks from the TRD Global Tracking Unit (GTU, trigger) -// +// Stored in the ESD object +// Author: B.Vulpescu #include "TObject.h" @@ -16,19 +16,19 @@ class AliESDTrdTrack : public TObject { AliESDTrdTrack(const AliESDTrdTrack& track); AliESDTrdTrack& operator=(const AliESDTrdTrack& track); - Float_t GetYproj() { return fYproj; }; - Float_t GetZproj() { return fZproj; }; - Float_t GetSlope() { return fSlope; }; - Int_t GetDetector() { return fDetector; }; - Int_t GetTracklets() { return fNtracklets; }; - Int_t GetPlanes() { return fNplanes; }; - Int_t GetClusters() { return fNclusters; }; - Float_t GetPt() { return fPt; }; - Float_t GetPhi() { return fPhi; }; - Float_t GetEta() { return fEta; }; - Int_t GetLabel() { return fLabel; }; - Float_t GetPID() { return fPID; }; - Bool_t IsElectron() { return fIsElectron; } + Float_t GetYproj() const { return fYproj; }; + Float_t GetZproj() const { return fZproj; }; + Float_t GetSlope() const { return fSlope; }; + Int_t GetDetector() const { return fDetector; }; + Int_t GetTracklets() const { return fNtracklets; }; + Int_t GetPlanes() const { return fNplanes; }; + Int_t GetClusters() const { return fNclusters; }; + Float_t GetPt() const { return fPt; }; + Float_t GetPhi() const { return fPhi; }; + Float_t GetEta() const { return fEta; }; + Int_t GetLabel() const { return fLabel; }; + Float_t GetPID() const { return fPID; }; + Bool_t IsElectron() const { return fIsElectron; } void SetYproj(Float_t val) { fYproj = val; }; void SetZproj(Float_t val) { fZproj = val; }; @@ -48,7 +48,7 @@ class AliESDTrdTrack : public TObject { Float_t fYproj; // Average values calculated Float_t fZproj; // from the tracklets - Float_t fSlope; // + Float_t fSlope; // slope of the tracklet Int_t fDetector; // First detector in the module Int_t fNtracklets; // Number of tracklets Int_t fNplanes; // Number of TRD planes diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx index c939cec8435..17df5deb372 100644 --- a/STEER/AliESDtrack.cxx +++ b/STEER/AliESDtrack.cxx @@ -20,7 +20,7 @@ // e-mail: Jouri.Belikov@cern.ch //----------------------------------------------------------------- -#include "TMath.h" +#include #include "AliESDVertex.h" #include "AliESDtrack.h" diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h index c9204d3b51e..be8c4189120 100644 --- a/STEER/AliESDtrack.h +++ b/STEER/AliESDtrack.h @@ -27,11 +27,8 @@ #include "AliPID.h" #include "AliESDfriendTrack.h" -#include - class AliESDVertex; class AliKalmanTrack; -class AliESDfriendTrack; class AliTrackPointArray; class AliESDtrack : public AliExternalTrackParam { @@ -42,7 +39,7 @@ public: const AliESDfriendTrack *GetFriendTrack() const {return fFriendTrack;} void MakeMiniESDtrack(); void SetID(Int_t id) { fID =id;} - Int_t GetID(){ return fID;} + Int_t GetID() const { return fID;} void SetStatus(ULong_t flags) {fFlags|=flags;} void ResetStatus(ULong_t flags) {fFlags&=~flags;} Bool_t UpdateTrackParams(const AliKalmanTrack *t, ULong_t flags); @@ -62,9 +59,6 @@ public: Double_t GetIntegratedLength() const {return fTrackLength;} void GetIntegratedTimes(Double_t *times) const; Double_t GetMass() const; - TVector3 P3() const {Double_t p[3]; GetPxPyPz(p); return TVector3(p[0],p[1],p[2]);} //running track momentum - TVector3 X3() const {Double_t x[3]; GetXYZ(x); return TVector3(x[0],x[1],x[2]);} //running track position - Bool_t GetConstrainedPxPyPz(Double_t *p) const { if (!fCp) return kFALSE; @@ -131,7 +125,7 @@ public: for (Int_t i=0;i<4;i++) fTPCPoints[i]=points[i]; } void SetTPCPointsF(UChar_t findable){fTPCnclsF = findable;} - Float_t GetTPCPoints(Int_t i){return fTPCPoints[i];} + Float_t GetTPCPoints(Int_t i) const {return fTPCPoints[i];} void SetKinkIndexes(Int_t points[3]) { for (Int_t i=0;i<3;i++) fKinkIndexes[i] = points[i]; } @@ -247,7 +241,6 @@ public: }; protected: - //AliESDtrack & operator=(const AliESDtrack & ); ULong_t fFlags; // Reconstruction status flags Int_t fLabel; // Track label @@ -261,15 +254,14 @@ protected: Int_t fStopVertex; // Index of the stop vertex -//Track parameters constrained to the primary vertex - AliExternalTrackParam *fCp; - Double_t fCchi2; //chi2 at the primary vertex + AliExternalTrackParam *fCp; // Track parameters constrained to the primary vertex + Double_t fCchi2; // chi2 at the primary vertex + -//Track parameters at the inner wall of the TPC - AliExternalTrackParam *fIp; + AliExternalTrackParam *fIp; // Track parameters at the inner wall of the TPC -//Track parameters at the inner wall of the TRD - AliExternalTrackParam *fOp; + + AliExternalTrackParam *fOp; // Track parameters at the inner wall of the TRD // ITS related track information Float_t fITSchi2; // chi2 in the ITS @@ -330,10 +322,14 @@ protected: Float_t fRICHmipX; // x of the MIP in LORS Float_t fRICHmipY; // y of the MIP in LORS - AliTrackPointArray *fPoints;//Array of track space points in the global frame + AliTrackPointArray *fPoints;// Array of track space points in the global frame AliESDfriendTrack *fFriendTrack; //! All the complementary information + private: + + AliESDtrack & operator=(const AliESDtrack & ) {return *this;} + ClassDef(AliESDtrack,27) //ESDtrack }; diff --git a/TRD/AliTRDtrack.cxx b/TRD/AliTRDtrack.cxx index b2b7d81ce34..c8c41f78740 100644 --- a/TRD/AliTRDtrack.cxx +++ b/TRD/AliTRDtrack.cxx @@ -17,6 +17,7 @@ #include #include +#include #include "AliESDtrack.h" #include "AliTRDgeometry.h" -- 2.43.0