corrected some things that gave compiler warnings; minor cleanup

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index d53a3b20a97226952bc6842bf7f5a9ed3ca0acd4..cf3cf802fc9fa6aaadae7d1eab1d785aec890aec 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -154,7 +154,6 @@ Float_t AliEMCALDigit::GetEta() const
 { // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  //const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
   const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
@@ -165,7 +164,6 @@ Float_t AliEMCALDigit::GetPhi() const
 { // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  //const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
   const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return phi ;

diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx
index b27a09df468ef6d72b6ce5957ed9c4bbe3522e8b..9727e0e4fcc3d6fa0dea60f09f9443477dbc2b36 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.cxx
+++ b/EMCAL/AliEMCALDigitizer.cxx
@@ -156,6 +156,8 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd):
     AliDebug(1," no runloader present");
   delete [] fInputFileNames ; 
   delete [] fEventNames ; 
+
+  if(fHists) delete fHists;
 }
 
 //____________________________________________________________________________
@@ -447,7 +449,7 @@ void AliEMCALDigitizer::Exec(Option_t *option)
 
   rl->LoadSDigits("EMCAL");
   for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
-    //gime->Event(ievent,"S") ; 
+    
     rl->GetEvent(ievent);
 
     Digitize(ievent) ; //Add prepared SDigits to digits and add the noise
@@ -461,8 +463,7 @@ void AliEMCALDigitizer::Exec(Option_t *option)
     //increment the total number of Digits per run 
     fDigitsInRun += emcalLoader->Digits()->GetEntriesFast() ;  
   }
-  //  gime->WriteDigitizer("OVERWRITE");
-
+  
   emcalLoader->CleanDigitizer() ;
 
   if(strstr(option,"tim")){
@@ -583,7 +584,6 @@ void AliEMCALDigitizer::MixWith(TString alirunFileName, TString eventFolderName)
     return ; 
   }
   // looking for the file which contains SDigits
-  //AliEMCALGetter * gime = AliEMCALGetter::Instance() ; 
   AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
   TString fileName( emcalLoader->GetSDigitsFileName() ) ; 
     if ( eventFolderName != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name 
@@ -769,8 +769,9 @@ TList *AliEMCALDigitizer::BookControlHists(int var)
     new TH1F("hDigiAbsId","EMCAL absId cells with fAmp > fDigitThreshold ",
     geom->GetNCells(), 0.5, Double_t(geom->GetNCells())+0.5);
   }
+
   fHists = AliEMCALHistoUtilities::MoveHistsToList("EmcalDigiControlHists", kFALSE);
-  fHists = 0;
+  fHists = 0; //huh? JLK 03-Mar-2006
   return fHists;
 }
 

diff --git a/EMCAL/AliEMCALGeometry.cxx b/EMCAL/AliEMCALGeometry.cxx
index 26a724040f6de2dbd4d11c169876ef905215c8bb..5c96dfae1c156561ed4e96389cc7617ff0695415 100644 (file)
--- a/EMCAL/AliEMCALGeometry.cxx
+++ b/EMCAL/AliEMCALGeometry.cxx
@@ -948,7 +948,8 @@ void  AliEMCALGeometry::GetTransformationForSM()
   for(i=0; i<XEN1->GetNdaughters(); i++) {
     TGeoNodeMatrix *sm = (TGeoNodeMatrix*)XEN1->GetDaughter(i);
     fMatrixOfSM[i] = sm->GetMatrix();
-    printf(" %i : matrix %x \n", i, fMatrixOfSM[i]);
+    //Compiler doesn't like this syntax...
+    //    printf(" %i : matrix %x \n", i, fMatrixOfSM[i]);
   }
   transInit = kTRUE;
 }
@@ -963,7 +964,7 @@ void AliEMCALGeometry::GetGlobal(const Double_t *loc, Double_t *glob, int nsm) c
   }
 }
 
-void AliEMCALGeometry::GetGlobal(const Int_t absId, TVector3 &vglob) const
+void AliEMCALGeometry::GetGlobal(const Int_t /* absId */, TVector3 & /* vglob */) const
 { // have to be defined  
 }
 

diff --git a/EMCAL/AliEMCALv3.cxx b/EMCAL/AliEMCALv3.cxx
index a9f4a61f655510730f8efe719e1e6070eaee36dd..183088d2135604e7442ca6f0326c6003d00a915a 100644 (file)
--- a/EMCAL/AliEMCALv3.cxx
+++ b/EMCAL/AliEMCALv3.cxx
@@ -43,7 +43,6 @@
 #include "AliHeader.h"
 #include "AliMC.h"
 #include "AliPoints.h"
-#include "AliEMCALGetter.h"
 // for TRD1,2 case
 
 ClassImp(AliEMCALv3)

diff --git a/EMCAL/jetfinder/AliEMCALJetMicroDst.h b/EMCAL/jetfinder/AliEMCALJetMicroDst.h
index 8e972d4ddd54e64ddaa53d7a4f6b87ea72d6d5dc..203511f4975d8efa965941ae446cf3b5b089a67a 100644 (file)
--- a/EMCAL/jetfinder/AliEMCALJetMicroDst.h
+++ b/EMCAL/jetfinder/AliEMCALJetMicroDst.h
@@ -76,7 +76,7 @@ class AliEMCALJetMicroDst: public TNamed {
 
   Bool_t  IsPythiaDst() const ;
   virtual Bool_t  IsFolder() const;
-  virtual void Browse(TBrowser* b) const ;
+  virtual void Browse(TBrowser* b) ;
 
   // service routine
   static TList *MoveHistsToList(const char* name="ListOfHists", Bool_t putToBrowser=kTRUE);