In mapping:

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

diff --git a/MUON/MUONmassPlot_ESD.C b/MUON/MUONmassPlot_ESD.C
index c19866d80dff83a54164e98315fdb2a02e793ae5..59b3ccded0e5cb97a07ced89c61ee84a7903b283 100644 (file)
--- a/MUON/MUONmassPlot_ESD.C
+++ b/MUON/MUONmassPlot_ESD.C
@@ -24,11 +24,12 @@
 #include "AliESDEvent.h"
 #include "AliESDVertex.h"
 #include "AliTracker.h"
+#include "AliESDMuonTrack.h"
 
 // MUON includes
 #include "AliMUONTrackParam.h"
 #include "AliMUONTrackExtrap.h"
-#include "AliESDMuonTrack.h"
+#include "AliMUONESDInterface.h"
 #endif
 
 /// \ingroup macros
@@ -217,17 +218,20 @@ Bool_t MUONmassPlot(char* filename = "generated/galice.root", Int_t ExtrapToVert
     // loop over all reconstructed tracks (also first track of combination)
     for (Int_t iTrack = 0; iTrack <  nTracks;  iTrack++) {
 
+      // skip ghosts
+      if (!esd->GetMuonTrack(iTrack)->ContainTrackerData()) continue;
+      
       AliESDMuonTrack* muonTrack = new AliESDMuonTrack(*(esd->GetMuonTrack(iTrack)));
 
       // extrapolate to vertex if required and available
       if (ExtrapToVertex > 0 && Vertex->GetNContributors()) {
-        trackParam.GetParamFromUncorrected(*muonTrack);
+       AliMUONESDInterface::GetParamAtFirstCluster(*muonTrack, trackParam);
        AliMUONTrackExtrap::ExtrapToVertex(&trackParam, fXVertex, fYVertex, fZVertex, errXVtx, errYVtx);
-       trackParam.SetParamFor(*muonTrack); // put the new parameters in this copy of AliESDMuonTrack
+       AliMUONESDInterface::SetParamAtVertex(trackParam, *muonTrack); // put the new parameters in this copy of AliESDMuonTrack
       } else if ((ExtrapToVertex > 0 && !Vertex->GetNContributors()) || ExtrapToVertex == 0){
-        trackParam.GetParamFromUncorrected(*muonTrack);
+       AliMUONESDInterface::GetParamAtFirstCluster(*muonTrack, trackParam);
        AliMUONTrackExtrap::ExtrapToVertex(&trackParam, 0., 0., 0., 0., 0.);
-       trackParam.SetParamFor(*muonTrack); // put the new parameters in this copy of AliESDMuonTrack
+       AliMUONESDInterface::SetParamAtVertex(trackParam, *muonTrack); // put the new parameters in this copy of AliESDMuonTrack
       }
 
       fCharge1 = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
@@ -270,17 +274,20 @@ Bool_t MUONmassPlot(char* filename = "generated/galice.root", Int_t ExtrapToVert
        // loop over second track of combination
        for (Int_t iTrack2 = iTrack + 1; iTrack2 < nTracks; iTrack2++) {
          
+         // skip ghosts
+         if (!esd->GetMuonTrack(iTrack2)->ContainTrackerData()) continue;
+         
          AliESDMuonTrack* muonTrack2 = new AliESDMuonTrack(*(esd->GetMuonTrack(iTrack2)));
          
          // extrapolate to vertex if required and available
          if (ExtrapToVertex > 0 && Vertex->GetNContributors()) {
-           trackParam.GetParamFromUncorrected(*muonTrack2);
+           AliMUONESDInterface::GetParamAtFirstCluster(*muonTrack2, trackParam);
            AliMUONTrackExtrap::ExtrapToVertex(&trackParam, fXVertex, fYVertex, fZVertex, errXVtx, errYVtx);
-           trackParam.SetParamFor(*muonTrack2); // put the new parameters in this copy of AliESDMuonTrack
+           AliMUONESDInterface::SetParamAtVertex(trackParam, *muonTrack2); // put the new parameters in this copy of AliESDMuonTrack
          } else if ((ExtrapToVertex > 0 && !Vertex->GetNContributors()) || ExtrapToVertex == 0){
-            trackParam.GetParamFromUncorrected(*muonTrack2);
+           AliMUONESDInterface::GetParamAtFirstCluster(*muonTrack2, trackParam);
            AliMUONTrackExtrap::ExtrapToVertex(&trackParam, 0., 0., 0., 0., 0.);
-           trackParam.SetParamFor(*muonTrack2); // put the new parameters in this copy of AliESDMuonTrack
+           AliMUONESDInterface::SetParamAtVertex(trackParam, *muonTrack2); // put the new parameters in this copy of AliESDMuonTrack
          }
          
          fCharge2 = Int_t(TMath::Sign(1.,muonTrack2->GetInverseBendingMomentum()));