Permalink
Browse files

Remove rootclang warnings.

  • Loading branch information...
MarkusFrankATcernch committed Jan 24, 2018
1 parent 423b210 commit 59cc9562d0ae48225ea5b242d41911149e2b1a36
@@ -23,6 +23,8 @@
#include "DDCond/ConditionsRootPersistency.h"
#include "DDCond/ConditionsTreePersistency.h"
namespace { class ConditionsDictionary {}; }
// -------------------------------------------------------------------------
// Regular dd4hep dictionaries
// -------------------------------------------------------------------------
@@ -36,35 +38,38 @@
#pragma link C++ namespace dd4hep::cond;
using namespace dd4hep;
using namespace dd4hep::cond;
// These are necessary to support interactivity
#pragma link C++ class cond::UserPool-;
#pragma link C++ class cond::UpdatePool-;
#pragma link C++ class cond::ConditionsPool-;
#pragma link C++ class cond::ConditionsManager-;
#pragma link C++ class cond::ConditionsManagerObject-;
#pragma link C++ class cond::ConditionsIOVPool-;
#pragma link C++ class cond::ConditionsContent-;
#pragma link C++ class cond::ConditionsLoadInfo-;
#pragma link C++ class cond::ConditionsContent::LoadInfo<std::string>-;
#pragma link C++ class std::map<Condition::key_type,cond::ConditionsLoadInfo* >-;
#pragma link C++ class std::map<Condition::key_type,cond::ConditionDependency* >-;
#pragma link C++ class UserPool-;
#pragma link C++ class UpdatePool-;
#pragma link C++ class ConditionsPool-;
#pragma link C++ class ConditionsManager-;
#pragma link C++ class ConditionsManagerObject-;
#pragma link C++ class ConditionsIOVPool-;
#pragma link C++ class ConditionsContent-;
#pragma link C++ class ConditionsLoadInfo-;
#pragma link C++ class ConditionsContent::LoadInfo<std::string>-;
#pragma link C++ class std::map<Condition::key_type,ConditionsLoadInfo* >-;
#pragma link C++ class std::map<Condition::key_type,ConditionDependency* >-;
// std::shared_ptr<T> is not yet supported by ROOT!
//#pragma link C++ class std::shared_ptr<cond::ConditionsPool>-;
//#pragma link C++ class std::map<IOV::Key,std::shared_ptr<cond::ConditionsPool> >-;
//#pragma link C++ class std::shared_ptr<ConditionsPool>-;
//#pragma link C++ class std::map<IOV::Key,std::shared_ptr<ConditionsPool> >-;
// This one we need to save conditions pool to file
#pragma link C++ class std::pair<std::string,IOV::Key>+;
#pragma link C++ class std::pair<std::pair<std::string,int>, IOV::Key>+;
#pragma link C++ class std::pair<std::string,std::pair<std::pair<std::string,int>,IOV::Key> >+;
#pragma link C++ class std::list<std::pair<std::pair<std::string,std::pair<std::pair<std::string,int>,IOV::Key> >, std::vector<Condition> >+;
//#pragma link C++ class std::list<cond::ConditionsRootPersistency::Pool>+;
//#pragma link C++ class std::list<cond::ConditionsRootPersistency::IOVPool>+;
template class std::list< std::pair< std::pair< std::string, std::pair< std::pair<std::string,int>, IOV::Key> >, std::vector<Condition> > >;
#pragma link C++ class std::list<std::pair<std::pair<std::string,std::pair<std::pair<std::string,int>,IOV::Key> >, std::vector<Condition> > >+;
//#pragma link C++ class std::list<ConditionsRootPersistency::Pool>+;
//#pragma link C++ class std::list<ConditionsRootPersistency::IOVPool>+;
#pragma link C++ class cond::ConditionsRootPersistency+;
#pragma link C++ class cond::ConditionsTreePersistency+;
#pragma link C++ class ConditionsRootPersistency+;
#pragma link C++ class ConditionsTreePersistency+;
#endif
@@ -39,9 +39,9 @@ namespace dd4hep {
public:
typedef unsigned long (*func_t)(void* obj, const void* fun, const void* args[]);
/// Structure definition to store callback related data \ingroup DD4HEP
typedef struct {
struct mfunc_t {
void *first, *second;
} mfunc_t;
};
typedef unsigned long ulong;
void* par;
@@ -106,7 +106,7 @@ namespace dd4hep {
} /* End namespace align */
} /* End namespace dd4hep */
static PrintLevel s_PRINT = WARNING;
static PrintLevel s_PRINT = WARNING;
//static PrintLevel s_PRINT = INFO;
Result Calculator::to_world(Context& context,
@@ -267,9 +267,23 @@ Result AlignmentsCalculator::compute(const std::map<DetElement, Delta>& deltas,
Result result;
Calculator obj;
Calculator::Context context(alignments);
// This is a tricky one. We absolutely need the detector elements ordered
// by their depth aka. the distance to /world.
// Unfortunately one cannot use the raw pointer of the DetElement here,
// But has to insert them in a map which is ordered by the DetElement path.
//
// Otherwise memory randomization gives us the wrong order and the
// corrections are calculated in the wrong order ie. not top -> down the
// hierarchy, but in "some" order depending on the pointer values!
//
std::map<DetElement,Delta,Calculator::Context::PathOrdering> ordered_deltas;
for( const auto& i : deltas )
ordered_deltas.insert(i);
for( const auto& i : ordered_deltas )
context.insert(i.first, &(i.second));
for( const auto& i : deltas )
for( const auto& i : ordered_deltas )
obj.resolve(context,i.first);
for( auto& i : context.entries )
result += obj.compute(context, i);
@@ -21,7 +21,9 @@
// C/C++ include files
#include <vector>
#include <list>
#include <map>
#include <set>
#include <string>
#include "TRint.h"
@@ -41,6 +43,14 @@ using namespace std;
#pragma link C++ class dd4hep::Property;
#if defined(DD4HEP_HAVE_ALL_PARSERS)
template class dd4hep::PropertyValue<char>;
template class dd4hep::PropertyValue<unsigned char>;
template class dd4hep::PropertyValue<short>;
template class dd4hep::PropertyValue<unsigned short>;
template class dd4hep::PropertyValue<unsigned int>;
template class dd4hep::PropertyValue<long>;
template class dd4hep::PropertyValue<unsigned long>;
#pragma link C++ class dd4hep::PropertyValue<char>-;
#pragma link C++ class dd4hep::PropertyValue<unsigned char>-;
#pragma link C++ class dd4hep::PropertyValue<short>-;
@@ -49,6 +59,14 @@ using namespace std;
#pragma link C++ class dd4hep::PropertyValue<long>-;
#pragma link C++ class dd4hep::PropertyValue<unsigned long>-;
template class dd4hep::PropertyValue<std::vector<char> >;
template class dd4hep::PropertyValue<std::vector<unsigned char> >;
template class dd4hep::PropertyValue<std::vector<short> >;
template class dd4hep::PropertyValue<std::vector<unsigned short> >;
template class dd4hep::PropertyValue<std::vector<unsigned int> >;
template class dd4hep::PropertyValue<std::vector<long> >;
template class dd4hep::PropertyValue<std::vector<unsigned long> >;
#pragma link C++ class dd4hep::PropertyValue<std::vector<char> >-;
#pragma link C++ class dd4hep::PropertyValue<std::vector<unsigned char> >-;
#pragma link C++ class dd4hep::PropertyValue<std::vector<short> >-;
@@ -57,6 +75,14 @@ using namespace std;
#pragma link C++ class dd4hep::PropertyValue<std::vector<long> >-;
#pragma link C++ class dd4hep::PropertyValue<std::vector<unsigned long> >-;
template class dd4hep::PropertyValue<std::list<char> >;
template class dd4hep::PropertyValue<std::list<unsigned char> >;
template class dd4hep::PropertyValue<std::list<short> >;
template class dd4hep::PropertyValue<std::list<unsigned short> >;
template class dd4hep::PropertyValue<std::list<unsigned int> >;
template class dd4hep::PropertyValue<std::list<long> >;
template class dd4hep::PropertyValue<std::list<unsigned long> >;
#pragma link C++ class dd4hep::PropertyValue<std::list<char> >-;
#pragma link C++ class dd4hep::PropertyValue<std::list<unsigned char> >-;
#pragma link C++ class dd4hep::PropertyValue<std::list<short> >-;
@@ -65,6 +91,14 @@ using namespace std;
#pragma link C++ class dd4hep::PropertyValue<std::list<long> >-;
#pragma link C++ class dd4hep::PropertyValue<std::list<unsigned long> >-;
template class dd4hep::PropertyValue<std::set<char> >;
template class dd4hep::PropertyValue<std::set<unsigned char> >;
template class dd4hep::PropertyValue<std::set<short> >;
template class dd4hep::PropertyValue<std::set<unsigned short> >;
template class dd4hep::PropertyValue<std::set<unsigned int> >;
template class dd4hep::PropertyValue<std::set<long> >;
template class dd4hep::PropertyValue<std::set<unsigned long> >;
#pragma link C++ class dd4hep::PropertyValue<std::set<char> >-;
#pragma link C++ class dd4hep::PropertyValue<std::set<unsigned char> >-;
#pragma link C++ class dd4hep::PropertyValue<std::set<short> >-;
@@ -74,29 +108,47 @@ using namespace std;
#pragma link C++ class dd4hep::PropertyValue<std::set<unsigned long> >-;
#endif
template class dd4hep::PropertyValue<int>;
template class dd4hep::PropertyValue<float>;
template class dd4hep::PropertyValue<double>;
template class dd4hep::PropertyValue<std::string>;
#pragma link C++ class dd4hep::PropertyValue<int>-;
#pragma link C++ class dd4hep::PropertyValue<float>-;
#pragma link C++ class dd4hep::PropertyValue<double>-;
#pragma link C++ class dd4hep::PropertyValue<std::string>-;
template class dd4hep::PropertyValue<std::vector<int> >;
template class dd4hep::PropertyValue<std::vector<float> >;
template class dd4hep::PropertyValue<std::vector<double> >;
template class dd4hep::PropertyValue<std::vector<std::string> >;
#pragma link C++ class dd4hep::PropertyValue<std::vector<int> >-;
#pragma link C++ class dd4hep::PropertyValue<std::vector<float> >-;
#pragma link C++ class dd4hep::PropertyValue<std::vector<double> >-;
#pragma link C++ class dd4hep::PropertyValue<std::vector<std::string> >-;
template class dd4hep::PropertyValue<std::list<int> >;
template class dd4hep::PropertyValue<std::list<float> >;
template class dd4hep::PropertyValue<std::list<double> >;
template class dd4hep::PropertyValue<std::list<std::string> >;
#pragma link C++ class dd4hep::PropertyValue<std::list<int> >-;
#pragma link C++ class dd4hep::PropertyValue<std::list<float> >-;
#pragma link C++ class dd4hep::PropertyValue<std::list<double> >-;
#pragma link C++ class dd4hep::PropertyValue<std::list<std::string> >-;
template class dd4hep::PropertyValue<std::set<int> >;
template class dd4hep::PropertyValue<std::set<float> >;
template class dd4hep::PropertyValue<std::set<double> >;
template class dd4hep::PropertyValue<std::set<std::string> >;
#pragma link C++ class dd4hep::PropertyValue<std::set<int> >-;
#pragma link C++ class dd4hep::PropertyValue<std::set<float> >-;
#pragma link C++ class dd4hep::PropertyValue<std::set<double> >-;
#pragma link C++ class dd4hep::PropertyValue<std::set<std::string> >-;
template class std::map<std::string, dd4hep::Property>;
#pragma link C++ class std::map<std::string, dd4hep::Property>-;
#pragma link C++ class PropertyManager-;
#pragma link C++ class PropertyConfigurable-;
#pragma link C++ class dd4hep::PropertyManager-;
#pragma link C++ class dd4hep::PropertyConfigurable-;
#pragma link C++ class dd4hep::PropertyConfigurator-;
#pragma link C++ class dd4hep::PropertyGrammar-;
View
@@ -16,6 +16,10 @@ dd4hep_package( DDEve
#---Add Plugin Library-----------------------------------------------------
dd4hep_add_dictionary ( G__DDEve
SOURCES ${DDCore_INCLUDE_DIRS}/include/ROOT/Warnings.h include/DDEve/*.h
EXCLUDE include/DDEve/Utilities.h
include/DDEve/ParticleActors.h
include/DDEve/HitActors.h
include/DDEve/Factories.h
LINKDEF ${DDCore_INCLUDE_DIRS}/include/ROOT/LinkDef.h
)
#
View
@@ -32,13 +32,16 @@
#include "DDG4/DDG4Dict.h"
#include "DDEve/DDEveEventData.h"
namespace { class DDG4IO {}; }
// CINT configuration
#if defined(__MAKECINT__) || defined(__CINT__) || defined(__CLING__) || defined(__ROOTCLING__)
namespace dd4hep { namespace sim {
typedef Geant4Tracker SimpleTracker;
typedef Geant4Calorimeter SimpleCalorimeter;
typedef Geant4HitData SimpleHit;
}}
#else
// C/C++ include files
@@ -34,7 +34,7 @@ namespace dd4hep {
* \version 1.0
* \ingroup DD4HEP_EVE
*/
class dd4hepMenu : public PopupMenu {
class DD4hepMenu : public PopupMenu {
public:
protected:
@@ -43,9 +43,9 @@ namespace dd4hep {
EventControl* m_evtCtrl;
public:
/// Standard constructor
dd4hepMenu(Display* eve);
DD4hepMenu(Display* eve);
/// Default destructor
virtual ~dd4hepMenu();
virtual ~DD4hepMenu();
/// Add the menu to the menu bar
virtual void Build(TGMenuBar* bar, int hints=kLHintsNormal) override;
@@ -67,7 +67,7 @@ namespace dd4hep {
/// Callback when the geometry was loaded
void OnGeometryLoaded();
/// ROOT implementation macro
ClassDefOverride(dd4hepMenu,0);
ClassDefOverride(DD4hepMenu,0);
};
} /* End namespace dd4hep */
Oops, something went wrong.

0 comments on commit 59cc956

Please sign in to comment.