From a2a96d513d1516f0dae5d77baca08da1ce70c0e2 Mon Sep 17 00:00:00 2001 From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch> Date: Thu, 24 Aug 2023 14:42:51 +0200 Subject: [PATCH] Update World volume interface --- GeoModelExamples/HelloGeoReadNodeAction/main.cxx | 8 ++++---- GeoModelExamples/HelloGeoWriteReadWrite/main.cpp | 4 ++-- .../KitchenSinkPlugin/src/KitchenSinkPlugin.cxx | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/GeoModelExamples/HelloGeoReadNodeAction/main.cxx b/GeoModelExamples/HelloGeoReadNodeAction/main.cxx index a23324c0f..4ac2a6731 100644 --- a/GeoModelExamples/HelloGeoReadNodeAction/main.cxx +++ b/GeoModelExamples/HelloGeoReadNodeAction/main.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +// Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration /* * HelloGeoReadNodeAction.cpp @@ -30,7 +30,7 @@ #define SYSTEM_OF_UNITS GeoModelKernelUnits // so we will get, e.g., 'GeoModelKernelUnits::cm' -GeoPhysVol* createTheWorld(GeoPhysVol* world) +GeoVPhysVol* createTheWorld(GeoVPhysVol* world) { if (world == nullptr) { @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) /* build the GeoModel geometry */ - GeoPhysVol* dbPhys = geoReader.buildGeoModel(); // builds the whole GeoModel tree in memory + GeoVPhysVol* dbPhys = geoReader.buildGeoModel(); // builds the whole GeoModel tree in memory std::cout << "ReadGeoModel::buildGeoModel() done." << std::endl; std::cout << "Reading records from the imported geometry DB file..." << std::endl; @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) // create the world volume container and // get the 'world' volume, i.e. the root volume of the GeoModel tree std::cout << "Getting the 'world' GeoPhysVol, i.e. the root volume of the GeoModel tree" << std::endl; - GeoPhysVol* world = createTheWorld(dbPhys); + GeoVPhysVol* world = createTheWorld(dbPhys); std::cout << "Getting the GeoLogVol used by the 'world' volume" << std::endl; const GeoLogVol* logVol = world->getLogVol(); std::cout << "'world' GeoLogVol name: " << logVol->getName() << std::endl; diff --git a/GeoModelExamples/HelloGeoWriteReadWrite/main.cpp b/GeoModelExamples/HelloGeoWriteReadWrite/main.cpp index 8e2051a5f..bac423c15 100644 --- a/GeoModelExamples/HelloGeoWriteReadWrite/main.cpp +++ b/GeoModelExamples/HelloGeoWriteReadWrite/main.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration +// Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration /* * This example writes a sample geometry, reads it back in, then writes it again. @@ -191,7 +191,7 @@ int main(int argc, char *argv[]) GeoModelIO::ReadGeoModel geoReader = GeoModelIO::ReadGeoModel(db2); std::cout << "OK! ReadGeoModel is set." << std::endl; /* build the GeoModel geometry */ - GeoPhysVol* dbPhys = geoReader.buildGeoModel(); // builds the whole GeoModel tree in memory + GeoVPhysVol* dbPhys = geoReader.buildGeoModel(); // builds the whole GeoModel tree in memory std::cout << "ReadGeoModel::buildGeoModel() done." << std::endl; diff --git a/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx b/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx index 7f4e5c4fa..d1597e8ef 100644 --- a/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx +++ b/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx @@ -44,7 +44,6 @@ class KitchenSinkPlugin : public GeoVGeometryPlugin { public: -<<<<<<< HEAD // Constructor: KitchenSinkPlugin(); -- GitLab