Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGLF / FORWARD / analysis2 / AliBaseMCTrackDensity.cxx

diff --git a/PWGLF/FORWARD/analysis2/AliBaseMCTrackDensity.cxx b/PWGLF/FORWARD/analysis2/AliBaseMCTrackDensity.cxx
index f693a802b25acff1cea8b92067f5d360a9a5c33d..8c8100d78cd8d0e5ce47cd04eb9ed661fc2d1087 100644 (file)
--- a/PWGLF/FORWARD/analysis2/AliBaseMCTrackDensity.cxx
+++ b/PWGLF/FORWARD/analysis2/AliBaseMCTrackDensity.cxx
@@ -31,7 +31,7 @@ AliBaseMCTrackDensity::AliBaseMCTrackDensity()
     fDebug(false)
 {
   // Default constructor 
-  DGUARD(0,0,"MC track density default construction");
+  DGUARD(fDebug, 3,"Default CTOR of AliBasMCTrackDensity");
 }
 
 //____________________________________________________________________
@@ -50,7 +50,7 @@ AliBaseMCTrackDensity::AliBaseMCTrackDensity(const char* name)
     fDebug(false)
 {
   // Normal constructor constructor 
-  DGUARD(0,0,"MC track density named construction: %s", name);
+  DGUARD(fDebug, 3,"Named CTOR of AliBasMCTrackDensity: %s", name);
 }
 
 //____________________________________________________________________
@@ -69,7 +69,7 @@ AliBaseMCTrackDensity::AliBaseMCTrackDensity(const AliBaseMCTrackDensity& o)
     fDebug(o.fDebug)
 {
   // Normal constructor constructor 
-  DGUARD(0,0,"MC track density copy construction");
+  DGUARD(fDebug, 3,"Copy CTOR of AliBasMCTrackDensity");
 }
 
 //____________________________________________________________________
@@ -96,7 +96,7 @@ AliBaseMCTrackDensity::operator=(const AliBaseMCTrackDensity& o)
 
 //____________________________________________________________________
 void
-AliBaseMCTrackDensity::DefineOutput(TList* l)
+AliBaseMCTrackDensity::CreateOutputObjects(TList* l)
 {
   DGUARD(fDebug,1,"MC track defines output");
   TList* ll = new TList;
@@ -318,7 +318,7 @@ AliBaseMCTrackDensity::ProcessTracks(const AliMCEvent& event,
     // track back to the original primary?
     if (fUseOnlyPrimary && !isPrimary) continue;
 
-    const AliMCParticle* mother = GetMother(iTr, event);
+    const AliMCParticle* mother = isPrimary ? particle : GetMother(iTr, event);
     ProcessTrack(particle, mother);
 
   } // Loop over tracks
@@ -333,18 +333,28 @@ AliBaseMCTrackDensity::CalculateWeight(Double_t eta, Double_t pt,
 {
   return fWeights.CalcWeight(eta, pt, phi, id, fPhiR, fB);
 }
+
+#define PF(N,V,...)                                    \
+  AliForwardUtil::PrintField(N,V, ## __VA_ARGS__)
+#define PFB(N,FLAG)                            \
+  do {                                                                 \
+    AliForwardUtil::PrintName(N);                                      \
+    std::cout << std::boolalpha << (FLAG) << std::noboolalpha << std::endl; \
+  } while(false)
+#define PFV(N,VALUE)                                   \
+  do {                                                 \
+    AliForwardUtil::PrintName(N);                      \
+    std::cout << (VALUE) << std::endl; } while(false)
+
 //____________________________________________________________________
 void
 AliBaseMCTrackDensity::Print(Option_t* /*option*/) const 
 {
-  char ind[gROOT->GetDirLevel()+1];
-  for (Int_t i = 0; i < gROOT->GetDirLevel(); i++) ind[i] = ' ';
-  ind[gROOT->GetDirLevel()] = '\0';
-  std::cout << ind << ClassName() << ": " << GetName() << '\n'
-           << std::boolalpha 
-           << ind << " Only primary tracks:    " << fUseOnlyPrimary << '\n'
-           << ind << " Use flow after burner:  " << fUseFlowWeights 
-           << std::noboolalpha << std::endl;
+  AliForwardUtil::PrintTask(*this);
+  gROOT->IncreaseDirLevel();  
+  PFB("Only primary tracks", fUseOnlyPrimary);
+  PFB("Use flow after burner", fUseFlowWeights);
+  gROOT->DecreaseDirLevel();
   
 }