diff --git a/GeoModelRead/GeoModelRead/ReadGeoModel.h b/GeoModelRead/GeoModelRead/ReadGeoModel.h
index 17bcef52366579557325f5a24f62a56a12be24a6..7ab9a1436b978c78e3b138b9838c32ab3a63f565 100644
--- a/GeoModelRead/GeoModelRead/ReadGeoModel.h
+++ b/GeoModelRead/GeoModelRead/ReadGeoModel.h
@@ -67,11 +67,11 @@ class GeoBox;
// namespaces
using namespace GeoGenfun;
-using namespace GeoXF;
+//using namespace GeoXF;
// type definitions
-typedef const Function & TRANSFUNCTION;
+typedef const GeoXF::Function & TRANSFUNCTION;
// containers for boolean shapes' information
typedef std::tuple<unsigned int/*shape ID*/, GeoShape*, unsigned int/*opA ID*/, unsigned int/*opB ID*/> tuple_shapes_boolean_info;
typedef std::vector<tuple_shapes_boolean_info> type_shapes_boolean_info;
@@ -176,9 +176,9 @@ private:
void storeBuiltElement(const unsigned int id, GeoElement* nodePtr);
GeoElement* getBuiltElement(const unsigned int id);
- bool isBuiltFunc(const unsigned int id);
- void storeBuiltFunc(const unsigned int id, TRANSFUNCTION nodePtr);
- TRANSFUNCTION getBuiltFunc(const unsigned int id);
+ bool isBuiltFunction(const unsigned int id);
+ void storeBuiltFunction(const unsigned int id, GeoXF::Function* nodePtr);
+ GeoXF::Function* getBuiltFunction(const unsigned int id);
bool isBuiltPhysVol(const unsigned int id);
void storeBuiltPhysVol(const unsigned int id, GeoPhysVol* nodePtr);
@@ -236,8 +236,8 @@ private:
std::vector<std::vector<std::string>> m_materials;
std::vector<std::vector<std::string>> m_elements;
std::vector<std::vector<std::string>> m_shapes;
- QHash<unsigned int, QStringList> m_functions;
- // std::vector<std::vector<std::string>> m_functions;
+// QHash<unsigned int, QStringList> m_functions;
+ std::vector<std::vector<std::string>> m_functions;
std::vector<std::vector<std::string>> m_allchildren;
std::unordered_map<unsigned int, std::string> m_tableID_toTableName; // to look for node's type name starting from a table ID
@@ -257,7 +257,7 @@ private:
std::vector<GeoLogVol*> m_memMapLogVols;
std::vector<GeoMaterial*> m_memMapMaterials;
std::vector<GeoElement*> m_memMapElements;
- // std::vector<TRANSFUNCTION> m_memMapFunctions; // FIXME: implement cache for Functions
+ // std::vector<GeoXF::Function*> m_memMapFunctions; // FIXME:
std::unordered_map<unsigned int, GeoShape*> m_memMapShapes; // we need keys, because shapes are not built following the ID order
std::unordered_map<std::string, GeoGraphNode*> m_memMap; // we need keys, to keep track of the volume's copyNumber
diff --git a/GeoModelRead/src/ReadGeoModel.cpp b/GeoModelRead/src/ReadGeoModel.cpp
index 129c256efbc5839e9d23d996e17c9d0f74a53157..8ea5e1cdebf4d70c3800d7fafd53ada6cd05ebe1 100644
--- a/GeoModelRead/src/ReadGeoModel.cpp
+++ b/GeoModelRead/src/ReadGeoModel.cpp
@@ -186,7 +186,7 @@ GeoPhysVol* ReadGeoModel::buildGeoModelPrivate()
m_shapes = m_dbManager->getTableFromNodeTypeStd("GeoShape");
m_materials = m_dbManager->getTableFromNodeTypeStd("GeoMaterial");
m_elements = m_dbManager->getTableFromNodeTypeStd("GeoElement");
- m_functions = m_dbManager->getTableFromNodeType("Function");
+ m_functions = m_dbManager->getTableFromNodeTypeStd("Function");
m_physVols = m_dbManager->getTableFromNodeTypeStd("GeoPhysVol");
m_fullPhysVols = m_dbManager->getTableFromNodeTypeStd("GeoFullPhysVol");
m_transforms = m_dbManager->getTableFromNodeTypeStd("GeoTransform");
@@ -386,13 +386,13 @@ void ReadGeoModel::buildAllLogVols()
if (nSize>0) std::cout << "All " << nSize << " LogVols have been built!\n";
}
-// TODO: move to an utility class
-void printQHashQstringUInt(QHash<QString, unsigned int> qq) {
- QHash<QString, unsigned int>::const_iterator i = qq.constBegin();
- while (i != qq.constEnd()) {
- std::cout << i.key().toStdString() << ": " << i.value() << std::endl;
- }
-}
+ //// FIXME: TODO: move to an utility class
+//void printQHashQstringUInt(QHash<QString, unsigned int> qq) {
+// QHash<QString, unsigned int>::const_iterator i = qq.constBegin();
+// while (i != qq.constEnd()) {
+// std::cout << i.key().toStdString() << ": " << i.value() << std::endl;
+// }
+//}
//! Iterate over the list of nodes, build them all, and store their pointers
void ReadGeoModel::buildAllPhysVols()
@@ -491,24 +491,10 @@ void ReadGeoModel::buildAllSerialTransformers()
// std::cout << "All Functions have been built!\n";
// }
-// //! Iterate over the list of nodes, build them all, and store their pointers
-// void ReadGeoModel::buildAllRecords(QHash<unsigned int, QStringList> list)
-// {
-// QHash<unsigned int, QStringList>::const_iterator i = list.constBegin();
-// while (i != list.constEnd()) {
-// // cout << i.key() << ": " << i.value() << Qt::endl;
-// unsigned int shapeID = i.key();
-// buildNode(shapeID, &shapes_info_sub);
-// createBooleanShapeOperands(&shapes_info_sub);
-// ++i;
-// }
-// std::cout << "\nAll nodes have been built!\n\n\n";
-// }
-
- void ReadGeoModel::loopOverAllChildrenInBunches()
- {
+void ReadGeoModel::loopOverAllChildrenInBunches()
+{
int nChildrenRecords = m_allchildren.size();
if (m_debug) std::cout << "number of children to process: " << nChildrenRecords << std::endl;
@@ -982,7 +968,6 @@ GeoShape* ReadGeoModel::buildShape(const unsigned int shapeId, type_shapes_boole
// try // TODO: implement try/catch
// {
- // QStringList paramsShape = m_shapes[ shapeId.toUInt() ];
std::vector<std::string> paramsShape = m_shapes[ shapeId-1 ]; // remember: nodes' IDs start from 1
const unsigned int id = std::stoi(paramsShape[0]);
@@ -2668,31 +2653,36 @@ GeoSerialTransformer* ReadGeoModel::buildSerialTransformer(const unsigned int id
TRANSFUNCTION ReadGeoModel::buildFunction(const unsigned int id)
{
- // if( isBuiltFunc(id) ) {
- // return getBuiltFunc(id);
- // }
-
- QStringList values = m_functions[id];
- std::string expr = values[1].toStdString();
-// std::string expr = m_functions[id][1];
-
-
- if (m_deepDebug) {
- muxCout.lock();
- std::cout << "ReadGeoModel::buildFunction(const std::string& expr)" << std::endl;
- std::cout << "expression: " << expr << std::endl;
- muxCout.unlock();
+ /* FIXME: see below
+ if( isBuiltFunction(id) ) {
+ GeoXF::Function* fPtr = getBuiltFunction(id);
+ TRANSFUNCTION tf = (*fPtr); // Remember: "typedef const Function & TRANSFUNCTION"
+ return tf;
}
+ */
+ std::string expr = m_functions[id-1][1]; // nodes' IDs start from 1
+
if (0==expr.size()) {
+ muxCout.lock();
std::cout << "FATAL ERROR!! Function expression is empty!! Aborting..." << std::endl;
+ muxCout.unlock();
exit(EXIT_FAILURE);
}
TransFunctionInterpreter interpreter;
TFPTR func=interpreter.interpret( expr );
TRANSFUNCTION tf = *(func.release()); // make func returns a pointer to the managed object and releases the ownership, then get the object dereferencing the pointer
- // storeBuiltFunc(id, tf);
+
+ /* FIXME: At the moment, enabling this cache makes the app crash at the end, when calling the destructor. I suspect because the pointers are not correct and so removing them throws an error.
+ // Get a non-const pointer to the Function object,
+ // and store that into the cache.
+ // Remember: "typedef const Function & TRANSFUNCTION"
+ const GeoXF::Function* fPtrConst = &tf;
+ GeoXF::Function* fPtr = const_cast <GeoXF::Function*>(fPtrConst);
+ storeBuiltFunction(id, fPtr);
+ */
+
return tf;
}
@@ -2858,9 +2848,25 @@ void ReadGeoModel::storeBuiltSerialTransformer(const unsigned int id, GeoSerialT
}
GeoSerialTransformer* ReadGeoModel::getBuiltSerialTransformer(const unsigned int id)
{
- return m_memMapSerialTransformers[id-1]; // vector, but nodes' IDs start from 1
+ return m_memMapSerialTransformers[id-1]; // remember: nodes' IDs start from 1
}
+ /* FIXME:
+ // --- methods for caching Functions nodes ---
+ bool ReadGeoModel::isBuiltFunction(const unsigned int id)
+ {
+ return (id <= m_memMapFunctions.size()); // vector: we exploit the fact that we built the vols ordered by their IDs
+ }
+ void ReadGeoModel::storeBuiltFunction(const unsigned int id, GeoXF::Function* nodePtr)
+ {
+ m_memMapFunctions.push_back(nodePtr); // vector, we store them in the order of IDs
+
+ }
+ GeoXF::Function* ReadGeoModel::getBuiltFunction(const unsigned int id)
+ {
+ return m_memMapFunctions[id-1]; // remember: nodes' IDs start from 1
+ }
+*/
// --- methods for caching GeoPhysVol/GeoFullPhysVol nodes ---
std::string getVPhysVolKey(const unsigned int id, const unsigned int tableId, const unsigned int copyNumber)
@@ -2883,22 +2889,5 @@ GeoGraphNode* ReadGeoModel::getVPhysVol(const unsigned int id, const unsigned in
}
return m_memMap[key];
}
-// --- methods for caching Functions nodes ---
-// bool ReadGeoModel::isBuiltFunc(const unsigned int id)
-// {
-// std::lock_guard<std::mutex> lk(muxFunc);
-// return m_memMapFuncs.count(id);
-// }
-// void ReadGeoModel::storeBuiltFunc(const unsigned int id, TRANSFUNCTION nodePtr)
-// {
-// std::lock_guard<std::mutex> lk(muxFunc);
-// m_memMapFuncs[id] = &nodePtr;
-// }
-// TRANSFUNCTION ReadGeoModel::getBuiltFunc(const unsigned int id)
-// {
-// std::lock_guard<std::mutex> lk(muxFunc);
-// return m_memMapFuncs[id];
-// }
-
} /* namespace GeoModelIO */