Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
spdroot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
NICA
spdroot
Commits
eb4498af
Commit
eb4498af
authored
1 year ago
by
Artem Ivanov
Browse files
Options
Downloads
Patches
Plain Diff
Fixed bugs in BBC and TOF geometry description
parent
128da46f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bbc/SpdBbc.cxx
+15
-17
15 additions, 17 deletions
bbc/SpdBbc.cxx
tof/barrel/SpdTofB.cxx
+307
-283
307 additions, 283 deletions
tof/barrel/SpdTofB.cxx
with
322 additions
and
300 deletions
bbc/SpdBbc.cxx
+
15
−
17
View file @
eb4498af
...
...
@@ -275,8 +275,15 @@ void SpdBbc::ConstructDetector()
cout
<<
"-E- <SpdBbc::BuildModule> Unknown material: "
<<
mat
<<
endl
;
return
;
}
// Double_t mthick = mapper->GetModuleThickness();
// Double_t msize = mapper->GetModuleSize();
// Double_t mwidth = mapper->GetModuleWidth();
Double_t
bbcthickness
=
0.5
;
//cm
Double_t
bbcthickness
=
mapper
->
GetModuleThickness
()
;
//cm
//**************
TGeoVolume
*
fRing1
=
gGeoManager
->
MakeTube
(
mapper
->
AddPrefix
(
"Ring"
),
material
,
4.25
,
9.5
,
0.5
*
bbcthickness
);
fRing1
->
SetFillColor
(
kMagenta
);
...
...
@@ -320,10 +327,6 @@ void SpdBbc::ConstructDetector()
fSector6
->
SetTransparency
(
15
);
// Double_t mthick = mapper->GetModuleThickness();
// Double_t msize = mapper->GetModuleSize();
// Double_t mwidth = mapper->GetModuleWidth();
AddSensitiveVolume
(
fRing1
);
//ATTENTION FIXME ATTENTION
AddSensitiveVolume
(
fSector2
);
//ATTENTION FIXME ATTENTION
AddSensitiveVolume
(
fSector3
);
//ATTENTION FIXME ATTENTION
...
...
@@ -363,15 +366,12 @@ void SpdBbc::ConstructDetector()
TGeoTranslation
trans0
;
trans0
.
SetTranslation
(
0
,
0
,
0
);
Double_t
shift
=
171.6
;
// Double_t shift = 171.6;
Double_t
shift
=
mapper
->
GetMinDistance
();
//TGeoVolume *
fModule1
=
new
TGeoVolumeAssembly
(
mapper
->
AddPrefix
(
"zplus"
));
// fModule1->SetFillColor(kMagenta);
// fModule1->SetLineColor(kMagenta);
// fModule1->SetTransparency(30);
fModule1
->
AddNode
(
fRing1
,
1
,
new
TGeoCombiTrans
(
trans0
,
rot0
));
fModule1
->
AddNode
(
fRing2
,
2
,
new
TGeoCombiTrans
(
trans0
,
rot0
));
fModule1
->
AddNode
(
fRing3
,
3
,
new
TGeoCombiTrans
(
trans0
,
rot0
));
...
...
@@ -389,11 +389,7 @@ void SpdBbc::ConstructDetector()
// TGeoVolume *
fModule2
=
new
TGeoVolumeAssembly
(
mapper
->
AddPrefix
(
"zminus"
));
// fModule2->SetFillColor(kMagenta);
// fModule2->SetLineColor(kMagenta);
// fModule2->SetTransparency(30);
fModule2
->
AddNode
(
fRing1
,
1
,
new
TGeoCombiTrans
(
trans0
,
rot0
));
fModule2
->
AddNode
(
fRing2
,
2
,
new
TGeoCombiTrans
(
trans0
,
rot0
));
fModule2
->
AddNode
(
fRing3
,
3
,
new
TGeoCombiTrans
(
trans0
,
rot0
));
...
...
@@ -408,6 +404,8 @@ void SpdBbc::ConstructDetector()
fMasterVolume
->
AddNode
(
fModule2
,
2
,
new
TGeoCombiTrans
(
trans2
,
rot2
));
}
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
...
...
This diff is collapsed.
Click to expand it.
tof/barrel/SpdTofB.cxx
+
307
−
283
View file @
eb4498af
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