Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Detector
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
LHCb
Detector
Commits
74020b93
Commit
74020b93
authored
1 year ago
by
Gitlab CI
Committed by
Hangyi Wu
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed formatting
patch generated by
https://gitlab.cern.ch/lhcb/Detector/-/jobs/31266501
parent
bad0b6a2
No related branches found
No related tags found
No related merge requests found
Pipeline
#5946778
passed
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Detector/UT/include/Detector/UT/DeUT.h
+17
-17
17 additions, 17 deletions
Detector/UT/include/Detector/UT/DeUT.h
Detector/UT/include/Detector/UT/DeUTLayer.h
+1
-1
1 addition, 1 deletion
Detector/UT/include/Detector/UT/DeUTLayer.h
with
18 additions
and
18 deletions
Detector/UT/include/Detector/UT/DeUT.h
+
17
−
17
View file @
74020b93
...
...
@@ -237,10 +237,10 @@ namespace LHCb::Detector::UT {
const
LayerGeom
getLayerGeom
(
unsigned
int
layerid
)
const
{
LayerGeom
layergeom
;
auto
SectorsInLayer
=
sectors
(
LayerID_t
{
layerid
}
);
auto
tStation
=
layerid
/
2
;
unsigned
int
keysectorID
=
(
tStation
==
0
)
?
31
:
11
;
layergeom
.
z
=
SectorsInLayer
[
keysectorID
].
globalCentre
().
z
();
auto
SectorsInLayer
=
sectors
(
LayerID_t
{
layerid
}
);
auto
tStation
=
layerid
/
2
;
unsigned
int
keysectorID
=
(
tStation
==
0
)
?
31
:
11
;
layergeom
.
z
=
SectorsInLayer
[
keysectorID
].
globalCentre
().
z
();
float
YFirstRow
=
0
;
float
YLastRow
=
0
;
float
smallestXLastCol
=
0
;
...
...
@@ -252,21 +252,21 @@ namespace LHCb::Detector::UT {
unsigned
int
bottomMostRow
=
1u
;
// loop over sectors within this layer to get x, y of corner sectors
std
::
for_each
(
SectorsInLayer
.
begin
(),
SectorsInLayer
.
end
(),
[
&
](
DeUTSector
const
&
utSector
)
{
if
(
utSector
.
channelID
().
stave
()
<
1
)
return
;
// skip Stave0 due to its Y shift
auto
pos
=
utSector
.
toGlobal
(
ROOT
::
Math
::
XYZPoint
{
0
,
0
,
0
}
);
std
::
for_each
(
SectorsInLayer
.
begin
(),
SectorsInLayer
.
end
(),
[
&
](
DeUTSector
const
&
utSector
)
{
if
(
utSector
.
channelID
().
stave
()
<
1
)
return
;
// skip Stave0 due to its Y shift
auto
pos
=
utSector
.
toGlobal
(
ROOT
::
Math
::
XYZPoint
{
0
,
0
,
0
}
);
auto
pos_x
=
pos
.
x
();
auto
pos_y
=
pos
.
y
();
if
(
pos_x
<
smallestXFirstcol
)
smallestXFirstcol
=
pos_x
;
if
(
pos_x
>
smallestXLastCol
)
smallestXLastCol
=
pos_x
;
if
(
pos_y
<
YFirstRow
)
YFirstRow
=
pos_y
;
if
(
pos_y
>
YLastRow
)
YLastRow
=
pos_y
;
});
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"smallestXFirstcol = %.3f"
,
smallestXFirstcol
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"smallestXLastCol = %.3f"
,
smallestXLastCol
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"YFirstRow = %.3f"
,
YFirstRow
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"YLastRow = %.3f"
,
YLastRow
);
if
(
pos_x
<
smallestXFirstcol
)
smallestXFirstcol
=
pos_x
;
if
(
pos_x
>
smallestXLastCol
)
smallestXLastCol
=
pos_x
;
if
(
pos_y
<
YFirstRow
)
YFirstRow
=
pos_y
;
if
(
pos_y
>
YLastRow
)
YLastRow
=
pos_y
;
}
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"smallestXFirstcol = %.3f"
,
smallestXFirstcol
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"smallestXLastCol = %.3f"
,
smallestXLastCol
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"YFirstRow = %.3f"
,
YFirstRow
);
dd4hep
::
printout
(
dd4hep
::
DEBUG
,
"DeUT::getLayerGeom"
,
"YLastRow = %.3f"
,
YLastRow
);
// gather all information into the corresponding LayerInfo object
auto
ncols
=
biggestColumn
-
smallestColumn
+
1
;
...
...
This diff is collapsed.
Click to expand it.
Detector/UT/include/Detector/UT/DeUTLayer.h
+
1
−
1
View file @
74020b93
...
...
@@ -32,7 +32,7 @@ namespace LHCb::Detector::UT {
std
::
array
<
DeUTStaveObject
,
9
>
m_staves
;
ChannelID
m_channelID
;
ROOT
::
Math
::
Plane3D
m_plane
;
double
m_angle
=
0
;
double
m_angle
=
0
;
double
m_sinAngle
=
0
;
double
m_cosAngle
=
0
;
...
...
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