Merge branch 'master' of https://git.cern.ch/reps/AliRoot

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3907b4814c58056e06b083ee88e60432f8bbb00a..d876d162ed17b514d3fd3fdb83494ea4449c0336 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,7 +386,7 @@ COMMAND ar t ${RAWDatabaseALIB} | xargs rm
 COMMAND ar t ${MDCALIB} | xargs rm 
 COMMAND ar t ${ESDALIB} | xargs rm 
 COMMAND ar t ${STEERBaseALIB} | xargs rm 
-COMMAND ${CMAKE_CXX_COMPILER} ${LDFLAGS} -o ${BINPATH}/alimdca ${LIBPATH}/alimdccxxo.a ${LIBPATH}/libAliMDC.a ${ROOTALIBDIR}/libRoot.a ${ROOTALIBDIR}/libfreetype.a ${ROOTALIBDIR}/libpcre.a ${ROOTALIBDIR}/liblzma.a -pthread -ldl -lz
+COMMAND ${CMAKE_CXX_COMPILER} ${LDFLAGS} -o ${BINPATH}/alimdca ${LIBPATH}/alimdccxxo.a ${LIBPATH}/libAliMDC.a ${ROOTALIBDIR}/libRoot.a ${ROOTALIBDIR}/libfreetype.a ${ROOTALIBDIR}/libpcre.a ${ROOTALIBDIR}/liblzma.a -pthread -lssl -ldl -lz
 COMMAND @echo "Target alimdc-static made"
 )
 

diff --git a/PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.cxx b/PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.cxx
index a8c00522ddaae7986d844b9bf1c4f1e4509c8f27..44069fef574d5a665fda310eee39b7395495da8a 100644 (file)
--- a/PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.cxx
+++ b/PWG/CaloTrackCorrBase/AliAnalysisTaskCounter.cxx
@@ -126,14 +126,17 @@ void AliAnalysisTaskCounter::UserCreateOutputObjects()
   
   fOutputContainer = new TList();
   
-  fh1Xsec = new TH1F("hXsec","xsec from pyxsec.root",1,0,1);
-  fh1Xsec->GetXaxis()->SetBinLabel(1,"<#sigma>");
-  fOutputContainer->Add(fh1Xsec);
+  if(fCheckMCCrossSection)
+  {
+    fh1Xsec = new TH1F("hXsec","xsec from pyxsec.root",1,0,1);
+    fh1Xsec->GetXaxis()->SetBinLabel(1,"<#sigma>");
+    fOutputContainer->Add(fh1Xsec);
+    
+    fh1Trials = new TH1F("hTrials","trials root file",1,0,1);
+    fh1Trials->GetXaxis()->SetBinLabel(1,"#sum{ntrials}");
+    fOutputContainer->Add(fh1Trials);
+  }
   
-  fh1Trials = new TH1F("hTrials","trials root file",1,0,1);
-  fh1Trials->GetXaxis()->SetBinLabel(1,"#sum{ntrials}");
-  fOutputContainer->Add(fh1Trials);
-
   fhZVertex     = new TH1F("hZVertex", " Z vertex distribution"   , 200 , -50 , 50  ) ;
   fhZVertex->SetXTitle("v_{z} (cm)");
   fOutputContainer->Add(fhZVertex);
@@ -167,7 +170,7 @@ void AliAnalysisTaskCounter::UserCreateOutputObjects()
   fOutputContainer->Add(fhEventPlaneAngle) ;
   
   fhNEvents = new TH1I("hNEvents", "Number of analyzed events", 21, 0, 21) ;
-  fhNEvents->SetXTitle("Selection");
+  //fhNEvents->SetXTitle("Selection");
   fhNEvents->SetYTitle("# events");
   fhNEvents->GetXaxis()->SetBinLabel(1 ,"1  = PS");
   fhNEvents->GetXaxis()->SetBinLabel(2 ,"2  = 1  & ESD");
@@ -190,7 +193,7 @@ void AliAnalysisTaskCounter::UserCreateOutputObjects()
   fhNEvents->GetXaxis()->SetBinLabel(18,"18 = Reject EMCAL 1");
   fhNEvents->GetXaxis()->SetBinLabel(19,"19 = 18 & 2");
   fhNEvents->GetXaxis()->SetBinLabel(20,"20 = Reject EMCAL 2");
-  fhNEvents->GetXaxis()->SetBinLabel(21,"20 = 20 & 2");
+  fhNEvents->GetXaxis()->SetBinLabel(21,"21 = 20 & 2");
 
   fOutputContainer->Add(fhNEvents);
 

diff --git a/PWGGA/CaloTrackCorrelations/macros/ana.C b/PWGGA/CaloTrackCorrelations/macros/ana.C
index 381574023053d06d259cf6fb5602f5339cf61641..c8c107f864b6c1777d70483bca9280de3cdf117a 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/ana.C
+++ b/PWGGA/CaloTrackCorrelations/macros/ana.C
@@ -560,7 +560,9 @@ void  LoadLibraries(Int_t mode)
   gSystem->Load("libRAWDatasim.so"); // Root + libraries to if reclusterization is done
   gSystem->Load("libVZERObase.so");  // Root + libraries to if reclusterization is done
   gSystem->Load("libVZEROrec.so");   // Root + libraries to if reclusterization is done
-  
+
+  gSystem->Load("libPHOSUtils");
+
   gSystem->Load("libEMCALUtils");
   //SetupPar("EMCALUtils");
   gSystem->Load("libEMCALraw");  // Root + libraries to if reclusterization is done
@@ -573,23 +575,23 @@ void  LoadLibraries(Int_t mode)
   //SetupPar("EMCALrec");
   
   gSystem->Load("libANALYSISalice.so");
+  gSystem->Load("libESDfilter.so");
+
   gSystem->Load("libTENDER.so");
   gSystem->Load("libTENDERSupplies.so");
-  gSystem->Load("libPHOSUtils");
+  
   gSystem->Load("libCORRFW");
   gSystem->Load("libPWGTools");
-  
-  gSystem->Load("libPHOSUtils");
-  gSystem->Load("libEMCALUtils");
-  gSystem->Load("libPWGCaloTrackCorrBase");
-  gSystem->Load("libPWGGACaloTrackCorrelations");
+
   gSystem->Load("libPWGEMCAL");
   gSystem->Load("libPWGGAEMCALTasks");
-  //SetupPar("PWGCaloTrackCorrBase");
-  //SetupPar("PWGGACaloTrackCorrelations");
   //SetupPar("PWGEMCAL");
   //SetupPar("PWGGAEMCALTasks");
   
+  gSystem->Load("libPWGCaloTrackCorrBase");
+  gSystem->Load("libPWGGACaloTrackCorrelations");
+  //SetupPar("PWGCaloTrackCorrBase");
+  //SetupPar("PWGGACaloTrackCorrelations");
  
   //gSystem->Load("libJETAN");
   //gSystem->Load("FASTJETAN");