Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
39dfa380
Commit
39dfa380
authored
8 years ago
by
Markus Frank
Committed by
MarkusFrankATcernch
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix errors for clang compiler
parent
745f68b1
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
DDCore/src/Alignments.cpp
+2
-2
2 additions, 2 deletions
DDCore/src/Alignments.cpp
DDSegmentation/src/MegatileLayerGridXY.cpp
+7
-3
7 additions, 3 deletions
DDSegmentation/src/MegatileLayerGridXY.cpp
with
9 additions
and
5 deletions
DDCore/src/Alignments.cpp
+
2
−
2
View file @
39dfa380
...
...
@@ -40,7 +40,7 @@ namespace DD4hep {
}
#else
/// Initializing constructor to create a new object (Specialized for AlignmentNamedObject)
template
<
>
Alignment
::
Alignment
<
Alignment
::
Object
>
(
const
string
&
nam
)
{
template
<
>
Alignment
::
Alignment
<
Alignment
Data
>
(
const
string
&
nam
)
{
assign
(
new
Alignment
::
Object
(),
nam
,
"alignment"
);
}
/// Initializing constructor to create a new object (Specialized for AlignmentNamedObject)
...
...
@@ -48,7 +48,7 @@ namespace DD4hep {
assign
(
new
Interna
::
AlignmentNamedObject
(
nam
,
"alignment"
),
nam
,
"alignment"
);
}
/// Initializing constructor to create a new object (Specialized for AlignmentConditionObject)
template
<
>
AlignmentCondition
::
AlignmentCondition
<
AlignmentCondition
::
Object
>
(
const
string
&
nam
)
{
template
<
>
AlignmentCondition
::
AlignmentCondition
<
Interna
::
AlignmentConditionObject
>
(
const
string
&
nam
)
{
assign
(
new
Object
(
nam
,
"alignment"
),
nam
,
"alignment"
);
}
#endif
...
...
This diff is collapsed.
Click to expand it.
DDSegmentation/src/MegatileLayerGridXY.cpp
+
7
−
3
View file @
39dfa380
...
...
@@ -73,9 +73,10 @@ namespace DD4hep {
cellPosition
.
X
=
cellIndexX
*
(
_currentSegInfo
.
megaTileSizeX
/
_currentSegInfo
.
nCellsX
)
+
_currentSegInfo
.
megaTileOffsetX
;
cellPosition
.
Y
=
cellIndexY
*
(
_currentSegInfo
.
megaTileSizeY
/
_currentSegInfo
.
nCellsY
)
+
_currentSegInfo
.
megaTileOffsetY
;
if
(
abs
(
cellPosition
.
X
)
>
10000
||
abs
(
cellPosition
.
Y
)
>
10000
)
{
if
(
std
::
f
abs
(
cellPosition
.
X
)
>
10000
e0
||
std
::
f
abs
(
cellPosition
.
Y
)
>
10000
e0
)
{
std
::
cout
<<
"crazy cell position: "
<<
cellPosition
.
X
<<
" "
<<
cellPosition
.
Y
<<
std
::
endl
;
std
::
cout
<<
"layer, wafer, cellx,y indices: "
<<
layerIndex
<<
" "
<<
waferIndex
<<
" "
<<
cellIndexX
<<
" "
<<
cellIndexY
<<
std
::
endl
;
std
::
cout
<<
"layer, wafer, cellx,y indices: "
<<
layerIndex
<<
" "
<<
waferIndex
<<
" "
<<
cellIndexX
<<
" "
<<
cellIndexY
<<
std
::
endl
;
assert
(
0
&&
"crazy cell position?"
);
}
...
...
@@ -84,7 +85,10 @@ namespace DD4hep {
/// determine the cell ID based on the position
CellID
MegatileLayerGridXY
::
cellID
(
const
Vector3D
&
localPosition
,
const
Vector3D
&
/* globalPosition */
,
const
VolumeID
&
vID
)
const
{
CellID
MegatileLayerGridXY
::
cellID
(
const
Vector3D
&
localPosition
,
const
Vector3D
&
/* globalPosition */
,
const
VolumeID
&
vID
)
const
{
// this is the local position within a megatile, local coordinates
// get the layer, wafer, module indices from the volumeID
...
...
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