Skip to content
Snippets Groups Projects
Commit a655a4ff authored by de Séréville Nicolas's avatar de Séréville Nicolas
Browse files

+ Update mugast geometry for square detectors 

+ Update trapezoid geometry for gaspard
parent d92f5b3c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Inputs/DetectorConfiguration/MUGAST.detector
+ 94
− 90
View file @ a655a4ff
......@@ -9,126 +9,130 @@ Target
X= 0
Y= 0
Z= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
GaspardTracker
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 End-Cap Back
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 End-Cap Back
GPDTrapezoid
X128_Y128= 41.963 21.364 -138.589
X1_Y128= 23.737 39.592 -138.591
X128_Y1= 122.368 54.712 -71.098
X1_Y1= 57.084 119.996 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
X128_Y128= 41.963 21.364 -138.589
X1_Y128= 23.737 39.592 -138.591
X128_Y1= 122.368 54.712 -71.098
X1_Y1= 57.084 119.996 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
GPDTrapezoid
X128_Y128= -41.963 -21.364 -138.589
X1_Y128= -23.737 -39.592 -138.591
X128_Y1= -122.368 -54.712 -71.098
X1_Y1= -57.084 -119.996 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
X128_Y128= -41.963 -21.364 -138.589
X1_Y128= -23.737 -39.592 -138.591
X128_Y1= -122.368 -54.712 -71.098
X1_Y1= -57.084 -119.996 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
GPDTrapezoid
X128_Y128= -21.364 41.963 -138.589
X1_Y128= -39.592 23.737 -138.591
X128_Y1= -54.712 122.368 -71.098
X1_Y1= -119.996 57.084 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
X128_Y128= -21.364 41.963 -138.589
X1_Y128= -39.592 23.737 -138.591
X128_Y1= -54.712 122.368 -71.098
X1_Y1= -119.996 57.084 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
GPDTrapezoid
X128_Y128= 21.364 -41.963 -138.589
X1_Y128= 39.592 -23.737 -138.591
X128_Y1= 54.712 -122.368 -71.098
X1_Y1= 119.996 -57.084 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
X128_Y128= 21.364 -41.963 -138.589
X1_Y128= 39.592 -23.737 -138.591
X128_Y1= 54.712 -122.368 -71.098
X1_Y1= 119.996 -57.084 -71.098
FIRSTSTAGE= 1
SECONDSTAGE= 0
THIRDSTAGE= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
GPDSquare
X1_Y1= -61.823 128.742 53.5
X128_Y1= -61.823 128.742 -58.5
X1_Y128= -132.251 58.314 -58.5
X128_Y128= -132.251 58.314 53.5
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
X1_Y1= -61.823 128.742 53.5
X128_Y1= -61.823 128.742 -58.5
X1_Y128= -132.251 58.314 -58.5
X128_Y128= -132.251 58.314 53.5
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
GPDSquare
X1_Y1= -61.823 -128.742 53.5
X128_Y1= -61.823 -128.742 -58.5
X1_Y128= -132.251 -58.314 -58.5
X128_Y128= -132.251 -58.314 53.5
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
X1_Y1= -134.75 47.281 53.5
X128_Y1= -134.75 47.281 -58.5
X1_Y128= -134.75 -52.319 -58.5
X128_Y128= -134.75 -52.319 53.5
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%
MUST2Array
%%%%%%% Telescope 1 %%%%%%%
M2Telescope
X1_Y1= -126.981 52.085 83.567
X1_Y128= -80.351 7.414 160.524
X128_Y1= -57.486 124.629 83.567
X128_Y128= -10.856 79.959 160.524
SI= 1
SILI= 1
CSI= 1
VIS= all
X1_Y1= -126.981 52.085 83.567
X1_Y128= -80.351 7.414 160.524
X128_Y1= -57.486 124.629 83.567
X128_Y128= -10.856 79.959 160.524
SI= 1
SILI= 1
CSI= 1
VIS= all
%%%%%%% Telescope 2 %%%%%%%
M2Telescope
X1_Y1= -52.085 -126.981 83.567
X1_Y128= -7.414 -80.351 160.524
X128_Y1= -124.629 -57.486 83.567
X128_Y128= -79.959 -10.856 160.524
SI= 1
SILI= 1
CSI= 1
VIS= all
X1_Y1= -52.085 -126.981 83.567
X1_Y128= -7.414 -80.351 160.524
X128_Y1= -124.629 -57.486 83.567
X128_Y128= -79.959 -10.856 160.524
SI= 1
SILI= 1
CSI= 1
VIS= all
%%%%%%% Telescope 3 %%%%%%%
M2Telescope
X1_Y1= 80.351 -7.414 160.524
X1_Y128= 10.856 -79.959 160.524
X128_Y1= 126.981 -52.085 83.567
X128_Y128= 57.486 -124.629 83.567
SI= 1
SILI= 1
CSI= 1
VIS= all
X1_Y1= 80.351 -7.414 160.524
X1_Y128= 10.856 -79.959 160.524
X128_Y1= 126.981 -52.085 83.567
X128_Y128= 57.486 -124.629 83.567
SI= 1
SILI= 1
CSI= 1
VIS= all
%%%%%%% Telescope 4 %%%%%%%
M2Telescope
X1_Y1= 7.414 80.351 160.524
X1_Y128= 79.959 10.856 160.524
X128_Y1= 52.085 126.981 83.567
X128_Y128= 124.629 57.486 83.567
SI= 1
SILI= 1
CSI= 1
VIS= all
X1_Y1= 7.414 80.351 160.524
X1_Y128= 79.959 10.856 160.524
X128_Y1= 52.085 126.981 83.567
X128_Y128= 124.629 57.486 83.567
SI= 1
SILI= 1
CSI= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Paris
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
ParisCluster
A= 291.358 -7.734 -38.5
B= 291 -7.118 129
C= 246.046 -168.989 129
D= 246.661 -168.641 -38.5
A= 291.358 -7.734 -38.5
B= 291 -7.118 129
C= 246.046 -168.989 129
D= 246.661 -168.641 -38.5
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
ParisCluster
A= 243.139 158.516 -38.5
B= 242.517 158.852 129
C= 290.527 -2.142 129
D= 290.863 -1.52 -38.5
A= 243.139 158.516 -38.5
B= 242.517 158.852 129
C= 290.527 -2.142 129
D= 290.863 -1.52 -38.5
Inputs/DetectorConfiguration/gaspHyde.detector
+ 11
− 11
View file @ a655a4ff
......@@ -49,8 +49,8 @@ GPDAnnular
%GPDTrapezoid
X128_Y128= 55.338 -14.346 -146.501
X1_Y128= 55.338 14.346 -146.501
X128_Y1= 138.519 -48.717 -69.236
X1_Y1= 138.518 48.726 -69.237
X128_Y1= 138.519 -48.717 -69.236
X1_Y1= 138.518 48.726 -69.237
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
......@@ -60,7 +60,7 @@ GPDAnnular
X128_Y128= 49.215 29.045 -146.501
X1_Y128= 28.986 49.274 -146.501
X128_Y1= 132.395 63.500 -69.236
X1_Y1= 63.492 132.401 -69.237
X1_Y1= 63.492 132.401 -69.237
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
......@@ -126,7 +126,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Barrel
%GPDSquare
GPDSquare
THETA= 90
PHI= 0
R= 143
......@@ -136,7 +136,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
%GPDSquare
GPDSquare
THETA= 90
PHI= 45
R= 143
......@@ -146,7 +146,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
%GPDSquare
GPDSquare
THETA= 90
PHI= 90
R= 143
......@@ -156,7 +156,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
%GPDSquare
GPDSquare
THETA= 90
PHI= 135
R= 143
......@@ -166,7 +166,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
%GPDSquare
GPDSquare
THETA= 90
PHI= 180
R= 143
......@@ -176,7 +176,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
%GPDSquare
GPDSquare
THETA= 90
PHI= 225
R= 143
......@@ -186,7 +186,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7
%GPDSquare
GPDSquare
THETA= 90
PHI= 270
R= 143
......@@ -196,7 +196,7 @@ GPDAnnular
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
%GPDSquare
GPDSquare
THETA= 90
PHI= 315
R= 143
......
NPLib/GASPARD/GaspardTrackerTrapezoid.cxx
+ 6
− 2
View file @ a655a4ff
......@@ -41,8 +41,12 @@ GaspardTrackerTrapezoid::GaspardTrackerTrapezoid(map<int, GaspardTrackerModule*>
m_EventData(0),
m_PreTreatData(new TGaspardTrackerData),
m_NumberOfModule(0),
m_FirstStageBaseLarge(97.5), // mm
m_FirstStageHeight(113.5), // mm
// gaspHyde
// m_FirstStageBaseLarge(97.5), // mm
// m_FirstStageHeight(113.5), // mm
// mugast
m_FirstStageBaseLarge(92.326), // mm
m_FirstStageHeight(105), // mm
m_NumberOfStripsX(128),
m_NumberOfStripsY(128)
{
......
NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh
+ 19
− 7
View file @ a655a4ff
......@@ -154,14 +154,22 @@ namespace GPDTRAP
// const G4double BaseSmall = 35*mm;
// const G4double Length = 20*mm;
// gaspHyde
const G4double Height = 115*mm;
const G4double BaseLarge = 98*mm;
const G4double BaseSmall = 30*mm;
// const G4double Height = 115*mm;
// const G4double BaseLarge = 98*mm;
// const G4double BaseSmall = 30*mm;
// const G4double Length = 20*mm;
// const G4double InterStageDistance = 7*mm;
// mugast
const G4double Height = 106*mm;
const G4double BaseLarge = 93*mm;
const G4double BaseSmall = 26*mm;
const G4double Length = 20*mm;
const G4double InterStageDistance = 7*mm;
// First stage
const G4double FirstStageThickness = 300*micrometer;
// const G4double FirstStageThickness = 300*micrometer;
// mugast
const G4double FirstStageThickness = 500*micrometer;
const G4int NumberOfStripsX = 128;
const G4int NumberOfStripsY = 128;
// gaspard Trapezoid
......@@ -169,9 +177,13 @@ namespace GPDTRAP
// const G4double FirstStageBaseLarge = 78*mm;
// const G4double FirstStageBaseSmall = 29*mm;
// gaspHyde
const G4double FirstStageHeight = 113.5*mm;
const G4double FirstStageBaseLarge = 97.5*mm;
const G4double FirstStageBaseSmall = 28.5*mm;
// const G4double FirstStageHeight = 113.5*mm;
// const G4double FirstStageBaseLarge = 97.5*mm;
// const G4double FirstStageBaseSmall = 28.5*mm;
// mugast
const G4double FirstStageHeight = 105*mm;
const G4double FirstStageBaseLarge = 92.326*mm;
const G4double FirstStageBaseSmall = 25.77*mm;
// Second stage
const G4double SecondStageHeight = FirstStageHeight;
......
NPSimulation/macro/vis.mac
+ 2
− 1
View file @ a655a4ff
......@@ -10,7 +10,8 @@
/process/eLoss/verbose 0
#
# Use this open statement to create an OpenGL view:
/vis/open OGLI 1200x600-0+0
#/vis/open OGLI 1200x600-0+0
/vis/open VRML2FILE
#
# Draw geometry:
/vis/drawVolume
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment