From 458be3888f166f6c409a1a6de5834d7d00906d0e Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Wed, 27 Nov 2013 19:19:36 +0000
Subject: [PATCH] Fix AClick
---
DDG4/examples/initAClick.C | 23 +++++++----------------
DDG4/python/DDG4.py | 18 +++++++++++++++---
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/DDG4/examples/initAClick.C b/DDG4/examples/initAClick.C
index 2226c8463..d5c5691cd 100644
--- a/DDG4/examples/initAClick.C
+++ b/DDG4/examples/initAClick.C
@@ -8,23 +8,14 @@ string make_str(const char* data) {
return string(data);
}
-void init() {
+void initAClick() {
string g4_base = make_str(gSystem->Getenv("Geant4_DIR"));
- string base = make_str(gSystem->Getenv("SW"));
- string inc = " -I"+make_str(gSystem->Getenv("DD4hep_DIR"))+"/../DD4hep.trunk/";
- gSystem->AddIncludePath((inc + "DDSegmentation/include ").c_str());
- gSystem->AddIncludePath((inc + "DDCore/include ").c_str());
- gSystem->AddIncludePath((inc + "DDG4/include ").c_str());
- gSystem->AddIncludePath((" -I" + g4_base + "/include/Geant4 -Wno-shadow -g -O0 ").c_str());
- string g4_libs = " -L"+g4_base+"/lib -L"+g4_base+"/lib64";
- string libs = " -L"+make_str(gSystem->Getenv("DD4hep_DIR"))+"/lib";
- gSystem->AddLinkedLibs((libs+" -lDD4hepCore -lDD4hepG4 -lDDSegmentation ").c_str());
- gSystem->AddLinkedLibs((g4_libs+" -lG4event -lG4tracking -lG4particles ").c_str());
+ string dd4hep = make_str(gSystem->Getenv("DD4hep_DIR"));
+ string inc = " -I"+dd4hep+"/include -I"+g4_base+"/include/Geant4 -Wno-shadow -g -O0";
+ string libs = " -L"+dd4hep+"/lib -lDD4hepCore -lDD4hepG4 -lDDSegmentation";
+ libs += (" -L"+g4_base+"/lib -L"+g4_base+"/lib64 -lG4event -lG4tracking -lG4particles");
+ gSystem->AddIncludePath(inc.c_str());
+ gSystem->AddLinkedLibs(libs.c_str());
cout << "Includes: " << gSystem->GetIncludePath() << endl;
cout << "Linked libs:" << gSystem->GetLinkedLibs() << endl;
}
-
-void initAClick() {
- init();
-}
-
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 4e2d16fb1..012d5df2e 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -7,7 +7,7 @@ import ROOT
def compileAClick(dictionary,g4=True):
from ROOT import gInterpreter, gSystem
dd4hep = os.environ['DD4hep_DIR']
- inc = ' -I'+dd4hep+'/include '
+ inc = ' -I'+os.environ['ROOTSYS']+'/include -I'+dd4hep+'/include '
lib = ' -L'+dd4hep+'/lib -lDD4hepCore -lDD4hepG4 -lDDSegmentation '
if g4:
geant4 = os.environ['Geant4_DIR']
@@ -18,7 +18,7 @@ def compileAClick(dictionary,g4=True):
gSystem.AddLinkedLibs(lib)
#####print "Includes: ",gSystem.GetIncludePath(),"\n","Linked libs:",gSystem.GetLinkedLibs()
gInterpreter.ProcessLine('.L '+dictionary+'+')
- #####gInterpreter.Load('Geant4Dict_C.so')
+ #####gInterpreter.Load('DDG4Dict_C.so')
from ROOT import DD4hep as module
return module
@@ -29,13 +29,25 @@ def _import_class(ns,nam):
setattr(current,nam,getattr(scope,nam))
#---------------------------------------------------------------------------
-DD4hep = compileAClick(dictionary='DDG4Dict.C',g4=True)
+DD4hep = compileAClick(dictionary='./DDG4Dict.C',g4=True)
Sim = DD4hep.Simulation
Simulation = DD4hep.Simulation
Kernel = Sim.KernelHandle
Interface = Sim.Geant4ActionCreation
+class _Levels:
+ def __init__(self):
+ self.VERBOSE=1
+ self.DEBUG=2
+ self.INFO=3
+ self.WARNING=4
+ self.ERROR=5
+ self.FATAL=6
+ self.ALWAYS=7
+
+OutputLevel = _Levels()
+
def _registerGlobalAction(self,action):
self.get().registerGlobalAction(Interface.toAction(action))
def _registerGlobalFilter(self,filter):
--
GitLab