Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Riccardo Longo
JZCaPA
Commits
eade107a
Commit
eade107a
authored
Apr 27, 2022
by
Chad Lantz
Browse files
Added one third prototype EM module
parent
e258b43a
Changes
2
Hide whitespace changes
Inline
Side-by-side
MonteCarlo/src/DetectorConstruction.cc
View file @
eade107a
...
...
@@ -424,11 +424,19 @@ G4VPhysicalVolume* DetectorConstruction::Construct2021SPSTestBeam(){
/********** 2021 Test Beam EM Prototype ************/
}
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
,
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
();
zdc
->
SetDetectorType
(
"TB2021EM"
);
zdc
->
SetDetectorType
(
type
.
c_str
()
);
zdc
->
SetReducedTreeFlag
(
REDUCED_TREE
);
zdc
->
SetOpticalFlag
(
OPTICAL
);
pos
=
zdc
->
GetPosition
();
...
...
MonteCarlo/src/ModTypeZDC.cc
View file @
eade107a
...
...
@@ -118,7 +118,7 @@ void ModTypeZDC::Construct(){
m_SteelAbsHeight
=
290
*
mm
;
ConstructDetector
();
/********** 2021 Test Beam EM Prototype ************/
/********** 2021 Test Beam
Full
EM Prototype ************/
}
else
if
(
m_detType
==
"TB2021EM"
){
m_fiberDiam
=
new
G4ThreeVector
(
1.5
*
mm
,
0.
,
0.
);
m_absDim
=
new
G4ThreeVector
(
42.
*
mm
,
120.
*
mm
,
4.
*
mm
);
...
...
@@ -131,6 +131,19 @@ void ModTypeZDC::Construct(){
m_SteelAbsHeight
=
130
*
mm
;
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
{
ConstructDetector
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment