diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index 3e98d8965bc6b709763db216ee66c88015726043..83273c35964ae7bffa908b7468219534c83d5351 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -14,10 +14,10 @@ dd4hep_package( DDCore
DDSegmentation DDParsers
OPTIONAL XERCESC
INCLUDE_DIRS include
- INSTALL_INCLUDES include/DD4hep include/XML include/JSON)
+ INSTALL_INCLUDES include/DD4hep include/XML include/JSON)
#---Generate ROOT dictionary------------------------------------------------------
-dd4hep_add_dictionary( G__dd4hep
+dd4hep_add_dictionary( G__DD4hep
SOURCES include/DD4hep/*.h
include/DD4hep/detail/*.h
include/XML/*.h
@@ -33,12 +33,11 @@ dd4hep_add_dictionary( G__dd4hep
include/XML/tinystring.h
LINKDEF include/ROOT/LinkDef.h )
-
#---Generate DDCore Library-------------------------------------------------------
dd4hep_add_package_library ( DDCore
SOURCES src/*.cpp src/XML/*.cpp
OPTIONAL [BOOST SOURCES src/JSON/*.cpp]
- GENERATED G__dd4hep.cxx
+ GENERATED G__DD4hep.cxx
INCLUDE_DIRS ${GaudiPluginService_INCLUDE_DIRS}
LINK_LIBRARIES DDParsers ${GaudiPluginService_LIBRARIES}
)
diff --git a/DDCore/include/ROOT/LinkDef.h b/DDCore/include/ROOT/LinkDef.h
index 0343ac1c48005872828ed40433c21fc375d5804c..81fb5cc5fdab2072663f0a1454bc112f080fcdd8 100644
--- a/DDCore/include/ROOT/LinkDef.h
+++ b/DDCore/include/ROOT/LinkDef.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
@@ -16,3 +15,12 @@
//
// Keep this file EMPTY. All CINT statements can be put in header files preceeding this one.....
//
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wunused"
+#pragma GCC diagnostic ignored "-Woverlength-strings"
+
+#endif
+
diff --git a/DDEve/CMakeLists.txt b/DDEve/CMakeLists.txt
index 6659efdbd965ef19760951b67be117fd99a6f9e8..2fe3b6c7db6935471d6054ca27dfc1fc72518a68 100644
--- a/DDEve/CMakeLists.txt
+++ b/DDEve/CMakeLists.txt
@@ -14,7 +14,10 @@ dd4hep_package( DDEve
INSTALL_INCLUDES include/DDEve)
#
#---Add Plugin Library-----------------------------------------------------
-dd4hep_add_dictionary ( G__DDEve SOURCES include/DDEve/*.h )
+dd4hep_add_dictionary ( G__DDEve
+ SOURCES include/DDEve/*.h
+ LINKDEF ${DDCore_INCLUDE_DIRS}/include/ROOT/LinkDef.h
+ )
#
dd4hep_add_plugin ( DDEve SOURCES src/*.cpp
GENERATED G__DDEve.cxx
@@ -24,6 +27,7 @@ if(DD4HEP_USE_GEANT4)
dd4hep_add_dictionary ( G__DDG4IO
SOURCES DDEve/DDG4IO.C
OPTIONAL DDG4
+ LINKDEF ${DDCore_INCLUDE_DIRS}/include/ROOT/LinkDef.h
)
dd4hep_add_regular_library ( DDG4IO
SOURCES DDEve/IO.cpp
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index 9f55fc5c36dd1ba9e7d5521f261007accde218a9..e94633d296f17016c39efded743c8d6bd84786c3 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -19,17 +19,26 @@ dd4hep_add_package_library(DDG4 SOURCES src/*.cpp )
#--------------------------- Legacy libraries (for Frank) -------------------------
dd4hep_add_plugin(DDG4Legacy SOURCES legacy/*.cpp)
#-----------------------------------------------------------------------------------
-dd4hep_add_dictionary( G__DDG4 SOURCES python/DDG4Dict.C )
+dd4hep_add_dictionary( G__DDG4
+ SOURCES python/DDG4Dict.C
+ LINKDEF ${DDCore_INCLUDE_DIRS}/include/ROOT/LinkDef.h
+ )
#--------------------------- Plugin library for the simulation framework ---------
dd4hep_add_plugin(DDG4Plugins
GENERATED G__DDG4.cxx
- SOURCES plugins/*.cpp)
+ SOURCES plugins/*.cpp
+ )
#--------------------------- Plugin library for the simulation framework ---------
-dd4hep_add_dictionary(G__DDG4Python SOURCES src/python/DDG4Python.C
- OPTIONAL [PYTHON REQUIRED] )
+dd4hep_add_dictionary(G__DDG4Python
+ SOURCES src/python/DDG4Python.C
+ LINKDEF ${DDCore_INCLUDE_DIRS}/include/ROOT/LinkDef.h
+ OPTIONAL [PYTHON REQUIRED]
+ )
#--------------------------- Plugin library for the simulation framework ---------
dd4hep_add_dictionary(G__DDPython SOURCES tpython/DDPython.C
- OPTIONAL [PYTHON REQUIRED] )
+ LINKDEF ${DDCore_INCLUDE_DIRS}/include/ROOT/LinkDef.h
+ OPTIONAL [PYTHON REQUIRED]
+ )
#--------------------------- Specialized python plugins --------------------------
dd4hep_add_regular_library(DDPython
GENERATED G__DDPython.cxx
diff --git a/DDG4/include/DDG4/DDG4Dict.h b/DDG4/include/DDG4/DDG4Dict.h
index a9f832b77a6d1eb74e4eb0d4612eb68afd7a43fe..3682825fd87d0c01363e3293c7b1bcaed8c835e2 100644
--- a/DDG4/include/DDG4/DDG4Dict.h
+++ b/DDG4/include/DDG4/DDG4Dict.h
@@ -18,13 +18,6 @@
#ifndef DD4HEP_DDG4_DDG4DICT_H
#define DD4HEP_DDG4_DDG4DICT_H
-// Disable some diagnostics for ROOT dictionaries
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#pragma GCC diagnostic ignored "-Wunused"
-#endif
-
// FRamework include files
#include "DDG4/Geant4Data.h"
#include "DDG4/Geant4Particle.h"
diff --git a/DDG4/python/DDG4Dict.C b/DDG4/python/DDG4Dict.C
index 41b5db80ad8f88059b48a4e468de5feb536c4d15..cff433871734d7426b0cbc8f6b1ff47fe37ec08e 100644
--- a/DDG4/python/DDG4Dict.C
+++ b/DDG4/python/DDG4Dict.C
@@ -16,13 +16,6 @@
//
//====================================================================
-// Disable some diagnostics for ROOT dictionaries
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#pragma GCC diagnostic ignored "-Wdeprecated"
-#pragma GCC diagnostic ignored "-Wunused"
-#endif
-
// Framework include files
#include "DDG4/Geant4Config.h"
#include "DDG4/Geant4Primary.h"
diff --git a/UtilityApps/src/graphicalMaterialScan.cpp b/UtilityApps/src/graphicalMaterialScan.cpp
index edb423448e548dca03a88f915c776facad170f0f..5db17379438ccc292f7880fc94c180f8816649ea 100644
--- a/UtilityApps/src/graphicalMaterialScan.cpp
+++ b/UtilityApps/src/graphicalMaterialScan.cpp
@@ -18,6 +18,7 @@
// average lambda/length across these paths
// for each material, fraction of path length which crosses that material
// (inspired by material scan)
+//
// Author : D.Jeans, UTokyo
//
//==========================================================================
@@ -101,13 +102,13 @@ int main_wrapper(int argc, char** argv) {
}
double x0,y0,z0,x1,y1,z1;
- unsigned int nslice, nbins, mm;
+ unsigned int nslice, nbins, mm_count;
std::stringstream sstr;
sstr <<
argv[3] << " " << argv[4] << " " << argv[5] << " " <<
argv[6] << " " << argv[7] << " " << argv[8] << " " <<
argv[9] << " " << argv[10] << " " << argv[11] << " " << "NONE";
- sstr >> x0 >> y0 >> z0 >> x1 >> y1 >> z1 >> nslice >> nbins >> mm;
+ sstr >> x0 >> y0 >> z0 >> x1 >> y1 >> z1 >> nslice >> nbins >> mm_count;
if ( !sstr.good() ) {
Handler::usage();
::exit(EINVAL);
@@ -194,13 +195,13 @@ int main_wrapper(int argc, char** argv) {
std::map < std::string , float > materialmap;
- for (unsigned int jx=0; jx<2*mm; jx++) {
- if ( jx<mm ) {
- double xcom = xmin + (1+jx)*( xmax - xmin )/(mm+1.);
+ for (unsigned int jx=0; jx<2*mm_count; jx++) {
+ if ( jx<mm_count ) {
+ double xcom = xmin + (1+jx)*( xmax - xmin )/(mm_count+1.);
p0.array()[index[1]] = xcom; p0.array()[index[2]] = ymin;
p1.array()[index[1]] = xcom; p1.array()[index[2]] = ymax;
} else {
- double ycom = ymin + (jx-mm+1)*( ymax - ymin )/(mm+1.);
+ double ycom = ymin + (jx-mm_count+1)*( ymax - ymin )/(mm_count+1.);
p0.array()[index[1]] = xmin; p0.array()[index[2]] = ycom;
p1.array()[index[1]] = xmax; p1.array()[index[2]] = ycom;
}