diff --git a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h index 55e508910360b24f67c7bf3af8a1930c4c5a8608..836f82a80b503d5202d6aa99707c536f8631712c 100644 --- a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h +++ b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVDetectorFactory.h @@ -16,7 +16,7 @@ #include "GeoModelKernel/GeoVPhysVol.h" -class GeoPhysVol; +class GeoVPhysVol; class GeoVDetectorManager; class GeoVDetectorFactory @@ -26,7 +26,7 @@ class GeoVDetectorFactory virtual ~GeoVDetectorFactory(); // Create the system. - virtual void create (GeoPhysVol* world) = 0; + virtual void create (GeoVPhysVol* world) = 0; // Access to the Detector Manager. When implementing this // method, please use the covariant return type mechanism. diff --git a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h index b2c29a63682f7df1fff2227f72bf9a247da90716..b8ed64306315b8819f9bbc1fca047ec6b331a1aa 100644 --- a/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h +++ b/GeoModelCore/GeoModelKernel/GeoModelKernel/GeoVGeometryPlugin.h @@ -33,7 +33,7 @@ class GeoVGeometryPlugin //! Create the system geometry. /// Note: this is a pure virtual method, so you need to implement it in your derived plugin class - virtual void create ( GeoPhysVol* world, bool publish = false ) = 0; + virtual void create ( GeoVPhysVol* world, bool publish = false ) = 0; //! Returns the plugin's name std::string getName() { return m_pluginName; } diff --git a/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx b/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx index c7cb428b1dc2aa26d531cebd6b79d70c2590f8fe..6edac522b98ce5afb10b35c4a685dc75bbd6dc35 100644 --- a/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx +++ b/GeoModelExamples/KitchenSinkPlugin/src/KitchenSinkPlugin.cxx @@ -51,7 +51,7 @@ class KitchenSinkPlugin : public GeoVGeometryPlugin { ~KitchenSinkPlugin(); // Creation of geometry: - virtual void create(GeoPhysVol *world, bool publish=false); + virtual void create(GeoVPhysVol *world, bool publish=false); private: @@ -79,7 +79,7 @@ KitchenSinkPlugin::~KitchenSinkPlugin() // example (normally one may "publish" a list of FullPhysVol's and Alignable // transforms, but this example has none such). // -void KitchenSinkPlugin::create(GeoPhysVol *world, bool /*publish*/) +void KitchenSinkPlugin::create(GeoVPhysVol *world, bool /*publish*/) { const double degree=M_PI/180.0; diff --git a/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx b/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx index 41a3c4ef4de4331787ae1cedabcc55ca8c701e0f..df940fb98947a75f65ae3f228e6d3e6b5e3e04ed 100644 --- a/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx +++ b/GeoModelExamples/MinimalPlugin/src/MinimalPlugin.cxx @@ -18,7 +18,7 @@ class MinimalPlugin : public GeoVGeometryPlugin { ~MinimalPlugin(); // Creation of geometry: - virtual void create(GeoPhysVol *world, bool publish=false); + virtual void create(GeoVPhysVol *world, bool publish=false); private: @@ -46,7 +46,7 @@ MinimalPlugin::~MinimalPlugin() // example (normally one may "publish" a list of FullPhysVol's and Alignable // transforms, but this example has none such). // -void MinimalPlugin::create(GeoPhysVol *world, bool /*publish*/) +void MinimalPlugin::create(GeoVPhysVol *world, bool /*publish*/) { const double degree=M_PI/180.0; diff --git a/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx b/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx index 4530b696d4113a92841a03f1b5e0fc90762737fb..e27c4ff5e68bddd59a1c11621b0058ecc454bc2f 100644 --- a/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx +++ b/GeoModelTools/GDMLtoGM/src/GDMLtoGM.cxx @@ -31,7 +31,7 @@ class GDMLtoGM : public GeoVGeometryPlugin { ~GDMLtoGM(); // Creation of geometry: - virtual void create(GeoPhysVol *world, bool publish = false ) override; + virtual void create(GeoVPhysVol *world, bool publish = false ) override; private: @@ -48,7 +48,7 @@ GDMLtoGM::~GDMLtoGM() //## Other Operations (implementation) -void GDMLtoGM::create(GeoPhysVol *world, bool /* 'publish' is not used here */) +void GDMLtoGM::create(GeoVPhysVol *world, bool /* 'publish' is not used here */) { char* fPath=getenv("GDML_FILE_NAME"); std::string fileName; diff --git a/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx b/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx index 08292ec0b04daf531816833759c94d8bcde1c17a..d237655cca8adbe6d9cb188904c4c887a2e626f1 100644 --- a/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx +++ b/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx @@ -31,7 +31,7 @@ class GMXPlugin : public GeoVGeometryPlugin { ~GMXPlugin(); // Creation of geometry: - virtual void create(GeoPhysVol *world, bool publish) override; + virtual void create(GeoVPhysVol *world, bool publish) override; private: @@ -78,7 +78,7 @@ GMXPlugin::~GMXPlugin() //## Other Operations (implementation) -void GMXPlugin::create(GeoPhysVol *world, bool publish) +void GMXPlugin::create(GeoVPhysVol *world, bool publish) { std::cout<< "This is GMXPlugin: creating a GeoModelXml detector "<<std::endl; std::vector<std::string> filesToParse; diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h index c2777264df453490229768ec3e87b0b3d88f4ef6..30a90db1f26d11f978886729a864272addea3097 100644 --- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h +++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h @@ -58,7 +58,7 @@ class IEvaluator; class Gmx2Geo { public: - Gmx2Geo(const std::string& gmxFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags = 0, bool useMatManager = 0, std::string levelMapName = "", const processorList& procs=processorList()); + Gmx2Geo(const std::string& gmxFile, GeoVPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags = 0, bool useMatManager = 0, std::string levelMapName = "", const processorList& procs=processorList()); private: // Disallow copying Gmx2Geo(const Gmx2Geo &right); diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx index 8274bd071b1f955c622bb81c9c8758aa17a4a5e4..5de2274ad1f524e817b0d1519d0ded6775421ea1 100644 --- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx +++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx @@ -33,7 +33,7 @@ using namespace std; using namespace xercesc; -Gmx2Geo::Gmx2Geo(const string& xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags, bool useMatManager, std::string levelMapName, const processorList& procs) { +Gmx2Geo::Gmx2Geo(const string& xmlFile, GeoVPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags, bool useMatManager, std::string levelMapName, const processorList& procs) { // // Create the xml tree (DOMDocument) // @@ -426,4 +426,4 @@ for (auto param:params){ } data.push_back(param.second); } -} \ No newline at end of file +}