diff --git a/Inputs/DetectorConfiguration/gaspHyde.detector b/Inputs/DetectorConfiguration/gaspHyde.detector
index 5dc9f2b99f1388c4a34015519c8b6b9e91e8ae9c..bf200543d101f23e60fd1fec6b4306a2cd911973 100644
--- a/Inputs/DetectorConfiguration/gaspHyde.detector
+++ b/Inputs/DetectorConfiguration/gaspHyde.detector
@@ -117,80 +117,80 @@ GPDAnnular
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 End-Cap Back
GPDTrapezoid
- X1_Y1= 55.338 -14.346 -146.501
- X128_Y1= 55.338 14.346 -146.501
- X1_Y128= 138.519 -48.717 -69.236
- X128_Y128= 138.518 48.726 -69.237
+ 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
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
GPDTrapezoid
- X1_Y1= 49.215 29.045 -146.501
- X128_Y1= 28.986 49.274 -146.501
- X1_Y128= 132.395 63.500 -69.236
- X128_Y128= 63.492 132.401 -69.237
+ 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
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
GPDTrapezoid
- X1_Y1= 14.263 55.338 -146.501
- X128_Y1= -14.346 55.338 -146.501
- X1_Y128= 48.717 138.519 -69.236
- X128_Y128= -48.726 138.518 -69.237
+ X128_Y128= 14.263 55.338 -146.501
+ X1_Y128= -14.346 55.338 -146.501
+ X128_Y1= 48.717 138.519 -69.236
+ X1_Y1= -48.726 138.518 -69.237
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
GPDTrapezoid
- X1_Y1= -29.045 49.215 -146.501
- X128_Y1= -49.274 28.986 -146.501
- X1_Y128= -63.500 132.395 -69.236
- X128_Y128= -132.401 63.492 -69.237
+ X128_Y128= -29.045 49.215 -146.501
+ X1_Y128= -49.274 28.986 -146.501
+ X128_Y1= -63.500 132.395 -69.236
+ X1_Y1= -132.401 63.492 -69.237
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
GPDTrapezoid
- X1_Y1= -55.338 14.346 -146.501
- X128_Y1= -55.338 -14.346 -146.501
- X1_Y128= -138.519 48.717 -69.236
- X128_Y128= -138.518 -48.726 -69.237
+ 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
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
GPDTrapezoid
- X1_Y1= -49.215 -29.045 -146.501
- X128_Y1= -28.986 -49.274 -146.501
- X1_Y128= -132.395 -63.500 -69.236
- X128_Y128= -63.492 -132.401 -69.237
+ 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
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7
GPDTrapezoid
- X1_Y1= -14.263 -55.338 -146.501
- X128_Y1= 14.346 -55.338 -146.501
- X1_Y128= -48.717 -138.519 -69.236
- X128_Y128= 48.726 -138.518 -69.237
+ X128_Y128= -14.263 -55.338 -146.501
+ X1_Y128= 14.346 -55.338 -146.501
+ X128_Y1= -48.717 -138.519 -69.236
+ X1_Y1= 48.726 -138.518 -69.237
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
GPDTrapezoid
- X1_Y1= 29.045 -49.215 -146.501
- X128_Y1= 49.274 -28.986 -146.501
- X1_Y128= 63.500 -132.395 -69.236
- X128_Y128= 132.401 -63.492 -69.237
+ X128_Y128= 29.045 -49.215 -146.501
+ X1_Y128= 49.274 -28.986 -146.501
+ X128_Y1= 63.500 -132.395 -69.236
+ X1_Y1= 132.401 -63.492 -69.237
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
@@ -357,80 +357,80 @@ GPDSquare
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 Front-Cap Back
GPDTrapezoid
- X1_Y1= 55.338 14.346 146.501
- X128_Y1= 55.338 -14.346 146.501
- X1_Y128= 138.518 48.726 69.237
- X128_Y128= 138.519 -48.717 69.236
+ X128_Y128= 55.338 14.346 146.501
+ X1_Y128= 55.338 -14.346 146.501
+ X128_Y1= 138.518 48.726 69.237
+ X1_Y1= 138.519 -48.717 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%2
GPDTrapezoid
- X1_Y1= 28.986 49.274 146.501
- X128_Y1= 49.215 29.045 146.501
- X1_Y128= 63.492 132.401 69.237
- X128_Y128= 132.395 63.500 69.236
+ X128_Y128= 28.986 49.274 146.501
+ X1_Y128= 49.215 29.045 146.501
+ X128_Y1= 63.492 132.401 69.237
+ X1_Y1= 132.395 63.500 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%3
GPDTrapezoid
- X1_Y1= -14.346 55.338 146.501
- X128_Y1= 14.263 55.338 146.501
- X1_Y128= -48.726 138.518 69.237
- X128_Y128= 48.717 138.519 69.236
+ X128_Y128= -14.346 55.338 146.501
+ X1_Y128= 14.263 55.338 146.501
+ X128_Y1= -48.726 138.518 69.237
+ X1_Y1= 48.717 138.519 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%4
GPDTrapezoid
- X1_Y1= -49.274 28.986 146.501
- X128_Y1= -29.045 49.215 146.501
- X1_Y128= -132.401 63.492 69.237
- X128_Y128= -63.500 132.395 69.236
+ X128_Y128= -49.274 28.986 146.501
+ X1_Y128= -29.045 49.215 146.501
+ X128_Y1= -132.401 63.492 69.237
+ X1_Y1= -63.500 132.395 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%5
GPDTrapezoid
- X1_Y1= -55.338 -14.346 146.501
- X128_Y1= -55.338 14.346 146.501
- X1_Y128= -138.518 -48.726 69.237
- X128_Y128= -138.519 48.717 69.236
+ X128_Y128= -55.338 -14.346 146.501
+ X1_Y128= -55.338 14.346 146.501
+ X128_Y1= -138.518 -48.726 69.237
+ X1_Y1= -138.519 48.717 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%6
GPDTrapezoid
- X1_Y1= -28.986 -49.274 146.501
- X128_Y1= -49.215 -29.045 146.501
- X1_Y128= -63.492 -132.401 69.237
- X128_Y128= -132.395 -63.500 69.236
+ X128_Y128= -28.986 -49.274 146.501
+ X1_Y128= -49.215 -29.045 146.501
+ X128_Y1= -63.492 -132.401 69.237
+ X1_Y1= -132.395 -63.500 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%7
GPDTrapezoid
- X1_Y1= 14.346 -55.338 146.501
- X128_Y1= -14.263 -55.338 146.501
- X1_Y128= 48.726 -138.518 69.237
- X128_Y128= -48.717 -138.519 69.236
+ X128_Y128= 14.346 -55.338 146.501
+ X1_Y128= -14.263 -55.338 146.501
+ X128_Y1= 48.726 -138.518 69.237
+ X1_Y1= -48.717 -138.519 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
VIS= all
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%8
GPDTrapezoid
- X1_Y1= 49.274 -28.986 146.501
- X128_Y1= 29.045 -49.215 146.501
- X1_Y128= 132.401 -63.492 69.237
- X128_Y128= 63.500 -132.395 69.236
+ X128_Y128= 49.274 -28.986 146.501
+ X1_Y128= 29.045 -49.215 146.501
+ X128_Y1= 132.401 -63.492 69.237
+ X1_Y1= 63.500 -132.395 69.236
FIRSTSTAGE= 1
SECONDSTAGE= 1
THIRDSTAGE= 1
diff --git a/NPLib/scripts/makefile.sh b/NPLib/scripts/makefile.sh
index bf7e778f472a0b7d2fd135be081d211886c00507..75cc49995a8988c303b57c42f3fb9e05352a5c05 100755
--- a/NPLib/scripts/makefile.sh
+++ b/NPLib/scripts/makefile.sh
@@ -36,5 +36,5 @@ do
# add "-C ./" pattern at the beginning of the name
cmd="-C ./$name"
# execute make command with target specified on command line
- make $1 $cmd
+ make --silent $1 $cmd
done
diff --git a/NPSimulation/src/GaspardTrackerTrapezoid.cc b/NPSimulation/src/GaspardTrackerTrapezoid.cc
index 447b24b8bcb877c99f3e7168879e6afdbb1b695d..d242860330f754d5f2dd9123a77a3419f324cd40 100644
--- a/NPSimulation/src/GaspardTrackerTrapezoid.cc
+++ b/NPSimulation/src/GaspardTrackerTrapezoid.cc
@@ -614,10 +614,15 @@ void GaspardTrackerTrapezoid::ConstructDetector(G4LogicalVolume* world)
for (G4int i = 0; i < NumberOfModule; i++) {
// By Point
if (m_DefinitionType[i]) {
- // (u,v,w) unitary vector associated to telescope referencial
+ // (u,v,w) unitary vector associated to trapezoidal referencial
// (u,v) // to silicon plan
+ // -------
+ // / \ ^
+ // / \ | v
+ // / \ |
+ // --------------- <------
+ // u
// w perpendicular to (u,v) plan and pointing ThirdStage
- // new positioning scheme ?
G4cout << "XXXXXXXXXXXX Trapezoid " << i << " XXXXXXXXXXXXX" << G4endl;
MMu = m_X128_Y1[i] - m_X1_Y1[i];
MMu = MMu.unit();
@@ -647,6 +652,12 @@ void GaspardTrackerTrapezoid::ConstructDetector(G4LogicalVolume* world)
// (u,v,w) unitary vector associated to telescope referencial
// (u,v) // to silicon plan
+ // -------
+ // / \ ^
+ // / \ | v
+ // / \ |
+ // --------------- <------
+ // u
// w perpendicular to (u,v) plan and pointing ThirdStage
// Phi is angle between X axis and projection in (X,Y) plan
// Theta is angle between position vector and z axis
@@ -659,14 +670,15 @@ void GaspardTrackerTrapezoid::ConstructDetector(G4LogicalVolume* world)
MMCenter = MMw;
// vector parallel to one axis of silicon plane
+ // in fact, this is vector u
G4double ii = cos(Theta / rad) * cos(Phi / rad);
G4double jj = cos(Theta / rad) * sin(Phi / rad);
G4double kk = -sin(Theta / rad);
G4ThreeVector Y = G4ThreeVector(ii, jj, kk);
MMw = MMw.unit();
- MMu = MMw.cross(Y);
- MMv = MMw.cross(MMu);
+ MMv = MMw.cross(Y);
+ MMu = MMv.cross(MMw);
MMv = MMv.unit();
MMu = MMu.unit();