1) Macro compile-DxHFE.C moved to macros subdirectory.

2) Bugfix for missing schema info when running on Grid (Hege).
Solved by marking member variables as transient, the problem in Root,
though, is not understood (details in the header file).

diff --git a/PWGHF/correlationHF/AliAnalysisTaskDxHFECorrelation.cxx b/PWGHF/correlationHF/AliAnalysisTaskDxHFECorrelation.cxx
index 7203f1ce256b73cfc130741282cbbd9932646736..005ae4beb974a5a088489025b629e4925e55ddec 100644 (file)
--- a/PWGHF/correlationHF/AliAnalysisTaskDxHFECorrelation.cxx
+++ b/PWGHF/correlationHF/AliAnalysisTaskDxHFECorrelation.cxx
@@ -29,6 +29,7 @@
 #include "AliDxHFEParticleSelectionMCD0.h"
 #include "AliDxHFEParticleSelectionEl.h"
 #include "AliDxHFEParticleSelectionMCEl.h"
+#include "AliDxHFEParticleSelection.h"
 #include "AliAnalysisManager.h"
 #include "AliLog.h"
 #include "AliESDInputHandler.h"
@@ -113,9 +114,9 @@ AliAnalysisTaskDxHFECorrelation::~AliAnalysisTaskDxHFECorrelation()
   fElectrons=NULL;
   if (fCorrelation) delete fCorrelation;
   fCorrelation=NULL;
-  if (fCutsD0) delete fCutsD0;
+  // external object, do not delete
   fCutsD0=NULL;
-  if (fCutsHFE) delete fCutsHFE;
+  // external object, do not delete
   fCutsHFE=NULL;
   if(fPID) delete fPID;
   fPID=NULL;
@@ -160,6 +161,8 @@ void AliAnalysisTaskDxHFECorrelation::UserCreateOutputObjects()
   //Correlation
   fCorrelation=new AliDxHFECorrelation;
   fCorrelation->SetCuts(dynamic_cast<AliRDHFCutsD0toKpi*>(fCutsD0));
+  // TODO: check if we can get rid of the mc flag in the correlation analysis class
+  fCorrelation->SetUseMC(fUseMC);
   fCorrelation->Init();
 
   // Fix for merging:

diff --git a/PWGHF/correlationHF/AliDxHFECorrelation.h b/PWGHF/correlationHF/AliDxHFECorrelation.h
index 8ddd5131c85c37ac427d159fe30c9b52ec0c33ff..80dd3d2ef3916668f418bfe1e5d2b21664f137f3 100644 (file)
--- a/PWGHF/correlationHF/AliDxHFECorrelation.h
+++ b/PWGHF/correlationHF/AliDxHFECorrelation.h
@@ -92,16 +92,25 @@ class AliDxHFECorrelation : public TNamed {
   /// assignment operator
   AliDxHFECorrelation& operator=(const AliDxHFECorrelation& other);
 
-  TObjArray* fHistograms;     // the histograms - for the moment not in use. 
-  TList* fControlObjects;     // list of control objects
-  THnSparse* fCorrProperties; // the Correlation properties of selected particles
-  TH1* fhEventControlCorr;    // event control histogram
-  AliRDHFCutsD0toKpi *fCuts;  //  Cuts 
-  Bool_t fUseMC;              // use MC info
+  // 2012-09-18: when running on Grid the histograms were empty. We encountered
+  // messages "cannot create object of class TH1" when writing the analysis manager
+  // to file for Grid analysis.
+  // This class had a TH1 member marked to be saved, the object though was part of
+  // a list, also a member of the class. Root has a problem with the schema info
+  // in that case.
+  // Solved by marking fhEventControlCorr as transient, the cause, though, is not
+  // understood
+
+  TObjArray* fHistograms;     //  the histograms - for the moment not in use. 
+  TList* fControlObjects;     //  list of control objects
+  THnSparse* fCorrProperties; //  the Correlation properties of selected particles
+  TH1* fhEventControlCorr;    //! event control histogram (saved via control object list)
+  AliRDHFCutsD0toKpi *fCuts;  //! Cuts 
+  Bool_t fUseMC;              //! use MC info
 
   static const char* fgkEventControlBinNames[];
   static const char* fgkCorrControlBinNames[];
 
-  ClassDef(AliDxHFECorrelation, 2)
+  ClassDef(AliDxHFECorrelation, 3)
 };
 #endif

diff --git a/PWGHF/correlationHF/compile-DxHFE.C b/PWGHF/correlationHF/macros/compile-DxHFE.C
similarity index 100%
rename from PWGHF/correlationHF/compile-DxHFE.C
rename to PWGHF/correlationHF/macros/compile-DxHFE.C