Changes for report #69974: Virtual class for calorimeter analysis objects

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisTaskESDfilter.cxx

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index 290eace9d9e062693003706bb9067cc283b1e46c..ba72ab02f6d84f3cca41530bf1231386238cbb67 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -1145,50 +1145,39 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
 \r
       AliESDCaloCluster * cluster = esd->GetCaloCluster(iClust);\r
 \r
-      Int_t id        = cluster->GetID();\r
-      Int_t nLabel    = cluster->GetNLabels();\r
-      TArrayI* labels = cluster->GetLabels();\r
-      Int_t *label = 0;\r
-      if (labels){\r
-       label = (cluster->GetLabels())->GetArray();\r
-       for(int i = 0;i < labels->GetSize();++i){\r
-         if(mcH)mcH->SelectParticle(label[i]);\r
-       }\r
-      }     \r
+      Int_t  id        = cluster->GetID();\r
+      Int_t  nLabel    = cluster->GetNLabels();\r
+      Int_t *labels    = cluster->GetLabels();\r
+      if(labels){ \r
+                 for(int i = 0;i < nLabel;++i){\r
+                         if(mcH)mcH->SelectParticle(labels[i]);\r
+                 }\r
+         }             \r
 \r
       Float_t energy = cluster->E();\r
       cluster->GetPosition(posF);\r
-      Char_t ttype = AliAODCluster::kUndef; \r
 \r
-      if (cluster->GetClusterType() == AliESDCaloCluster::kPHOSCluster) {\r
-       ttype=AliAODCluster::kPHOSNeutral;\r
-      } \r
-      else if (cluster->GetClusterType() == AliESDCaloCluster::kEMCALClusterv1) {\r
-       ttype = AliAODCluster::kEMCALClusterv1;\r
-      }\r
-\r
-      \r
       AliAODCaloCluster *caloCluster = new(caloClusters[jClusters++]) AliAODCaloCluster(id,\r
                                                                                        nLabel,\r
-                                                                                       label,\r
+                                                                                       labels,\r
                                                                                        energy,\r
                                                                                        posF,\r
                                                                                        NULL,\r
-                                                                                       ttype);\r
+                                                                                       cluster->GetType(),0);\r
       \r
       caloCluster->SetCaloCluster(cluster->GetDistanceToBadChannel(),\r
-                                 cluster->GetClusterDisp(),\r
+                                 cluster->GetDispersion(),\r
                                  cluster->GetM20(), cluster->GetM02(),\r
                                  cluster->GetEmcCpvDistance(),  \r
                                  cluster->GetNExMax(),cluster->GetTOF()) ;\r
 \r
-      caloCluster->SetPIDFromESD(cluster->GetPid());\r
+      caloCluster->SetPIDFromESD(cluster->GetPID());\r
       caloCluster->SetNCells(cluster->GetNCells());\r
       caloCluster->SetCellsAbsId(cluster->GetCellsAbsId());\r
       caloCluster->SetCellsAmplitudeFraction(cluster->GetCellsAmplitudeFraction());\r
 \r
       TArrayI* matchedT =      cluster->GetTracksMatched();\r
-      if (nTracks>0 && matchedT && cluster->GetTrackMatched() >= 0) {  \r
+      if (nTracks>0 && matchedT && cluster->GetTrackMatchedIndex() >= 0) {     \r
        for (Int_t im = 0; im < matchedT->GetSize(); im++) {\r
            Int_t iESDtrack = matchedT->At(im);;\r
            if (aodTrackRefs->At(iESDtrack) != 0) {\r
@@ -1208,7 +1197,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
       \r
       AliAODCaloCells &aodEMcells = *(AODEvent()->GetEMCALCells());\r
       aodEMcells.CreateContainer(nEMcell);\r
-      aodEMcells.SetType(AliAODCaloCells::kEMCAL);\r
+      aodEMcells.SetType(AliAODCaloCells::kEMCALCell);\r
       for (Int_t iCell = 0; iCell < nEMcell; iCell++) {      \r
        aodEMcells.SetCell(iCell,esdEMcells.GetCellNumber(iCell),esdEMcells.GetAmplitude(iCell));\r
       }\r
@@ -1222,7 +1211,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
       \r
       AliAODCaloCells &aodPHcells = *(AODEvent()->GetPHOSCells());\r
       aodPHcells.CreateContainer(nPHcell);\r
-      aodPHcells.SetType(AliAODCaloCells::kPHOS);\r
+      aodPHcells.SetType(AliAODCaloCells::kPHOSCell);\r
       for (Int_t iCell = 0; iCell < nPHcell; iCell++) {      \r
        aodPHcells.SetCell(iCell,esdPHcells.GetCellNumber(iCell),esdPHcells.GetAmplitude(iCell));\r
       }\r