diff --git a/GeoModelRead/CMakeLists.txt b/GeoModelRead/CMakeLists.txt index c98ddbba8c6d771fcdecb41bd1a93b09f3c45f31..bd856cd9c031ba29b3b854642dd5337755d3e301 100644 --- a/GeoModelRead/CMakeLists.txt +++ b/GeoModelRead/CMakeLists.txt @@ -56,6 +56,6 @@ install( TARGETS GeoModelRead # Install a CMake description of the project/library. install( EXPORT GeoModelReadConfig DESTINATION cmake ) -# new test GeoModelIO +# Export as part of GeoModelIO install( TARGETS GeoModelRead EXPORT GeoModelRead-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelRead ) diff --git a/GeoModelRead/GeoModelRead/ReadGeoModel.h b/GeoModelRead/GeoModelRead/ReadGeoModel.h index 6369ced685271c04fa7b40f0386b2af141bbfd34..c5ab11ff2f5bf042c6d9093dd75fb6de9c99f1d2 100644 --- a/GeoModelRead/GeoModelRead/ReadGeoModel.h +++ b/GeoModelRead/GeoModelRead/ReadGeoModel.h @@ -86,13 +86,20 @@ private: void checkInputString(QString input); + void printTrf(GeoTrf::Transform3D t); + void printTransformationValues(QStringList t); + QList<double> convertQstringListToDouble(QStringList listin); + + // input arguments std::string _dbName; GeoPhysVol* _root; GMDBManager* m_dbManager; - unsigned long* m_progress; bool m_deepDebug; + // callback handles + unsigned long* m_progress; + // data containers QHash<QString, QMap<unsigned int, QStringList>> _allchildren; // key = "parentId:parentTable", item = list of children parameters, inserted by child position QHash<unsigned int, QStringList> _physVols;