Skip to content
Snippets Groups Projects
Commit 6fb102ba authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny: Committed by Johannes Junggeburth
Browse files

move Elements to REAL DB records

parent 499c1042
No related branches found
No related tags found
1 merge request!327New schema for the GeoModel SQLite database and updated I/O
...@@ -351,7 +351,7 @@ class WriteGeoModel : public GeoNodeAction { ...@@ -351,7 +351,7 @@ class WriteGeoModel : public GeoNodeAction {
std::vector<std::vector<std::string>> m_physVols; std::vector<std::vector<std::string>> m_physVols;
std::vector<std::vector<std::string>> m_fullPhysVols; std::vector<std::vector<std::string>> m_fullPhysVols;
std::vector<std::vector<std::string>> m_materials; std::vector<std::vector<std::string>> m_materials;
std::vector<std::vector<std::string>> m_elements; // std::vector<std::vector<std::string>> m_elements;
std::vector<std::vector<std::string>> m_transforms; std::vector<std::vector<std::string>> m_transforms;
std::vector<std::vector<std::string>> m_alignableTransforms; std::vector<std::vector<std::string>> m_alignableTransforms;
std::vector<std::vector<std::string>> m_serialDenominators; std::vector<std::vector<std::string>> m_serialDenominators;
...@@ -361,6 +361,8 @@ class WriteGeoModel : public GeoNodeAction { ...@@ -361,6 +361,8 @@ class WriteGeoModel : public GeoNodeAction {
std::vector<std::vector<std::string>> m_nameTags; std::vector<std::vector<std::string>> m_nameTags;
std::vector<std::vector<std::string>> m_shapes; std::vector<std::vector<std::string>> m_shapes;
DBRowsList m_elements;
DBRowsList m_shapes_Box; DBRowsList m_shapes_Box;
DBRowsList m_shapes_Tube; DBRowsList m_shapes_Tube;
DBRowsList m_shapes_Cons; DBRowsList m_shapes_Cons;
......
...@@ -2041,10 +2041,18 @@ unsigned int WriteGeoModel::addMaterial(const std::string& name, ...@@ -2041,10 +2041,18 @@ unsigned int WriteGeoModel::addMaterial(const std::string& name,
unsigned int WriteGeoModel::addElement(const std::string& name, unsigned int WriteGeoModel::addElement(const std::string& name,
const std::string& symbol, const std::string& symbol,
const double& elZ, const double& elA) { const double& elZ, const double& elA) {
std::vector<std::vector<std::string>>* container = &m_elements; // std::vector<std::vector<std::string>>* container = &m_elements;
std::vector<std::string> values; // std::vector<std::string> values;
values.insert(values.begin(), {name, symbol, CppHelper::to_string_with_precision(elZ), // values.insert(values.begin(), {name, symbol, CppHelper::to_string_with_precision(elZ),
CppHelper::to_string_with_precision(elA)}); // CppHelper::to_string_with_precision(elA)});
DBRowsList* container = &m_elements;
DBRowEntry values;
values.push_back(name);
values.push_back(symbol);
values.push_back(elZ);
values.push_back(elA);
return addRecord(container, values); return addRecord(container, values);
} }
......
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