Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nptool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
Admin message
Gitlab has been updated. More info
here
and
there
.
Show more breadcrumbs
np
nptool
Commits
ce134d88
Commit
ce134d88
authored
4 years ago
by
Adrien Matta
Browse files
Options
Downloads
Patches
Plain Diff
* Fixing strasse positionning in analysis
parent
02db1001
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NPLib/Detectors/Strasse/TStrassePhysics.cxx
+5
-7
5 additions, 7 deletions
NPLib/Detectors/Strasse/TStrassePhysics.cxx
Projects/Strasse/Control.cxx
+4
-4
4 additions, 4 deletions
Projects/Strasse/Control.cxx
with
9 additions
and
11 deletions
NPLib/Detectors/Strasse/TStrassePhysics.cxx
+
5
−
7
View file @
ce134d88
...
@@ -118,7 +118,6 @@ void TStrassePhysics::AddInnerDetector(double R, double Z, double Phi, double Sh
...
@@ -118,7 +118,6 @@ void TStrassePhysics::AddInnerDetector(double R, double Z, double Phi, double Sh
// Vector C position of detector face center
// Vector C position of detector face center
TVector3
C
(
Shift
,
R
,
Z
);
// center of the whole detector, including PCB
TVector3
C
(
Shift
,
R
,
Z
);
// center of the whole detector, including PCB
C
.
RotateZ
(
-
Phi
);
C
.
RotateZ
(
-
Phi
);
C
+=
Ref
;
// Vector W normal to detector face (pointing to the back)
// Vector W normal to detector face (pointing to the back)
TVector3
W
(
0
,
1
,
0
);
TVector3
W
(
0
,
1
,
0
);
...
@@ -156,7 +155,7 @@ void TStrassePhysics::AddInnerDetector(double R, double Z, double Phi, double Sh
...
@@ -156,7 +155,7 @@ void TStrassePhysics::AddInnerDetector(double R, double Z, double Phi, double Sh
lineY
.
clear
();
lineY
.
clear
();
lineZ
.
clear
();
lineZ
.
clear
();
for
(
int
j
=
0
;
j
<
Inner_Wafer_LongitudinalStrips
;
j
++
){
for
(
int
j
=
0
;
j
<
Inner_Wafer_LongitudinalStrips
;
j
++
){
P
=
P_1_1
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
P
=
P_1_1
+
Ref
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
lineX
.
push_back
(
P
.
X
());
lineX
.
push_back
(
P
.
X
());
lineY
.
push_back
(
P
.
Y
());
lineY
.
push_back
(
P
.
Y
());
lineZ
.
push_back
(
P
.
Z
());
lineZ
.
push_back
(
P
.
Z
());
...
@@ -189,7 +188,7 @@ void TStrassePhysics::AddInnerDetector(double R, double Z, double Phi, double Sh
...
@@ -189,7 +188,7 @@ void TStrassePhysics::AddInnerDetector(double R, double Z, double Phi, double Sh
lineZ
.
clear
();
lineZ
.
clear
();
for
(
int
j
=
0
;
j
<
Inner_Wafer_LongitudinalStrips
;
j
++
){
for
(
int
j
=
0
;
j
<
Inner_Wafer_LongitudinalStrips
;
j
++
){
P
=
P_1_1
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
P
=
P_1_1
+
Ref
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
lineX
.
push_back
(
P
.
X
());
lineX
.
push_back
(
P
.
X
());
lineY
.
push_back
(
P
.
Y
());
lineY
.
push_back
(
P
.
Y
());
lineZ
.
push_back
(
P
.
Z
());
lineZ
.
push_back
(
P
.
Z
());
...
@@ -215,7 +214,6 @@ void TStrassePhysics::AddOuterDetector(double R, double Z, double Phi, double Sh
...
@@ -215,7 +214,6 @@ void TStrassePhysics::AddOuterDetector(double R, double Z, double Phi, double Sh
// Vector C position of detector face center
// Vector C position of detector face center
TVector3
C
(
Shift
,
R
,
Z
);
// center of the whole detector, including PCB
TVector3
C
(
Shift
,
R
,
Z
);
// center of the whole detector, including PCB
C
.
RotateZ
(
-
Phi
);
C
.
RotateZ
(
-
Phi
);
C
+=
Ref
;
// Vector W normal to detector face (pointing to the back)
// Vector W normal to detector face (pointing to the back)
TVector3
W
(
0
,
1
,
0
);
TVector3
W
(
0
,
1
,
0
);
...
@@ -253,7 +251,7 @@ void TStrassePhysics::AddOuterDetector(double R, double Z, double Phi, double Sh
...
@@ -253,7 +251,7 @@ void TStrassePhysics::AddOuterDetector(double R, double Z, double Phi, double Sh
lineY
.
clear
();
lineY
.
clear
();
lineZ
.
clear
();
lineZ
.
clear
();
for
(
int
j
=
0
;
j
<
Outer_Wafer_LongitudinalStrips
;
j
++
){
for
(
int
j
=
0
;
j
<
Outer_Wafer_LongitudinalStrips
;
j
++
){
P
=
P_1_1
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
P
=
P_1_1
+
Ref
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
lineX
.
push_back
(
P
.
X
());
lineX
.
push_back
(
P
.
X
());
lineY
.
push_back
(
P
.
Y
());
lineY
.
push_back
(
P
.
Y
());
lineZ
.
push_back
(
P
.
Z
());
lineZ
.
push_back
(
P
.
Z
());
...
@@ -286,7 +284,7 @@ void TStrassePhysics::AddOuterDetector(double R, double Z, double Phi, double Sh
...
@@ -286,7 +284,7 @@ void TStrassePhysics::AddOuterDetector(double R, double Z, double Phi, double Sh
lineZ
.
clear
();
lineZ
.
clear
();
for
(
int
j
=
0
;
j
<
Outer_Wafer_LongitudinalStrips
;
j
++
){
for
(
int
j
=
0
;
j
<
Outer_Wafer_LongitudinalStrips
;
j
++
){
P
=
P_1_1
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
P
=
P_1_1
+
Ref
+
i
*
U
*
TransversePitch
+
j
*
V
*
LongitudinalPitch
;
lineX
.
push_back
(
P
.
X
());
lineX
.
push_back
(
P
.
X
());
lineY
.
push_back
(
P
.
Y
());
lineY
.
push_back
(
P
.
Y
());
lineZ
.
push_back
(
P
.
Z
());
lineZ
.
push_back
(
P
.
Z
());
...
@@ -763,7 +761,7 @@ void TStrassePhysics::ReadConfiguration(NPL::InputParser parser) {
...
@@ -763,7 +761,7 @@ void TStrassePhysics::ReadConfiguration(NPL::InputParser parser) {
double
Z
=
blocks_outer
[
i
]
->
GetDouble
(
"Z"
,
"mm"
);
double
Z
=
blocks_outer
[
i
]
->
GetDouble
(
"Z"
,
"mm"
);
double
Phi
=
blocks_outer
[
i
]
->
GetDouble
(
"Phi"
,
"deg"
);
double
Phi
=
blocks_outer
[
i
]
->
GetDouble
(
"Phi"
,
"deg"
);
double
Shift
=
blocks_outer
[
i
]
->
GetDouble
(
"Shift"
,
"mm"
);
double
Shift
=
blocks_outer
[
i
]
->
GetDouble
(
"Shift"
,
"mm"
);
TVector3
Ref
=
blocks_
inn
er
[
i
]
->
GetTVector3
(
"Ref"
,
"mm"
);
TVector3
Ref
=
blocks_
out
er
[
i
]
->
GetTVector3
(
"Ref"
,
"mm"
);
AddOuterDetector
(
R
,
Z
,
Phi
,
Shift
,
Ref
);
AddOuterDetector
(
R
,
Z
,
Phi
,
Shift
,
Ref
);
}
}
else
{
else
{
...
...
This diff is collapsed.
Click to expand it.
Projects/Strasse/Control.cxx
+
4
−
4
View file @
ce134d88
...
@@ -30,14 +30,14 @@ void Control(){
...
@@ -30,14 +30,14 @@ void Control(){
cVertex
->
Divide
(
2
,
2
);
cVertex
->
Divide
(
2
,
2
);
cond
=
"VertexX!=-1000"
;
cond
=
"VertexX!=-1000"
;
cVertex
->
cd
(
1
);
cVertex
->
cd
(
1
);
PhysicsTree
->
Draw
(
"VertexX-fRC_Vertex_Position_X>>hx(500,-
1,1
)"
,
cond
.
c_str
(),
"col"
)
;
PhysicsTree
->
Draw
(
"VertexX-fRC_Vertex_Position_X>>hx(500,-
2,2
)"
,
cond
.
c_str
(),
"col"
)
;
cVertex
->
cd
(
2
);
cVertex
->
cd
(
2
);
PhysicsTree
->
Draw
(
"VertexY-fRC_Vertex_Position_Y>>hy(500,-
1,1
)"
,
cond
.
c_str
(),
"col"
)
;
PhysicsTree
->
Draw
(
"VertexY-fRC_Vertex_Position_Y>>hy(500,-
2,2
)"
,
cond
.
c_str
(),
"col"
)
;
cVertex
->
cd
(
3
);
cVertex
->
cd
(
3
);
PhysicsTree
->
Draw
(
"VertexZ-fRC_Vertex_Position_Z>>hz(500,-
1,1
)"
,
cond
.
c_str
(),
"col"
)
;
PhysicsTree
->
Draw
(
"VertexZ-fRC_Vertex_Position_Z>>hz(500
0
,-
20,20
)"
,
cond
.
c_str
(),
"col"
)
;
cVertex
->
cd
(
4
);
cVertex
->
cd
(
4
);
PhysicsTree
->
Draw
(
"Distance>>hd(500,0,
2
)"
,
cond
.
c_str
(),
""
);
PhysicsTree
->
Draw
(
"Distance>>hd(500,0,
80
)"
,
cond
.
c_str
(),
""
);
//PhysicsTree->Draw("VertexY:VertexX:VertexZ", cond.c_str(),"");
//PhysicsTree->Draw("VertexY:VertexX:VertexZ", cond.c_str(),"");
...
...
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