Skip to content
Snippets Groups Projects
Commit 165e67c3 authored by Joseph Boudreau's avatar Joseph Boudreau
Browse files

Update gmx2geo so that it can build within any kind of physical volume...

Update gmx2geo so that it can  build within any kind of physical volume including full physical volumes; this is in order that geomodel xml can insert dead materials into the muon envelope
parent 17c5b437
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "GeoModelKernel/GeoVGeometryPlugin.h" #include "GeoModelKernel/GeoVGeometryPlugin.h"
#include "GeoModelKernel/GeoPhysVol.h"
#include "GeoModelKernel/GeoNameTag.h" #include "GeoModelKernel/GeoNameTag.h"
#include "GeoModelKernel/Units.h" #include "GeoModelKernel/Units.h"
#define SYSTEM_OF_UNITS GeoModelKernelUnits // so we will get, e.g., 'GeoModelKernelUnits::cm' #define SYSTEM_OF_UNITS GeoModelKernelUnits // so we will get, e.g., 'GeoModelKernelUnits::cm'
......
...@@ -58,7 +58,7 @@ class IEvaluator; ...@@ -58,7 +58,7 @@ class IEvaluator;
class Gmx2Geo { class Gmx2Geo {
public: 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: private:
// Disallow copying // Disallow copying
Gmx2Geo(const Gmx2Geo &right); Gmx2Geo(const Gmx2Geo &right);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
using namespace std; using namespace std;
using namespace xercesc; 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) // Create the xml tree (DOMDocument)
// //
...@@ -426,4 +426,4 @@ for (auto param:params){ ...@@ -426,4 +426,4 @@ for (auto param:params){
} }
data.push_back(param.second); data.push_back(param.second);
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment