]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/CreateAODfromESD.C
Make full use of newly introduced functionality:
[u/mrichter/AliRoot.git] / STEER / CreateAODfromESD.C
index ad1130dad9fe344718650a34be9b8f38bf12e481..ff99430fc7b4e02f9926f25f1724505dcd032d29 100644 (file)
@@ -4,12 +4,15 @@
 #include <TFile.h>
 #include <TTree.h>
 #include <TMath.h>
+#include <TArrayS.h>
+#include <TArrayD.h>
 
 #include "AliAODEvent.h"
 #include "AliAODHeader.h"
 #include "AliAODVertex.h"
 #include "AliAODTrack.h"
-#include "AliAODCluster.h"
+#include "AliAODCaloCluster.h"
+#include "AliAODPmdCluster.h"
 #include "AliAODTracklets.h"
 
 #include "AliESDEvent.h"
 #include "AliESDMuonTrack.h"
 #include "AliESDVertex.h"
 #include "AliESDv0.h"
+#include "AliESDkink.h"
 #include "AliESDcascade.h"
 #include "AliESDCaloCluster.h"
+#include "AliESDPmdTrack.h"
+#include "AliMultiplicity.h"
 
 #endif
 
 void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                      const char *outFileName = "AliAOD.root") {
 
+  // open input file
+  TFile *inFile = TFile::Open(inFileName, "READ");
+
   // create an AliAOD object 
   AliAODEvent *aod = new AliAODEvent();
   aod->CreateStdContent();
 
-  // open the file
+  // open output file
   TFile *outFile = TFile::Open(outFileName, "RECREATE");
+  outFile->cd();
 
   // 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");
   AliESDEvent *esd = new AliESDEvent();
   esd->ReadFromTree(t);
@@ -48,50 +57,56 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
   Float_t posF[3];
   Double_t pos[3];
   Double_t p[3];
+  Double_t p_pos[3];
+  Double_t p_neg[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) {
+    //cout << "event: " << iEvent << endl;
     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++;
-    
-    // Access to the header
+      if (esd->GetTrack(iTrack)->Charge()> 0) nPosTracks++;
+
+    // Access 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());
-  
+    header->SetRunNumber       (esd->GetRunNumber()       );
+    header->SetBunchCrossNumber(esd->GetBunchCrossNumber());
+    header->SetOrbitNumber     (esd->GetOrbitNumber()     );
+    header->SetPeriodNumber    (esd->GetPeriodNumber()    );
+    header->SetTriggerMask     (esd->GetTriggerMask()     ); 
+    header->SetTriggerCluster  (esd->GetTriggerCluster()  );
+    header->SetEventType       (esd->GetEventType()       );
+    header->SetMagneticField   (esd->GetMagneticField()   );
+    header->SetZDCN1Energy     (esd->GetZDCN1Energy()     );
+    header->SetZDCP1Energy     (esd->GetZDCP1Energy()     );
+    header->SetZDCN2Energy     (esd->GetZDCN2Energy()     );
+    header->SetZDCP2Energy     (esd->GetZDCP2Energy()     );
+    header->SetZDCEMEnergy     (esd->GetZDCEMEnergy()     );
+    header->SetRefMultiplicity   (nTracks);
+    header->SetRefMultiplicityPos(nPosTracks);
+    header->SetRefMultiplicityNeg(nTracks - nPosTracks);
+    header->SetMuonMagFieldScale(-999.); // FIXME
+    header->SetCentrality(-999.);        // FIXME
+
     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;
+    Int_t nVertices = nV0s + nCascades + nKinks + 1 /* = prim. vtx*/;
+    Int_t nJets     = 0;
+    Int_t nCaloClus = esd->GetNumberOfCaloClusters();
+    Int_t nFmdClus  = 0;
+    Int_t nPmdClus  = esd->GetNumberOfPmdTracks();
+   
+    aod->ResetStd(nTracks, nVertices, nV0s+nCascades, nJets, nCaloClus, nFmdClus, nPmdClus);
     
     // Array to take into account the tracks already added to the AOD
     Bool_t * usedTrack = NULL;
@@ -111,7 +126,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       usedKink = new Bool_t[nKinks];
       for (Int_t iKink=0; iKink<nKinks; ++iKink) usedKink[iKink]=kFALSE;
     }
-
+    
     // Access to the AOD container of vertices
     TClonesArray &vertices = *(aod->GetVertices());
     Int_t jVertices=0;
@@ -119,7 +134,11 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     // Access to the AOD container of tracks
     TClonesArray &tracks = *(aod->GetTracks());
     Int_t jTracks=0; 
-  
+   
+    // Access to the AOD container of V0s
+    TClonesArray &V0s = *(aod->GetV0s());
+    Int_t jV0s=0;
+    
     // Add primary vertex. The primary tracks will be defined
     // after the loops on the composite objects (V0, cascades, kinks)
     const AliESDVertex *vtx = esd->GetPrimaryVertex();
@@ -128,10 +147,13 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     vtx->GetCovMatrix(covVtx); //covariance matrix
 
     AliAODVertex * primary = new(vertices[jVertices++])
-      AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, AliAODVertex::kPrimary);
+      AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, -1, AliAODVertex::kPrimary);
          
+
+    AliAODTrack *aodTrack = 0x0;
+    
     // Create vertices starting from the most complex objects
-      
+
     // Cascades
     for (Int_t nCascade = 0; nCascade < nCascades; ++nCascade) {
       AliESDcascade *cascade = esd->GetCascade(nCascade);
@@ -144,12 +166,13 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                                                        covVtx,
                                                                        cascade->GetChi2Xi(), // = chi2/NDF since NDF = 2*2-3
                                                                        primary,
+                                                                       nCascade,
                                                                        AliAODVertex::kCascade);
 
-      primary->AddDaughter(vcascade);
+      primary->AddDaughter(vcascade); // the cascade 'particle' (represented by a vertex) is added as a daughter to the primary vertex
 
       // Add the V0 from the cascade. The ESD class have to be optimized...
-      // Now we have to search for the corresponding Vo in the list of V0s
+      // Now we have to search for the corresponding V0 in the list of V0s
       // using the indeces of the positive and negative tracks
 
       Int_t posFromV0 = cascade->GetPindex();
@@ -173,7 +196,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
       AliAODVertex * vV0FromCascade = 0x0;
 
-      if (indV0>-1 && !usedV0[indV0] ) {
+      if (indV0>-1 && !usedV0[indV0]) {
        
        // the V0 exists in the array of V0s and is not used
 
@@ -186,6 +209,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                                                 covVtx,
                                                                 v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
                                                                 vcascade,
+                                                                indV0,
                                                                 AliAODVertex::kV0);
       } else {
 
@@ -201,8 +225,10 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                                                 covVtx,
                                                                 v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
                                                                 vcascade,
+                                                                indV0,
                                                                 AliAODVertex::kV0);
        vcascade->AddDaughter(vV0FromCascade);
+
       }
 
       // Add the positive tracks from the V0
@@ -212,7 +238,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[posFromV0] = kTRUE;
 
        AliESDtrack *esdTrack = esd->GetTrack(posFromV0);
-       esdTrack->GetPxPyPz(p);
+       esdTrack->GetPxPyPz(p_pos);
        esdTrack->GetXYZ(pos);
        esdTrack->GetCovarianceXYZPxPyPz(covTr);
        esdTrack->GetESDpid(pid);
@@ -220,12 +246,12 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        vV0FromCascade->AddDaughter(aodTrack =
                                    new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(), 
-                                          p, 
+                                          p_pos
                                           kTRUE,
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           vV0FromCascade,
@@ -247,7 +273,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[negFromV0] = kTRUE;
        
        AliESDtrack *esdTrack = esd->GetTrack(negFromV0);
-       esdTrack->GetPxPyPz(p);
+       esdTrack->GetPxPyPz(p_neg);
        esdTrack->GetXYZ(pos);
        esdTrack->GetCovarianceXYZPxPyPz(covTr);
        esdTrack->GetESDpid(pid);
@@ -255,12 +281,12 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        vV0FromCascade->AddDaughter(aodTrack =
                 new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p,
+                                          p_neg,
                                           kTRUE,
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           vV0FromCascade,
@@ -275,6 +301,11 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
             << " track " << negFromV0 << " has already been used!" << endl;
       }
 
+      // add it to the V0 array as well
+      Double_t d0[2] = { -999., -99.};
+      // counting is probably wrong
+      new(V0s[jV0s++]) AliAODv0(vV0FromCascade, -999., -99., p_pos, p_neg, d0); // to be refined
+
       // Add the bachelor track from the cascade
 
       Int_t bachelor = cascade->GetBindex();
@@ -297,7 +328,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           vcascade,
@@ -311,19 +342,19 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        cerr << "Error: event " << iEvent << " cascade " << nCascade
             << " track " << bachelor << " has already been used!" << endl;
       }
-
+      
       // Add the primary track of the cascade (if any)
-
+      
     } // end of the loop on cascades
-    
     // V0s
         
     for (Int_t nV0 = 0; nV0 < nV0s; ++nV0) {
 
       if (usedV0[nV0]) continue; // skip if aready added to the AOD
 
-      AliESDv0 *v0 = esd->GetV0(nV0);
-      
+      AliESDv0 *v0 = esd->GetV0(nV0); 
+     
       v0->GetXYZ(pos[0], pos[1], pos[2]);
       v0->GetPosCov(covVtx);
 
@@ -332,6 +363,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                                covVtx,
                                                v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
                                                primary,
+                                               nV0,
                                                AliAODVertex::kV0);
       primary->AddDaughter(vV0);
 
@@ -345,7 +377,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[posFromV0] = kTRUE;
 
        AliESDtrack *esdTrack = esd->GetTrack(posFromV0);
-       esdTrack->GetPxPyPz(p);
+       esdTrack->GetPxPyPz(p_pos);
        esdTrack->GetXYZ(pos);
        esdTrack->GetCovarianceXYZPxPyPz(covTr);
        esdTrack->GetESDpid(pid);
@@ -353,12 +385,12 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        vV0->AddDaughter(aodTrack =
                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(), 
-                                          p, 
+                                          p_pos
                                           kTRUE,
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           vV0,
@@ -380,7 +412,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        usedTrack[negFromV0] = kTRUE;
 
        AliESDtrack *esdTrack = esd->GetTrack(negFromV0);
-       esdTrack->GetPxPyPz(p);
+       esdTrack->GetPxPyPz(p_neg);
        esdTrack->GetXYZ(pos);
        esdTrack->GetCovarianceXYZPxPyPz(covTr);
        esdTrack->GetESDpid(pid);
@@ -388,12 +420,12 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
        vV0->AddDaughter(aodTrack =
                 new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
                                           esdTrack->GetLabel(),
-                                          p,
+                                          p_neg,
                                           kTRUE,
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           vV0,
@@ -408,6 +440,9 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
             << " track " << negFromV0 << " has already been used!" << endl;
       }
 
+      // add it to the V0 array as well
+      Double_t d0[2] = { 999., 99.};
+      new(V0s[jV0s++]) AliAODv0(vV0, 999., 99., p_pos, p_neg, d0); // to be refined
     } // end of the loop on V0s
     
     // Kinks: it is a big mess the access to the information in the kinks
@@ -479,7 +514,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           primary,
@@ -502,6 +537,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                                    NULL,
                                                    0.,
                                                    mother,
+                                                   esdTrack->GetID(), // This is the track ID of the mother's track!
                                                    AliAODVertex::kKink);
            // Add the daughter track
 
@@ -525,7 +561,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                           pos,
                                           kFALSE,
                                           covTr, 
-                                          (Short_t)esdTrack->GetSign(),
+                                          (Short_t)esdTrack->Charge(),
                                           esdTrack->GetITSClusterMap(), 
                                           pid,
                                           vkink,
@@ -539,20 +575,13 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
              cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1
              << " track " << idaughter << " has already been used!" << endl;
            }
-
-
          }
        }
-
-      }      
-
+      }
     }
 
-    
     // Tracks (primary and orphan)
-      
-    for (Int_t nTrack = 0; nTrack < nTracks; ++nTrack) {
-       
+    for (Int_t nTrack = 0; nTrack < nTracks; ++nTrack) {       
 
       if (usedTrack[nTrack]) continue;
 
@@ -566,7 +595,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
 
       esdTrack->GetImpactParameters(impactXY,impactZ);
 
-      if (impactXY<3) {
+      if (impactXY<3.) {
        // track inside the beam pipe
       
        primary->AddDaughter(aodTrack =
@@ -577,7 +606,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                         pos,
                                         kFALSE,
                                         covTr, 
-                                        (Short_t)esdTrack->GetSign(),
+                                        (Short_t)esdTrack->Charge(),
                                         esdTrack->GetITSClusterMap(), 
                                         pid,
                                         primary,
@@ -589,25 +618,11 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       }
       else {
        // outside the beam pipe: orphan track
-           aodTrack =
-           new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
-                                        esdTrack->GetLabel(),
-                                        p,
-                                        kTRUE,
-                                        pos,
-                                        kFALSE,
-                                        covTr, 
-                                        (Short_t)esdTrack->GetSign(),
-                                        esdTrack->GetITSClusterMap(), 
-                                        pid,
-                                        NULL,
-                                        kFALSE, // check if this is right
-                                        kFALSE, // check if this is right
-                                        AliAODTrack::kOrphan);
-           aodTrack->ConvertAliPIDtoAODPID();
+       // Don't write them anymore!
+       continue;
       }        
     } // end of loop on tracks
-
+    
     // muon tracks
     Int_t nMuTracks = esd->GetNumberOfMuonTracks();
     for (Int_t nMuTrack = 0; nMuTrack < nMuTracks; ++nMuTrack) {
@@ -623,7 +638,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
       // 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 =
+      primary->AddDaughter(aodTrack =
          new(tracks[jTracks++]) AliAODTrack(0, // no ID provided
                                             0, // no label provided
                                             p,
@@ -631,72 +646,108 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                                             pos,
                                             kFALSE,
                                             NULL, // no covariance matrix provided
-                                            (Short_t)-99, // no charge provided
-                                            0, // no ITSClusterMap
+                                            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.);
+
+      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 PMD clusters
+    TClonesArray &pmdClusters = *(aod->GetPmdClusters());
+    Int_t jPmdClusters=0;
+  
+    for (Int_t iPmd = 0; iPmd < nPmdClus; ++iPmd) {
+      // file pmd clusters, to be revised!
+      AliESDPmdTrack *pmdTrack = esd->GetPmdTrack(iPmd);
+      Int_t nLabel = 0;
+      Int_t *label = 0x0;
+      Double_t pos[3] = { pmdTrack->GetClusterX(), pmdTrack->GetClusterY(), pmdTrack->GetClusterZ() };
+      Double_t pid[9] = { 0., 0., 0., 0., 0., 0., 0., 0., 0. }; // to be revised!
+      // type not set!
+      // assoc cluster not set
+      new(pmdClusters[jPmdClusters++]) AliAODPmdCluster(iPmd, nLabel, label, pmdTrack->GetClusterADC(), pos, pid);
+    }
+
     // Access to the AOD container of clusters
-    TClonesArray &clusters = *(aod->GetClusters());
+    TClonesArray &caloClusters = *(aod->GetCaloClusters());
     Int_t jClusters=0;
 
     // Calo Clusters
-    Int_t nClusters    = esd->GetNumberOfCaloClusters();
-
-    for (Int_t iClust=0; iClust<nClusters; ++iClust) {
+    TArrayS EMCCellNumber(15000);
+    TArrayD EMCCellAmplitude(15000);
+    Int_t nEMCCells = 0;
+    const Float_t fEMCAmpScale = 1./500;
+    for (Int_t iClust=0; iClust<nCaloClus; ++iClust) {
 
       AliESDCaloCluster * cluster = esd->GetCaloCluster(iClust);
 
       Int_t id = cluster->GetID();
-      Int_t label = -1;
+      Int_t nLabel = 0;
+      Int_t *label = 0x0;
       Float_t energy = cluster->E();
       cluster->GetPosition(posF);
-      AliAODVertex *prodVertex = primary;
-      AliAODTrack *primTrack = NULL;
       Char_t ttype=AliAODCluster::kUndef;
 
-      if (cluster->IsPHOS()) ttype=AliAODCluster::kPHOSNeutral;
-      else if (cluster->IsEMCAL()) {
-
-       if (cluster->GetClusterType() == AliESDCaloCluster::kPseudoCluster)
-         ttype = AliAODCluster::kEMCALPseudoCluster;
-       else
-         ttype = AliAODCluster::kEMCALClusterv1;
-
+      if (cluster->GetClusterType() == AliESDCaloCluster::kPHOSCluster) {
+       ttype=AliAODCluster::kPHOSNeutral;
+      } 
+      else if (cluster->GetClusterType() == AliESDCaloCluster::kEMCALClusterv1) {
+       ttype = AliAODCluster::kEMCALClusterv1;
+      }
+      else if (cluster->GetClusterType() == AliESDCaloCluster::kEMCALPseudoCluster) {
+       // Collect raw tower info
+       for (Int_t iDig = 0; iDig < cluster->GetNumberOfDigits(); iDig++) {
+         EMCCellNumber[nEMCCells] = cluster->GetDigitIndex()->At(iDig);
+         EMCCellAmplitude[nEMCCells] = fEMCAmpScale*cluster->GetDigitAmplitude()->At(iDig);
+         nEMCCells++;
+       }
+       // don't write cluster data (it's just a pseudo cluster, holding the tower information)
+       continue; 
       }
       
-      new(clusters[jClusters++]) AliAODCluster(id,
-                                              label,
-                                              energy,
-                                              pos,
-                                              NULL, // no covariance matrix provided
-                                              NULL, // no pid for clusters provided
-                                              prodVertex,
-                                              primTrack,
-                                              ttype);
+      AliAODCaloCluster *caloCluster = new(caloClusters[jClusters++]) AliAODCaloCluster(id,
+                                                                                       nLabel,
+                                                                                       label,
+                                                                                       energy,
+                                                                                       pos,
+                                                                                       NULL,
+                                                                                       ttype);
+      
+      caloCluster->SetCaloCluster(); // to be refined!
 
     } // end of loop on calo clusters
 
-    // tracklets
+    // fill EMC cell info
+    AliAODCaloCells &EMCCells = *(aod->GetCaloCells());
+    EMCCells.CreateContainer(nEMCCells);
+    EMCCells.SetType(AliAODCaloCells::kEMCAL);
+    for (Int_t iCell = 0; iCell < nEMCCells; iCell++) {      
+      EMCCells.SetCell(iCell,EMCCellNumber[iCell],EMCCellAmplitude[iCell]);
+    }
+    EMCCells.Sort();
+
+    // tracklets    
+    AliAODTracklets &SPDTracklets = *(aod->GetTracklets());
     const AliMultiplicity *mult = esd->GetMultiplicity();
     if (mult) {
       if (mult->GetNumberOfTracklets()>0) {
-       aod->GetTracklets()->CreateContainer(mult->GetNumberOfTracklets());
+       SPDTracklets.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));
+         SPDTracklets.SetTracklet(n, mult->GetTheta(n), mult->GetPhi(n), mult->GetDeltaPhi(n), mult->GetLabel(n));
        }
       }
     } else {
@@ -710,16 +761,15 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     // fill the tree for this event
     aodTree->Fill();
   } // end of event loop
-  
+
   aodTree->GetUserInfo()->Add(aod);
 
   // close ESD file
   inFile->Close();
-  
+
   // write the tree to the specified file
   outFile = aodTree->GetCurrentFile();
   outFile->cd();
   aodTree->Write();
   outFile->Close();
-
 }