Skip to content
Snippets Groups Projects
Commit e1a48e69 authored by Andrea Dell'Acqua's avatar Andrea Dell'Acqua
Browse files

Major revision: all modifications by Nigel Hessey (spring 2020) imported

parent fe774c6e
No related branches found
No related tags found
1 merge request!67Bringing GeoModelXML into GeoModel
Showing
with 54 additions and 15 deletions
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_ADD_BRANCH_PROCESSOR_H
#define GEO_MODEL_XML_ADD_BRANCH_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for addbranch tags.
//
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_ASSEMBLY_PROCESSOR_H
#define GEO_MODEL_XML_ASSEMBLY_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for assembly tags.
//
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_ASSEMBLYREF_PROCESSOR_H
#define GEO_MODEL_XML_ASSEMBLYREF_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for assemblyref tags.
......
......@@ -9,15 +9,17 @@
//
#ifndef GEO_MODEL_XML_ELEMENT2GEO_ITEM_H
#define GEO_MODEL_XML_ELEMENT2GEO_ITEM_H
#include <xercesc/util/XercesDefs.hpp>
#include <map>
#include <string>
#include <xercesc/dom/DOM.hpp>
class RCBase;
class GmxUtil;
XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
XERCES_CPP_NAMESPACE_END
class ProcessorRegistry;
namespace HepTool {class Evaluator;}
......
......@@ -9,10 +9,13 @@
//
#ifndef GEO_MODEL_XML_ELEMENT_PROCESSOR_H
#define GEO_MODEL_XML_ELEMENT_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
#include "GeoModelXml/GeoNodeList.h"
#include <xercesc/dom/DOM.hpp>
XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
XERCES_CPP_NAMESPACE_END
class GmxUtil;
class ElementProcessor {
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_GMX2GEO_H
#define GEO_MODEL_XML_GMX2GEO_H
#include <xercesc/util/XercesDefs.hpp>
/**
* @brief Create a branch of a GeoModel Tree.
......@@ -43,9 +44,12 @@
#include "GeoModelXml/GmxInterface.h"
class GeoPhysVol;
#include <xercesc/dom/DOM.hpp>
#include <xercesc/dom/DOMLSParser.hpp>
XERCES_CPP_NAMESPACE_BEGIN
class DOMDocument;
XERCES_CPP_NAMESPACE_END
XERCES_CPP_NAMESPACE_BEGIN
class DOMNode;
XERCES_CPP_NAMESPACE_END
class Evaluator;
......
......@@ -9,7 +9,11 @@
// to element handlers instead of a (changing??) list.
//
#include <string>
#ifndef STANDALONE_GMX
#include "CLHEP/Evaluator/Evaluator.h"
#else
#include "ExpressionEvaluator/Evaluator.h"
#endif
#include "GeoModelXml/ProcessorRegistry.h"
#include "GeoModelXml/Element2GeoItemRegistry.h"
......@@ -28,7 +32,11 @@
#include "GeoModelXml/MakeTransformationref.h"
#include "GeoModelXml/MakeTranslation.h"
#include "GeoModelXml/MakeRotation.h"
#ifndef STANDALONE_GMX
#include "GeoModelXml/MakeScaling.h"
#endif
#include "GeoModelXml/shape/MakeSimplePolygonBrep.h"
#include "GeoModelXml/shape/MakeBox.h"
#include "GeoModelXml/shape/MakeCons.h"
#include "GeoModelXml/shape/MakeGenericTrap.h"
......@@ -56,7 +64,11 @@ public:
GmxInterface *gmxInterface();
double evaluate(char const *expression);
std::string debracket(std::string expression);
#ifndef STANDALONE_GMX
HepTool::Evaluator eval;
#else
Evaluator eval;
#endif
PositionIndex positionIndex;
ProcessorRegistry processorRegistry;
Element2GeoItemRegistry geoItemRegistry;
......@@ -78,6 +90,7 @@ public:
//
MakeElement element;
MakeMaterial material;
MakeSimplePolygonBrep simplepolygonbrep;
MakeBox box;
MakeCons cons;
MakeGenericTrap generictrap;
......@@ -99,6 +112,9 @@ public:
//
MakeTranslation translation;
MakeRotation rotation;
#ifndef STANDALONE_GMX
MakeScaling scaling;
#endif
//
// Other things
//
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_INDEX_PROCESSOR_H
#define GEO_MODEL_XML_INDEX_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for index tags which change the formula for generating a position-index.
//
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_LOGVOL_PROCESSOR_H
#define GEO_MODEL_XML_LOGVOL_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for logvol tags.
//
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_LOGVOLREF_PROCESSOR_H
#define GEO_MODEL_XML_LOGVOLREF_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for logvolref tags.
......
......@@ -7,6 +7,7 @@
//
#ifndef GEO_MODEL_XML_MAKE_ELEMENT_H
#define GEO_MODEL_XML_MAKE_ELEMENT_H
#include <xercesc/util/XercesDefs.hpp>
#include "GeoModelXml/Element2GeoItem.h"
......
......@@ -7,6 +7,7 @@
//
#ifndef GEO_MODEL_XML_MAKE_MATERIAL_H
#define GEO_MODEL_XML_MAKE_MATERIAL_H
#include <xercesc/util/XercesDefs.hpp>
#include "GeoModelXml/Element2GeoItem.h"
......
......@@ -4,17 +4,17 @@
#ifndef GEO_MODEL_XML_MAKE_ROTATION_H
#define GEO_MODEL_XML_MAKE_ROTATION_H
#include <xercesc/util/XercesDefs.hpp>
//
// Create and return a HepRotation3d. Caller must delete it.
//
#include <xercesc/dom/DOM.hpp>
XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
XERCES_CPP_NAMESPACE_END
#include "GeoModelKernel/GeoDefinitions.h"
//namespace HepGeom {class Rotate3D;}
class GmxUtil;
class MakeRotation {
public:
MakeRotation();
......
......@@ -7,6 +7,7 @@
//
#ifndef GEO_MODEL_XML_MAKE_TRANSFORMATION_H
#define GEO_MODEL_XML_MAKE_TRANSFORMATION_H
#include <xercesc/util/XercesDefs.hpp>
#include "GeoModelXml/Element2GeoItem.h"
......
......@@ -7,6 +7,7 @@
//
#ifndef GEO_MODEL_XML_MAKE_TRANSFORMATIONREF_H
#define GEO_MODEL_XML_MAKE_TRANSFORMATIONREF_H
#include <xercesc/util/XercesDefs.hpp>
#include "GeoModelXml/Element2GeoItem.h"
......
......@@ -4,15 +4,15 @@
#ifndef GEO_MODEL_XML_MAKE_TRANSLATION_H
#define GEO_MODEL_XML_MAKE_TRANSLATION_H
#include <xercesc/util/XercesDefs.hpp>
//
// Create and return a HepRotation3d. Caller must delete it.
//
XERCES_CPP_NAMESPACE_BEGIN
class DOMElement;
XERCES_CPP_NAMESPACE_END
#include "GeoModelKernel/GeoDefinitions.h"
#include <xercesc/dom/DOM.hpp>
//namespace HepGeom {class Translate3D;}
class GmxUtil;
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_MULTICOPY_PROCESSOR_H
#define GEO_MODEL_XML_MULTICOPY_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for multicopy tags.
//
......
......@@ -7,6 +7,7 @@
//
#ifndef GEO_MODEL_XML_STRICT_ERROR_HANDLER_H
#define GEO_MODEL_XML_STRICT_ERROR_HANDLER_H
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/util/XMLString.hpp>
......@@ -36,4 +37,4 @@ inline bool StrictErrorHandler::getSawErrors() const {
return m_SawErrors;
}
#endif //STRICT_ERROR_HANDLER_H
\ No newline at end of file
#endif //STRICT_ERROR_HANDLER_H
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_TRANSFORM_PROCESSOR_H
#define GEO_MODEL_XML_TRANSFORM_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for transform tags.
......
......@@ -4,6 +4,7 @@
#ifndef GEO_MODEL_XML_TRANSFORMREF_PROCESSOR_H
#define GEO_MODEL_XML_TRANSFORMREF_PROCESSOR_H
#include <xercesc/util/XercesDefs.hpp>
//
// Processor for logvolref tags.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment