Fixing a warning that was a bug

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

diff --git a/MUON/AliMUONCheck.cxx b/MUON/AliMUONCheck.cxx
index d83fbf986de552bc072c06c4e6cfa67fbc942c7c..6d985c39726e342cf15c79bd976d3846f5a260de 100644 (file)
--- a/MUON/AliMUONCheck.cxx
+++ b/MUON/AliMUONCheck.cxx
@@ -32,9 +32,6 @@
 
 #include "AliMUONCheck.h"
 #include "AliMUONConstants.h"
-#include "AliMUONTrack.h"
-#include "AliMUONTrackParam.h"
-#include "AliMUONTrackExtrap.h"
 #include "AliMUONMCDataInterface.h"
 #include "AliMUONDataInterface.h"
 #include "AliMpCDB.h"
@@ -52,7 +49,7 @@
 #include "AliESDEvent.h"
 #include "AliESDMuonTrack.h"
 #include "AliESDVertex.h"
-#include "AliMagFMaps.h"
+#include "AliMagF.h"
 #include "AliLog.h"
 
 #include <TSystem.h>
@@ -71,16 +68,11 @@ AliMUONCheck::AliMUONCheck(const char* galiceFile, const char* esdFile,Int_t fir
 fFileName(galiceFile),
 fFileNameSim(),
 fesdFileName(esdFile),
-foutDir(outDir),
+fkOutDir(outDir),
 fFirstEvent(firstEvent),
 fLastEvent(lastEvent)
 {
-  /// ctor
-
-  // Load mapping
-  if ( ! AliMpCDB::LoadMpSegmentation() ) {
-    AliFatal("Could not access mapping from OCDB !");
-  }
+  /// ctor  
 }
 
 //_____________________________________________________________________________
@@ -91,16 +83,11 @@ AliMUONCheck::AliMUONCheck(const char* galiceFile, const char* galiceFileSim,
 fFileName(galiceFile),
 fFileNameSim(galiceFileSim),
 fesdFileName(esdFile),
-foutDir(outDir),
+fkOutDir(outDir),
 fFirstEvent(firstEvent),
 fLastEvent(lastEvent)
 {
   /// ctor
-
-  // Load mapping
-  if ( ! AliMpCDB::LoadMpSegmentation() ) {
-    AliFatal("Could not access mapping from OCDB !");
-  }
 }
 
 //_____________________________________________________________________________
@@ -277,6 +264,10 @@ AliMUONCheck::CheckESD(Bool_t pdc06TriggerResponse)
     for ( Int_t iTrack1 = 0; iTrack1<nTracks; ++iTrack1 ) 
     { //1st loop
       AliESDMuonTrack* muonTrack = fESD->GetMuonTrack(iTrack1);
+      
+      // skip fake tracks (ghosts)
+      if (!muonTrack->ContainTrackerData()) continue;
+      
       ftracktot++;
       
       thetaX = muonTrack->GetThetaX();
@@ -344,7 +335,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);
@@ -527,7 +518,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");
@@ -672,7 +663,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);
@@ -769,7 +760,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;
@@ -826,52 +817,6 @@ AliMUONCheck::CheckOccupancy(Bool_t perDetEle) const
 
 }
 
-//_____________________________________________________________________________
-void 
-AliMUONCheck::CheckRecTracks () const
-{
-  /// Reads and dumps rec tracks objects
-  
-  AliWarning("Reimplement me ? or use AliMUONDumper simply ?");
-  
-  //  // waiting for mag field in CDB 
-  //  AliInfoStream() << "Loading field map...\n";
-  //  if (!AliTracker::GetFieldMap()) {
-  //    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k5kG);
-  //    AliTracker::SetFieldMap(field, kFALSE);
-  //  }
-  //  
-  //  // Loading data
-  //  fLoader->LoadTracks("READ");
-  //  
-  //  Int_t endOfLoop = fLastEvent+1;
-  //  if ( fLastEvent == -1 ) endOfLoop = fRunLoader->GetNumberOfEvents();
-  //
-  //  for (Int_t ievent=fFirstEvent; ievent<endOfLoop; ievent++) {
-  //    fRunLoader->GetEvent(ievent);
-  //    
-  //    fRecData->SetTreeAddress("RT");
-  //    fRecData->GetRecTracks();
-  //    TClonesArray* recTracks = fRecData->RecTracks();
-  //    
-  //    Int_t nrectracks = (Int_t) recTracks->GetEntriesFast(); //
-  //    printf(">>> Event %d, Number of Recconstructed tracks %d \n",ievent, nrectracks);
-  //
-  //    // Set the magnetic field for track extrapolations
-  //    AliMUONTrackExtrap::SetField(AliTracker::GetFieldMap());
-  //
-  //    // Loop over tracks
-  //    for (Int_t iRecTracks = 0; iRecTracks <  nrectracks;  iRecTracks++) {
-  //      AliMUONTrack* recTrack = (AliMUONTrack*) recTracks->At(iRecTracks);
-  //      AliMUONTrackParam* trackParam = (AliMUONTrackParam*) (recTrack->GetTrackParamAtHit())->First();
-  //      AliMUONTrackExtrap::ExtrapToZ(trackParam,0.);
-  //      recTrack->Print("full");
-  //    }
-  //    fRecData->ResetRecTracks();
-  //  }   
-  //  fLoader->UnloadTracks();
-}
-
 //_____________________________________________________________________________
 void AliMUONCheck::SetEventsToCheck(Int_t firstEvent, Int_t lastEvent)
 {