Coding conventions correction.

[u/mrichter/AliRoot.git] / MUON / MUONefficiency.C

diff --git a/MUON/MUONefficiency.C b/MUON/MUONefficiency.C
index a49e0acbe7302579fd4f4088cd35bb4ac1b66f27..e6adc8fcc66c4577179c34657dec623f16fd3d8e 100644 (file)
--- a/MUON/MUONefficiency.C
+++ b/MUON/MUONefficiency.C
@@ -63,6 +63,7 @@
 
 // MUON includes
 #include "AliMUONTrackParam.h"
+#include "AliMUONTrackExtrap.h"
 #include "AliESDMuonTrack.h"
 #endif
 
@@ -179,7 +180,7 @@ Bool_t MUONefficiency( Int_t ResType = 553, Int_t FirstEvent = 0, Int_t LastEven
   // set  mag field 
   // waiting for mag field in CDB 
   printf("Loading field map...\n");
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k4kG);
+  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k5kG);
   AliTracker::SetFieldMap(field, kFALSE);
 
   // open run loader and load gAlice, kinematics and header
@@ -314,6 +315,8 @@ Bool_t MUONefficiency( Int_t ResType = 553, Int_t FirstEvent = 0, Int_t LastEven
       cout << " number of tracks: " << nTracks  <<endl;
     }
 
+    // set the magnetic field for track extrapolations
+    AliMUONTrackExtrap::SetField(AliTracker::GetFieldMap());
     // loop over all reconstructed tracks (also first track of combination)
     for (Int_t iTrack = 0; iTrack <  nTracks;  iTrack++) {
 
@@ -322,7 +325,7 @@ Bool_t MUONefficiency( Int_t ResType = 553, Int_t FirstEvent = 0, Int_t LastEven
       if (!Vertex->GetNContributors()) {
        //re-extrapolate to vertex, if not kown before.
        trackParam.GetParamFrom(*muonTrack);
-       trackParam.ExtrapToVertex(fXVertex, fYVertex, fZVertex);
+       AliMUONTrackExtrap::ExtrapToVertex(&trackParam, fXVertex, fYVertex, fZVertex);
        trackParam.SetParamFor(*muonTrack);
       }
 
@@ -388,7 +391,7 @@ Bool_t MUONefficiency( Int_t ResType = 553, Int_t FirstEvent = 0, Int_t LastEven
           
          if (!Vertex->GetNContributors()) {
            trackParam.GetParamFrom(*muonTrack);
-           trackParam.ExtrapToVertex(fXVertex, fYVertex, fZVertex);
+           AliMUONTrackExtrap::ExtrapToVertex(&trackParam, fXVertex, fYVertex, fZVertex);
            trackParam.SetParamFor(*muonTrack);
          }
 
@@ -448,11 +451,9 @@ Bool_t MUONefficiency( Int_t ResType = 553, Int_t FirstEvent = 0, Int_t LastEven
              
              //trigger info 
              if (ResType == 553)
-               ptTrig = 0x400;// mask for Hpt unlike sign pair
+               ptTrig = 0x20;// mask for Hpt unlike sign pair
              else if (ResType == 443)
-               ptTrig = 0x800;// mask for Apt unlike sign pair
-             else 
-               ptTrig = 0x200;// mask for Lpt unlike sign pair
+               ptTrig = 0x10;// mask for Lpt unlike sign pair
              
              
              if (esd->GetTriggerMask() &  ptTrig) NbTrigger++;