From 420e4cff0bed220c16c601cd7d478c0c2af09b47 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Wed, 17 Jan 2024 13:35:02 +0100
Subject: [PATCH] Try to fix (some) CAD interface tests
---
DDCAD/include/DDCAD/Utilities.h | 41 ++++++++++++++++++++++++++++-----
DDCAD/src/ASSIMPReader.cpp | 30 ++++++++++++++----------
DDCAD/src/ASSIMPWriter.cpp | 6 ++---
DDCore/include/DD4hep/Handle.h | 4 +++-
DDCore/src/Handle.cpp | 4 ++++
5 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/DDCAD/include/DDCAD/Utilities.h b/DDCAD/include/DDCAD/Utilities.h
index ef5a4c89b..1b0a86f08 100644
--- a/DDCAD/include/DDCAD/Utilities.h
+++ b/DDCAD/include/DDCAD/Utilities.h
@@ -15,6 +15,7 @@
#include <vector>
#include <cmath>
+#include <limits>
#include <TGeoTessellated.h>
#include <TGeoVector3.h>
@@ -25,7 +26,7 @@ namespace dd4hep {
/// Namespace for implementation details of the AIDA detector description toolkit
namespace cad {
- inline std::stringstream streamFacet(TGeoFacet const& facet,
+ inline std::string streamFacet(TGeoFacet const& facet,
TGeoTessellated const& shape) {
using ::operator<<;
std::stringstream str;
@@ -40,24 +41,24 @@ namespace dd4hep {
#else
str << facet;
#endif
- return str;
+ return str.str();
}
- inline std::stringstream streamVertices(ROOT::Geom::Vertex_t const& v1,
+ inline std::string streamVertices(ROOT::Geom::Vertex_t const& v1,
ROOT::Geom::Vertex_t const& v2,
ROOT::Geom::Vertex_t const& v3) {
using ::operator<<;
std::stringstream str;
str << "{" << v1 << ", " << v2 << ", " << v3 << "}";
- return str;
+ return str.str();
}
-
// Determine if the facet is degenerated by calculating its determinant
inline bool facetIsDegenerated(std::vector<ROOT::Geom::Vertex_t> const& vertices){
+#if 0
const ROOT::Geom::Vertex_t& v1 = vertices[0];
const ROOT::Geom::Vertex_t& v2 = vertices[1];
const ROOT::Geom::Vertex_t& v3 = vertices[2];
- constexpr double epsilon = 1.0e-10;
+ constexpr double epsilon = std::numeric_limits<double>::epsilon();
// v1.x v2.x v3.x v1.x v2.x
//
// v1.y v2.y v3.y v1.y v2.y
@@ -71,6 +72,34 @@ namespace dd4hep {
- v2.z() * v3.y() * v1.x()
- v3.z() * v1.y() * v2.x();
return std::fabs(det) < epsilon;
+#else
+ using ROOT::Geom::Vertex_t;
+ // Compute normal using non-zero segments
+ constexpr double kTolerance = 1.e-20;
+ bool degenerated = true;
+ Vertex_t normal;
+ int fNvert = int(vertices.size());
+ for (int i = 0; i < fNvert - 1; ++i) {
+ Vertex_t e1 = vertices[i + 1] - vertices[i];
+ if (e1.Mag2() < kTolerance)
+ continue;
+ for (int j = i + 1; j < fNvert; ++j) {
+ Vertex_t e2 = vertices[(j + 1) % fNvert] - vertices[j];
+ if (e2.Mag2() < kTolerance)
+ continue;
+ normal = Vertex_t::Cross(e1, e2);
+ // e1 and e2 may be colinear
+ if (normal.Mag2() < kTolerance)
+ continue;
+ normal.Normalize();
+ degenerated = false;
+ break;
+ }
+ if (!degenerated)
+ break;
+ }
+ return degenerated;
+#endif
}
}
}
diff --git a/DDCAD/src/ASSIMPReader.cpp b/DDCAD/src/ASSIMPReader.cpp
index 67a1c37a0..5a22c5b3b 100644
--- a/DDCAD/src/ASSIMPReader.cpp
+++ b/DDCAD/src/ASSIMPReader.cpp
@@ -63,9 +63,9 @@ ASSIMPReader::readShapes(const std::string& source, double unit_length) const
if ( dump_facets ) {
for( size_t i=0, n=shape->GetNfacets(); i < n; ++i ) {
const auto& facet = shape->GetFacet(i);
- std::stringstream str = dd4hep::cad::streamFacet(facet, shape);
+ std::string str = dd4hep::cad::streamFacet(facet, shape);
printout(ALWAYS,"ASSIMPReader","++ Facet %4ld : %s",
- i, str.str().c_str());
+ i, str.c_str());
}
}
shape->SetTitle(TESSELLATEDSOLID_TAG);
@@ -90,7 +90,6 @@ ASSIMPReader::readVolumes(const std::string& source, double unit_length) const
bool dump_facets = ((flags>>8)&0x1) == 1;
int aiflags = aiProcess_Triangulate|aiProcess_JoinIdenticalVertices|aiProcess_CalcTangentSpace;
auto scene = importer->ReadFile( source.c_str(), aiflags);
- char text[1048];
if ( !scene ) {
except("ASSIMPReader","+++ FileNotFound: %s",source.c_str());
@@ -108,9 +107,20 @@ ASSIMPReader::readVolumes(const std::string& source, double unit_length) const
vertices.emplace_back(Vertex(v[i].x*unit, v[i].y*unit, v[i].z*unit));
}
TessellatedSolid shape(name,vertices);
+ if ( name.empty() ) {
+ name = _toString(result.size(), "tessellated_%ld");
+ }
+
for(unsigned int i=0; i < mesh->mNumFaces; i++) {
const unsigned int* idx = mesh->mFaces[i].mIndices;
- shape->AddFacet(idx[0], idx[1], idx[2]);
+ bool degenerated = dd4hep::cad::facetIsDegenerated({vertices[idx[0]], vertices[idx[1]], vertices[idx[2]]});
+ if ( !degenerated ) {
+ shape->AddFacet(idx[0], idx[1], idx[2]);
+ continue;
+ }
+ printout(INFO, "ASSIMPReader", "+++ %s: Drop degenerated facet: %d %d %d",
+ name.c_str(), idx[0], idx[1], idx[2]);
+
}
if ( shape->GetNfacets() > 2 ) {
std::string mat_name;
@@ -124,14 +134,9 @@ ASSIMPReader::readVolumes(const std::string& source, double unit_length) const
if ( !mat.isValid() ) {
printout(ERROR, "ASSIMPReader",
"+++ %s: No material named '%s' FOUND. Will use Air. [Missing material]",
- text, mat_name.c_str());
+ name.c_str(), mat_name.c_str());
mat = detector.air();
}
- if ( name.empty() ) {
- ::snprintf(text,sizeof(text),"tessellated_%ld", result.size());
- text[sizeof(text)-1] = 0;
- name = text;
- }
Volume vol(name, Solid(shape.ptr()), mat);
if ( mesh->HasVertexColors(0) ) {
const aiColor4D* col = mesh->mColors[0];
@@ -146,6 +151,7 @@ ASSIMPReader::readVolumes(const std::string& source, double unit_length) const
}
}
if ( !vis.isValid() ) {
+ char text[1024];
::snprintf(text,sizeof(text),"vis_%s_%p", name.c_str(), (void*)vol.ptr());
text[sizeof(text)-1] = 0;
vis = VisAttr(text);
@@ -162,9 +168,9 @@ ASSIMPReader::readVolumes(const std::string& source, double unit_length) const
if ( dump_facets ) {
for( size_t i=0, n=shape->GetNfacets(); i < n; ++i ) {
const auto& facet = shape->GetFacet(i);
- std::stringstream str = dd4hep::cad::streamFacet(facet, shape);
+ std::string str = dd4hep::cad::streamFacet(facet, shape);
printout(ALWAYS,"ASSIMPReader","++ Facet %4ld : %s",
- i, str.str().c_str());
+ i, str.c_str());
}
}
result.emplace_back(std::unique_ptr<TGeoVolume>(vol.ptr()));
diff --git a/DDCAD/src/ASSIMPWriter.cpp b/DDCAD/src/ASSIMPWriter.cpp
index f31219174..f468c63e0 100644
--- a/DDCAD/src/ASSIMPWriter.cpp
+++ b/DDCAD/src/ASSIMPWriter.cpp
@@ -159,7 +159,7 @@ namespace {
continue;
}
#if ROOT_VERSION_CODE >= ROOT_VERSION(6,31,1)
- bool degenerated = dd4hep::cad::facetIsDegenerated(vertices);
+ bool degenerated = dd4hep::cad::facetIsDegenerated({vertices[vv0],vertices[vv1],vertices[vv2]});
#else
bool degenerated = true;
TGeoFacet f(&vertices, 3, vv0, vv1, vv2);
@@ -426,8 +426,8 @@ int ASSIMPWriter::write(const std::string& file_name,
ROOT::Geom::Vertex_t v1(vv[id[0]].x, vv[id[0]].y, vv[id[0]].z);
ROOT::Geom::Vertex_t v2(vv[id[1]].x, vv[id[1]].y, vv[id[1]].z);
ROOT::Geom::Vertex_t v3(vv[id[2]].x, vv[id[2]].y, vv[id[2]].z);
- std::stringstream str = dd4hep::cad::streamVertices(v1, v2, v3);
- printout(ALWAYS,"ASSIMPWriter","++ Facet %4ld : %s", j, str.str().c_str());
+ std::string str = dd4hep::cad::streamVertices(v1, v2, v3);
+ printout(ALWAYS,"ASSIMPWriter","++ Facet %4ld : %s", j, str.c_str());
}
}
else {
diff --git a/DDCore/include/DD4hep/Handle.h b/DDCore/include/DD4hep/Handle.h
index f337140b0..8dfdbce70 100644
--- a/DDCore/include/DD4hep/Handle.h
+++ b/DDCore/include/DD4hep/Handle.h
@@ -239,10 +239,12 @@ namespace dd4hep {
/// String conversions: boolean value to string \ingroup DD4HEP_CORE
std::string _toString(bool value);
- /// String conversions: integer value to string \ingroup DD4HEP_CORE
+ /// String conversions: short integer value to string \ingroup DD4HEP_CORE
std::string _toString(short value, const char* fmt = "%d");
/// String conversions: integer value to string \ingroup DD4HEP_CORE
std::string _toString(int value, const char* fmt = "%d");
+ /// String conversions: unsigned long integer value to string \ingroup DD4HEP_CORE
+ std::string _toString(unsigned long value, const char* fmt = "%ld");
/// String conversions: float value to string \ingroup DD4HEP_CORE
std::string _toString(float value, const char* fmt = "%.17e");
/// String conversions: double value to string \ingroup DD4HEP_CORE
diff --git a/DDCore/src/Handle.cpp b/DDCore/src/Handle.cpp
index 7cfa46fcb..cbc9b1b7b 100644
--- a/DDCore/src/Handle.cpp
+++ b/DDCore/src/Handle.cpp
@@ -344,6 +344,10 @@ namespace dd4hep {
return __to_string(value, fmt);
}
+ string _toString(unsigned long value, const char* fmt) {
+ return __to_string(value, fmt);
+ }
+
string _toString(float value, const char* fmt) {
return __to_string(value, fmt);
}
--
GitLab