Skip to content
Snippets Groups Projects
Commit 39dfa380 authored by Markus Frank's avatar Markus Frank Committed by MarkusFrankATcernch
Browse files

Fix errors for clang compiler

parent 745f68b1
No related branches found
No related tags found
No related merge requests found
......@@ -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<AlignmentData>(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
......
......@@ -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::fabs( cellPosition.X )>10000e0 || std::fabs( cellPosition.Y )>10000e0 ) {
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment