Correct warnings for gcc 4.3

diff --git a/HLT/pendolino/AliHLTPendolino.cxx b/HLT/pendolino/AliHLTPendolino.cxx
index 4d14799234f2b3f790d92c8fe2f4c9da8f42ed3b..bd5e951a32da017fd88659a3cc0ccc41ce7056f5 100644 (file)
--- a/HLT/pendolino/AliHLTPendolino.cxx
+++ b/HLT/pendolino/AliHLTPendolino.cxx
@@ -756,11 +756,11 @@ Int_t AliHLTPendolino::initPredictProc(TString detector, Int_t run,
 }
 
 
-const UInt_t AliHLTPendolino::GetStartTimeDCSQuery() {
+UInt_t AliHLTPendolino::GetStartTimeDCSQuery() {
        return fStartTime;
 }
 
-const UInt_t AliHLTPendolino::GetEndTimeDCSQuery() {
+UInt_t AliHLTPendolino::GetEndTimeDCSQuery() {
        return fEndTime;
 }
 

diff --git a/HLT/pendolino/AliHLTPendolino.h b/HLT/pendolino/AliHLTPendolino.h
index 2ec58fffb8e8b15633dda4b2bef290b1639ea2fc..6fcdc8c8faf3d21733ef0e087f6f86681d75ffd0 100644 (file)
--- a/HLT/pendolino/AliHLTPendolino.h
+++ b/HLT/pendolino/AliHLTPendolino.h
@@ -373,7 +373,7 @@ class AliHLTPendolino : public AliShuttleInterface {
                 * implementation in the Offline Shuttle - there the initial start time
                 * is set to the start-of-data for the complete run.)
                 */
-               virtual const UInt_t GetStartTimeDCSQuery();
+               virtual UInt_t GetStartTimeDCSQuery();
 
                /**
                 * Function to get the end time of the DCS Archive DB request; in HLT
@@ -382,7 +382,7 @@ class AliHLTPendolino : public AliShuttleInterface {
                 * implementation in the Offline Shuttle - there the initial end time
                 * is set to the end-of-data for the complete run.)
                 */
-               virtual const UInt_t GetEndTimeDCSQuery();
+               virtual UInt_t GetEndTimeDCSQuery();
                                
                
        protected:

diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h
index 01aa067c9a86731e7f2224c57895ca867c764681..aceca482cd82d7b0b14202b8e210a868d3ada906 100644 (file)
--- a/PHOS/AliPHOSPID.h
+++ b/PHOS/AliPHOSPID.h
@@ -70,7 +70,7 @@ class AliPHOSPID : public TObject {
   void SetESD(AliESDEvent *esd) { fESD = esd; }
 
   void SetEnergyCorrectionOn(Bool_t on=kTRUE) {fEnergyCorrectionOn = on;}
-  const Bool_t GetEnergyCorrectionOn() const  {return fEnergyCorrectionOn;}
+  Bool_t GetEnergyCorrectionOn() const  {return fEnergyCorrectionOn;}
 
   virtual const char * Version() const = 0;
 

diff --git a/PHOS/AliPHOSRawDecoder.h b/PHOS/AliPHOSRawDecoder.h
index 8cadedb33a85df39a41ed58e90253c8cd81c3e25..3c89c55714ace71d06a8188e5cc5c78fad4ea772 100644 (file)
--- a/PHOS/AliPHOSRawDecoder.h
+++ b/PHOS/AliPHOSRawDecoder.h
@@ -30,15 +30,15 @@ public:
   void SubtractPedestals(Bool_t subtract) {fPedSubtract=subtract;}
   void SetAmpOffset(Int_t extPed=5){fAmpOffset=extPed ;}
 
-  const Double_t GetEnergy() const { return fEnergy; }
-  const Double_t GetTime() const { return fTime; }
-  const Double_t GetSampleQuality() const {return fQuality ;}
-  const Double_t GetPedestalRMS() const {return fPedestalRMS ;}
-  const Int_t GetModule() const { return fModule; }
-  const Int_t GetColumn() const { return fColumn; }
-  const Int_t GetRow() const { return fRow; }
-  const Bool_t IsLowGain() const { return fLowGainFlag; }
-  const Bool_t IsOverflow() const { return fOverflow ;}
+  Double_t GetEnergy() const { return fEnergy; }
+  Double_t GetTime() const { return fTime; }
+  Double_t GetSampleQuality() const {return fQuality ;}
+  Double_t GetPedestalRMS() const {return fPedestalRMS ;}
+  Int_t GetModule() const { return fModule; }
+  Int_t GetColumn() const { return fColumn; }
+  Int_t GetRow() const { return fRow; }
+  Bool_t IsLowGain() const { return fLowGainFlag; }
+  Bool_t IsOverflow() const { return fOverflow ;}
 
   const AliRawReader* GetRawReader() const { return fRawReader; }
   void SetCalibData(AliPHOSCalibData * cdata){ fCalibData=cdata ;}

diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx
index 6560c0957a298fd999eac8baef14ccc649523fbb..c5016a344d09f43ff1f5f55bc04975f26588abf1 100644 (file)
--- a/PHOS/AliPHOSvImpacts.cxx
+++ b/PHOS/AliPHOSvImpacts.cxx
@@ -233,8 +233,8 @@ void AliPHOSvImpacts::StepManager(void)
     gMC -> Gmtod (pm,   pd,   2);    // transform 3-momentum from master to daughter system
 
     // Select tracks coming to the crystal from up or down sides
-    if (pd[1]<0 && xyzd[1] >  GetGeometry()->GetCrystalSize(1)/2-0.1 ||
-       pd[1]>0 && xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2+0.1) {
+    if ((pd[1]<0 && xyzd[1] >  GetGeometry()->GetCrystalSize(1)/2-0.1) ||
+       (pd[1]>0 && xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2+0.1)) {
     // Select tracks coming to the crystal from up or down sides
       Int_t pid = gMC->TrackPid();
       Int_t module;

diff --git a/STEER/AliAODCluster.cxx b/STEER/AliAODCluster.cxx
index aaabd96325268e9b0c03eeb000d1080799b2cb45..83ffd665b5cf0ef541038702170c6e5911bdd4a1 100644 (file)
--- a/STEER/AliAODCluster.cxx
+++ b/STEER/AliAODCluster.cxx
@@ -232,5 +232,5 @@ void AliAODCluster::Print(Option_t* /* option */) const
   printf("Cluster type: %d\n", GetType()); 
   printf("     energy = %f\n", E());
   printf("       chi2 = %f\n", Chi2());
-  printf("  PID object: %p\n", PID());
+  printf("  PID object: %p\n", static_cast<const void*>(PID()));
 }

diff --git a/STEER/AliAODCluster.h b/STEER/AliAODCluster.h
index f742ebad3b7634612ffdb6240694daa29d255285..9306489b0446d7df467fae235a5b653dff39218e 100644 (file)
--- a/STEER/AliAODCluster.h
+++ b/STEER/AliAODCluster.h
@@ -75,11 +75,11 @@ class AliAODCluster : public TObject {
  
   template <class T> void SetPID(const T *pid) {
     if(pid) for(Int_t i=0; i<13; ++i) fPID[i]=pid[i];
-    else {for(Int_t i=0; i<13; fPID[i++]=0);} fPID[AliAODCluster::kUnknown]=1.;}
+    else {for(Int_t i=0; i<13; fPID[i++]=0) ;} fPID[AliAODCluster::kUnknown]=1.;}
 
   template <class T> void SetPIDFromESD(const T *pid) {
     if(pid) {for(Int_t i=0; i<11; ++i) fPID[i]=pid[i];  fPID[11]=0;   fPID[12]=0;}
-    else {for(Int_t i=0; i<13; fPID[i++]=0);} fPID[AliAODCluster::kUnknown]=1.;}
+    else {for(Int_t i=0; i<13; fPID[i++]=0) ;} fPID[AliAODCluster::kUnknown]=1.;}
 
   Int_t  GetID() const { return fID; }
   Int_t  GetLabel(UInt_t i) const;

diff --git a/STEER/AliAODEvent.h b/STEER/AliAODEvent.h
index 3b872e5c08605d39774dccf1986e7ced255165eb..d648082059301f371ac1d5b52626208b8ad012b6 100644 (file)
--- a/STEER/AliAODEvent.h
+++ b/STEER/AliAODEvent.h
@@ -178,7 +178,7 @@ class AliAODEvent : public AliVEvent {
                   Int_t pmdClusSize = 0);
   void    ClearStd();
   void    ReadFromTree(TTree *tree, Option_t* opt = "");
-  const void WriteToTree(TTree* tree) const {tree->Branch(fAODObjects);}
+  void    WriteToTree(TTree* tree) const {tree->Branch(fAODObjects);}
 
   void  Print(Option_t *option="") const;
   void  MakeEntriesReferencable();

diff --git a/STEER/AliAODTagCreator.cxx b/STEER/AliAODTagCreator.cxx
index 14aab67167f6019379d22b01461cd6222bd05b35..b5c8f20ac229697c48aa4ec1cbe672cf0a429f3c 100644 (file)
--- a/STEER/AliAODTagCreator.cxx
+++ b/STEER/AliAODTagCreator.cxx
@@ -320,7 +320,7 @@ void AliAODTagCreator::CreateTags(const char* type)
        const TUrl *url = file->GetEndpointUrl();
        fguid = file->GetUUID().AsString();
 
-       if (type == "grid") {
+       if (!strcmp(type,"grid")) {
            TString fturltemp = "alien://"; fturltemp += url->GetFile();
            fturl = fturltemp(0,fturltemp.Index(".root",5,0,TString::kExact)+5);
        } else {
@@ -334,7 +334,7 @@ void AliAODTagCreator::CreateTags(const char* type)
        // Set the event and input file references
        evTag->SetEventId(iEventNumber+1);
        evTag->SetGUID(fguid);
-       if(type == "grid") {
+       if(!strcmp(type,"grid")) {
            evTag->SetMD5(0);
            evTag->SetTURL(fturl);
            evTag->SetSize(0);

diff --git a/STEER/AliAODTrack.cxx b/STEER/AliAODTrack.cxx
index 2a86a7d04d8e01dc56f599d6b3044f95780389b7..611dc6208aad7f799522de7a241de4686d215925 100644 (file)
--- a/STEER/AliAODTrack.cxx
+++ b/STEER/AliAODTrack.cxx
@@ -472,7 +472,7 @@ void AliAODTrack::SetMatchTrigger(Int_t matchTrig){
   }
 }
 
-Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Char_t *cathode){
+Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Option_t *cathode){
 //
 // Retrieve hit information for MUON identified by  (station, plane, cathode)
   if(cathode){

diff --git a/STEER/AliAODTrack.h b/STEER/AliAODTrack.h
index 704e12cc4cfa666ef03b1b51fd46730d518c0d76..c26ce179a13bd8ec4b76ff4163612bc45a0172aa 100644 (file)
--- a/STEER/AliAODTrack.h
+++ b/STEER/AliAODTrack.h
@@ -128,7 +128,7 @@ class AliAODTrack : public AliVParticle {
  
   template <class T> void SetPID(const T *pid) {
     if(pid) for(Int_t i=0; i<10; ++i) fPID[i]=pid[i];
-    else {for(Int_t i=0; i<10; fPID[i++]=0.); fPID[AliAODTrack::kUnknown]=1.;}}
+    else {for(Int_t i=0; i<10; fPID[i++]=0.) ; fPID[AliAODTrack::kUnknown]=1.;}}
 
   Bool_t IsOn(Int_t mask) const {return (fFlags&mask)>0;}
   ULong_t GetStatus() const { return GetFlags(); }
@@ -236,7 +236,7 @@ class AliAODTrack : public AliVParticle {
   Int_t    MatchTriggerHighPt()  const  { return (GetMatchTrigger()>2)?1:0; }  //  Muon track matches trigger track and passes High pt cut
   Double_t GetChi2MatchTrigger() const  { return fChi2MatchTrigger;}
   void     SetChi2MatchTrigger(Double_t Chi2MatchTrigger) {fChi2MatchTrigger = Chi2MatchTrigger; }
-  Int_t    HitsMT(Int_t istation, Int_t iplane, Char_t *cathode=0);  // Check if track hits Muon chambers
+  Int_t    HitsMT(Int_t istation, Int_t iplane, Option_t *cathode=0);  // Check if track hits Muon chambers
   Int_t    HitsMuonChamber(Int_t MuonChamber);  // Check if track hits Muon chambers
   Bool_t   IsMuonTrack() const { return (GetMUONClusterMap()>0) ? kTRUE : kFALSE; }
 

diff --git a/STEER/AliAODVertex.cxx b/STEER/AliAODVertex.cxx
index 6f8b5251b3ce6f51ec625b09e75b56e0e9d4983b..d5ba95d1931d80b2f4f87655f4cdb427ed5e6dc6 100644 (file)
--- a/STEER/AliAODVertex.cxx
+++ b/STEER/AliAODVertex.cxx
@@ -456,7 +456,7 @@ void AliAODVertex::PrintIndices() const
 
   TRefArrayIter iter(&fDaughters);
   while (TObject *daugh = iter.Next()) {
-    printf("Particle %p originates from this vertex.\n", daugh);
+    printf("Particle %p originates from this vertex.\n", static_cast<void*>(daugh));
   }
 }
 
@@ -469,7 +469,7 @@ void AliAODVertex::Print(Option_t* /*option*/) const
   printf("     x = %f\n", fPosition[0]);
   printf("     y = %f\n", fPosition[1]);
   printf("     z = %f\n", fPosition[2]);
-  printf(" parent particle: %p\n", fParent.GetObject());
+  printf(" parent particle: %p\n", static_cast<void*>(fParent.GetObject()));
   printf(" origin of %d particles\n", fDaughters.GetEntriesFast());
   printf(" vertex type %d\n", fType);
   

diff --git a/STEER/AliCDBRunRange.cxx b/STEER/AliCDBRunRange.cxx
index 404f087ea3a31021cac2603bb8c94b21b4fc858f..a4cb954e359422d6dd13d75d4968a924e00ce453 100644 (file)
--- a/STEER/AliCDBRunRange.cxx
+++ b/STEER/AliCDBRunRange.cxx
@@ -65,12 +65,10 @@ Bool_t AliCDBRunRange::Overlaps(const AliCDBRunRange& other) const {
                return kFALSE;
        }
        
-       return (fFirstRun <= other.fFirstRun && other.fFirstRun <= fLastRun
-                       || fFirstRun <= other.fLastRun 
-                               && other.fLastRun <= fLastRun)
-               || (other.fFirstRun <= fFirstRun && fFirstRun <= other.fLastRun
-                       || other.fFirstRun <= fLastRun 
-                               && fLastRun <= other.fLastRun);
+       return ((fFirstRun <= other.fFirstRun && other.fFirstRun <= fLastRun)
+               || (fFirstRun <= other.fLastRun && other.fLastRun <= fLastRun))
+         || ((other.fFirstRun <= fFirstRun && fFirstRun <= other.fLastRun)
+             || (other.fFirstRun <= fLastRun && fLastRun <= other.fLastRun));
 }
 
 //___________________________________________________________________________

diff --git a/STEER/AliCorrQAChecker.cxx b/STEER/AliCorrQAChecker.cxx
index 09eb5d47e571c4befa7ba2d7db24edafa15f1627..6010b864ea75d1f6c6f2b17dd0a0cd27b20dcd75 100644 (file)
--- a/STEER/AliCorrQAChecker.cxx
+++ b/STEER/AliCorrQAChecker.cxx
@@ -42,7 +42,7 @@
 ClassImp(AliCorrQAChecker)
 
 //__________________________________________________________________
-const Double_t AliCorrQAChecker::Check(AliQA::ALITASK_t index, TNtupleD * nData) 
+Double_t AliCorrQAChecker::Check(AliQA::ALITASK_t index, TNtupleD * nData) 
 {
  // check the QA of correlated data stored in a ntuple
   if ( index != AliQA::kRAW ) {

diff --git a/STEER/AliCorrQAChecker.h b/STEER/AliCorrQAChecker.h
index c3727dc40f6db8d6d9f9bdddb24cbf7127052f14..2a7966fc38c1938b9be354589c2a6968a0c9df1f 100644 (file)
--- a/STEER/AliCorrQAChecker.h
+++ b/STEER/AliCorrQAChecker.h
@@ -31,9 +31,9 @@ public:
   AliCorrQAChecker(const AliCorrQAChecker& qac) : AliQACheckerBase(qac.GetName(), qac.GetTitle()) {;} // cpy ctor   
   virtual ~AliCorrQAChecker() {;} // dtor
 
-  virtual const Double_t Check(AliQA::ALITASK_t index) { return AliQACheckerBase::Check(index) ;}
-  virtual const Double_t Check(AliQA::ALITASK_t index, TObjArray * obj) { return AliQACheckerBase::Check(index, obj) ;}
-  virtual const Double_t Check(AliQA::ALITASK_t index, TNtupleD * nData) ; 
+  virtual Double_t Check(AliQA::ALITASK_t index) { return AliQACheckerBase::Check(index) ;}
+  virtual Double_t Check(AliQA::ALITASK_t index, TObjArray * obj) { return AliQACheckerBase::Check(index, obj) ;}
+  virtual Double_t Check(AliQA::ALITASK_t index, TNtupleD * nData) ; 
 
 private:
   

diff --git a/STEER/AliESDEvent.cxx b/STEER/AliESDEvent.cxx
index 64a13010186d9f06f149e6f38b989b61eb170acf..eddc4acd00290f4a21df3d5a27c2e6f046848577 100644 (file)
--- a/STEER/AliESDEvent.cxx
+++ b/STEER/AliESDEvent.cxx
@@ -1099,7 +1099,7 @@ Int_t AliESDEvent::GetEMCALClusters(TRefArray *clusters) const
   return clusters->GetEntriesFast();
 }
 
-const void AliESDEvent::WriteToTree(TTree* tree) const {
+void AliESDEvent::WriteToTree(TTree* tree) const {
   // Book the branches as in TTree::Branch(TCollection*)
   // but add a "." at the end of top level branches which are
   // not a TClonesArray

diff --git a/STEER/AliESDEvent.h b/STEER/AliESDEvent.h
index 04d0879c4a261596aa17ca88c4be7c193d68e969..9069ca5f788041f1aca34ed3f88ead8ffd2a1c69 100644 (file)
--- a/STEER/AliESDEvent.h
+++ b/STEER/AliESDEvent.h
@@ -338,7 +338,7 @@ public:
   void ReadFromTree(TTree *tree, Option_t* opt = "");
   TObject* FindListObject(const char *name);
   AliESD *GetAliESDOld(){return fESDOld;}
-  const void WriteToTree(TTree* tree) const;
+  void WriteToTree(TTree* tree) const;
   void GetStdContent();
   void ResetStdContent();
   void CreateStdContent();

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index df4f216beb03c0da5989d67b60f88f216d44e320..4a7852ecbcf34f566e764533f337b2ee9dfb90a5 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -738,7 +738,7 @@ TObject *  AliESDtrack::GetCalibObject(Int_t index){
 }
 
 
-const Bool_t AliESDtrack::FillTPCOnlyTrack(AliESDtrack &track){
+Bool_t AliESDtrack::FillTPCOnlyTrack(AliESDtrack &track){
   
   // Fills the information of the TPC-only first reconstruction pass
   // into the passed ESDtrack object. For consistency fTPCInner is also filled

diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h
index a68626fc1379114eb33627c4e110b00896add00c..4e334965724f6a9990e916993657d579dc840f21 100644 (file)
--- a/STEER/AliESDtrack.h
+++ b/STEER/AliESDtrack.h
@@ -118,7 +118,7 @@ public:
   }
   const AliExternalTrackParam * GetInnerParam() const { return fIp;}
   const AliExternalTrackParam * GetTPCInnerParam() const {return fTPCInner;}
-  const Bool_t FillTPCOnlyTrack(AliESDtrack &track);
+  Bool_t FillTPCOnlyTrack(AliESDtrack &track);
   Bool_t GetInnerXYZ(Double_t *r) const {
     if (!fIp) return kFALSE;
     return fIp->GetXYZ(r);

diff --git a/STEER/AliMCEvent.h b/STEER/AliMCEvent.h
index a8454886c4c170c5120c973ae530e8718edb2572..6534b5826a7e549b28ea5f18484d5f9b39b5bd78 100644 (file)
--- a/STEER/AliMCEvent.h
+++ b/STEER/AliMCEvent.h
@@ -45,7 +45,7 @@ public:
     virtual void CreateStdContent()                        {;} 
     virtual void GetStdContent()                           {;}
     virtual void ReadFromTree(TTree * /*tree*/, Option_t* /*opt*/) {;}
-    virtual const void WriteToTree(TTree* /*tree*/)  const {;}
+    virtual void WriteToTree(TTree* /*tree*/)  const {;}
 
     virtual void SetStdNames()                             {;}
     virtual void Print(Option_t */*option=""*/)  const     {;}

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index 516192943dc20b79fee39a9087a4af9879fd7c1f..86643ae066ac8ef1b86178f4b3ad63078507d077 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -446,7 +446,7 @@ void AliModule::ReadEuclid(const char* filnam, char* topvol)
     }
     //Pad the string with blanks
     i=-1;
-    while(natmed[++i]);
+    while(natmed[++i]) ;
     while(i<20) natmed[i++]=' ';
     natmed[i]='\0';
     //
@@ -613,7 +613,7 @@ void AliModule::ReadEuclidMedia(const char* filnam)
     if (nwbuf>0) for(i=0;i<nwbuf;i++) fscanf(lun,"%f",&ubuf[i]);
     //Pad the string with blanks
     i=-1;
-    while(namate[++i]);
+    while(namate[++i]) ;
     while(i<20) namate[i++]=' ';
     namate[i]='\0';
     //
@@ -628,7 +628,7 @@ void AliModule::ReadEuclidMedia(const char* filnam)
     if (fieldm<0) fieldm=sxmgmx;
     //Pad the string with blanks
     i=-1;
-    while(natmed[++i]);
+    while(natmed[++i]) ;
     while(i<20) natmed[i++]=' ';
     natmed[i]='\0';
     //

diff --git a/STEER/AliPreprocessor.cxx b/STEER/AliPreprocessor.cxx
index 6b9c54d393d00997182f653b73a0455ea191a418..c7f65bd706072e6c596dd881aa313b3ba1cc89d4 100644 (file)
--- a/STEER/AliPreprocessor.cxx
+++ b/STEER/AliPreprocessor.cxx
@@ -409,7 +409,7 @@ Bool_t AliPreprocessor::AliPreprocessor::ProcessRunType()
        return kFALSE;
 }
 //______________________________________________________________________________________________
-const UInt_t AliPreprocessor::GetStartTimeDCSQuery()
+UInt_t AliPreprocessor::GetStartTimeDCSQuery()
 {
        // Return Start Time for the DCS query
        //
@@ -418,7 +418,7 @@ const UInt_t AliPreprocessor::GetStartTimeDCSQuery()
        return fShuttle->GetStartTimeDCSQuery();
 }
 //______________________________________________________________________________________________
-const UInt_t AliPreprocessor::GetEndTimeDCSQuery()
+UInt_t AliPreprocessor::GetEndTimeDCSQuery()
 {
        // Return End Time for the DCS query
        //

diff --git a/STEER/AliPreprocessor.h b/STEER/AliPreprocessor.h
index 05220aefcee2f68617d6a2c640e6331b3f1d4662..230ae2156a8b4739064906bccd85680a7ec609d2 100644 (file)
--- a/STEER/AliPreprocessor.h
+++ b/STEER/AliPreprocessor.h
@@ -54,8 +54,8 @@ class AliPreprocessor : public TNamed
     Bool_t GetHLTStatus();
     const char* GetTriggerConfiguration();
     void Log(const char* message);
-    const UInt_t GetStartTimeDCSQuery();
-    const UInt_t GetEndTimeDCSQuery();
+    UInt_t GetStartTimeDCSQuery();
+    UInt_t GetEndTimeDCSQuery();
     
     void AddRunType(const char* runType);
 

diff --git a/STEER/AliQA.cxx b/STEER/AliQA.cxx
index b23fdcc45058f565807912f5f72d7610138c8951..dfabd49cb7dfd363251b30e543fe6dfbb368de97 100644 (file)
--- a/STEER/AliQA.cxx
+++ b/STEER/AliQA.cxx
@@ -178,7 +178,7 @@ void AliQA::Close()
 } 
 
 //_______________________________________________________________
-const Bool_t AliQA::CheckFatal() const
+Bool_t AliQA::CheckFatal() const
 {
   // check if any FATAL status is set
   Bool_t rv = kFALSE ;
@@ -189,7 +189,7 @@ const Bool_t AliQA::CheckFatal() const
 }
 
 //_______________________________________________________________
-const Bool_t AliQA::CheckRange(DETECTORINDEX_t det) const
+Bool_t AliQA::CheckRange(DETECTORINDEX_t det) const
 { 
   // check if detector is in given detector range: 0-kNDET
 
@@ -200,7 +200,7 @@ const Bool_t AliQA::CheckRange(DETECTORINDEX_t det) const
 }
 
 //_______________________________________________________________
-const Bool_t AliQA::CheckRange(ALITASK_t task) const
+Bool_t AliQA::CheckRange(ALITASK_t task) const
 { 
   // check if task is given taskk range: 0:kNTASK
   Bool_t rv = ( task < kRAW || task > kNTASK )  ? kFALSE : kTRUE ;
@@ -210,7 +210,7 @@ const Bool_t AliQA::CheckRange(ALITASK_t task) const
 }
 
 //_______________________________________________________________
-const Bool_t AliQA::CheckRange(QABIT_t bit) const
+Bool_t AliQA::CheckRange(QABIT_t bit) const
 { 
   // check if bit is in given bit range: 0-kNBit
 
@@ -280,7 +280,7 @@ const char * AliQA::GetBitName(QABIT_t bit) const
 }
 
 //_______________________________________________________________
-const AliQA::DETECTORINDEX_t AliQA::GetDetIndex(const char * name) 
+AliQA::DETECTORINDEX_t AliQA::GetDetIndex(const char * name) 
 {
        // returns the detector index corresponding to a given name
        TString sname(name) ; 
@@ -395,7 +395,7 @@ const TString AliQA::GetRunTypeName(RUNTYPE_t rt)
 }
 
 //_______________________________________________________________
-const AliQA::TASKINDEX_t AliQA::GetTaskIndex(const char * name) 
+AliQA::TASKINDEX_t AliQA::GetTaskIndex(const char * name) 
 {
        // returns the detector index corresponding to a given name
        TString sname(name) ; 
@@ -410,7 +410,7 @@ const AliQA::TASKINDEX_t AliQA::GetTaskIndex(const char * name)
 }
 
 //_______________________________________________________________
-const Bool_t AliQA::IsSet(DETECTORINDEX_t det, ALITASK_t tsk, QABIT_t bit) const
+Bool_t AliQA::IsSet(DETECTORINDEX_t det, ALITASK_t tsk, QABIT_t bit) const
 {
   // Checks is the requested bit is set
        
@@ -426,7 +426,7 @@ const Bool_t AliQA::IsSet(DETECTORINDEX_t det, ALITASK_t tsk, QABIT_t bit) const
 }
 
 //_______________________________________________________________
-const Bool_t AliQA::IsSetAny(DETECTORINDEX_t det, ALITASK_t tsk) const
+Bool_t AliQA::IsSetAny(DETECTORINDEX_t det, ALITASK_t tsk) const
 {
   // Checks is the requested bit is set
        
@@ -446,7 +446,7 @@ const Bool_t AliQA::IsSetAny(DETECTORINDEX_t det, ALITASK_t tsk) const
                return kTRUE ;
 }
 //_______________________________________________________________
-const Bool_t AliQA::IsSetAny(DETECTORINDEX_t det) const
+Bool_t AliQA::IsSetAny(DETECTORINDEX_t det) const
 {
   // Checks is the requested bit is set
        
@@ -563,7 +563,7 @@ void AliQA::Merge(TCollection * list) {
 }
 
 //_______________________________________________________________
-const ULong_t AliQA::Offset(ALITASK_t tsk) const
+ULong_t AliQA::Offset(ALITASK_t tsk) const
 {
   // Calculates the bit offset for a given module (SIM, REC, ESD, ANA)
 

diff --git a/STEER/AliQA.h b/STEER/AliQA.h
index b63971ccfdd45675993897a2a2a0a5601af67207..a2e831e3bfaed480c3a6fb6530ca77fae558b398 100644 (file)
--- a/STEER/AliQA.h
+++ b/STEER/AliQA.h
@@ -47,19 +47,19 @@ public:
        static  AliQA *        Instance(const DETECTORINDEX_t det) ;
        static  AliQA *        Instance(const ALITASK_t tsk) ;
        static  AliQA *        Instance(const TASKINDEX_t tsk) ;
-       const Bool_t           CheckFatal() const ;
+       Bool_t           CheckFatal() const ;
        static void            Close() ; 
        static const char *    GetAliTaskName(ALITASK_t tsk) ;
   static const TString   GetExpert() { return fkgExpert ; }
-  static const UInt_t    GetExpertBit() { return fkgExpertBit ; }
+  static       UInt_t    GetExpertBit() { return fkgExpertBit ; }
        static const TString   GetLabLocalFile() { return fkgLabLocalFile ; } 
        static const TString   GetLabLocalOCDB() { return fkgLabLocalOCDB ; } 
        static const TString   GetLabAliEnOCDB() { return fkgLabAliEnOCDB ; } 
-       static const DETECTORINDEX_t GetDetIndex(const char * name) ; 
+       static       DETECTORINDEX_t GetDetIndex(const char * name) ; 
        static const TString   GetDetName(DETECTORINDEX_t det) { return fgDetNames[det] ; }
        static const char *    GetDetName(Int_t det) ;
        static const TString   GetGRPPath() { return fgGRPPath ; }  
-  static const UInt_t    GetQABit() { return fkgQABit ; }
+  static       UInt_t    GetQABit() { return fkgQABit ; }
        static TFile *         GetQADataFile(const char * name, const Int_t run) ; 
        static TFile *         GetQADataFile(const char * fileName) ;
        static const char *    GetQADataFileName(const char * name, const Int_t run) 
@@ -75,11 +75,11 @@ public:
        static const char  *   GetRefOCDBDirName() { return fkgRefOCDBDirName.Data() ; }
        static const char  *   GetRefDataDirName() { return fkgRefDataDirName.Data() ; }
        static const TString   GetRunTypeName(RUNTYPE_t rt = kNULLTYPE) ;
-       static const TASKINDEX_t GetTaskIndex(const char * name) ; 
-       static const TString   GetTaskName(UInt_t tsk) { return fgTaskNames[tsk] ; }
-       const Bool_t           IsSet(DETECTORINDEX_t det, ALITASK_t tsk, QABIT_t bit) const ;
-       const Bool_t           IsSetAny(DETECTORINDEX_t det, ALITASK_t tsk) const ;
-       const Bool_t           IsSetAny(DETECTORINDEX_t det) const ;
+       static       TASKINDEX_t GetTaskIndex(const char * name) ; 
+       static       TString   GetTaskName(UInt_t tsk) { return fgTaskNames[tsk] ; }
+             Bool_t           IsSet(DETECTORINDEX_t det, ALITASK_t tsk, QABIT_t bit) const ;
+             Bool_t           IsSetAny(DETECTORINDEX_t det, ALITASK_t tsk) const ;
+             Bool_t           IsSetAny(DETECTORINDEX_t det) const ;
        void                   Merge(TCollection * list) ; 
        void                   Set(QABIT_t bit) ;
        static void                            SetQAResultDirName(const char * name) ; 
@@ -94,13 +94,13 @@ public:
 
 private:      
 
-       const Bool_t         CheckRange(DETECTORINDEX_t det) const ;
-       const Bool_t         CheckRange(ALITASK_t tsk) const ;
-       const Bool_t         CheckRange(QABIT_t bit) const ;
+             Bool_t         CheckRange(DETECTORINDEX_t det) const ;
+             Bool_t         CheckRange(ALITASK_t tsk) const ;
+             Bool_t         CheckRange(QABIT_t bit) const ;
        const char *         GetBitName(QABIT_t bit) const ;
-       const ULong_t        GetStatus(DETECTORINDEX_t det) const  { return fQA[det] ;}
+             ULong_t        GetStatus(DETECTORINDEX_t det) const  { return fQA[det] ;}
        void                 Finish() const ;  
-       const ULong_t        Offset(ALITASK_t tsk) const ;
+             ULong_t        Offset(ALITASK_t tsk) const ;
        void                 ShowASCIIStatus(DETECTORINDEX_t det, ALITASK_t tsk, ULong_t status) const ; 
        void                 ResetStatus(DETECTORINDEX_t det) { fQA[det] = 0 ; }
        void                 Set(DETECTORINDEX_t det) { fDet = det ;}

diff --git a/STEER/AliQACheckerBase.cxx b/STEER/AliQACheckerBase.cxx
index c2e44244e0d4699d56b7e4663c98e680ec3835ae..994e6a3d82b9aea45d10c92da10b9ab1393d3e98 100644 (file)
--- a/STEER/AliQACheckerBase.cxx
+++ b/STEER/AliQACheckerBase.cxx
@@ -75,7 +75,7 @@ AliQACheckerBase& AliQACheckerBase::operator = (const AliQACheckerBase& qadm )
 }
 
 //____________________________________________________________________________
-const Double_t AliQACheckerBase::Check(AliQA::ALITASK_t /*index*/) 
+Double_t AliQACheckerBase::Check(AliQA::ALITASK_t /*index*/) 
 {
   // Performs a basic checking
   // Compares all the histograms stored in the directory
@@ -124,7 +124,7 @@ const Double_t AliQACheckerBase::Check(AliQA::ALITASK_t /*index*/)
 }  
 
 //____________________________________________________________________________
-const Double_t AliQACheckerBase::Check(AliQA::ALITASK_t /*index*/, TObjArray * list) 
+Double_t AliQACheckerBase::Check(AliQA::ALITASK_t /*index*/, TObjArray * list) 
 {
   // Performs a basic checking
   // Compares all the histograms in the list
@@ -168,7 +168,7 @@ const Double_t AliQACheckerBase::Check(AliQA::ALITASK_t /*index*/, TObjArray * l
 }  
 
 //____________________________________________________________________________ 
-const Double_t AliQACheckerBase::DiffC(const TH1 * href, const TH1 * hin) const
+Double_t AliQACheckerBase::DiffC(const TH1 * href, const TH1 * hin) const
 {
   // compares two histograms using the Chi2 test
   if ( hin->Integral() == 0 ) {
@@ -180,7 +180,7 @@ const Double_t AliQACheckerBase::DiffC(const TH1 * href, const TH1 * hin) const
 }
 
 //____________________________________________________________________________ 
-const Double_t AliQACheckerBase::DiffK(const TH1 * href, const TH1 * hin) const
+Double_t AliQACheckerBase::DiffK(const TH1 * href, const TH1 * hin) const
 {
   // compares two histograms using the Kolmogorov test
   if ( hin->Integral() == 0 ) {

diff --git a/STEER/AliQACheckerBase.h b/STEER/AliQACheckerBase.h
index 7c6d6dd1bfa4d6a7d654fdc872c6a1302017560c..4010b90d8b1548a811c13ce999b86bbe4eb04c8f 100644 (file)
--- a/STEER/AliQACheckerBase.h
+++ b/STEER/AliQACheckerBase.h
@@ -39,11 +39,11 @@ public:
   void   SetRefandData(TDirectory * ref, TObjArray * refOCDB, TDirectory * data=NULL) { fRefSubDir = ref ;  fRefOCDBSubDir = refOCDB, fDataSubDir = data ; }
 
 protected:
-  virtual const Double_t Check(AliQA::ALITASK_t index) ;
-  virtual const Double_t Check(AliQA::ALITASK_t, TObjArray *) ; 
-  virtual const Double_t Check(AliQA::ALITASK_t, TNtupleD *) { return -1.0 ;} 
-  const Double_t DiffC(const TH1 * href, const TH1 * hin) const ;   
-  const Double_t DiffK(const TH1 * href, const TH1 * hin) const ;   
+  virtual Double_t Check(AliQA::ALITASK_t index) ;
+  virtual Double_t Check(AliQA::ALITASK_t, TObjArray *) ; 
+  virtual Double_t Check(AliQA::ALITASK_t, TNtupleD *) { return -1.0 ;} 
+  Double_t DiffC(const TH1 * href, const TH1 * hin) const ;   
+  Double_t DiffK(const TH1 * href, const TH1 * hin) const ;   
   void           Finish() const ; 
   virtual void   SetQA(AliQA::ALITASK_t index, Double_t value) const ; 
 

diff --git a/STEER/AliQADataMaker.h b/STEER/AliQADataMaker.h
index 9e7ea6cf1687771acec7cfd5409678e68749fca7..56b9974f0dc302f60cce1eb70d2e2ae2d377e27e 100644 (file)
--- a/STEER/AliQADataMaker.h
+++ b/STEER/AliQADataMaker.h
@@ -58,10 +58,10 @@ public:
        virtual TH1 *       GetSDigitsData(const Int_t index)                      = 0 ; 
        const char *        GetDetectorDirName() const { return fDetectorDirName.Data() ; }
   TList *             GetParameterList() const { return fParameterList ; }
-       const Int_t         Increment() { return ++fCycleCounter ; } 
+       Int_t         Increment() { return ++fCycleCounter ; } 
        virtual TObjArray * Init(AliQA::TASKINDEX_t, Int_t cycles = -1)                              = 0 ;
        virtual void        Init(AliQA::TASKINDEX_t, TObjArray * list, Int_t run, Int_t cycles = -1) = 0 ;
-       const Bool_t        IsCycleDone() const { return fCycleCounter > fCycle ? kTRUE : kFALSE ; }
+       Bool_t        IsCycleDone() const { return fCycleCounter > fCycle ? kTRUE : kFALSE ; }
        void                Reset() { fCycleCounter = 0 ; }
        void                SetCycle(Int_t nevts) { fCycle = nevts ; } 
   void                SetWriteExpert() { fWriteExpert = kTRUE ; }

diff --git a/STEER/AliQADataMakerSteer.h b/STEER/AliQADataMakerSteer.h
index 4e2e431d58b66c91cdac045a691cc75464ff7faf..46509439e23952cb8e1adf0292685bfdf65a4487 100644 (file)
--- a/STEER/AliQADataMakerSteer.h
+++ b/STEER/AliQADataMakerSteer.h
@@ -70,7 +70,7 @@ public:
 private: 
        Bool_t                    DoIt(const AliQA::TASKINDEX_t taskIndex) ;
        AliLoader   * GetLoader(Int_t iDet) ; 
-       const Int_t   GetQACycles(const Int_t iDet) { return fQACycles[iDet] ; }
+       Int_t   GetQACycles(const Int_t iDet) const { return fQACycles[iDet] ; }
        Bool_t                    Init(const AliQA::TASKINDEX_t taskIndex, const  char * fileName = NULL) ;
        Bool_t        InitRunLoader() ; 
        Bool_t        IsSelected(const char * detName)  ;

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 547dd979cfbff655a8b01cddb891cfc76979397c..8f1e7ace94a3263a430ccf33314893ef689d7b30 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -710,7 +710,7 @@ Bool_t AliReconstruction::MisalignGeometry(const TString& detectors)
     
     for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
       if(!IsSelected(fgkDetectorName[iDet], detStr)) continue;
-      if(fgkDetectorName[iDet]=="HLT") continue;
+      if(!strcmp(fgkDetectorName[iDet],"HLT")) continue;
       if(AliGeomManager::IsModuleInGeom(fgkDetectorName[iDet]))
       {
        loadAlObjsListOfDets += fgkDetectorName[iDet];

diff --git a/STEER/AliShuttleInterface.cxx b/STEER/AliShuttleInterface.cxx
index 8d3b4e788779fa1db80c1deec58b7141a42012a6..527df5d12498c25f35df53686e7b777756bfb8c8 100644 (file)
--- a/STEER/AliShuttleInterface.cxx
+++ b/STEER/AliShuttleInterface.cxx
@@ -72,7 +72,7 @@ const char* AliShuttleInterface::GetDetName(UInt_t detPos){
 }
 
 //______________________________________________________________________________________________
-const Int_t AliShuttleInterface::GetDetPos(const char* detName){
+Int_t AliShuttleInterface::GetDetPos(const char* detName){
 // Return detector position in the detector code array
 
        for(UInt_t iDet=0; iDet < kNDetectors; iDet++){

diff --git a/STEER/AliShuttleInterface.h b/STEER/AliShuttleInterface.h
index 3469cfffdc455fd1b9b4a1e1eb2e43a788df43db..956769758f3430fbc7a77fbbb07532afae2475e3 100644 (file)
--- a/STEER/AliShuttleInterface.h
+++ b/STEER/AliShuttleInterface.h
@@ -37,8 +37,8 @@ class AliShuttleInterface : public TObject
     virtual TList* GetFileIDs(Int_t system, const char* detector, const char* source) = 0;
     
     virtual const char* GetRunParameter(const char* lbEntry) = 0;
-    virtual const UInt_t GetStartTimeDCSQuery() = 0;
-    virtual const UInt_t GetEndTimeDCSQuery() = 0;
+    virtual UInt_t GetStartTimeDCSQuery() = 0;
+    virtual UInt_t GetEndTimeDCSQuery() = 0;
     virtual const char* GetRunType() = 0;
     virtual Bool_t GetHLTStatus() = 0;
     virtual const char* GetTriggerConfiguration() = 0;
@@ -53,8 +53,8 @@ class AliShuttleInterface : public TObject
 
     static const char* GetOfflineDetName(const char* detName);
     static const char* GetDetName(UInt_t detPos);
-    static const Int_t GetDetPos(const char* detName);
-    static const UInt_t NDetectors() {return kNDetectors;}
+    static Int_t GetDetPos(const char* detName);
+    static UInt_t NDetectors() {return kNDetectors;}
 
     static TString GetMainCDB () {return fgkMainCDB;}
     static TString GetLocalCDB () {return fgkLocalCDB;}

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 5722ac4ec2757ec4a48d22ef120a91815c47f591..5995677cfd19e307f7e6981ae44f8fa5a1a03558 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -771,7 +771,7 @@ Bool_t AliSimulation::RunTrigger(const char* config, const char* detectors)
    TString trconfiguration = config;
 
    if (trconfiguration.IsNull()) {
-     if (gAlice->GetTriggerDescriptor() != "") {
+     if (strcmp(gAlice->GetTriggerDescriptor(),"")) {
        trconfiguration = gAlice->GetTriggerDescriptor();
      }
      else
@@ -841,7 +841,7 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
   // Either from AliSimulation or from
   // gAlice
   if (fMakeTrigger.IsNull()) {
-    if (gAlice->GetTriggerDescriptor() != "")
+    if (strcmp(gAlice->GetTriggerDescriptor(),""))
       fMakeTrigger = gAlice->GetTriggerDescriptor();
   }
   else

diff --git a/STEER/AliSplineFit.h b/STEER/AliSplineFit.h
index a1e564c673daf324f6ec9ee002f3bc34a5ef5fd9..cf8e6cbcf3af07531648a551943f260465e4f518 100644 (file)
--- a/STEER/AliSplineFit.h
+++ b/STEER/AliSplineFit.h
@@ -51,7 +51,7 @@ class AliSplineFit : public TObject {
 
   void SetGraph (TGraph* graph) { fGraph=graph; }
   void SetMinPoints (Int_t minPoints) { fMinPoints=minPoints;}
-  const Int_t GetMinPoints() const { return fMinPoints; }
+  Int_t GetMinPoints() const { return fMinPoints; }
 
  protected:
 

diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx
index 30349d72cea3e134d35899018fc767f193c3b29d..dedbe3337ce8d27d66c8a56fce26af31ea1d8c57 100644 (file)
--- a/STEER/AliStack.cxx
+++ b/STEER/AliStack.cxx
@@ -334,9 +334,9 @@ Bool_t AliStack::PurifyKine()
          part = dynamic_cast<TParticle*>(fParticleMap.At(nkeep));
          // as the parent is always *before*, it must be already
          // in place. This is what we are checking anyway!
-         if((parent=part->GetFirstMother())>fHgwmk) 
+         if((parent=part->GetFirstMother())>fHgwmk) {
              if(fTrackLabelMap[parent]==-99) Fatal("PurifyKine","fTrackLabelMap[%d] = -99!\n",parent);
-             else part->SetFirstMother(fTrackLabelMap[parent]);
+             else part->SetFirstMother(fTrackLabelMap[parent]);}
          nkeep++;
       }
   }

diff --git a/STEER/AliSurveyObj.cxx b/STEER/AliSurveyObj.cxx
index 723761dd106f7b1cac4a31e66c67ded0a9f36f59..1edd8446d8015d3ce482461cafb88dd6bdba0631 100644 (file)
--- a/STEER/AliSurveyObj.cxx
+++ b/STEER/AliSurveyObj.cxx
@@ -150,7 +150,7 @@ Bool_t AliSurveyObj::Connect(const char *gridUrl, const char *user) {
 
   // If the same "Grid" is alreay active, skip connection
   if (!gGrid || gridUrl != gGrid->GridUrl() ||
-      (( user != "" ) && ( user != gGrid->GetUser() )) ) {
+      (( strcmp(user,"") ) && ( strcmp(user,gGrid->GetUser()) )) ) {
     // connection to the Grid
     AliInfo("\nConnecting to the Grid...");
     if (gGrid) {

diff --git a/STEER/AliTrackResiduals.cxx b/STEER/AliTrackResiduals.cxx
index 51742bb4e36f079ad272afa8de95221e3adb0484..4d0e7342768f07bd2b686f35ab8b9a813e1802a1 100644 (file)
--- a/STEER/AliTrackResiduals.cxx
+++ b/STEER/AliTrackResiduals.cxx
@@ -240,7 +240,7 @@ void AliTrackResiduals::DeleteTrackPointArrays()
 }
 
 //_____________________________________________________
-const Int_t AliTrackResiduals::GetNFreeParam(){ 
+Int_t AliTrackResiduals::GetNFreeParam(){ 
   Int_t unfixedparam=6;
   for(Int_t j=0;j<6;j++){
     if(fBFixed[j]==kTRUE)unfixedparam--;

diff --git a/STEER/AliTrackResiduals.h b/STEER/AliTrackResiduals.h
index ab35deb9414c50e168b11f93a2eedc711369fbdb..f3dcd70311ac9555607ec19d5f8e6d8f03726e51 100644 (file)
--- a/STEER/AliTrackResiduals.h
+++ b/STEER/AliTrackResiduals.h
@@ -42,7 +42,7 @@ class AliTrackResiduals : public TObject {
   Int_t   GetNdf() const  { return fNdf; }
   Int_t   GetMinNPoints() const  { return fMinNPoints; }
   void    FixParameter(Int_t par,Float_t value=0.) {fBFixed[par]=kTRUE; fFixed[par]= value;}
-  const Int_t GetNFreeParam();
+  Int_t GetNFreeParam();
   void   ReleaseParameter(Int_t par) {fBFixed[par]=kFALSE;}
 
  protected:

diff --git a/STEER/AliVEvent.h b/STEER/AliVEvent.h
index dd09df27fa7c5c986d6e6fc9eb0523f2698f3791..1ba6ca76bf54760fa596ed0356e65a973de24939 100644 (file)
--- a/STEER/AliVEvent.h
+++ b/STEER/AliVEvent.h
@@ -37,7 +37,7 @@ public:
   virtual void GetStdContent() = 0;
 
   virtual void ReadFromTree(TTree *tree, Option_t* opt) = 0;
-  virtual const void WriteToTree(TTree* tree) const = 0;
+  virtual void WriteToTree(TTree* tree) const = 0;
 
   //virtual void Reset() = 0;
   //virtual void ResetStdContent() = 0;