diff --git a/CMakeLists.txt b/CMakeLists.txt index 695851896ca29dcb69e08441eb985396cd919165..cfe10d5a164b2254eff877d7c5b0edfb427446c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,14 +35,17 @@ endif() add_subdirectory(DDExamples/UtilityApps) add_subdirectory(DDExamples/AlignDet) add_subdirectory(DDExamples/CLICSiD) -add_subdirectory(DDExamples/ILDExDet) -add_subdirectory(DDExamples/ILDExReco) -add_subdirectory(DDExamples/ILDExTest) + +## Cannot use these ones anymore, since Frank has introduced lcio..... +##add_subdirectory(DDExamples/ILDExDet) +##add_subdirectory(DDExamples/ILDExReco) +##add_subdirectory(DDExamples/ILDExTest) if(DD4HEP_WITH_GEANT4) add_subdirectory(DDExamples/CLICSiDSimu) - add_subdirectory(DDExamples/ILDExSimu) endif() +# add_subdirectory(DDExamples/ILDExSimu) #---Configuration------------------------------------------------------------------- configure_file(cmake/thisdd4hep.csh thisdd4hep.csh @ONLY) configure_file(cmake/thisdd4hep.sh thisdd4hep.sh @ONLY) + diff --git a/DDExamples/ILDExDet/CMakeLists.txt b/DDExamples/ILDExDet/CMakeLists.txt index 186a5cce1f44d4bcef46fa400f778f6c56ed4ad3..a3844bbf5a78e00b4e49cd12df707e4b4143e391 100644 --- a/DDExamples/ILDExDet/CMakeLists.txt +++ b/DDExamples/ILDExDet/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR) -find_package(LCIO REQUIRED) +##find_package(LCIO REQUIRED) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/DDCore/include diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp index 9a8d59a9604295b6346378761ed18072fbbb9349..e2315b4f28052b39e17217a451036e77826857fe 100644 --- a/DDG4/src/Geant4Converter.cpp +++ b/DDG4/src/Geant4Converter.cpp @@ -482,7 +482,7 @@ void* Geant4Converter::handlePlacement(const string& name, const TGeoNode* node) cout << "Attempt to DOUBLE-place physical volume:" << name << " No:" << node->GetNumber() << endl; } return g4; - } +} /// Convert the geometry type region into the corresponding Geant4 object(s). void* Geant4Converter::handleRegion(const TNamed* region, const set<const TGeoVolume*>& volumes) const {