Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nptool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Admin message
Gitlab has been updated. More info
here
.
Show more breadcrumbs
np
nptool
Commits
29a01700
Commit
29a01700
authored
7 years ago
by
shuyaota
Browse files
Options
Downloads
Patches
Plain Diff
Added Deadlayer for Hyball
parent
82b58ea7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NPSimulation/Detectors/Tiara/Tiara.cc
+18
-0
18 additions, 0 deletions
NPSimulation/Detectors/Tiara/Tiara.cc
NPSimulation/Detectors/Tiara/Tiara.hh
+10
-3
10 additions, 3 deletions
NPSimulation/Detectors/Tiara/Tiara.hh
with
28 additions
and
3 deletions
NPSimulation/Detectors/Tiara/Tiara.cc
+
18
−
0
View file @
29a01700
...
@@ -719,6 +719,12 @@ void Tiara::ConstructHyball(G4LogicalVolume* world){
...
@@ -719,6 +719,12 @@ void Tiara::ConstructHyball(G4LogicalVolume* world){
HYBALL_ActiveWafer_OuterRadius
,
0.6
*
HYBALL_ActiveWafer_Thickness
,
HYBALL_ActiveWafer_OuterRadius
,
0.6
*
HYBALL_ActiveWafer_Thickness
,
-
0.5
*
HYBALL_ActiveWafer_Angle
,
HYBALL_ActiveWafer_Angle
);
-
0.5
*
HYBALL_ActiveWafer_Angle
,
HYBALL_ActiveWafer_Angle
);
//by Shuya 180219. Hyball DeadLayer
G4Tubs
*
Hyball_DeadLayer
=
new
G4Tubs
(
"HyballDeadLayer"
,
HYBALL_ActiveWafer_InnerRadius
,
HYBALL_ActiveWafer_OuterRadius
,
0.5
*
HYBALL_DeadLayer_Thickness
,
-
0.5
*
HYBALL_ActiveWafer_Angle
,
HYBALL_ActiveWafer_Angle
);
// Substract Active Wafer from Wafer
// Substract Active Wafer from Wafer
G4SubtractionSolid
*
InertWafer
=
new
G4SubtractionSolid
(
"Hyball_InertWafer"
,
WaferFull
,
ActiveWaferShape
,
G4SubtractionSolid
*
InertWafer
=
new
G4SubtractionSolid
(
"Hyball_InertWafer"
,
WaferFull
,
ActiveWaferShape
,
...
@@ -751,6 +757,12 @@ void Tiara::ConstructHyball(G4LogicalVolume* world){
...
@@ -751,6 +757,12 @@ void Tiara::ConstructHyball(G4LogicalVolume* world){
logicAW
->
SetVisAttributes
(
SiliconVisAtt
);
logicAW
->
SetVisAttributes
(
SiliconVisAtt
);
logicAW
->
SetSensitiveDetector
(
m_HyballScorer
);
logicAW
->
SetSensitiveDetector
(
m_HyballScorer
);
//by Shuya 180219
// logic Hyball DeadLayer
G4LogicalVolume
*
logicDL
=
new
G4LogicalVolume
(
Hyball_DeadLayer
,
m_MaterialSilicon
,
"logicDL"
,
0
,
0
,
0
);
logicDL
->
SetVisAttributes
(
SiliconVisAtt
);
// Place all the Piece in the mother volume
// Place all the Piece in the mother volume
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
0
),
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
0
),
G4ThreeVector
(
0
,
0
,
0
),
G4ThreeVector
(
0
,
0
,
0
),
...
@@ -767,6 +779,12 @@ void Tiara::ConstructHyball(G4LogicalVolume* world){
...
@@ -767,6 +779,12 @@ void Tiara::ConstructHyball(G4LogicalVolume* world){
logicAW
,
"Hyball_ActiveWafer"
,
logicAW
,
"Hyball_ActiveWafer"
,
logicHyball
,
false
,
0
);
logicHyball
,
false
,
0
);
//by Shuya 180219. Note beacause Hyball is placed in negative direction (such as -147 mm) in world coordinate, deadlayer (front side) positions must be added in positive direction.
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
0
),
G4ThreeVector
(
0
,
0
,
0.5
*
HYBALL_ActiveWafer_Thickness
+
0.5
*
HYBALL_DeadLayer_Thickness
),
logicDL
,
"Hyball_DeadLayer"
,
logicHyball
,
false
,
0
);
for
(
unsigned
int
i
=
0
;
i
<
m_HyballZ
.
size
()
;
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
m_HyballZ
.
size
()
;
i
++
){
// Place mother volume
// Place mother volume
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
m_HyballPhi
[
i
]),
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
m_HyballPhi
[
i
]),
...
...
This diff is collapsed.
Click to expand it.
NPSimulation/Detectors/Tiara/Tiara.hh
+
10
−
3
View file @
29a01700
...
@@ -48,8 +48,10 @@ using namespace CLHEP;
...
@@ -48,8 +48,10 @@ using namespace CLHEP;
namespace
TIARA
{
namespace
TIARA
{
// Energy and time Resolution
// Energy and time Resolution
const
G4double
ResoTime
=
0
;
const
G4double
ResoTime
=
0
;
const
G4double
ResoEnergyInnerBarrel
=
0.017
*
MeV
;
// = 136keV FWHM
//const G4double ResoEnergyInnerBarrel = 0.017*MeV ;// = 136keV FWHM
const
G4double
ResoEnergyOuterBarrel
=
0.017
*
MeV
;
// = 136keV FWHM
//const G4double ResoEnergyOuterBarrel = 0.017*MeV ;// = 136keV FWHM
const
G4double
ResoEnergyInnerBarrel
=
0.050
*
MeV
;
// = 136keV FWHM
const
G4double
ResoEnergyOuterBarrel
=
0.050
*
MeV
;
// = 136keV FWHM
const
G4double
ResoEnergyHyball
=
0.017
*
MeV
;
// = 70keV FWHM
const
G4double
ResoEnergyHyball
=
0.017
*
MeV
;
// = 70keV FWHM
const
G4double
EnergyThreshold
=
200
*
keV
;
const
G4double
EnergyThreshold
=
200
*
keV
;
...
@@ -86,7 +88,9 @@ namespace TIARA{
...
@@ -86,7 +88,9 @@ namespace TIARA{
const
G4double
INNERBARREL_ActiveWafer_Thickness
=
400
*
um
;
const
G4double
INNERBARREL_ActiveWafer_Thickness
=
400
*
um
;
const
G4double
INNERBARREL_InertWafer_Length
=
97.00
*
mm
;
const
G4double
INNERBARREL_InertWafer_Length
=
97.00
*
mm
;
const
G4double
INNERBARREL_InertWafer_Width
=
24.80
*
mm
;
const
G4double
INNERBARREL_InertWafer_Width
=
24.80
*
mm
;
const
G4double
INNERBARREL_ActiveWafer_DeadLayerThickness
=
1
*
um
;
//by Shuya 180219. Equivalent to thickness in Al (note material itself is Si).
//const G4double INNERBARREL_ActiveWafer_DeadLayerThickness = 1*um;
const
G4double
INNERBARREL_ActiveWafer_DeadLayerThickness
=
0.3
*
um
;
const
G4double
INNERBARREL_InertWafer_Thickness
=
const
G4double
INNERBARREL_InertWafer_Thickness
=
INNERBARREL_ActiveWafer_Thickness
+
2
*
INNERBARREL_ActiveWafer_DeadLayerThickness
;
INNERBARREL_ActiveWafer_Thickness
+
2
*
INNERBARREL_ActiveWafer_DeadLayerThickness
;
const
G4int
INNERBARREL_NumberOfStrip
=
4
;
const
G4int
INNERBARREL_NumberOfStrip
=
4
;
...
@@ -117,6 +121,9 @@ namespace TIARA{
...
@@ -117,6 +121,9 @@ namespace TIARA{
const
G4double
HYBALL_ActiveWafer_Angle
=
54.8
*
deg
;
const
G4double
HYBALL_ActiveWafer_Angle
=
54.8
*
deg
;
const
G4double
HYBALL_NumberOfAnnularStrip
=
16
;
const
G4double
HYBALL_NumberOfAnnularStrip
=
16
;
const
G4double
HYBALL_NumberOfRadialStrip
=
8
;
const
G4double
HYBALL_NumberOfRadialStrip
=
8
;
//by Shuya 180219. Equivalent to thickness in Al (note material itself is Si).
const
G4double
HYBALL_DeadLayer_Thickness
=
0.61
*
um
;
}
}
...
...
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