- removing hardcoded value, and using constants class to get number of max addresses.

[u/mrichter/AliRoot.git] / MUON / AliMUONCheck.cxx

diff --git a/MUON/AliMUONCheck.cxx b/MUON/AliMUONCheck.cxx
index 086c0f157bbc6b0861e8a2bbb66cb6bb485a1254..fc47a06929dfeddeceebbdae5ff5ef453404af4a 100644 (file)
--- a/MUON/AliMUONCheck.cxx
+++ b/MUON/AliMUONCheck.cxx
@@ -49,7 +49,7 @@
 #include "AliESDEvent.h"
 #include "AliESDMuonTrack.h"
 #include "AliESDVertex.h"
-#include "AliMagFMaps.h"
+#include "AliMagF.h"
 #include "AliLog.h"
 
 #include <TSystem.h>
@@ -68,7 +68,7 @@ AliMUONCheck::AliMUONCheck(const char* galiceFile, const char* esdFile,Int_t fir
 fFileName(galiceFile),
 fFileNameSim(),
 fesdFileName(esdFile),
-foutDir(outDir),
+fkOutDir(outDir),
 fFirstEvent(firstEvent),
 fLastEvent(lastEvent)
 {
@@ -83,7 +83,7 @@ AliMUONCheck::AliMUONCheck(const char* galiceFile, const char* galiceFileSim,
 fFileName(galiceFile),
 fFileNameSim(galiceFileSim),
 fesdFileName(esdFile),
-foutDir(outDir),
+fkOutDir(outDir),
 fFirstEvent(firstEvent),
 fLastEvent(lastEvent)
 {
@@ -156,7 +156,7 @@ AliMUONCheck::CheckESD(Bool_t pdc06TriggerResponse)
   if (!tree) 
   {
     Error("CheckESD", "no ESD tree found");
-    AliError(Form("CheckESD", "no ESD tree found"));
+    AliError(Form("no ESD tree found"));
     return ;
   }
   fESD->ReadFromTree(tree);
@@ -171,8 +171,7 @@ AliMUONCheck::CheckESD(Bool_t pdc06TriggerResponse)
   for (ievent = fFirstEvent; ievent < endOfLoop; ++ievent ) 
   {
     nev++;    
-    tree->GetEvent(ievent);
-    if (!fESD) 
+    if (tree->GetEvent(ievent) <= 0) 
     {
       Error("CheckESD", "no ESD object found for event %d", ievent);
       return ;
@@ -335,7 +334,7 @@ AliMUONCheck::CheckESD(Bool_t pdc06TriggerResponse)
     
   }//if(pdc06TriggerResponse)
   
-  gSystem->cd(foutDir);
+  gSystem->cd(fkOutDir);
   
   FILE *outtxt=fopen("output.txt","a");
   freopen("output.txt","a",outtxt);
@@ -518,7 +517,7 @@ AliMUONCheck::CheckKine()
   printf("***                       Leaving MuonKine()                 *** \n");
   printf("**************************************************************** \n");
   
-  gSystem->cd(foutDir);
+  gSystem->cd(fkOutDir);
   FILE *outtxt=fopen("output.txt","a");
   freopen("output.txt","a",outtxt);
   fprintf(outtxt,"                                                   \n");
@@ -663,7 +662,7 @@ AliMUONCheck::CheckTrackRef()
     
   }//evt loop
   
-  gSystem->cd(foutDir);
+  gSystem->cd(fkOutDir);
   TCanvas *c6 = new TCanvas("c6","TOF",400,10,600,700);
   c6->Divide(1,2);
   c6->cd(1);
@@ -760,7 +759,7 @@ AliMUONCheck::CheckOccupancy(Bool_t perDetEle) const
         ndigits = digitStore->GetSize(detele,1-cathode);
         
              dEchannelsNonBending[ichamber][idetele] = nchannels;
-        dEoccupancyBending[ichamber][idetele] = ndigits;
+        dEoccupancyNonBending[ichamber][idetele] = ndigits;
              cHchannelsNonBending[ichamber] += nchannels;
              cHoccupancyNonBending[ichamber] += ndigits;
              totalchannelsNonBending += nchannels;