From e097664302f0c0e22bad53f375372991cb378421 Mon Sep 17 00:00:00 2001
From: "Joseph F. Boudreau" <boudreau@pitt.edu>
Date: Fri, 31 May 2024 09:33:30 +0200
Subject: [PATCH] Wait for threads 15-25 to finish before starting thread 26.
---
GeoModelIO/GeoModelRead/src/ReadGeoModel.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/GeoModelIO/GeoModelRead/src/ReadGeoModel.cpp b/GeoModelIO/GeoModelRead/src/ReadGeoModel.cpp
index 20c2ef088..43bb3e963 100644
--- a/GeoModelIO/GeoModelRead/src/ReadGeoModel.cpp
+++ b/GeoModelIO/GeoModelRead/src/ReadGeoModel.cpp
@@ -381,7 +381,6 @@ GeoVPhysVol* ReadGeoModel::buildGeoModelPrivate() {
std::thread t24(&ReadGeoModel::buildAllShapes_TwistedTrap, this);
std::thread t25(&ReadGeoModel::buildAllShapes_SimplePolygonBrep, this);
- std::thread t26(&ReadGeoModel::buildAllShapes_Operators, this);
t2.join(); // ok, all Elements have been built
// needs Elements
@@ -400,6 +399,8 @@ GeoVPhysVol* ReadGeoModel::buildGeoModelPrivate() {
t24.join(); // ok, all Shapes-TwistedTrap have been built
t25.join(); // ok, all Shapes-SimplePolygonBrep have been built
+ // Needs more primitive shapes:
+ std::thread t26(&ReadGeoModel::buildAllShapes_Operators, this);
t26.join(); // ok, all Shapes-Operators have been built
t3.join(); // ok, all Materials have been built
--
GitLab