Skip to content
Snippets Groups Projects
Unverified Commit 26c5ff22 authored by FU Chengdong's avatar FU Chengdong Committed by GitHub
Browse files

GeoSvc to GeomSvc

parent 22465e8d
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "gearimpl/Util.h" #include "gearimpl/Util.h"
#include <gear/SimpleMaterial.h> #include <gear/SimpleMaterial.h>
#include <gearimpl/GearParametersImpl.h> #include <gearimpl/GearParametersImpl.h>
#include "DetInterface/IGeoSvc.h" #include "DetInterface/IGeomSvc.h"
#include "TMaterial.h" #include "TMaterial.h"
...@@ -47,7 +47,7 @@ TMaterial* MaterialDataBase::getMaterial(std::string mat_name){ ...@@ -47,7 +47,7 @@ TMaterial* MaterialDataBase::getMaterial(std::string mat_name){
} }
void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ){ void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ){
if( !_isInitialised ){ if( !_isInitialised ){
this->createMaterials(gearMgr, geoSvc); this->createMaterials(gearMgr, geoSvc);
...@@ -57,7 +57,7 @@ void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ...@@ -57,7 +57,7 @@ void MaterialDataBase::initialise( const gear::GearMgr& gearMgr, IGeoSvc* geoSvc
} }
void MaterialDataBase::registerForService(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ) { void MaterialDataBase::registerForService(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ) {
if( !_isInitialised ){ if( !_isInitialised ){
//std::cout << "debug fucd: " << "--------------------" << std::endl; //std::cout << "debug fucd: " << "--------------------" << std::endl;
...@@ -91,7 +91,7 @@ void MaterialDataBase::addMaterial(TMaterial* mat, std::string name) { ...@@ -91,7 +91,7 @@ void MaterialDataBase::addMaterial(TMaterial* mat, std::string name) {
} }
void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* geoSvc ){ void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeomSvc* geoSvc ){
Double_t A, Z, density, radlen ; Double_t A, Z, density, radlen ;
std::string name; std::string name;
...@@ -221,7 +221,7 @@ void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* ge ...@@ -221,7 +221,7 @@ void MaterialDataBase::createMaterials(const gear::GearMgr& gearMgr, IGeoSvc* ge
this->addMaterial(&vxdsupport, name); this->addMaterial(&vxdsupport, name);
} }
catch( gear::UnknownParameterException& e){ catch( gear::UnknownParameterException& e){
std::cout << "Error while read material from GeoSvc!" << std::endl; std::cout << "Error while read material from GeomSvc!" << std::endl;
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment