]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/CreateAODfromESD.C
Some more classes moved from libSTEER to libSTEERBase.
[u/mrichter/AliRoot.git] / STEER / CreateAODfromESD.C
index 0a81ba1ce3033f508a7b3616d94acc080057b0de..26c5fa933878f43a81c12cf8deffd5e00eba3ba6 100644 (file)
 #include "AliAODVertex.h"
 #include "AliAODTrack.h"
 #include "AliAODCluster.h"
+#include "AliAODTracklets.h"
 
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliESDtrack.h"
+#include "AliESDMuonTrack.h"
 #include "AliESDVertex.h"
 #include "AliESDv0.h"
 #include "AliESDcascade.h"
@@ -31,55 +33,66 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
   TFile *outFile = TFile::Open(outFileName, "RECREATE");
 
   // create the tree
-  TTree *aodTree = new TTree("AOD", "AliAOD tree");
+  TTree *aodTree = new TTree("aodTree", "AliAOD tree");
   aodTree->Branch(aod->GetList());
 
   // connect to ESD
   TFile *inFile = TFile::Open(inFileName, "READ");
   TTree *t = (TTree*) inFile->Get("esdTree");
-  TBranch *b = t->GetBranch("ESD");
-  AliESD *esd = 0;
-  b->SetAddress(&esd);
+  AliESDEvent *esd = new AliESDEvent();
+  esd->ReadFromTree(t);
 
