From 5b20dd671b65cd8ce8a5b725fbb6c5409beb1c5e Mon Sep 17 00:00:00 2001
From: Marilena Bandieramonte <marilena.bandieramonte@cern.ch>
Date: Tue, 9 Jan 2024 16:15:37 +0100
Subject: [PATCH] Fix compilation errors on MacOS
---
FullSimLight/include/FSLDetectorConstruction.hh | 2 +-
FullSimLight/src/FSLDetectorConstruction.cc | 4 ++--
GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/FullSimLight/include/FSLDetectorConstruction.hh b/FullSimLight/include/FSLDetectorConstruction.hh
index f470a69a2..f762ead94 100644
--- a/FullSimLight/include/FSLDetectorConstruction.hh
+++ b/FullSimLight/include/FSLDetectorConstruction.hh
@@ -89,7 +89,7 @@ public:
static G4double GetFieldValue() { return gFieldValue; }
G4double GetTolerance (){return fTolerance;}
- GeoVPhysVol* CreateTheWorld(GeoVPhysVol* world);
+ GeoPhysVol* CreateTheWorld(GeoPhysVol* world);
/// Clean the geometry from Unidentified volumes before dumping it in GDML format
void PullUnidentifiedVolumes( G4LogicalVolume* v );
diff --git a/FullSimLight/src/FSLDetectorConstruction.cc b/FullSimLight/src/FSLDetectorConstruction.cc
index bcbd24fde..54f037e7e 100644
--- a/FullSimLight/src/FSLDetectorConstruction.cc
+++ b/FullSimLight/src/FSLDetectorConstruction.cc
@@ -112,7 +112,7 @@ FSLDetectorConstruction::~FSLDetectorConstruction()
delete fDetectorMessenger;
}
-GeoVPhysVol* FSLDetectorConstruction::CreateTheWorld(GeoVPhysVol* world)
+GeoPhysVol* FSLDetectorConstruction::CreateTheWorld(GeoPhysVol* world)
{
if (world == nullptr)
{
@@ -156,7 +156,7 @@ G4VPhysicalVolume *FSLDetectorConstruction::Construct()
}
- GeoVPhysVol* worldTmp = CreateTheWorld(nullptr);
+ GeoPhysVol* worldTmp = CreateTheWorld(nullptr);
factory->create(worldTmp);
world = worldTmp;
diff --git a/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp b/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp
index b656e33e3..41a815416 100644
--- a/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp
+++ b/GeoModelExamples/HelloGeoRead2G4/HelloGeoReadG4.cpp
@@ -97,7 +97,7 @@ int main(int argc, char* argv[]) {
std::cout << "ReadGeoModel set.\n";
/* build the GeoModel geometry */
- GeoPhysVol* world =
+ const GeoVPhysVol* world =
readInGeo.buildGeoModel(); // builds the whole GeoModel tree in memory
// and get an handle to the 'world' volume
std::cout << "ReadGeoModel::buildGeoModel() done.\n";
--
GitLab