first batch of changes for forward compatibility with ROOT6

Author: ThomasRuf

CMakeLists.txt

@@ -106,8 +106,8 @@ CHECK_EXTERNAL_PACKAGE_INSTALL_DIR()
 # For example the framework can run without GEANT4, but ROOT is
 # mandatory
 
-find_package(ROOT 5.32.00 REQUIRED)
-find_package(PLUTO REQUIRED)
+find_package(ROOT 5.34.00 REQUIRED)
+# find_package(PLUTO REQUIRED)
 find_package(Pythia8 REQUIRED)
 find_package(GENERATORS REQUIRED)
 find_package(GEANT3 REQUIRED)

ecal/ecalInf.cxx

@@ -172,7 +172,7 @@ ecalInf::ecalInf(const char* filename)
     rtdb->getContainer("CbmGeoEcalPar");
   }
   */
-  ifstream file(filename);
+  std::ifstream file(filename);
   Int_t linenum;
   Double_t val;
   string buffer;

ecal/ecalReconstructed.h

@@ -23,7 +23,7 @@ friend class ecalReco;
   inline Int_t CellNum() const {return fCellNum;}
   inline Int_t ClusterNum() const {return fClusterNum;}
   inline Int_t MCTrack() const {return fMCTrack;}
-  inline Int_t SetMCTrack(Int_t mctrack) {fMCTrack=mctrack;}
+  inline void SetMCTrack(Int_t mctrack) {fMCTrack=mctrack;}
 
 private:
   /** Uncalibrated energy **/

gconfig/basiclibs.C

@@ -20,4 +20,5 @@ void basiclibs()
   gSystem->Load("libMinuit");
   gSystem->Load("libMathMore");
   gSystem->Load("libpythia8");
+  gSystem->Load("libgenfit.so");
 }  

genfit/CMakeLists.txt

@@ -7,7 +7,7 @@ EndIf (Boost_Avail)
 
 # Set the build type. Possibilities are None, Debug, Release,
 # RelWithDebInfo and MinSizeRel
-#SET(CMAKE_BUILD_TYPE Debug)
+SET(CMAKE_BUILD_TYPE Release)
 
 # either, the environment variable RAVEPATH has to be specified, and RAVE's pkgConfig will be used to determine everything we need
 # or, RAVE_LDFLAGS, RAVE_INCLUDE_DIRS and RAVE_CFLAGS have to be set via the command-line
@@ -23,7 +23,7 @@ IF(DEFINED ENV{RAVEPATH})
 ELSEIF(DEFINED RAVE_LDFLAGS)
 	IF(DEFINED RAVE_INCLUDE_DIRS)
 		IF(DEFINED RAVE_CFLAGS)
-			MESSAGE("RAVE_LDFLAGS, RAVE_INCLUDE_DIRS and RAVE_CFLAGS are set. Try to build GFRave.")
+			MESSAGE("RAVE_LDFLAGS, RAVE_INCLUDE_DIRS and RAVE_CFLAGS are set. Try to build GFRave. ${RAVE_LDFLAGS}")
 			SET(RAVE True)
 		ENDIF()
 	ENDIF()
@@ -78,15 +78,20 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
 
 include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-std=c++03 HAS_STD_FLAG)
-check_cxx_compiler_flag(--std=c++03 HAS_STD_FLAG_ALTERNATIVE)
-if (HAS_STD_FLAG)
+# ROOT 6 requires c++11 support, enforced via headers
+If (ROOT_FOUND_VERSION LESS 59999)
+ check_cxx_compiler_flag(-std=c++03 HAS_STD_FLAG)
+ check_cxx_compiler_flag(--std=c++03 HAS_STD_FLAG_ALTERNATIVE)
+ if (HAS_STD_FLAG)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
-elseif (HAS_STD_FLAG_ALTERNATIVE)
+ elseif (HAS_STD_FLAG_ALTERNATIVE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++03")
-else()
+ else()
   message("Neither --std=c++03 nor -std=c++03 seem to work.  Moving on.")
-endif()
+ endif()
+else() 
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+EndIf()
 
 # require proper c++, standard is C++03, flag reads: c++98
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long -Wshadow -Werror=overloaded-virtual"   )
@@ -282,7 +287,7 @@ link_directories( ${LINK_DIRECTORIES})
 Set(SRCS ${library_sources})
 Set(HEADERS)
 Set(LIBRARY_NAME genfit)
-Set(DEPENDENCIES Cint Core Geom Matrix Eve Gui Physics MathCore EG)
+Set(DEPENDENCIES Core Geom Matrix Eve Gui Physics MathCore EG)
 
 Set(LINKDEF
 ${CMAKE_CURRENT_SOURCE_DIR}/core/src/coreLinkDef.h
@@ -297,14 +302,15 @@ ${CMAKE_CURRENT_SOURCE_DIR}/utilities/src/utilitiesLinkDef.h
 if(DEFINED RAVE)
   Set(LINKDEF ${LINKDEF} ${CMAKE_CURRENT_SOURCE_DIR}/GFRave/src/GFRaveLinkDef.h)
 endif()
-ROOT_GENERATE_ROOTMAP()
+If (ROOT_FOUND_VERSION LESS 59999)
+    ROOT_GENERATE_ROOTMAP()
+EndIf()
 
 # to not call again ROOT_GENERATE_ROOTMAP
 Set(LINKDEF)
 
 GENERATE_LIBRARY()
 
-
 # the examples, build with "make tests"
 ADD_CUSTOM_TARGET( tests )
 MACRO( ADD_GENFIT_TEST _testname )

hcal/hcalInf.cxx

@@ -173,7 +173,7 @@ hcalInf::hcalInf(const char* filename)
     rtdb->getContainer("CbmGeoHcalPar");
   }
   */
-  ifstream file(filename);
+  std::ifstream file(filename);
   Int_t linenum;
   Double_t val;
   string buffer;

macro/run_simScript.py

@@ -276,7 +276,8 @@
 else:            run.SetStoreTraj(ROOT.kFALSE)
 # -----Initialize simulation run------------------------------------
 run.Init()
-fStack = ROOT.gMC.GetStack()
+gMC = ROOT.TVirtualMC.GetMC()
+fStack = gMC.GetStack()
 if not deepCopy : fStack.SetEnergyCut(100.*u.MeV)
 
 if eventDisplay:

muon/muon.h

@@ -1,5 +1,5 @@
-#ifndef VETO_H
-#define VETO_H
+#ifndef MUON_H
+#define MUON_H
 
 #include "FairDetector.h"
 
@@ -121,4 +121,4 @@ class muon: public FairDetector
     ClassDef(muon,1)
 };
 
-#endif //VETO_H
+#endif //MUON_H

nutaudet/CMakeLists.txt

@@ -32,6 +32,6 @@ TargetPoint.cxx
 Set(HEADERS )
 Set(LINKDEF nutaudetLinkDef.h)
 Set(LIBRARY_NAME nutaudet)
-Set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Cint Core)
+Set(DEPENDENCIES Base ShipData GeoBase ParBase Geom Core)
 
 GENERATE_LIBRARY()

passive/CMakeLists.txt

@@ -32,6 +32,6 @@ ShipGoliath.cxx
 Set(HEADERS )
 Set(LINKDEF PassiveLinkDef.h)
 Set(LIBRARY_NAME Passive)
-Set(DEPENDENCIES Base GeoBase ParBase Geom Cint Core)
+Set(DEPENDENCIES Base GeoBase ParBase Geom Core)
 
 GENERATE_LIBRARY()