-  Int_t nEvents = b->GetEntries();
+  Int_t nEvents = t->GetEntries();
+
+  // set arrays and pointers
+  Float_t posF[3];
+  Double_t pos[3];
+  Double_t p[3];
+  Double_t covVtx[6];
+  Double_t covTr[21];
+  Double_t pid[10];
 
   // loop over events and fill them
   for (Int_t iEvent = 0; iEvent < nEvents; ++iEvent) {
-    b->GetEntry(iEvent);
+    t->GetEntry(iEvent);
 
     // Multiplicity information needed by the header (to be revised!)
     Int_t nTracks   = esd->GetNumberOfTracks();
     Int_t nPosTracks = 0;
     for (Int_t iTrack=0; iTrack<nTracks; ++iTrack) 
-      if (esd->GetTrack(iTrack)->GetSign()> 0) nPosTracks++;
-
-    // create the header
-    aod->AddHeader(new AliAODHeader(esd->GetRunNumber(),
-                                   esd->GetBunchCrossNumber(),
-                                   esd->GetOrbitNumber(),
-                                   nTracks,
-                                   nPosTracks,
-                                   nTracks-nPosTracks,
-                                   esd->GetMagneticField(),
-                                   -999., // fill muon magnetic field
-                                   -999., // centrality; to be filled, still
-                                   esd->GetZDCN1Energy(),
-                                   esd->GetZDCP1Energy(),
-                                   esd->GetZDCN2Energy(),
-                                   esd->GetZDCP2Energy(),
-                                   esd->GetZDCEMEnergy(),
-                                   esd->GetTriggerMask(),
-                                   esd->GetTriggerCluster(),
-                                   esd->GetEventType()));
-
+      if (esd->GetTrack(iTrack)->Charge()> 0) nPosTracks++;
+    
+    // Access to the header
+    AliAODHeader *header = aod->GetHeader();
+
+    // fill the header
+    *header = AliAODHeader(esd->GetRunNumber(),
+                          esd->GetBunchCrossNumber(),
+                          esd->GetOrbitNumber(),
+                          esd->GetPeriodNumber(),
+                          nTracks,
+                          nPosTracks,
+                          nTracks-nPosTracks,
+                          esd->GetMagneticField(),
+                          -999., // fill muon magnetic field
+                          -999., // centrality; to be filled, still
+                          esd->GetZDCN1Energy(),
+                          esd->GetZDCP1Energy(),
+                          esd->GetZDCN2Energy(),
+                          esd->GetZDCP2Energy(),
+                          esd->GetZDCEMEnergy(),
+                          esd->GetTriggerMask(),
+                          esd->GetTriggerCluster(),
+                          esd->GetEventType());
+  
     Int_t nV0s      = esd->GetNumberOfV0s();
     Int_t nCascades = esd->GetNumberOfCascades();
     Int_t nKinks    = esd->GetNumberOfKinks();
     Int_t nVertices = nV0s + nCascades + nKinks;
     
     aod->ResetStd(nTracks, nVertices);
+    AliAODTrack *aodTrack;
     
-
     // Array to take into account the tracks already added to the AOD
     Bool_t * usedTrack = NULL;
     if (nTracks>0) {
@@ -111,13 +124,11 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     // after the loops on the composite objects (V0, cascades, kinks)
     const AliESDVertex *vtx = esd->GetPrimaryVertex();
       
-    Double_t pos[3];
     vtx->GetXYZ(pos); // position
-    Double_t covVtx[6]; // We have to give changing names to the variables (like cov?, x?, and p?) because CINT doesn't recognize blocks correctly.
     vtx->GetCovMatrix(covVtx); //covariance matrix
 
     AliAODVertex * primary = new(vertices[jVertices++])
-      AliAODVertex(pos, covVtx, vtx->GetChi2(), NULL, AliAODVertex::kPrimary);
+      AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, AliAODVertex::kPrimary);
          
     // Create vertices starting from the most complex objects
       
@@ -125,15 +136,13 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     for (Int_t nCascade = 0; nCascade < nCascades; ++nCascade) {
       AliESDcascade *cascade = esd->GetCascade(nCascade);
       
-      Double_t posXi[3];
-      cascade->GetXYZ(posXi[0], posXi[1], posXi[2]);
-      Double_t covXi[6];
-      cascade->GetPosCovXi(covXi);
+      cascade->GetXYZ(pos[0], pos[1], pos[2]);
+      cascade->GetPosCovXi(covVtx);
      
       // Add the cascade vertex
-      AliAODVertex * vcascade = new(vertices[jVertices++]) AliAODVertex(posXi,
-                                                                       covXi,
-                                                                       cascade->GetChi2Xi(),
+      AliAODVertex * vcascade = new(vertices[jVertices++]) AliAODVertex(pos,
+                                                                       covVtx,
+                                                                       cascade->GetChi2Xi(), // = chi2/NDF since NDF = 2*2-3
                                                                        primary,
                                                                        AliAODVertex::kCascade);
 
@@ -170,14 +179,12 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
        usedV0[indV0] = kTRUE;
        
-       Double_t posV0[3];
-       v0->GetXYZ(posV0[0], posV0[1], posV0[2]);
-       Double_t covV0_1[6];
-       v0->GetPosCov(covV0_1);
+       v0->GetXYZ(pos[0], pos[1], pos[2]);
+       v0->GetPosCov(covVtx);
        
-       vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(posV0,
-                                                                covV0_1,
-                                                                v0->GetChi2V0(),
+       vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos,
+                                                                covVtx,
+                                                                v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
                                                                 vcascade,
                                                                 AliAODVertex::kV0);
       } else {
@@ -187,14 +194,12 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
             << " The V0 " << indV0 
             << " doesn't exist in the array of V0s or was used!" << endl;
 
-       Double_t posV0_2[3];
-       cascade->GetXYZ(posV0_2[0], posV0_2[1], posV0_2[2]);
-       Double_t covV0_2[6];
-       cascade->GetPosCov(covV0_2);
+       cascade->GetXYZ(pos[0], pos[1], pos[2]);
+       cascade->GetPosCov(covVtx);
       
-       vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(posV0_2,
-                                                                covV0_2,
-                                                                v0->GetChi2V0(),
+       vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos,
+                                                                covVtx,
+                                                                v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
                                                                 vcascade,
                                                                 AliAODVertex::kV0);
        vcascade->AddDaughter(vV0FromCascade);
@@ -207,34 +212,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[posFromV0] = kTRUE;
 
        AliESDtrack *esdTrack = esd->GetTrack(posFromV0);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
        
-       Double_t p1[3];
-       esdTrack->GetPxPyPz(p1);
-       
-       Double_t x1[3];
-       esdTrack->GetXYZ(x1);
-       
-       Double_t covV0PosTr[21];
-       esdTrack->GetCovarianceXYZPxPyPz(covV0PosTr);
-       
-       Double_t pid1[10];
-       esdTrack->GetESDpid(pid1);
-       
-       vV0FromCascade->AddDaughter(
+       vV0FromCascade->AddDaughter(aodTrack =
                                    new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(), 
-                                          p1
+                                          p, 
                                           kTRUE,
-                                          x1,
+                                          pos,
                                           kFALSE,
-                                          covV0PosTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr, 
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid1,
+                                          pid,
                                           vV0FromCascade,
+                                          kTRUE,  // check if this is right
                                           kFALSE, // check if this is right
                                           AliAODTrack::kSecondary)
                );
+       aodTrack->ConvertAliPIDtoAODPID();
       }
       else {
        cerr << "Error: event " << iEvent << " cascade " << nCascade
@@ -248,34 +247,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[negFromV0] = kTRUE;
        
        AliESDtrack *esdTrack = esd->GetTrack(negFromV0);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
        
-       Double_t p2[3];
-       esdTrack->GetPxPyPz(p2);
-       
-       Double_t x2[3];
-       esdTrack->GetXYZ(x2);
-       
-       Double_t covV0NegTr[21];
-       esdTrack->GetCovarianceXYZPxPyPz(covV0NegTr);
-       
-       Double_t pid2[10];
-       esdTrack->GetESDpid(pid2);
-       
-       vV0FromCascade->AddDaughter(
+       vV0FromCascade->AddDaughter(aodTrack =
                 new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p2,
+                                          p,
                                           kTRUE,
-                                          x2,
+                                          pos,
                                           kFALSE,
-                                          covV0NegTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr, 
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid2,
+                                          pid,
                                           vV0FromCascade,
+                                          kTRUE,  // check if this is right
                                           kFALSE, // check if this is right
                                           AliAODTrack::kSecondary)
                );
+       aodTrack->ConvertAliPIDtoAODPID();
       }
       else {
        cerr << "Error: event " << iEvent << " cascade " << nCascade
@@ -291,35 +284,29 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[bachelor] = kTRUE;
        
        AliESDtrack *esdTrack = esd->GetTrack(bachelor);
-       
-       Double_t p3[3];
-       esdTrack->GetPxPyPz(p3);
-       
-       Double_t x3[3];
-       esdTrack->GetXYZ(x3);
-       
-       Double_t covXiTr[21];
-       esdTrack->GetCovarianceXYZPxPyPz(covXiTr);
-       
-       Double_t pid3[10];
-       esdTrack->GetESDpid(pid3);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
 
-       vcascade->AddDaughter(
+       vcascade->AddDaughter(aodTrack =
                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p3,
+                                          p,
                                           kTRUE,
-                                          x3,
+                                          pos,
                                           kFALSE,
-                                          covXiTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr, 
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid3,
+                                          pid,
                                           vcascade,
+                                          kTRUE,  // check if this is right
                                           kFALSE, // check if this is right
                                           AliAODTrack::kSecondary)
                );
-      }
+       aodTrack->ConvertAliPIDtoAODPID();
+     }
       else {
        cerr << "Error: event " << iEvent << " cascade " << nCascade
             << " track " << bachelor << " has already been used!" << endl;
@@ -337,15 +324,13 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
       AliESDv0 *v0 = esd->GetV0(nV0);
       
-      Double_t posV0_3[3];
-      v0->GetXYZ(posV0_3[0], posV0_3[1], posV0_3[2]);
-      Double_t covV0_3[6];
-      v0->GetPosCov(covV0_3);
+      v0->GetXYZ(pos[0], pos[1], pos[2]);
+      v0->GetPosCov(covVtx);
 
       AliAODVertex * vV0 = 
-       new(vertices[jVertices++]) AliAODVertex(posV0_3,
-                                               covV0_3,
-                                               v0->GetChi2V0(),
+       new(vertices[jVertices++]) AliAODVertex(pos,
+                                               covVtx,
+                                               v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
                                                primary,
                                                AliAODVertex::kV0);
       primary->AddDaughter(vV0);
@@ -360,34 +345,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[posFromV0] = kTRUE;
 
        AliESDtrack *esdTrack = esd->GetTrack(posFromV0);
-      
-       Double_t p4[3];
-       esdTrack->GetPxPyPz(p4);
-       
-       Double_t x4[3];
-       esdTrack->GetXYZ(x4);
-       
-       Double_t covV0PosTr_2[21];
-       esdTrack->GetCovarianceXYZPxPyPz(covV0PosTr_2);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
        
-       Double_t pid4[10];
-       esdTrack->GetESDpid(pid4);
-       
-       vV0->AddDaughter(
+       vV0->AddDaughter(aodTrack =
                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(), 
-                                          p4
+                                          p, 
                                           kTRUE,
-                                          x4,
+                                          pos,
                                           kFALSE,
-                                          covV0PosTr_2
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid4,
+                                          pid,
                                           vV0,
+                                          kTRUE,  // check if this is right
                                           kFALSE, // check if this is right
                                           AliAODTrack::kSecondary)
                );
+       aodTrack->ConvertAliPIDtoAODPID();
       }
       else {
        cerr << "Error: event " << iEvent << " V0 " << nV0
@@ -401,34 +380,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[negFromV0] = kTRUE;
 
        AliESDtrack *esdTrack = esd->GetTrack(negFromV0);
-      
-       Double_t p5[3];
-       esdTrack->GetPxPyPz(p5);
-       
-       Double_t x5[3];
-       esdTrack->GetXYZ(x5);
-       
-       Double_t covV0NegTr_2[21];
-       esdTrack->GetCovarianceXYZPxPyPz(covV0NegTr_2);
-       
-       Double_t pid5[10];
-       esdTrack->GetESDpid(pid5);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
 
-       vV0->AddDaughter(
+       vV0->AddDaughter(aodTrack =
                 new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p5,
+                                          p,
                                           kTRUE,
-                                          x5,
+                                          pos,
                                           kFALSE,
-                                          covV0NegTr_2
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid5,
+                                          pid,
                                           vV0,
+                                          kTRUE,  // check if this is right
                                           kFALSE, // check if this is right
                                           AliAODTrack::kSecondary)
                );
+       aodTrack->ConvertAliPIDtoAODPID();
       }
       else {
        cerr << "Error: event " << iEvent << " V0 " << nV0
@@ -444,10 +417,9 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     for (Int_t iTrack=0; iTrack<nTracks; ++iTrack) {
 
 
-      AliESDtrack * track = esd->GetTrack(iTrack);
+      AliESDtrack * esdTrack = esd->GetTrack(iTrack);
 
-
-      Int_t ikink = track->GetKinkIndex(0);
+      Int_t ikink = esdTrack->GetKinkIndex(0);
 
       if (ikink) {
        // Negative kink index: mother, positive: daughter
@@ -456,9 +428,9 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
        for (Int_t jTrack = iTrack+1; jTrack<nTracks; ++jTrack) {
 
-         AliESDtrack * track1 = esd->GetTrack(jTrack);
+         AliESDtrack * esdTrack1 = esd->GetTrack(jTrack);
 
-         Int_t jkink = track1->GetKinkIndex(0);
+         Int_t jkink = esdTrack1->GetKinkIndex(0);
 
          if ( TMath::Abs(ikink)==TMath::Abs(jkink) ) {
 
@@ -494,34 +466,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
              usedTrack[imother] = kTRUE;
        
              AliESDtrack *esdTrack = esd->GetTrack(imother);
-       
-             Double_t p6[3];
-             esdTrack->GetPxPyPz(p6);
-             
-             Double_t x6[3];
-             esdTrack->GetXYZ(x6);
-             
-             Double_t covKinkMother[21];
-             esdTrack->GetCovarianceXYZPxPyPz(covKinkMother);
-             
-             Double_t pid6[10];
-             esdTrack->GetESDpid(pid6);
+             esdTrack->GetPxPyPz(p);
+             esdTrack->GetXYZ(pos);
+             esdTrack->GetCovarianceXYZPxPyPz(covTr);
+             esdTrack->GetESDpid(pid);
 
              mother = 
                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p6,
+                                          p,
                                           kTRUE,
-                                          x6,
+                                          pos,
                                           kFALSE,
-                                          covKinkMother, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr, 
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid6,
+                                          pid,
                                           primary,
                                           kTRUE, // check if this is right
+                                          kTRUE, // check if this is right
                                           AliAODTrack::kPrimary);
              primary->AddDaughter(mother);
+             mother->ConvertAliPIDtoAODPID();
            }
            else {
              cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1
@@ -546,34 +512,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
              usedTrack[idaughter] = kTRUE;
        
              AliESDtrack *esdTrack = esd->GetTrack(idaughter);
-       
-             Double_t p7[3];
-             esdTrack->GetPxPyPz(p7);
-             
-             Double_t x7[3];
-             esdTrack->GetXYZ(x7);
-             
-             Double_t covKinkDaughter[21];
-             esdTrack->GetCovarianceXYZPxPyPz(covKinkDaughter);
-             
-             Double_t pid7[10];
-             esdTrack->GetESDpid(pid7);
+             esdTrack->GetPxPyPz(p);
+             esdTrack->GetXYZ(pos);
+             esdTrack->GetCovarianceXYZPxPyPz(covTr);
+             esdTrack->GetESDpid(pid);
 
              daughter = 
                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p7,
+                                          p,
                                           kTRUE,
-                                          x7,
+                                          pos,
                                           kFALSE,
-                                          covKinkDaughter, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          covTr, 
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
-                                          pid7,
+                                          pid,
                                           vkink,
                                           kTRUE, // check if this is right
+                                          kTRUE, // check if this is right
                                           AliAODTrack::kPrimary);
              vkink->AddDaughter(daughter);
+             daughter->ConvertAliPIDtoAODPID();
            }
            else {
              cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1
@@ -597,18 +557,10 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       if (usedTrack[nTrack]) continue;
 
       AliESDtrack *esdTrack = esd->GetTrack(nTrack);
-      
-      Double_t p8[3];
-      esdTrack->GetPxPyPz(p8);
-      
-      Double_t x8[3];
-      esdTrack->GetXYZ(x8);
-      
-      Double_t covTr[21];
+      esdTrack->GetPxPyPz(p);
+      esdTrack->GetXYZ(pos);
       esdTrack->GetCovarianceXYZPxPyPz(covTr);
-       
-      Double_t pid8[10];
-      esdTrack->GetESDpid(pid8);
+      esdTrack->GetESDpid(pid);
 
       Float_t impactXY, impactZ;
 
@@ -617,41 +569,85 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       if (impactXY<3) {
        // track inside the beam pipe
       
-       primary->AddDaughter(
+       primary->AddDaughter(aodTrack =
            new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                         esdTrack->GetLabel(),
-                                        p8,
+                                        p,
                                         kTRUE,
-                                        x8,
+                                        pos,
                                         kFALSE,
                                         covTr, 
-                                        (Short_t)esdTrack->GetSign(),
+                                        (Short_t)esdTrack->Charge(),
                                         esdTrack->GetITSClusterMap(), 
-                                        pid8,
+                                        pid,
                                         primary,
                                         kTRUE, // check if this is right
+                                        kTRUE, // check if this is right
                                         AliAODTrack::kPrimary)
            );
+       aodTrack->ConvertAliPIDtoAODPID();
       }
       else {
        // outside the beam pipe: orphan track
+           aodTrack =
            new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                         esdTrack->GetLabel(),
-                                        p8,
+                                        p,
                                         kTRUE,
-                                        x8,
+                                        pos,
                                         kFALSE,
                                         covTr, 
-                                        (Short_t)esdTrack->GetSign(),
+                                        (Short_t)esdTrack->Charge(),
                                         esdTrack->GetITSClusterMap(), 
-                                        pid8,
+                                        pid,
                                         NULL,
                                         kFALSE, // check if this is right
+                                        kFALSE, // check if this is right
                                         AliAODTrack::kOrphan);
+           aodTrack->ConvertAliPIDtoAODPID();
       }        
     } // end of loop on tracks
 
-
+    // muon tracks
+    Int_t nMuTracks = esd->GetNumberOfMuonTracks();
+    for (Int_t nMuTrack = 0; nMuTrack < nMuTracks; ++nMuTrack) {
+      
+      AliESDMuonTrack *esdMuTrack = esd->GetMuonTrack(nMuTrack);     
+      p[0] = esdMuTrack->Px(); 
+      p[1] = esdMuTrack->Py(); 
+      p[2] = esdMuTrack->Pz();
+      pos[0] = primary->GetX(); 
+      pos[1] = primary->GetY(); 
+      pos[2] = primary->GetZ();
+      
+      // has to be changed once the muon pid is provided by the ESD
+      for (Int_t i = 0; i < 10; pid[i++] = 0.); pid[AliAODTrack::kMuon]=1.;
+      
+      primary->AddDaughter( aodTrack =
+         new(tracks[jTracks++]) AliAODTrack(0, // no ID provided
+                                            0, // no label provided
+                                            p,
+                                            kTRUE,
+                                            pos,
+                                            kFALSE,
+                                            NULL, // no covariance matrix provided
+                                            esdMuTrack->Charge(),
+                                            0, // ITSClusterMap is set below
+                                            pid,
+                                            primary,
+                                            kFALSE,  // muon tracks are not used to fit the primary vtx
+                                            kFALSE,  // not used for vertex fit
+                                            AliAODTrack::kPrimary)
+         );
+       aodTrack->SetHitsPatternInTrigCh(esdMuTrack->GetHitsPatternInTrigCh());
+       Int_t track2Trigger = esdMuTrack->GetMatchTrigger();
+       aodTrack->SetMatchTrigger(track2Trigger);
+       if (track2Trigger) 
+         aodTrack->SetChi2MatchTrigger(esdMuTrack->GetChi2MatchTrigger());
+       else 
+         aodTrack->SetChi2MatchTrigger(0.);
+    }
+    
     // Access to the AOD container of clusters
     TClonesArray &clusters = *(aod->GetClusters());
     Int_t jClusters=0;
@@ -665,11 +661,8 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
       Int_t id = cluster->GetID();
       Int_t label = -1;
-      Float_t energy = cluster->GetClusterEnergy();
-      Float_t x9[3];
-      cluster->GetGlobalPosition(x9);
-      Float_t * covMatrix = NULL;
-      Float_t * pid9 = NULL; 
+      Float_t energy = cluster->E();
+      cluster->GetPosition(posF);
       AliAODVertex *prodVertex = primary;
       AliAODTrack *primTrack = NULL;
       Char_t ttype=AliAODCluster::kUndef;
@@ -687,15 +680,28 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       new(clusters[jClusters++]) AliAODCluster(id,
                                               label,
                                               energy,
-                                              x9,
-                                              covMatrix,
-                                              pid9,
+                                              pos,
+                                              NULL, // no covariance matrix provided
+                                              NULL, // no pid for clusters provided
                                               prodVertex,
                                               primTrack,
                                               ttype);
 
     } // end of loop on calo clusters
 
+    // tracklets
+    const AliMultiplicity *mult = esd->GetMultiplicity();
+    if (mult) {
+      if (mult->GetNumberOfTracklets()>0) {
+       aod->GetTracklets()->CreateContainer(mult->GetNumberOfTracklets());
+
+       for (Int_t n=0; n<mult->GetNumberOfTracklets(); n++) {
+         aod->GetTracklets()->SetTracklet(n, mult->GetTheta(n), mult->GetPhi(n), mult->GetDeltaPhi(n), mult->GetLabel(n));
+       }
+      }
+    } else {
+      Printf("ERROR: AliMultiplicity could not be retrieved from ESD");
+    }
 
     delete [] usedTrack;
     delete [] usedV0;