From: kharlov Date: Wed, 14 Oct 2009 22:41:56 +0000 (+0000) Subject: Compilation warnings fixed. X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=c5a539a336b90e0d8369a021c5992f9ce0b31027;hp=4bceb7ccb675e541d703122d879e8783a3fdeb1d;p=u%2Fmrichter%2FAliRoot.git Compilation warnings fixed. --- diff --git a/PHOS/AliPHOSEmcCalibData.cxx b/PHOS/AliPHOSEmcCalibData.cxx index cc0c0606f7e..ddb304d9995 100644 --- a/PHOS/AliPHOSEmcCalibData.cxx +++ b/PHOS/AliPHOSEmcCalibData.cxx @@ -24,14 +24,18 @@ ClassImp(AliPHOSEmcCalibData) //________________________________________________________________ - AliPHOSEmcCalibData::AliPHOSEmcCalibData(): TNamed() +AliPHOSEmcCalibData::AliPHOSEmcCalibData(): + TNamed(), + fSampleTimeStep(0) { // Default constructor Reset(); } //________________________________________________________________ -AliPHOSEmcCalibData::AliPHOSEmcCalibData(const char* name) +AliPHOSEmcCalibData::AliPHOSEmcCalibData(const char* name): + TNamed(), + fSampleTimeStep(0) { // Constructor TString namst = "Calib_"; @@ -43,7 +47,8 @@ AliPHOSEmcCalibData::AliPHOSEmcCalibData(const char* name) //________________________________________________________________ AliPHOSEmcCalibData::AliPHOSEmcCalibData(const AliPHOSEmcCalibData& calibda) : - TNamed(calibda) + TNamed(calibda), + fSampleTimeStep(calibda.fSampleTimeStep) { // copy constructor SetName(calibda.GetName()); diff --git a/PHOS/AliPHOSTrackSegmentMakerv1.cxx b/PHOS/AliPHOSTrackSegmentMakerv1.cxx index 94c2a7373f1..c05bd26d548 100644 --- a/PHOS/AliPHOSTrackSegmentMakerv1.cxx +++ b/PHOS/AliPHOSTrackSegmentMakerv1.cxx @@ -112,13 +112,6 @@ // // --- ROOT system --- -#include "AliMagF.h" -#include "AliTracker.h" -#include "AliGeomManager.h" -#include "AliCluster.h" -#include "AliKalmanTrack.h" -#include "AliGlobalQADataMaker.h" - #include "TVector3.h" #include "TTree.h" #include "TBenchmark.h" @@ -136,6 +129,14 @@ #include "AliPHOSCpvRecPoint.h" #include "AliLog.h" #include "AliMagF.h" +#include "AliMagF.h" +#include "AliTracker.h" +#include "AliGeomManager.h" +#include "AliCluster.h" +#include "AliKalmanTrack.h" +#include "AliGlobalQADataMaker.h" +#include "AliVParticle.h" + ClassImp( AliPHOSTrackSegmentMakerv1) @@ -437,14 +438,9 @@ void AliPHOSTrackSegmentMakerv1::GetDistanceInPHOSPlane(AliPHOSEmcRecPoint * em Double_t rCPV = cpvGlobal.Pt() ;// Radius from IP to current point // Extrapolate the global track direction if any to CPV and find the closest track - Int_t nTracks = fESD->GetNumberOfTracks(); Int_t iClosestTrack = -1; - Double_t minDistance = 1.e6; TVector3 inPHOS ; - AliESDtrack *track; - Double_t xyz[3] ; - Double_t pxyz[3]; for (Int_t iTrack=0; iTrackGetTrack(iTrack); if (!track->GetXYZAt(rCPV, fESD->GetMagneticField(), xyz)) @@ -700,7 +696,6 @@ void AliPHOSTrackSegmentMakerv1::PrintTrackSegments(Option_t * option) //__________________________________________________________________________ Double_t AliPHOSTrackSegmentMakerv1::GetBz()const { - Double_t kAlmost0Field=1.e-13; AliMagF* fld = (AliMagF*)TGeoGlobalMagField::Instance()->GetField(); if (!fld) return 0.5*kAlmost0Field; Double_t bz = fld->SolenoidField(); @@ -711,7 +706,6 @@ void AliPHOSTrackSegmentMakerv1::GetBxByBz(const Double_t r[3], Double_t b[3])co //------------------------------------------------------------------ // Returns Bx, By and Bz (kG) at the point "r" . //------------------------------------------------------------------ - Double_t kAlmost0Field=1.e-13; AliMagF* fld = (AliMagF*)TGeoGlobalMagField::Instance()->GetField(); if (!fld) { b[0] = b[1] = 0.; diff --git a/PHOS/AliPHOSTracker.cxx b/PHOS/AliPHOSTracker.cxx index 23ddeff965d..715f9a53c31 100644 --- a/PHOS/AliPHOSTracker.cxx +++ b/PHOS/AliPHOSTracker.cxx @@ -91,7 +91,7 @@ AliPHOSTracker::~AliPHOSTracker() } //____________________________________________________________________________ -Int_t AliPHOSTracker::LoadClusters(TTree *cTree) { +Int_t AliPHOSTracker::LoadClusters(TTree *) { //-------------------------------------------------------------------- // This function loads the PHOS clusters //-------------------------------------------------------------------- @@ -143,7 +143,7 @@ Int_t AliPHOSTracker::LoadClusters(TTree *cTree) { } //____________________________________________________________________________ -Int_t AliPHOSTracker::PropagateBack(AliESDEvent *esd) { +Int_t AliPHOSTracker::PropagateBack(AliESDEvent *) { //-------------------------------------------------------------------- // Called by AliReconstruction // Performs the track matching with the PHOS modules diff --git a/PHOS/AliPHOSTracker.h b/PHOS/AliPHOSTracker.h index 56989af78b7..870695d3727 100644 --- a/PHOS/AliPHOSTracker.h +++ b/PHOS/AliPHOSTracker.h @@ -38,8 +38,8 @@ public: AliPHOSTracker(); virtual ~AliPHOSTracker(); - Int_t LoadClusters(TTree *ct); - Int_t PropagateBack(AliESDEvent *ev); + Int_t LoadClusters(TTree *); + Int_t PropagateBack(AliESDEvent *); AliCluster *GetCluster(Int_t idx) const; void UnloadClusters();