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
Show more breadcrumbs
np
nptool
Commits
3b86e539
Commit
3b86e539
authored
11 years ago
by
adrien-matta
Browse files
Options
Downloads
Patches
Plain Diff
* Preparing Tiara for adding geometry of OuterBarrel and Hyball
parent
0677d26e
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/Tiara/Tiara.cc
+98
-79
98 additions, 79 deletions
NPSimulation/Tiara/Tiara.cc
NPSimulation/Tiara/Tiara.hh
+6
-5
6 additions, 5 deletions
NPSimulation/Tiara/Tiara.hh
with
104 additions
and
84 deletions
NPSimulation/Tiara/Tiara.cc
+
98
−
79
View file @
3b86e539
...
...
@@ -140,7 +140,7 @@ void Tiara::ReadConfiguration(string Path){
// Called After DetecorConstruction::AddDetector Method
void
Tiara
::
ConstructDetector
(
G4LogicalVolume
*
world
){
ConstructChamber
(
world
);
ConstructBarrel
(
world
);
Construct
Inner
Barrel
(
world
);
}
// Read sensitive part and fill the Root tree.
...
...
@@ -157,86 +157,9 @@ void Tiara::InitializeScorers(){
void
Tiara
::
InitializeRootOutput
(){
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void
Tiara
::
ConstructChamber
(
G4LogicalVolume
*
world
){
// Vaccum Chamber of Tiara
// The chamber is made of a central cylinder surrounding the barrel Si
// Two Cone that expeand out of the central cylinder to let room for Exogam
// Two outer cylinder surrounding Hyball
// Hyball is hold on a back plate that close the Diabolo Shaped Chamber
// Material to be moved in a Material Function //
// Al
G4double
density
=
2.702
*
g
/
cm3
;
G4double
a
=
26.98
*
g
/
mole
;
G4Material
*
Aluminium
=
new
G4Material
(
"Aluminium"
,
13.
,
a
,
density
);
// Making the Chamber //
// We make the individual pieces, starting from the inside to the outside
// Then we merge them together using the a G4AdditionSolid
// The whole chamber is then placed
// Central Tube
G4Tubs
*
solidCentralTube
=
new
G4Tubs
(
"TiaraChamberCentralTube"
,
CHAMBER_CentralTube_Inner_Radius
,
CHAMBER_CentralTube_Outer_Radius
,
CHAMBER_CentralTube_Length
/
2.
,
0
*
deg
,
360
*
deg
);
// Forward-Backward Cones
G4Cons
*
solidOuterCone
=
new
G4Cons
(
"TiaraChamberOuterCone"
,
CHAMBER_CentralTube_Inner_Radius
,
CHAMBER_CentralTube_Outer_Radius
,
CHAMBER_OuterCylinder_Inner_Radius
,
CHAMBER_OuterCylinder_Outer_Radius
,
CHAMBER_OuterCone_Length
/
2.
,
0
*
deg
,
360
*
deg
);
// Outer Cylinder
G4Tubs
*
solidOuterCylinder
=
new
G4Tubs
(
"TiaraChamberOuterCylinder"
,
CHAMBER_OuterCylinder_Inner_Radius
,
CHAMBER_OuterCylinder_Outer_Radius
,
CHAMBER_OuterCylinder_Length
/
2.
,
0
*
deg
,
360
*
deg
);
// Add the volume together
G4UnionSolid
*
solidTiaraChamberStep1
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidCentralTube
,
solidOuterCone
,
new
G4RotationMatrix
,
G4ThreeVector
(
0
,
0
,
CHAMBER_OuterCone_Z_Pos
));
G4UnionSolid
*
solidTiaraChamberStep2
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidTiaraChamberStep1
,
solidOuterCone
,
new
G4RotationMatrix
(
0
,
180
*
deg
,
0
),
G4ThreeVector
(
0
,
0
,
-
CHAMBER_OuterCone_Z_Pos
));
G4UnionSolid
*
solidTiaraChamberStep3
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidTiaraChamberStep2
,
solidOuterCylinder
,
new
G4RotationMatrix
,
G4ThreeVector
(
0
,
0
,
CHAMBER_OuterCylinder_Z_Pos
));
G4UnionSolid
*
solidTiaraChamberStep4
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidTiaraChamberStep3
,
solidOuterCylinder
,
new
G4RotationMatrix
,
G4ThreeVector
(
0
,
0
,
-
CHAMBER_OuterCylinder_Z_Pos
));
// Create Logic Volume
G4LogicalVolume
*
logicTiaraChamber
=
new
G4LogicalVolume
(
solidTiaraChamberStep4
,
Aluminium
,
"logicTiaraChamber"
,
0
,
0
,
0
);
// Visual Attribute
G4VisAttributes
*
ChamberVisAtt
=
new
G4VisAttributes
(
G4Colour
(
0.0
,
0.4
,
0.5
));
ChamberVisAtt
->
SetForceWireframe
(
true
);
ChamberVisAtt
->
SetForceAuxEdgeVisible
(
true
);
logicTiaraChamber
->
SetVisAttributes
(
ChamberVisAtt
);
// Place the whole chamber
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
0
),
G4ThreeVector
(
0
,
0
,
0
),
logicTiaraChamber
,
"TiaraChamber"
,
world
,
false
,
0
);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void
Tiara
::
ConstructBarrel
(
G4LogicalVolume
*
world
){
void
Tiara
::
Construct
Inner
Barrel
(
G4LogicalVolume
*
world
){
// Tiara Barrel
// The Barrel is made of 8 identical resistive strip detector
// The PCB is made from a G4ExtrudeSolid, because it has beveled edge
...
...
@@ -338,6 +261,102 @@ void Tiara::ConstructBarrel(G4LogicalVolume* world){
world
,
false
,
i
+
1
);
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void
Tiara
::
ConstructOuterBarrel
(
G4LogicalVolume
*
world
){
// TO BE DONE //
// Put the needed geometry parameter definition here instead of the namespace
// to facilitate the merge
// Respect Naming convention :example : OUTERBARREL_PCB_Length / OUTERBARREL_Wafer_Length
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void
Tiara
::
ConstructHyball
(
G4LogicalVolume
*
world
){
// TO BE DONE //
// Put the needed geometry parameter definition here instead of the namespace
// to facilitate the merge
// Respect Naming convention: example HYBALL_PCB_Radius / HYBALL_Wafer_Radius
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void
Tiara
::
ConstructChamber
(
G4LogicalVolume
*
world
){
// Vaccum Chamber of Tiara
// The chamber is made of a central cylinder surrounding the barrel Si
// Two Cone that expeand out of the central cylinder to let room for Exogam
// Two outer cylinder surrounding Hyball
// Hyball is hold on a back plate that close the Diabolo Shaped Chamber
// Material to be moved in a Material Function //
// Al
G4double
density
=
2.702
*
g
/
cm3
;
G4double
a
=
26.98
*
g
/
mole
;
G4Material
*
Aluminium
=
new
G4Material
(
"Aluminium"
,
13.
,
a
,
density
);
// Making the Chamber //
// We make the individual pieces, starting from the inside to the outside
// Then we merge them together using the a G4AdditionSolid
// The whole chamber is then placed
// Central Tube
G4Tubs
*
solidCentralTube
=
new
G4Tubs
(
"TiaraChamberCentralTube"
,
CHAMBER_CentralTube_Inner_Radius
,
CHAMBER_CentralTube_Outer_Radius
,
CHAMBER_CentralTube_Length
/
2.
,
0
*
deg
,
360
*
deg
);
// Forward-Backward Cones
G4Cons
*
solidOuterCone
=
new
G4Cons
(
"TiaraChamberOuterCone"
,
CHAMBER_CentralTube_Inner_Radius
,
CHAMBER_CentralTube_Outer_Radius
,
CHAMBER_OuterCylinder_Inner_Radius
,
CHAMBER_OuterCylinder_Outer_Radius
,
CHAMBER_OuterCone_Length
/
2.
,
0
*
deg
,
360
*
deg
);
// Outer Cylinder
G4Tubs
*
solidOuterCylinder
=
new
G4Tubs
(
"TiaraChamberOuterCylinder"
,
CHAMBER_OuterCylinder_Inner_Radius
,
CHAMBER_OuterCylinder_Outer_Radius
,
CHAMBER_OuterCylinder_Length
/
2.
,
0
*
deg
,
360
*
deg
);
// Add the volume together
G4UnionSolid
*
solidTiaraChamberStep1
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidCentralTube
,
solidOuterCone
,
new
G4RotationMatrix
,
G4ThreeVector
(
0
,
0
,
CHAMBER_OuterCone_Z_Pos
));
G4UnionSolid
*
solidTiaraChamberStep2
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidTiaraChamberStep1
,
solidOuterCone
,
new
G4RotationMatrix
(
0
,
180
*
deg
,
0
),
G4ThreeVector
(
0
,
0
,
-
CHAMBER_OuterCone_Z_Pos
));
G4UnionSolid
*
solidTiaraChamberStep3
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidTiaraChamberStep2
,
solidOuterCylinder
,
new
G4RotationMatrix
,
G4ThreeVector
(
0
,
0
,
CHAMBER_OuterCylinder_Z_Pos
));
G4UnionSolid
*
solidTiaraChamberStep4
=
new
G4UnionSolid
(
"TiaraChamber"
,
solidTiaraChamberStep3
,
solidOuterCylinder
,
new
G4RotationMatrix
,
G4ThreeVector
(
0
,
0
,
-
CHAMBER_OuterCylinder_Z_Pos
));
// Create Logic Volume
G4LogicalVolume
*
logicTiaraChamber
=
new
G4LogicalVolume
(
solidTiaraChamberStep4
,
Aluminium
,
"logicTiaraChamber"
,
0
,
0
,
0
);
// Visual Attribute
G4VisAttributes
*
ChamberVisAtt
=
new
G4VisAttributes
(
G4Colour
(
0.0
,
0.4
,
0.5
));
ChamberVisAtt
->
SetForceWireframe
(
true
);
ChamberVisAtt
->
SetForceAuxEdgeVisible
(
true
);
logicTiaraChamber
->
SetVisAttributes
(
ChamberVisAtt
);
// Place the whole chamber
new
G4PVPlacement
(
new
G4RotationMatrix
(
0
,
0
,
0
),
G4ThreeVector
(
0
,
0
,
0
),
logicTiaraChamber
,
"TiaraChamber"
,
world
,
false
,
0
);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void
Tiara
::
InitializeMaterial
(){
...
...
This diff is collapsed.
Click to expand it.
NPSimulation/Tiara/Tiara.hh
+
6
−
5
View file @
3b86e539
...
...
@@ -102,7 +102,8 @@ public:
public:
// To add a box detector
// Effectively construct Volume
void
ConstructBarrel
(
G4LogicalVolume
*
world
);
void
ConstructInnerBarrel
(
G4LogicalVolume
*
world
);
void
ConstructOuterBarrel
(
G4LogicalVolume
*
world
);
void
ConstructHyball
(
G4LogicalVolume
*
world
);
void
ConstructChamber
(
G4LogicalVolume
*
world
);
...
...
@@ -156,10 +157,10 @@ private:
// Initialize all Scorer
void
InitializeScorers
()
;
// Scorer Associate
to
the Silicon
G4MultiFunctionalDetector
*
m_
BOX
Scorer
;
G4MultiFunctionalDetector
*
m_
PAD
Scorer
;
G4MultiFunctionalDetector
*
m_
QQQ
Scorer
;
// Scorer Associate
with
the Silicon
G4MultiFunctionalDetector
*
m_
InnerBarrel
Scorer
;
G4MultiFunctionalDetector
*
m_
OuterBarrel
Scorer
;
G4MultiFunctionalDetector
*
m_
Hyball
Scorer
;
////////////////////////////////////////////////////
///////////////Private intern Data//////////////////
...
...
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