Changes for Root6 (Mikolaj)

diff --git a/AD/ADsim/AliADDigitizer.cxx b/AD/ADsim/AliADDigitizer.cxx
index 2dcdb4ddaa2d955f9bb433bb57a814ee519c4067..9e2ee691005d9218ce9a2bb181a0bc17f6df9b94 100644 (file)
--- a/AD/ADsim/AliADDigitizer.cxx
+++ b/AD/ADsim/AliADDigitizer.cxx
@@ -151,15 +151,14 @@ Bool_t AliADDigitizer::Init()
 
   // check if the digitizer was already initialized
   if (fSignalShape) return kTRUE;
-
   fSignalShape = new TF1("ADSignalShape",this,&AliADDigitizer::SignalShape,0,200,6,"AliADDigitizer","SignalShape");
+  fPMResponse = new TF1("ADPMResponse",this,&AliADDigitizer::PMResponse,-kPMRespTime,2.*kPMRespTime,0,"AliADDigitizer","PMResponse");
+  fSinglePhESpectrum = new TF1("ADSinglePhESpectrum",this,&AliADDigitizer::SinglePhESpectrum,0,20,0,"AliADDigitizer","SinglePhESpectrum");
   //  fSignalShape->SetParameters(0,1.57345e1,-4.25603e-1,2.9,6.40982,3.69339e-01);
   //  fSignalShape->SetParameters(1.34330e+00,1.13007e+02,-4.95705e-01,
   //                         3.68911e+00,1.01040e+00, 3.94675e-01);
   fSignalShape->SetParameters(-1.07335e+00,2.16002e+01,-1.26133e-01,
                              1.41619e+00,5.50334e-01,3.86111e-01);
-  fPMResponse = new TF1("ADPMResponse",this,&AliADDigitizer::PMResponse,-kPMRespTime,2.*kPMRespTime,0,"AliADDigitizer","PMResponse");
-  fSinglePhESpectrum = new TF1("ADSinglePhESpectrum",this,&AliADDigitizer::SinglePhESpectrum,0,20,0,"AliADDigitizer","SinglePhESpectrum");
   
   // Now get the CTP L0->L1 delay
   AliCDBEntry *entry = AliCDBManager::Instance()->Get("GRP/CTP/CTPtiming");

diff --git a/EPOS/epos167/CMakeLists.txt b/EPOS/epos167/CMakeLists.txt
index b501eca1f0579cecb90bbf16b66ebc9eea220f66..57ef4d2d1272131a1c69ad807b1c29eb66a9034c 100644 (file)
--- a/EPOS/epos167/CMakeLists.txt
+++ b/EPOS/epos167/CMakeLists.txt
@@ -17,7 +17,8 @@
 set(MODULE EPOS)
 
 # Module include folder
-include_directories(${AliRoot_SOURCE_DIR}/EPOS/epos167
+include_directories(${AliRoot_SOURCE_DIR}/EPOS
+                    ${AliRoot_SOURCE_DIR}/EPOS/epos167
                    )
 
 # Additional include folders in alphabetical order

diff --git a/EVGEN/AliGenGeVSim.cxx b/EVGEN/AliGenGeVSim.cxx
index 7204daad670e443dd9c401732d2394af58703c97..b22b588083351cdba35f8c39ee2f4a3879bbdd75 100644 (file)
--- a/EVGEN/AliGenGeVSim.cxx
+++ b/EVGEN/AliGenGeVSim.cxx
@@ -63,7 +63,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
+#include <RVersion.h>
 #include <Riostream.h>
 #include <TCanvas.h>
 #include <TF1.h>
@@ -568,8 +568,13 @@ void AliGenGeVSim::SetFormula(Int_t pdg) {
 
   // standard models
 
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+  if (fModel == 1) fCurrentForm = fPtFormula->GetFormula();
+  if (fModel > 1 && fModel < 5) fCurrentForm = fPtYFormula[fModel-2]->GetFormula();
+#else
   if (fModel == 1) fCurrentForm = fPtFormula;
   if (fModel > 1 && fModel < 5) fCurrentForm = fPtYFormula[fModel-2];
+#endif
 
 
   // custom model defined by a formula 
@@ -577,12 +582,22 @@ void AliGenGeVSim::SetFormula(Int_t pdg) {
   if (fModel == 5) {
     
     fCurrentForm = 0;
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+    TF2* tmpTF2 = (TF2*)gROOT->GetFunction(pattern[0]);
+    if (tmpTF2) fCurrentForm = tmpTF2->GetFormula();
+#else
     fCurrentForm = (TF2*)gROOT->GetFunction(pattern[0]);
+#endif
     
     if (!fCurrentForm) {
 
       snprintf(buff, 40, pattern[1], pdg);
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+      tmpTF2 = (TF2*)gROOT->GetFunction(buff);
+      if (tmpTF2) fCurrentForm = tmpTF2->GetFormula();
+#else
       fCurrentForm = (TF2*)gROOT->GetFunction(buff);
+#endif
 
       if (!fCurrentForm) Error(where, msg[0], pdg);
     }

diff --git a/HLT/BASE/AliHLTCTPData.cxx b/HLT/BASE/AliHLTCTPData.cxx
index bae38fdd26e6bb8a8ed30997bc2dd07d7245b4db..6f61f7df5b3362884102e0f55c4cca33069900db 100644 (file)
--- a/HLT/BASE/AliHLTCTPData.cxx
+++ b/HLT/BASE/AliHLTCTPData.cxx
@@ -30,6 +30,7 @@
 #include "AliHLTCDHWrapper.h"
 #include <limits>
 #include <sstream>
+#include <RVersion.h>
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTCTPData)
@@ -299,7 +300,11 @@ bool AliHLTCTPData::EvaluateCTPTriggerClass(const char* expression, AliHLTTrigge
   }
 
   TFormula form("trigger expression", condition);
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+  if (form.IsValid()!=0) {
+#else
   if (form.Compile()!=0) {
+#endif
     HLTError("invalid expression %s", expression);
     return false;
   }

diff --git a/LHAPDF/lhapdf-5.9.1/CMakeLists.txt b/LHAPDF/lhapdf-5.9.1/CMakeLists.txt
index 4e38ee9339e266649ae6e6ffe09fbc502320f60d..0e50c7c1f7817b5a5e126b73156e8e4d5b36609a 100644 (file)
--- a/LHAPDF/lhapdf-5.9.1/CMakeLists.txt
+++ b/LHAPDF/lhapdf-5.9.1/CMakeLists.txt
@@ -14,7 +14,7 @@
 # **************************************************************************
 
 # Module
-set(MODULE lhapdf-5_9_1)
+set(MODULE lhapdf_5_9_1)
 
 # Module include folder
 include_directories(${AliRoot_SOURCE_DIR}/LHAPDF/lhapdf-5.9.1

diff --git a/PYTHIA6/pythia6.4.21/CMakeLists.txt b/PYTHIA6/pythia6.4.21/CMakeLists.txt
index 78202e16266b4231dae2c8b64da1e7b19ba07ea1..1dbfb0b044582efa61537fd34d9b3fc74d555896 100644 (file)
--- a/PYTHIA6/pythia6.4.21/CMakeLists.txt
+++ b/PYTHIA6/pythia6.4.21/CMakeLists.txt
@@ -14,10 +14,10 @@
 # **************************************************************************
 
 # Module
-set(MODULE pythia6.4.21)
+set(MODULE pythia6_4_21)
 
 # Module include folder
-include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/${MODULE})
+include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/pythia6.4.21)
 
 # Additional include folders in alphabetical order except ROOT
 include_directories(${ROOT_INCLUDE_DIR}

diff --git a/PYTHIA6/pythia6.4.25/CMakeLists.txt b/PYTHIA6/pythia6.4.25/CMakeLists.txt
index bfc4e99a71b0dc962f428adf6e7023b347c4064d..bfbb9ab66129059118ce2e35ea8f4f99e7f76ada 100644 (file)
--- a/PYTHIA6/pythia6.4.25/CMakeLists.txt
+++ b/PYTHIA6/pythia6.4.25/CMakeLists.txt
@@ -14,10 +14,10 @@
 # **************************************************************************
 
 # Module
-set(MODULE pythia6.4.25)
+set(MODULE pythia6_4_25)
 
 # Module include folder
-include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/${MODULE})
+include_directories(${AliRoot_SOURCE_DIR}/PYTHIA6/pythia6.4.25)
 
 # Additional include folders in alphabetical order except ROOT
 include_directories(${ROOT_INCLUDE_DIR}

diff --git a/RAW/RAWDatabase/RAWDatabaseLinkDef.h b/RAW/RAWDatabase/RAWDatabaseLinkDef.h
index 3d6ec7710691f5c1bde30891c2d2a473cfd69500..30ea47f260e78686db2ffd1473597eccb8d30de4 100644 (file)
--- a/RAW/RAWDatabase/RAWDatabaseLinkDef.h
+++ b/RAW/RAWDatabase/RAWDatabaseLinkDef.h
@@ -1,4 +1,5 @@
 #ifdef __CINT__
+#include <RVersion.h>
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -8,7 +9,6 @@
 #pragma link C++ class AliRawEvent-;
 #pragma link C++ class AliRawEventV2+;
 #pragma link C++ class AliRawEventHeaderBase+;
-#pragma link C++ defined_in AliRawEventHeaderVersions.h;
 #pragma link C++ class AliRawEquipmentHeader;
 #pragma link C++ class AliRawVEquipment+;
 #pragma link C++ class AliRawEquipment-;
@@ -21,4 +21,14 @@
 #pragma link C++ class AliAltroMapping+;
 #pragma link C++ class AliCaloAltroMapping+;
 
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+#pragma link C++ class AliRawEventHeaderV3_11+;
+#pragma link C++ class AliRawEventHeaderV3_12+;
+#pragma link C++ class AliRawEventHeaderV3_13+;
+#pragma link C++ class AliRawEventHeaderV3_9+;
+#pragma link C++ class AliRawEventHeaderV3_14+;
+#else
+#pragma link C++ defined_in AliRawEventHeaderVersions.h;
+#endif
+
 #endif

diff --git a/TPC/TPCcalib/AliTPCcalibAlign.cxx b/TPC/TPCcalib/AliTPCcalibAlign.cxx
index b9ed7d3141e946a59600858f367215ae8537a2fe..e0b48802d546a57d317016ed7971ae7efb36da8f 100644 (file)
--- a/TPC/TPCcalib/AliTPCcalibAlign.cxx
+++ b/TPC/TPCcalib/AliTPCcalibAlign.cxx
@@ -138,6 +138,7 @@
 #include "TTreeStream.h"
 #include "Riostream.h"
 #include "TRandom.h"
+#include <RVersion.h>
 #include <sstream>
 
 #include "AliSysInfo.h"
@@ -1478,7 +1479,11 @@ TLinearFitter* AliTPCcalibAlign::GetOrMakeFitter12(Int_t s1,Int_t s2) {
   TLinearFitter * fitter = GetFitter12(s1,s2);
   if (fitter) return fitter;
   //  fitter =new TLinearFitter(12,"x[0]++x[1]++x[2]++x[3]++x[4]++x[5]++x[6]++x[7]++x[8]++x[9]++x[10]++x[11]");
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+  fitter =new TLinearFitter(f12.GetFormula(),"");
+#else
   fitter =new TLinearFitter(&f12,"");
+#endif
   fitter->StoreData(kFALSE);
   fFitterArray12.AddAt(fitter,GetIndex(s1,s2));        
   counter12++;
@@ -1495,7 +1500,11 @@ TLinearFitter* AliTPCcalibAlign::GetOrMakeFitter9(Int_t s1,Int_t s2) {
   TLinearFitter * fitter = GetFitter9(s1,s2);
   if (fitter) return fitter;
   //  fitter =new TLinearFitter(9,"x[0]++x[1]++x[2]++x[3]++x[4]++x[5]++x[6]++x[7]++x[8]");
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+  fitter =new TLinearFitter(f9.GetFormula(),"");
+#else
   fitter =new TLinearFitter(&f9,"");
+#endif
   fitter->StoreData(kFALSE);
   fFitterArray9.AddAt(fitter,GetIndex(s1,s2));
   counter9++;

diff --git a/cmake/CMakeALICE.cmake b/cmake/CMakeALICE.cmake
index 60a12b46b3478f12aef6168b91ca3ef5b82d0528..33073047003cc50b60aa679421cff79982bc7eb0 100644 (file)
--- a/cmake/CMakeALICE.cmake
+++ b/cmake/CMakeALICE.cmake
@@ -53,18 +53,22 @@ macro(generate_dictionary DNAME LDNAME DHDRS DINCDIRS)
                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                       )
     else (ROOT_VERSION_MAJOR LESS 6)
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${DNAME}.rootmap ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}.cxx
+      add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${DNAME}.rootmap ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}.cxx ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}_rdict.pcm
                        COMMAND
                          LD_LIBRARY_PATH=${ROOT_LIBDIR}:$ENV{LD_LIBRARY_PATH} ${ROOT_CINT}
                        ARGS
                          -f ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}.cxx
                          -rmf ${CMAKE_CURRENT_BINARY_DIR}/lib${DNAME}.rootmap -rml lib${DNAME}
-                         ${GLOBALDEFINITIONS} ${EXTRADEFINITIONS}  ${INCLUDE_PATH} ${DHDRS} ${LDNAME}
+                         ${GLOBALDEFINITIONS} ${EXTRADEFINITIONS} ${INCLUDE_PATH} ${DHDRS} ${LDNAME}
                        DEPENDS
                          ${DHDRS} ${LDNAME} ${ROOT_CINT}
                        WORKING_DIRECTORY
                          ${CMAKE_CURRENT_BINARY_DIR}
                       )
+
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${DNAME}.rootmap" DESTINATION lib)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}_rdict.pcm" DESTINATION lib)
+    
     endif (ROOT_VERSION_MAJOR LESS 6)
 
 endmacro(generate_dictionary)