Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
JZCaPA
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
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
Riccardo Longo
JZCaPA
Commits
eade107a
Commit
eade107a
authored
3 years ago
by
Chad Lantz
Browse files
Options
Downloads
Patches
Plain Diff
Added one third prototype EM module
parent
e258b43a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
MonteCarlo/src/DetectorConstruction.cc
+10
-2
10 additions, 2 deletions
MonteCarlo/src/DetectorConstruction.cc
MonteCarlo/src/ModTypeZDC.cc
+14
-1
14 additions, 1 deletion
MonteCarlo/src/ModTypeZDC.cc
with
24 additions
and
3 deletions
MonteCarlo/src/DetectorConstruction.cc
+
10
−
2
View file @
eade107a
...
@@ -424,11 +424,19 @@ G4VPhysicalVolume* DetectorConstruction::Construct2021SPSTestBeam(){
...
@@ -424,11 +424,19 @@ G4VPhysicalVolume* DetectorConstruction::Construct2021SPSTestBeam(){
/********** 2021 Test Beam EM Prototype ************/
/********** 2021 Test Beam EM Prototype ************/
}
else
if
(
det
.
contains
(
"UEM"
)
){
}
else
if
(
det
.
contains
(
"UEM"
)
){
//Determine if the module was 1/3 full, or completely full of absorber
int
run
=
m_alignment2021
->
runNumber
;
float
zOffset
=
0
;
std
::
string
type
=
"TB2021EM"
;
if
(
(
run
>
0
&&
run
<
117
)
||
(
run
>=
490
&&
run
<
621
)
||
(
run
>=
847
&&
run
<
70181
)
){
//1/3 module
type
+=
"THIRD"
;
zOffset
=
50.1
;
//Middle of the rear third of absorber/radiator volume
}
AddZDC
(
new
G4ThreeVector
(
m_alignment2021
->
x_det_table
*
mm
-
survey
->
table
.
x
()
*
mm
+
survey
->
pos
.
x
()
*
mm
,
AddZDC
(
new
G4ThreeVector
(
m_alignment2021
->
x_det_table
*
mm
-
survey
->
table
.
x
()
*
mm
+
survey
->
pos
.
x
()
*
mm
,
m_alignment2021
->
y_det_table
*
mm
-
survey
->
table
.
y
()
*
mm
+
survey
->
pos
.
y
()
*
mm
,
m_alignment2021
->
y_det_table
*
mm
-
survey
->
table
.
y
()
*
mm
+
survey
->
pos
.
y
()
*
mm
,
survey
->
pos
.
z
()
*
mm
)
);
survey
->
pos
.
z
()
*
mm
+
zOffset
)
);
ModTypeZDC
*
zdc
=
m_ZDCvec
.
back
();
ModTypeZDC
*
zdc
=
m_ZDCvec
.
back
();
zdc
->
SetDetectorType
(
"TB2021EM"
);
zdc
->
SetDetectorType
(
type
.
c_str
()
);
zdc
->
SetReducedTreeFlag
(
REDUCED_TREE
);
zdc
->
SetReducedTreeFlag
(
REDUCED_TREE
);
zdc
->
SetOpticalFlag
(
OPTICAL
);
zdc
->
SetOpticalFlag
(
OPTICAL
);
pos
=
zdc
->
GetPosition
();
pos
=
zdc
->
GetPosition
();
...
...
This diff is collapsed.
Click to expand it.
MonteCarlo/src/ModTypeZDC.cc
+
14
−
1
View file @
eade107a
...
@@ -118,7 +118,7 @@ void ModTypeZDC::Construct(){
...
@@ -118,7 +118,7 @@ void ModTypeZDC::Construct(){
m_SteelAbsHeight
=
290
*
mm
;
m_SteelAbsHeight
=
290
*
mm
;
ConstructDetector
();
ConstructDetector
();
/********** 2021 Test Beam EM Prototype ************/
/********** 2021 Test Beam
Full
EM Prototype ************/
}
else
if
(
m_detType
==
"TB2021EM"
){
}
else
if
(
m_detType
==
"TB2021EM"
){
m_fiberDiam
=
new
G4ThreeVector
(
1.5
*
mm
,
0.
,
0.
);
m_fiberDiam
=
new
G4ThreeVector
(
1.5
*
mm
,
0.
,
0.
);
m_absDim
=
new
G4ThreeVector
(
42.
*
mm
,
120.
*
mm
,
4.
*
mm
);
m_absDim
=
new
G4ThreeVector
(
42.
*
mm
,
120.
*
mm
,
4.
*
mm
);
...
@@ -131,6 +131,19 @@ void ModTypeZDC::Construct(){
...
@@ -131,6 +131,19 @@ void ModTypeZDC::Construct(){
m_SteelAbsHeight
=
130
*
mm
;
m_SteelAbsHeight
=
130
*
mm
;
ConstructDetector
();
ConstructDetector
();
/********** 2021 Test Beam 1/3 EM Prototype ************/
}
else
if
(
m_detType
==
"TB2021EMTHIRD"
){
m_fiberDiam
=
new
G4ThreeVector
(
1.5
*
mm
,
0.
,
0.
);
m_absDim
=
new
G4ThreeVector
(
42.
*
mm
,
120.
*
mm
,
4.
*
mm
);
m_nAbsorbers
=
8
;
m_matAbsorber
=
m_materials
->
pureW
;
m_HousingThickness
=
5.
*
mm
;
m_matHousing
=
m_materials
->
Steel
;
m_GapThickness
=
2.
*
mm
;
STEEL_ABSORBER
=
true
;
m_SteelAbsHeight
=
130
*
mm
;
ConstructDetector
();
}
else
{
}
else
{
ConstructDetector
();
ConstructDetector
();
}
}
...
...
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