From 063c1f3be9a61ecf7ecfb3f78d2a7c1387f7f687 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Fri, 8 May 2015 14:43:51 +0000
Subject: [PATCH] Library renames in python and Cint scripts
---
DDG4/examples/initAClick.C | 4 ++--
DDG4/examples/run.C | 4 ++--
DDG4/python/DD4hep.py | 6 +++---
DDG4/python/DDG4.py | 4 ++--
DDG4/scripts/dumpDDG4.C | 2 +-
examples/ClientTests/scripts/BoxTrafos.C | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/DDG4/examples/initAClick.C b/DDG4/examples/initAClick.C
index 79873df28..605270ec2 100644
--- a/DDG4/examples/initAClick.C
+++ b/DDG4/examples/initAClick.C
@@ -19,13 +19,13 @@ int initAClick(const char* command=0) {
string dd4hep = make_str(gSystem->Getenv("DD4hepINSTALL"));
string inc = " -I"+dd4hep+"/include -I"+g4_base+"/include/Geant4 -Wno-shadow -g -O0";
string libs = (" -L"+rootsys+"/lib");
- libs += " -lCore -lCint -lMathCore -L"+dd4hep+"/lib -lDD4hepCore -lDD4hepG4 -lDDSegmentation";
+ libs += " -lCore -lCint -lMathCore -L"+dd4hep+"/lib -lDDCore -lDDG4 -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;
- int ret = gSystem->Load("libDD4hepG4Plugins");
+ int ret = gSystem->Load("libDDG4Plugins");
return ret;
}
diff --git a/DDG4/examples/run.C b/DDG4/examples/run.C
index ecfef7b36..ac61809cd 100644
--- a/DDG4/examples/run.C
+++ b/DDG4/examples/run.C
@@ -4,8 +4,8 @@ void run() {
//gInterpreter->ProcessLine(".L exampleAClick.C+");
gInterpreter->ProcessLine(".L xmlAClick.C+");
//gInterpreter->ProcessLine(".L TEve.C+");
- //gSystem->Load("libDD4hepCore");
- //gSystem->Load("libDD4hepG4");
+ //gSystem->Load("libDDCore");
+ //gSystem->Load("libDDG4");
//gInterpreter->ProcessLine(".L FCC_Hcal.C+");
//gInterpreter->ProcessLine(".X DDG4Dump.C+");
//gInterpreter->ProcessLine(".X a.C++");
diff --git a/DDG4/python/DD4hep.py b/DDG4/python/DD4hep.py
index 2545d7bb2..d2a4177c7 100644
--- a/DDG4/python/DD4hep.py
+++ b/DDG4/python/DD4hep.py
@@ -6,7 +6,7 @@ def compileAClick(dictionary,g4=True):
import os.path
dd4hep = os.environ['DD4hepINSTALL']
inc = ' -I'+os.environ['ROOTSYS']+'/include -I'+dd4hep+'/include '
- lib = ' -L'+dd4hep+'/lib -lDD4hepCore -lDD4hepG4 -lDDSegmentation '
+ lib = ' -L'+dd4hep+'/lib -lDDCore -lDDG4 -lDDSegmentation '
if g4:
geant4 = os.environ['G4INSTALL']
inc = inc + ' -I'+geant4+'/include/Geant4 -Wno-shadow -g -O0 '
@@ -29,9 +29,9 @@ def loadDD4hep():
sys.path.append(os.environ['ROOTSYS']+os.sep+'lib')
import ROOT
from ROOT import gSystem
- result = gSystem.Load("libDD4hepCore")
+ result = gSystem.Load("libDDCore")
if 0 != result:
- raise Exception('DDG4.py: Failed to load the Geant4 library libDD4hepCore: '+gSystem.GetErrorStr())
+ raise Exception('DDG4.py: Failed to load the Geant4 library libDDCore: '+gSystem.GetErrorStr())
from ROOT import DD4hep as module
return module
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index db6f79114..1ea3529cd 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -2,9 +2,9 @@ from DD4hep import *
def loadDDG4():
from ROOT import gSystem
- result = gSystem.Load("libDD4hepG4Plugins")
+ result = gSystem.Load("libDDG4Plugins")
if 0 != result:
- raise Exception('DDG4.py: Failed to load the Geant4 library libDD4hepG4: '+gSystem.GetErrorStr())
+ raise Exception('DDG4.py: Failed to load the Geant4 library libDDG4: '+gSystem.GetErrorStr())
from ROOT import DD4hep as module
return module
diff --git a/DDG4/scripts/dumpDDG4.C b/DDG4/scripts/dumpDDG4.C
index a0c2290ad..943e3b6b8 100644
--- a/DDG4/scripts/dumpDDG4.C
+++ b/DDG4/scripts/dumpDDG4.C
@@ -209,7 +209,7 @@ int dumpDDG4(const char* fname, int event_num) {
int dumpddg4_load_geometry(const char* fname) {
if ( !have_geometry ) {
have_geometry = true;
- gSystem->Load("libDD4hepG4Plugins");
+ gSystem->Load("libDDG4Plugins");
LCDD& lcdd = LCDD::getInstance();
lcdd.fromXML(fname);
lcdd.apply("DD4hepVolumeManager",0,(char**)0);
diff --git a/examples/ClientTests/scripts/BoxTrafos.C b/examples/ClientTests/scripts/BoxTrafos.C
index 4974f481a..6f9d7b798 100644
--- a/examples/ClientTests/scripts/BoxTrafos.C
+++ b/examples/ClientTests/scripts/BoxTrafos.C
@@ -14,7 +14,7 @@
//====================================================================
namespace {
- struct Loader { Loader() { gSystem->Load("libDD4hepCore"); } } _load;
+ struct Loader { Loader() { gSystem->Load("libDDCore"); } } _load;
}
using namespace DD4hep::Geometry;
@@ -52,7 +52,7 @@ int BoxTrafos() {
xml += "/examples/ClientTests/compact/BoxTrafos.xml";
const char* argv[] = {xml.c_str(), "BUILD_DEFAULT", 0};
- gSystem->Load("libDD4hepCore");
+ gSystem->Load("libDDCore");
LCDD& lcdd = LCDD::getInstance();
lcdd.apply("DD4hepCompactLoader",2,(char**)argv);
lcdd.apply("DD4hepGeometryDisplay",0,0);
--
GitLab