satisfy coding conventions

diff --git a/STEER/AOD/AliAODMCParticle.cxx b/STEER/AOD/AliAODMCParticle.cxx
index 059d066b9d083d93a754e0711e7ae8e8ef9b9f3d..5e77910661c692c6cd765c3277e74298ba644989 100644 (file)
--- a/STEER/AOD/AliAODMCParticle.cxx
+++ b/STEER/AOD/AliAODMCParticle.cxx
@@ -97,7 +97,9 @@ AliAODMCParticle::AliAODMCParticle(const AliAODMCParticle& mcPart) :
 
 AliAODMCParticle& AliAODMCParticle::operator=(const AliAODMCParticle& mcPart)
 { 
-
+  //
+  // assignment operator
+  //
   if (this!=&mcPart) { 
     AliVParticle::operator=(mcPart);
     fPdgCode    = mcPart.fPdgCode;
@@ -122,6 +124,9 @@ AliAODMCParticle& AliAODMCParticle::operator=(const AliAODMCParticle& mcPart)
 
 Double_t AliAODMCParticle::M()         const
 {
+  //
+  // return the mass 
+  //
     TParticlePDG* pdg =  TDatabasePDG::Instance()->GetParticle(fPdgCode);
     if (pdg) {
        return (pdg->Mass());
@@ -133,6 +138,9 @@ Double_t AliAODMCParticle::M()         const
 
 Short_t AliAODMCParticle::Charge()     const
 {
+  //
+  // return tha charge
+  //
     TParticlePDG* pdg =  TDatabasePDG::Instance()->GetParticle(fPdgCode);
     if (pdg) {
        return (Short_t (pdg->Charge()));

diff --git a/STEER/AOD/AliAODMCParticle.h b/STEER/AOD/AliAODMCParticle.h
index 3e75742fb4275a6b4a6146c8e2e56d4b6715d192..87d27b875e55f0f7548b97764b81844a8170f9e9 100644 (file)
--- a/STEER/AOD/AliAODMCParticle.h
+++ b/STEER/AOD/AliAODMCParticle.h
@@ -1,5 +1,5 @@
-#ifndef AliAODMCParticle_H
-#define AliAODMCParticle_H
+#ifndef AliAODMCPARTICLE_H
+#define AliAODMCPARTICLE_H
 /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -82,12 +82,9 @@ class AliAODMCParticle: public AliVParticle {
 
     // for the status we use the upper 16 bits/2 bytes of the flag word
     void SetStatus(Int_t status){
-      // a TParticle can have a negative stuts, catch this here and do nothing
-      if(status<0)return;
-      // reset the upper bins keep the lower bins
-      fFlag &= 0xffff;
-      // bit shift by 16
-      fFlag |= (((UInt_t)status)<<16);
+      if(status<0)return; // a TParticle can have a negative stuts, catch this here and do nothing
+      fFlag &= 0xffff;   // reset the upper bins keep the lower bins
+      fFlag |= (((UInt_t)status)<<16); // bit shift by 16
     }
     UInt_t GetStatus() const {
       // bit shift by 16

diff --git a/STEER/AOD/AliAODPhoton.h b/STEER/AOD/AliAODPhoton.h
index 6c7524027998573648e6ed0a291dc9aa71987b67..d61659a99e88d0aec185fb3da824025bd18db869 100644 (file)
--- a/STEER/AOD/AliAODPhoton.h
+++ b/STEER/AOD/AliAODPhoton.h
@@ -1,5 +1,5 @@
-#ifndef AliAODPhoton_H
-#define AliAODPhoton_H
+#ifndef AliAODPHOTON_H
+#define AliAODPHOTON_H
 /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STEER/AOD/AliAODPid.h b/STEER/AOD/AliAODPid.h
index 2df5d752d661481120d3f4e02c658407ecf640a8..c69bf4cd814d41ce143aaff350c15cb4f3d381fe 100644 (file)
--- a/STEER/AOD/AliAODPid.h
+++ b/STEER/AOD/AliAODPid.h
@@ -1,5 +1,5 @@
-#ifndef AliAODPid_H
-#define AliAODPid_H
+#ifndef AliAODPID_H
+#define AliAODPID_H
 /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 

diff --git a/STEER/AOD/AliAODTrack.h b/STEER/AOD/AliAODTrack.h
index 3f6026aad128f4e18c9c432e4439de9abbe15b67..ce536a147c5dc6ba0ec3c2b9e578080d2414a206 100644 (file)
--- a/STEER/AOD/AliAODTrack.h
+++ b/STEER/AOD/AliAODTrack.h
@@ -125,8 +125,7 @@ class AliAODTrack : public AliVTrack {
 
   Double_t Chi2perNDF()  const { return fChi2perNDF; }
   UShort_t GetTPCNcls()  const { 
-    UShort_t cl = 0;
-    cl = fTPCFitMap.CountBits();
+    UShort_t cl = fTPCFitMap.CountBits();
     if(cl==0)return fTPCClusterMap.CountBits();// backward compatibility
     return cl;
   }

diff --git a/STEER/ESD/AliESDEvent.cxx b/STEER/ESD/AliESDEvent.cxx
index c774d20212a10fea08aa525635d431d120f18532..9a7b4f5764807a1d13c8c70d2f2a69f2862640d4 100644 (file)
--- a/STEER/ESD/AliESDEvent.cxx
+++ b/STEER/ESD/AliESDEvent.cxx
@@ -312,21 +312,21 @@ AliESDEvent & AliESDEvent::operator=(const AliESDEvent& source) {
     else if(its->InheritsFrom("TClonesArray")){
       // Create or expand the tclonesarray pointers
       // so we can directly copy to the object
-      TClonesArray *its_tca = (TClonesArray*)its;
-      TClonesArray *mine_tca = (TClonesArray*)mine;
+      TClonesArray *itstca = (TClonesArray*)its;
+      TClonesArray *minetca = (TClonesArray*)mine;
 
       // this leaves the capacity of the TClonesArray the same
       // except for a factor of 2 increase when size > capacity
       // does not release any memory occupied by the tca
-      mine_tca->ExpandCreate(its_tca->GetEntriesFast());
-      for(int i = 0;i < its_tca->GetEntriesFast();++i){
+      minetca->ExpandCreate(itstca->GetEntriesFast());
+      for(int i = 0;i < itstca->GetEntriesFast();++i){
        // copy 
-       TObject *mine_tca_obj = mine_tca->At(i);
-       TObject *its_tca_obj = its_tca->At(i);
+       TObject *minetcaobj = minetca->At(i);
+       TObject *itstcaobj = itstca->At(i);
        // no need to delete first
        // pointers within the class should be handled by Copy()...
        // Can there be Empty slots?
-       its_tca_obj->Copy(*mine_tca_obj);
+       itstcaobj->Copy(*minetcaobj);
       }
     }
     else{
@@ -428,6 +428,9 @@ void AliESDEvent::Reset()
 }
 
 Bool_t AliESDEvent::ResetWithPlacementNew(TObject *pObject){
+  //
+  // funtion to reset using the already allocated space
+  //
   Long_t dtoronly = TObject::GetDtorOnly();
   TClass *pClass = TClass::GetClass(pObject->ClassName()); 
   TObject::SetDtorOnly(pObject);
@@ -1047,7 +1050,7 @@ void  AliESDEvent::AddRawDataErrorLog(const AliRawDataErrorLog *log) const {
   new(errlogs[errlogs.GetEntriesFast()])  AliRawDataErrorLog(*log);
 }
 
-void AliESDEvent::SetZDCData(AliESDZDC * obj)
+void AliESDEvent::SetZDCData(const AliESDZDC * obj)
 { 
   // use already allocated space
   if(fESDZDC)
@@ -1143,14 +1146,14 @@ void AliESDEvent::SetFMDData(AliESDFMD * obj)
   }
 }
 
-void AliESDEvent::SetVZEROData(AliESDVZERO * obj)
+void AliESDEvent::SetVZEROData(const AliESDVZERO * obj)
 { 
   // use already allocated space
   if(fESDVZERO)
     *fESDVZERO = *obj;
 }
 
-void AliESDEvent::SetTZEROData(AliESDTZERO * obj)
+void AliESDEvent::SetTZEROData(const AliESDTZERO * obj)
 { 
   // use already allocated space
   if(fESDTZERO)

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index 41c13c14c88731678b356c76fb79524dae399277..ad1935a599b4786d7f9c296e4b7ef6995b21dfda 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -204,7 +204,7 @@ public:
   AliESDZDC*    GetESDZDC()  const {return fESDZDC;}
   AliESDZDC*    GetZDCData() const {return fESDZDC;}
 
-  void SetZDCData(AliESDZDC * obj);
+  void SetZDCData(const AliESDZDC * obj);
 
   // Delegated methods for fESDZDC
   Double_t GetZDCN1Energy() const {return fESDZDC?fESDZDC->GetZDCN1Energy():0;}
@@ -229,7 +229,7 @@ public:
 
   // TZERO CKB: put this in the header?
   const AliESDTZERO*    GetESDTZERO() const {return fESDTZERO;}
-  void SetTZEROData(AliESDTZERO * obj);
+  void SetTZEROData(const AliESDTZERO * obj);
  // delegetated methods for fESDTZERO
 
   Double32_t GetT0zVertex() const {return fESDTZERO?fESDTZERO->GetT0zVertex():0;}
@@ -250,7 +250,7 @@ public:
 
   // VZERO 
   AliESDVZERO *GetVZEROData() const { return fESDVZERO; }
-  void SetVZEROData(AliESDVZERO * obj);
+  void SetVZEROData(const AliESDVZERO * obj);
        
   #ifdef MFT_UPGRADE
   // MFT 

diff --git a/STEER/ESD/AliESDRun.cxx b/STEER/ESD/AliESDRun.cxx
index 7a72bfe7478218049c18cee57b29160795d7d05e..c5a845f03ed29d69d462890f0dbcf49f8604fd25 100644 (file)
--- a/STEER/ESD/AliESDRun.cxx
+++ b/STEER/ESD/AliESDRun.cxx
@@ -45,9 +45,11 @@ AliESDRun::AliESDRun() :
   fBeamType(""),
   fTriggerClasses(kNTriggerClasses),
   fDetInDAQ(0),
-  fDetInReco(0)
-  
+  fDetInReco(0)  
 {
+  //
+  // default ctor
+  //
   for (Int_t i=0; i<2; i++) fDiamondXY[i]=0.;
   fBeamParticle[0] = fBeamParticle[1] = 0;
   fDiamondCovXY[0]=fDiamondCovXY[2]=3.*3.;
@@ -78,7 +80,9 @@ AliESDRun::AliESDRun(const AliESDRun &esd) :
   fDetInDAQ(0),
   fDetInReco(0)
 { 
+  //
   // Copy constructor
+  //
   for (Int_t i=0; i<2; i++) fDiamondXY[i]=esd.fDiamondXY[i];
   for (Int_t i=0; i<3; i++) fDiamondCovXY[i]=esd.fDiamondCovXY[i];
   for (Int_t i=0; i<2; i++) fBeamParticle[i] = esd.fBeamParticle[i];