Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CEPCSW
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dhb112358@mail.ustc.edu.cn
CEPCSW
Commits
26c5ff22
Unverified
Commit
26c5ff22
authored
4 years ago
by
FU Chengdong
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
GeoSvc to GeomSvc
parent
22465e8d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Utilities/KalDet/src/ild/common/MaterialDataBase.cc
+5
-5
5 additions, 5 deletions
Utilities/KalDet/src/ild/common/MaterialDataBase.cc
with
5 additions
and
5 deletions
Utilities/KalDet/src/ild/common/MaterialDataBase.cc
+
5
−
5
View file @
26c5ff22
...
@@ -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/IGeo
m
Svc.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
,
IGeo
m
Svc
*
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
,
IGeo
m
Svc
*
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
,
IGeo
m
Svc
*
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 Geo
m
Svc!"
<<
std
::
endl
;
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment