Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zdcLG
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Daniel R. MacLean
zdcLG
Commits
546e6a39
Commit
546e6a39
authored
3 years ago
by
Chad Lantz
Browse files
Options
Downloads
Patches
Plain Diff
Re-enabled CADmodel macro command
parent
6d252eff
Branches
master
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/DetectorConstruction.cc
+8
-7
8 additions, 7 deletions
src/DetectorConstruction.cc
with
8 additions
and
7 deletions
src/DetectorConstruction.cc
+
8
−
7
View file @
546e6a39
...
...
@@ -74,7 +74,7 @@ DetectorConstruction::DetectorConstruction()
m_ConstructionHasBeenDone
(
false
),
m_UsingCADmodel
(
true
),
m_logicWorld
(
0
),
m_
phys
LG
(
0
),
m_
logic
LG
(
0
),
m_physPMT
(
0
),
m_DetectorMessenger
(
nullptr
)
{
...
...
@@ -164,8 +164,9 @@ void DetectorConstruction::BuildDefaultLG( ){
// Build the light guide here up until the logical volume
// Maybe build the aluminum portion into a single CAD solid and add
// fibers and air here
UseCADModel
(
"../models/LED-GMS-light-guide.stl"
);
if
(
m_logicLG
==
0
){
UseCADModel
(
"../models/LED-GMS-light-guide.stl"
);
}
bool
CHECK_OVERLAPS
=
true
;
...
...
@@ -211,7 +212,7 @@ void DetectorConstruction::BuildDefaultLG( ){
m_logicBuffer
=
new
G4LogicalVolume
(
m_fiberBuffer
,
// solid to be created from
materials
->
pQuartz
,
// material
"fiber_logicBuffer"
);
// name
// Place the fibers
G4RotationMatrix
*
fiberRotation
=
new
G4RotationMatrix
();
fiberRotation
->
rotateX
(
90.
*
deg
);
...
...
@@ -315,7 +316,7 @@ void DetectorConstruction::BuildPMT(){
m_logicIntSD
.
push_back
(
new
G4LogicalVolume
(
m_solidIntSD
.
back
(),
materials
->
Air
,
"logicIntSD2"
)
);
m_logicIntSD
.
back
()
->
SetVisAttributes
(
VisAtt_PMT
);
m_logicIntSD
.
back
()
->
SetSensitiveDetector
(
PMT
);
/***********************************
* Intermediate Sensitive Detector 3
...
...
@@ -323,11 +324,11 @@ void DetectorConstruction::BuildPMT(){
m_SDnames
.
push_back
(
"PhotodiodeSD"
);
PMT
=
new
PMTSD
(
m_SDnames
.
back
(),
true
);
// isIntermediate set to true
SDman
->
AddNewDetector
(
PMT
);
m_solidIntSD
.
push_back
(
new
G4Box
(
"solidPhotodiodeSD"
,
2.5
*
mm
,
0.001
*
mm
,
0.75
*
mm
)
);
m_solidIntSD
.
push_back
(
new
G4Box
(
"solidPhotodiodeSD"
,
2.5
*
mm
,
0.001
*
mm
,
0.75
*
mm
)
);
m_logicIntSD
.
push_back
(
new
G4LogicalVolume
(
m_solidIntSD
.
back
(),
materials
->
Air
,
"logicPhotodiodeSD"
));
m_logicIntSD
.
back
()
->
SetVisAttributes
(
VisAtt_PMT
);
m_logicIntSD
.
back
()
->
SetSensitiveDetector
(
PMT
);
}
/*
...
...
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