Skip to content
Snippets Groups Projects
Commit 615a0ace authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny:
Browse files

cleaning

parent 77804409
No related branches found
No related tags found
1 merge request!9Implements parallel I/O (Read, for the moment) & starts dropping Qt5
Pipeline #1666314 failed
...@@ -399,11 +399,7 @@ void ReadGeoModel::buildAllShapes() ...@@ -399,11 +399,7 @@ void ReadGeoModel::buildAllShapes()
m_memMapShapes.reserve( nSize*2 ); // TODO: check if *2 is good or redundant... m_memMapShapes.reserve( nSize*2 ); // TODO: check if *2 is good or redundant...
for (unsigned int ii=0; ii<nSize; ++ii) { for (unsigned int ii=0; ii<nSize; ++ii) {
const unsigned int shapeID = std::stoi(m_shapes[ii][0]); const unsigned int shapeID = std::stoi(m_shapes[ii][0]);
// if(shapeID!=15680) continue;
type_shapes_boolean_info shapes_info_sub; // tuple to store the boolean shapes to complete at a second stage type_shapes_boolean_info shapes_info_sub; // tuple to store the boolean shapes to complete at a second stage
if(shapeID==15680) {
std::cout<<"OK\n";
}
buildShape(shapeID, &shapes_info_sub); buildShape(shapeID, &shapes_info_sub);
createBooleanShapeOperands(&shapes_info_sub); createBooleanShapeOperands(&shapes_info_sub);
} }
...@@ -475,7 +471,6 @@ void ReadGeoModel::buildAllLogVols() ...@@ -475,7 +471,6 @@ void ReadGeoModel::buildAllLogVols()
m_memMapLogVols.reserve( nSize*2 ); // TODO: check if *2 is good or redundant... m_memMapLogVols.reserve( nSize*2 ); // TODO: check if *2 is good or redundant...
for (unsigned int ii=0; ii<nSize; ++ii) { for (unsigned int ii=0; ii<nSize; ++ii) {
const unsigned int nodeID = std::stoi(m_logVols[ii][0]); const unsigned int nodeID = std::stoi(m_logVols[ii][0]);
// if(nodeID!=10869) continue;
buildLogVol(nodeID); buildLogVol(nodeID);
} }
if (nSize>0) std::cout << "All " << nSize << " LogVols have been built!\n"; if (nSize>0) std::cout << "All " << nSize << " LogVols have been built!\n";
...@@ -1267,7 +1262,7 @@ std::string ReadGeoModel::getShapeType(const unsigned int shapeId) ...@@ -1267,7 +1262,7 @@ std::string ReadGeoModel::getShapeType(const unsigned int shapeId)
GeoShape* ReadGeoModel::buildShape(const unsigned int shapeId, type_shapes_boolean_info* shapes_info_sub) GeoShape* ReadGeoModel::buildShape(const unsigned int shapeId, type_shapes_boolean_info* shapes_info_sub)
{ {
if (isBuiltShape(shapeId)) { if (isBuiltShape(shapeId)) {
return getBuiltShape(shapeId); return getBuiltShape(shapeId);
} }
if (m_deepDebug) { if (m_deepDebug) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment