changes in the declaration of the data members to make the analysis not crash with...

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx
index 493a1ef1f53c77143c683587d0285569c854291a..f2b10a92496f67f35d0765acdef20ac68d43403b 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.cxx
@@ -82,7 +82,7 @@ AliAnalysisTaskEMCALClusterize::AliAnalysisTaskEMCALClusterize()
   , fGeom(0), fGeomName("EMCAL_FIRSTYEARV1"),  fGeomMatrixSet(kFALSE), fLoadGeomMatrices(kFALSE)
   , fCalibData(0),       fPedestalData(0),     fOCDBpath("raw://")
   , fDigitsArr(0),       fClusterArr(0),       fCaloClusterArr(0)
-  , fRecParam(0),        fClusterizer(0),      fUnfolder(0),           fJustUnfold(kFALSE) 
+  , fRecParam(0),        fClusterizer(0),      fUnfolder(0),           fJustUnfold(kFALSE)
   , fOutputAODBranch(0), fOutputAODBranchName("newEMCALClusters"),     fFillAODFile(kFALSE)
 {
   // Constructor
@@ -100,22 +100,22 @@ AliAnalysisTaskEMCALClusterize::~AliAnalysisTaskEMCALClusterize()
   
   if (fDigitsArr){
     fDigitsArr->Clear("C");
-    delete fDigitsArr; fDigitsArr=0;
+    delete fDigitsArr; 
   }
   
   if (fClusterArr){
     fClusterArr->Delete();
-    delete fClusterArr; fClusterArr=0;
+    delete fClusterArr;
   }
   
   if (fCaloClusterArr){
     fCaloClusterArr->Delete();
-    delete fCaloClusterArr; fCaloClusterArr=0;
+    delete fCaloClusterArr; 
   }
 
-  if(fClusterizer) {delete fClusterizer; fClusterizer = 0;}
-  if(fGeom)        {delete fGeom;        fGeom        = 0;}
-  if(fUnfolder)    {delete fUnfolder;    fUnfolder    = 0;}
+  if(fClusterizer) {delete fClusterizer;}
+  if(fGeom)        {delete fGeom;       }
+  if(fUnfolder)    {delete fUnfolder;   }
 
 }
 
@@ -129,7 +129,7 @@ void AliAnalysisTaskEMCALClusterize::UserCreateOutputObjects()
   fOutputAODBranch = new TClonesArray("AliAODCaloCluster", 0);
   fOutputAODBranch->SetName(fOutputAODBranchName);
   AddAODBranch("TClonesArray", &fOutputAODBranch);
-
+  printf("AliAnalysisTaskEMCALClusterize::UserCreateOutputObjects() - Create Branch: %s \n",fOutputAODBranchName.Data());
 }
 
 //________________________________________________________________________
@@ -145,7 +145,7 @@ void AliAnalysisTaskEMCALClusterize::UserExec(Option_t *)
   
   AliVEvent * event = InputEvent();
   if (!event) {
-    printf("ERROR: event not available\n");
+    printf("AliAnalysisTaskEMCALClusterize::UserExec() - ERROR: event not available\n");
     return;
   }
   

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h
index b620bfc900361be0a59cd77612814079f84779fc..8c8d8cb71c93961f07a410d31f7e956ac0f19bd3 100644 (file)
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALClusterize.h
@@ -40,7 +40,7 @@ class AliAnalysisTaskEMCALClusterize : public AliAnalysisTaskSE {
   void           SetGeometryName(TString &name)                 { fGeomName = name             ; }\r
   TString        GeometryName() const                           { return fGeomName             ; }  \r
   void           SwitchOnLoadOwnGeometryMatrices()              { fLoadGeomMatrices = kTRUE    ; }\r
-  void           SwitchOffLoadOwnGeometryMatrices()             { fLoadGeomMatrices = kFALSE   ; }\r
+  void           SwitchOffLoadOwnGeometryMatrices()             { fLoadGeomMatrices = kFALSE   ; } \r
   void           SetGeometryMatrixInSM(TGeoHMatrix* m, Int_t i) { fGeomMatrix[i]    = m        ; }\r
 \r
   //AOD methods\r
@@ -57,30 +57,30 @@ class AliAnalysisTaskEMCALClusterize : public AliAnalysisTaskSE {
   virtual void  RecPoints2Clusters(TClonesArray *fdigitsArr, TObjArray *fRecPoints, TObjArray *clusArray);\r
   \r
   //Geometry  \r
-  AliEMCALGeometry      *fGeom;             //! emcal geometry\r
+  AliEMCALGeometry      *fGeom;             // EMCAL geometry\r
   TString                fGeomName;         // Name of geometry to use.\r
-  TGeoHMatrix           *fGeomMatrix[10];   //! Geometry matrices with alignments\r
+  TGeoHMatrix           *fGeomMatrix[10];   // Geometry matrices with alignments\r
   Bool_t                 fGeomMatrixSet;    // Set geometry matrices only once, for the first event.         \r
   Bool_t                 fLoadGeomMatrices; // Matrices set from configuration, not get from geometry.root or from ESDs/AODs\r
 \r
   //OCDB\r
-  AliEMCALCalibData     *fCalibData;        //! emcal calib data\r
-  AliCaloCalibPedestal  *fPedestalData;     //! emcal pedestal\r
+  AliEMCALCalibData     *fCalibData;        // EMCAL calib data\r
+  AliCaloCalibPedestal  *fPedestalData;     // EMCAL pedestal\r
   TString                fOCDBpath;         // Path with OCDB location\r
 \r
   //Temporal arrays\r
-  TClonesArray          *fDigitsArr;        //-> digits array\r
-  TObjArray             *fClusterArr;       //! recpoints array\r
-  TObjArray             *fCaloClusterArr;   //! CaloClusters array\r
+  TClonesArray          *fDigitsArr;        //-> Digits array\r
+  TObjArray             *fClusterArr;       //-> Recpoints array\r
+  TObjArray             *fCaloClusterArr;   //-> CaloClusters array\r
 \r
   //Clusterizers \r
-  AliEMCALRecParam      *fRecParam;         //! reconstruction parameters container\r
-  AliEMCALClusterizer   *fClusterizer;      //! emcal clusterizer\r
-  AliEMCALAfterBurnerUF *fUnfolder;         //! unfolding procedure\r
+  AliEMCALRecParam      *fRecParam;         // Reconstruction parameters container\r
+  AliEMCALClusterizer   *fClusterizer;      //! EMCAL clusterizer\r
+  AliEMCALAfterBurnerUF *fUnfolder;         //! Unfolding procedure\r
   Bool_t                 fJustUnfold;       // Just unfold, do not recluster\r
   \r
   //AOD\r
-  TClonesArray          *fOutputAODBranch;  //-> AOD Branch with output clusters  \r
+  TClonesArray          *fOutputAODBranch;  //! AOD Branch with output clusters  \r
   TString                fOutputAODBranchName;  // New of output AOD branch\r
   Bool_t                 fFillAODFile;      // Fill the output AOD file with the new clusters, \r
                                             // if not they will be only available for the event they were generated\r