fixed bug that could ignore libSTEER if libSTEERbase was loaded in LoadModule (JFGO...

[u/mrichter/AliRoot.git] / ANALYSIS / EventMixing / AliMixInfo.cxx

diff --git a/ANALYSIS/EventMixing/AliMixInfo.cxx b/ANALYSIS/EventMixing/AliMixInfo.cxx
index 8132f247e874b073810db553a14268a727cd6091..24de78e1c6b5b4ff7d3b9bb183ca5e8e0eb9b90d 100644 (file)
--- a/ANALYSIS/EventMixing/AliMixInfo.cxx
+++ b/ANALYSIS/EventMixing/AliMixInfo.cxx
@@ -144,7 +144,7 @@ void AliMixInfo::Print(Option_t *option) const
    }
 }
 //_________________________________________________________________________________________________
-void AliMixInfo::Draw(Option_t* option)
+void AliMixInfo::Draw(Option_t *option)
 {
    //
    // Drwas mixi info canvas
@@ -161,7 +161,7 @@ void AliMixInfo::Draw(Option_t* option)
 //     TVirtualPad *upperPad1 = gPad->cd(2);
 //     upperPad1->Divide(1,2);
 //     upperPad1->cd(1);
-   TPavesText*text = new TPavesText(0.05, 0.05, 0.95, 0.95, 1);
+   TPavesText *text = new TPavesText(0.05, 0.05, 0.95, 0.95, 1);
    text->SetName("mixInfoText");
    text->AddText("Help:");
    text->AddText("Move over histogram to see mix info for different bins");
@@ -317,29 +317,25 @@ void AliMixInfo::DynamicExec(AliMixInfo *const mixInfo)
    Double_t numMix = hMix->GetBinContent(binX);
    Int_t hist2DValue = (Int_t) hSelected->GetBinContent(binX + 1, 1);
 
-   Int_t mixNum = 1;
+//    Int_t mixNum = 1;
    if (text) {
-      text->SetName("mixInfoText");
-      text->SetTextAlign(12);
-      text->SetToolTipText("Mixing Info about current binX");
-//         text->SetTextSize(0.1);
-//         text->SetTextColor(3);
-      text->SetBorderSize(2);
-      text->AddText(Form("binX=%d", binX));
-      text->AddText(Form("numMain=%.0f", numMain));
-      text->AddText(Form("numMix=%.0f", numMix));
-      text->AddText(Form("BINCONTENT=%d", hist2DValue));
-
       if (mixInfo) {
-
          AliMixEventPool *evPool = (AliMixEventPool *) mixInfo->GetEventPool("mixEventPool");
          if (evPool) {
-            mixNum = evPool->GetMixNumber();
-            if (binX - 1 > 0)
-               evPool->SetCutValuesFromBinIndex(binX - 1);
+//             mixNum = evPool->GetMixNumber();
+            if (binX - 1 >= 0) {
+               if (!evPool->SetCutValuesFromBinIndex(binX - 1)) return;
+            }
+            text->SetName("mixInfoText");
+            text->SetTextAlign(12);
+            text->SetToolTipText("Mixing Info about current binX");
+            text->SetBorderSize(2);
+            text->AddText(Form("binX=%d", binX));
+            text->AddText(Form("numMain=%.0f", numMain));
+            text->AddText(Form("numMix=%.0f", numMix));
+            text->AddText(Form("BINCONTENT=%d", hist2DValue));
             TObjArray *eventCuts = evPool->GetListOfEventCuts();
             if (eventCuts) {
-
                TObjArrayIter next(eventCuts);
                AliMixEventCutObj *cut;
                while ((cut = (AliMixEventCutObj *) next())) {
@@ -347,9 +343,7 @@ void AliMixInfo::DynamicExec(AliMixInfo *const mixInfo)
                   else text->AddText(Form("%s <Out of Range>", cut->GetCutName()));
                }
             }
-
          }
-
       }
       switch (hist2DValue) {
          case 1 :
@@ -425,7 +419,7 @@ void AliMixInfo::Add(AliMixInfo *mi)
    // adds AliMixInfo
    //
 
-   AliInfo(Form("Adding %p", mi));
+//    AliInfo(Form("Adding %p", mi));
    if (!mi) return;
    if (!fHistogramList) return;
    TH1I *hMain = GetHistogramByType(kMainEvents);