Changeset 850 for trunk/source/persistency/gdml/include

Timestamp:

Sep 10, 2008, 5:40:37 PM (16 years ago)

Author:

garnier

Message:

geant4.8.2 beta

Location:

trunk/source/persistency/gdml/include

Files:

• G4GDMLEvaluator.hh (modified) (2 diffs)
• G4GDMLParser.hh (modified) (2 diffs)

trunk/source/persistency/gdml/include/G4GDMLEvaluator.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLEvaluator.hh,v 1.10 2007/11/28 10:27:18 ztorzsok Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4GDMLEvaluator.hh,v 1.16 2008/07/16 15:46:33 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 //
@@ -43 +43 @@
 
 #include <CLHEP/Evaluator/Evaluator.h>
+#include <vector>
 
-#include "G4Types.hh"
-#include "G4String.hh"
-#include "G4Box.hh"
+#include "globals.hh"
 
-class G4GDMLEvaluator {
+class G4GDMLEvaluator
+{
+
+ public:
+
+   G4GDMLEvaluator();
+
+   void DefineConstant(const G4String&, G4double);
+   void DefineVariable(const G4String&, G4double);
+   void DefineMatrix(const G4String&, G4int, std::vector<G4double>);
+   void SetVariable(const G4String&, G4double);
+   G4bool IsVariable(const G4String&) const;
+   G4String SolveBrackets(const G4String&);
+   G4double Evaluate(const G4String&);
+   G4int EvaluateInteger(const G4String&);
+   G4double GetConstant(const G4String&);
+   G4double GetVariable(const G4String&);
+
+ private:
+
    HepTool::Evaluator eval;
    std::vector<G4String> variableList;
-public:
-   G4GDMLEvaluator();
-
-   void defineConstant(const G4String&,G4double);
-   void defineVariable(const G4String&,G4double);
-   void setVariable(const G4String&,G4double);
-   void checkVariable(const G4String&);
-
-   G4double Evaluate(const G4String&);
-   G4int EvaluateInteger(const G4String&);
 };
 

trunk/source/persistency/gdml/include/G4GDMLParser.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParser.hh,v 1.10 2007/11/30 11:58:46 ztorzsok Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4GDMLParser.hh,v 1.53 2008/08/21 12:17:09 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 //
@@ -33 +33 @@
 // Class description:
 //
+// GDML main parser.
+
 // History:
 // - Created.                                  Zoltan Torzsok, November 2007
 // -------------------------------------------------------------------------
-
+ 
 #ifndef _G4GDMLPARSER_INCLUDED_
 #define _G4GDMLPARSER_INCLUDED_
 
-#include "G4GDMLStructure.hh"
+#include "G4GDMLReadStructure.hh"
+#include "G4GDMLWriteStructure.hh"
+#include "G4STRead.hh"
 
-class G4GDMLParser {
-   G4GDMLStructure structure;
-public:
-   void Read(const G4String& fileName) { structure.Parse(fileName); }
-   G4VPhysicalVolume* GetWorldVolume(const G4String& setupName="Default") { return structure.getTopVolume(setupName); }
+#define G4GDML_DEFAULT_SCHEMALOCATION G4String("http://service-spi.web.cern.ch/service-spi/app/releases/GDML/GDML_2_10_0/src/GDMLSchema/gdml.xsd")
+
+class G4GDMLParser
+{
+  public:  // with description
+
+   G4GDMLParser() { xercesc::XMLPlatformUtils::Initialize(); }
+   ~G4GDMLParser() { xercesc::XMLPlatformUtils::Terminate(); }
+     //
+     // Parser constructor & destructor
+
+   inline void Read(const G4String& filename, G4bool Validate=true);
+     //
+     // Imports geometry with world-volume, specified by the GDML filename
+     // in input. Validation against schema is activated by default.
+
+   inline void ReadModule(const G4String& filename, G4bool Validate=true);
+     //
+     // Imports a single GDML module, specified by the GDML filename
+     // in input. Validation against schema is activated by default.
+
+   inline void Write(const G4String& filename,
+                     const G4VPhysicalVolume* const pvol = 0,
+                           G4bool storeReferences = true,
+                     const G4String& SchemaLocation = G4GDML_DEFAULT_SCHEMALOCATION);
+     //
+     // Exports on a GDML file, specified by 'filename' a geometry tree
+     // starting from 'pvol' as top volume. Uniqueness of stored entities
+     // is guaranteed by storing pointer-references by default.
+     // Alternative path for the schema location can be specified; by default
+     // the URL to the GDML web site is used.
+
+   inline G4LogicalVolume* ParseST(const G4String& name,
+                                         G4Material* medium,
+                                         G4Material* solid);
+     //
+     // Imports a tessellated geometry stored as STEP-Tools files
+     // 'name.geom' and 'name.tree'. It returns a pointer of a generated
+     // mother volume with 'medium' material associated, including the
+     // imported tessellated geometry with 'solid' material associated.
+
+   // Methods for Reader
+   //
+   inline G4double GetConstant(const G4String& name);
+   inline G4double GetVariable(const G4String& name);
+   inline G4double GetQuantity(const G4String& name);
+   inline G4ThreeVector GetPosition(const G4String& name);
+   inline G4ThreeVector GetRotation(const G4String& name);
+   inline G4ThreeVector GetScale(const G4String& name);
+   inline G4GDMLMatrix GetMatrix(const G4String& name);
+   inline G4LogicalVolume* GetVolume(const G4String& name);
+   inline G4VPhysicalVolume* GetWorldVolume(const G4String& setupName="Default");
+   inline G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol);
+
+   // Methods for Writer
+   //
+   inline void AddModule(const G4VPhysicalVolume* const physvol);
+   inline void AddModule(const G4int depth);
+   inline void SetAddPointerToName(G4bool set);
+
+  private:
+
+   G4GDMLReadStructure reader;
+   G4GDMLWriteStructure writer;
+
 };
 
+#include "G4GDMLParser.icc"
+
 #endif