cleanup

diff --git a/PWGGA/EMCALTasks/AliEsdSkimTask.cxx b/PWGGA/EMCALTasks/AliEsdSkimTask.cxx
index e4690319a43560b1a811e55e32f2b3c942621253..c9f97a9512798125606b500d65c20e33d62b701d 100644 (file)
--- a/PWGGA/EMCALTasks/AliEsdSkimTask.cxx
+++ b/PWGGA/EMCALTasks/AliEsdSkimTask.cxx
@@ -165,28 +165,11 @@ void AliEsdSkimTask::UserExec(Option_t */*opt*/)
     am->LoadBranch("PrimaryVertex.");
     *priv = *esdin->GetPrimaryVertexTracks();
   }
-#if 1
   AliESDCaloCells *ecells = dynamic_cast<AliESDCaloCells*>(objsout->FindObject("EMCALCells"));
   if (ecells) {
     am->LoadBranch("EMCALCells.");
     *ecells = *esdin->GetEMCALCells();
   }
-#else
-  TClonesArray *ecells = dynamic_cast<TClonesArray*>(objsout->FindObject("EMCALCells"));
-  if (ecells) {
-    am->LoadBranch("EMCALCells.");
-    AliESDCaloCells *ein = esdin->GetEMCALCells();
-    ecells->Clear();
-    for(Int_t i=0;i<ein->GetNumberOfCells();++i) {
-      Short_t  cellNumber = 0;
-      Double_t amplitude  = 0; 
-      Double_t time       = 0;
-      ein->GetCell(i, cellNumber, amplitude, time);
-      new ((*ecells)[i]) AliCaloCell(cellNumber, amplitude, time);
-    }
-  }
-#endif
-
   AliESDCaloCells *pcells = dynamic_cast<AliESDCaloCells*>(objsout->FindObject("PHOSCells"));
   if (pcells) {
     am->LoadBranch("PHOSCells.");
@@ -394,9 +377,6 @@ void AliEsdSkimTask::UserCreateOutputObjects()
   }
   if (fDoEmCs) {
     fEvent->AddObject(new AliESDCaloCells("EMCALCells","EMCALCells"));
-    //TClonesArray *arr = new TClonesArray("AliCaloCell",0);
-    //arr->SetName("EMCALCells");
-    //fEvent->AddObject(arr);
   }
   if (fDoPCs) {
     fEvent->AddObject(new AliESDCaloCells("PHOSCells","PHOSCells"));

diff --git a/PWGGA/EMCALTasks/AliEsdSkimTask.h b/PWGGA/EMCALTasks/AliEsdSkimTask.h
index 69f1658d15e20fb3eb8fd78e1759a8aa17081136..f2714a3c3a60d772b7b73e16b81280384c8eecf7 100644 (file)
--- a/PWGGA/EMCALTasks/AliEsdSkimTask.h
+++ b/PWGGA/EMCALTasks/AliEsdSkimTask.h
@@ -10,24 +10,6 @@ class TTree;
 class AliESDEvent;
 class AliESDtrackCuts;
 
-class AliCaloCell : public TObject
-{
- public:
-  AliCaloCell(Short_t num=0, Double_t amp=0., Double_t time=0) :
-    TObject(), fNum(num), fAmp(amp), fTime(time*1e9), fMcFr(0) {;}
-
-  Bool_t     IsSortable()                const { return kTRUE; }
-    //Int_t      Compare(const TObject* obj) const;
-
- public:
-  Short_t    fNum;     //         cell number/id
-  Double32_t fAmp;     //[0,0,16] cell amplitude
-  Double32_t fTime;    //[0,0,16] cell time
-  Double32_t fMcFr;    //[0,1,10] fraction of MC energy (fMcAmp=fMcFr*fAmp)
-
-  ClassDef(AliCaloCell,1) // Calo cell class
-};
-
 class AliEsdSkimTask : public AliAnalysisTaskSE {
  public:
   AliEsdSkimTask(const char *opt=0);