X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG2%2FFORWARD%2Fanalysis2%2FAliForwardMultiplicityBase.cxx;h=12ec76b7aec6efaa4d32d383f7da99797bd4fc4c;hb=5e4d905e94bf00d3b7df780588eea54b1eb4c061;hp=d1933db50f493d9abbfa627e37257a5f9fb32a34;hpb=7ec4d8431be2b02fd574647404626a1385086386;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG2/FORWARD/analysis2/AliForwardMultiplicityBase.cxx b/PWG2/FORWARD/analysis2/AliForwardMultiplicityBase.cxx
index d1933db50f4..12ec76b7aec 100644
--- a/PWG2/FORWARD/analysis2/AliForwardMultiplicityBase.cxx
+++ b/PWG2/FORWARD/analysis2/AliForwardMultiplicityBase.cxx
@@ -26,9 +26,21 @@
 #include "AliFMDHistCollector.h"
 #include "AliESDEvent.h"
 #include <TROOT.h>
-
+#include <iostream>
+#include <iomanip>
 
 //====================================================================
+AliForwardMultiplicityBase::AliForwardMultiplicityBase(const char* name) 
+  : AliAnalysisTaskSE(name), 
+    fEnableLowFlux(true), 
+    fFirstEvent(true),
+    fCorrManager(0)
+{
+  // Set our persistent pointer 
+  fCorrManager = &AliForwardCorrectionManager::Instance();
+}
+
+//____________________________________________________________________
 Bool_t 
 AliForwardMultiplicityBase::CheckCorrections(UInt_t what) const
 {
@@ -90,18 +102,13 @@ AliForwardMultiplicityBase::CheckCorrections(UInt_t what) const
 }
 //____________________________________________________________________
 Bool_t
-AliForwardMultiplicityBase::ReadCorrections(const TAxis*& pe, const TAxis*& pv)
+AliForwardMultiplicityBase::ReadCorrections(const TAxis*& pe, 
+					    const TAxis*& pv, 
+					    Bool_t        mc)
 {
   UInt_t what = AliForwardCorrectionManager::kAll;
   if (!fEnableLowFlux)
     what ^= AliForwardCorrectionManager::kDoubleHit;
-  if (!GetCorrections().IsUseSecondaryMap()) {
-    what ^= AliForwardCorrectionManager::kSecondaryMap;
-    // Need to make eta and vertex axis here since we don't read
-    // that from the secondary correction objects
-    pe = new TAxis(200, -4, 6);
-    pv = new TAxis(10, -10, 10);
-  }
   if (!GetCorrections().IsUseVertexBias())
     what ^= AliForwardCorrectionManager::kVertexBias;
   if (!GetCorrections().IsUseAcceptance())
@@ -111,12 +118,15 @@ AliForwardMultiplicityBase::ReadCorrections(const TAxis*& pe, const TAxis*& pv)
 
   AliForwardCorrectionManager& fcm = AliForwardCorrectionManager::Instance();
   if (!fcm.Init(GetEventInspector().GetCollisionSystem(),
-      GetEventInspector().GetEnergy(),
-      GetEventInspector().GetField(),
-      false,
-      what)) return false;
+		GetEventInspector().GetEnergy(),
+		GetEventInspector().GetField(),
+		mc,
+		what)) return false;
   if (!CheckCorrections(what)) return false;
 
+  // Sett our persistency pointer 
+  // fCorrManager = &fcm;
+
   // Get the eta axis from the secondary maps - if read in
   if (!pe) {
     pe = fcm.GetEtaAxis();
@@ -186,10 +196,18 @@ AliForwardMultiplicityBase::Print(Option_t* option) const
   // Parameters:
   //    option Not used
   //
+  
   std::cout << "AliForwardMultiplicityBase: " << GetName() << "\n" 
-	    << "  Enable low flux code:   " << (fEnableLowFlux ? "yes" : "no")
-	    << std::endl;
+	    << "  Enable low flux code:   " << (fEnableLowFlux ? "yes" : "no") 
+	    << "\n"
+	    << "  Off-line trigger mask:  0x" 
+	    << std::hex     << std::setfill('0') 
+	    << std::setw (8) << fOfflineTriggerMask 
+	    << std::dec     << std::setfill (' ') << std::endl;
   gROOT->IncreaseDirLevel();
+  if (fCorrManager) fCorrManager->Print();
+  else  
+    std::cout << "  Correction manager not set yet" << std::endl;
   GetEventInspector()   .Print(option);
   GetEnergyFitter()     .Print(option);    
   GetSharingFilter()    .Print(option);