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

Timestamp:

Jun 18, 2010, 11:42:07 AM (15 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/persistency/gdml/include

Files:

• G4GDMLParser.hh (modified) (2 diffs)
• G4GDMLParser.icc (modified) (9 diffs)
• G4GDMLReadDefine.hh (modified) (1 diff)
• G4GDMLReadSolids.hh (modified) (2 diffs)
• G4GDMLWrite.hh (modified) (2 diffs)
• G4GDMLWriteSolids.hh (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParser.hh,v 1.58 2009/04/15 13:29:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GDMLParser.hh,v 1.59 2010/02/17 18:06:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -91 +91 @@
    // 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 G4bool IsValid(const G4String& name) const;
+   inline G4double GetConstant(const G4String& name) const;
+   inline G4double GetVariable(const G4String& name) const;
+   inline G4double GetQuantity(const G4String& name) const;
+   inline G4ThreeVector GetPosition(const G4String& name) const;
+   inline G4ThreeVector GetRotation(const G4String& name) const;
+   inline G4ThreeVector GetScale(const G4String& name) const;
+   inline G4GDMLMatrix GetMatrix(const G4String& name) const;
+   inline G4LogicalVolume* GetVolume(const G4String& name) const;
+   inline G4VPhysicalVolume* GetWorldVolume(const G4String& setupName="Default") const;
    inline G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol);
    inline void StripNamePointers() const;

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParser.icc,v 1.8 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GDMLParser.icc,v 1.9 2010/02/17 18:06:25 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -84 +84 @@
 //
 
+inline G4bool G4GDMLParser::IsValid(const G4String& name) const
+{
+  return reader->IsValidID(name);
+}
+
 inline 
-G4double G4GDMLParser::GetConstant(const G4String& name)
+G4double G4GDMLParser::GetConstant(const G4String& name) const
 {
   return reader->GetConstant(name);
@@ -91 +96 @@
 
 inline 
-G4double G4GDMLParser::GetVariable(const G4String& name)
+G4double G4GDMLParser::GetVariable(const G4String& name) const
 {
   return reader->GetVariable(name);
@@ -97 +102 @@
 
 inline 
-G4double G4GDMLParser::GetQuantity(const G4String& name)
+G4double G4GDMLParser::GetQuantity(const G4String& name) const
 {
   return reader->GetQuantity(name);
@@ -103 +108 @@
 
 inline 
-G4ThreeVector G4GDMLParser::GetPosition(const G4String& name)
+G4ThreeVector G4GDMLParser::GetPosition(const G4String& name) const
 {
   return reader->GetPosition(name);
@@ -109 +114 @@
 
 inline 
-G4ThreeVector G4GDMLParser::GetRotation(const G4String& name)
+G4ThreeVector G4GDMLParser::GetRotation(const G4String& name) const
 {
   return reader->GetRotation(name);
@@ -115 +120 @@
 
 inline 
-G4ThreeVector G4GDMLParser::GetScale(const G4String& name)
+G4ThreeVector G4GDMLParser::GetScale(const G4String& name) const
 {
   return reader->GetScale(name);
@@ -121 +126 @@
 
 inline 
-G4GDMLMatrix G4GDMLParser::GetMatrix(const G4String& name)
+G4GDMLMatrix G4GDMLParser::GetMatrix(const G4String& name) const
 {
   return reader->GetMatrix(name);
@@ -127 +132 @@
 
 inline 
-G4LogicalVolume* G4GDMLParser::GetVolume(const G4String& name)
+G4LogicalVolume* G4GDMLParser::GetVolume(const G4String& name) const
 {
   return reader->GetVolume(name);
 }
 
-inline 
-G4VPhysicalVolume* G4GDMLParser::GetWorldVolume(const G4String& setupName)
+inline G4VPhysicalVolume*
+G4GDMLParser::GetWorldVolume(const G4String& setupName) const
 {
   return reader->GetWorldVolume(setupName);

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

@@ -72 +72 @@
  public:
 
+   G4bool IsValidID(const G4String&) const;
    G4double GetConstant(const G4String&);
    G4double GetVariable(const G4String&);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLReadSolids.hh,v 1.15 2009/04/24 15:34:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GDMLReadSolids.hh,v 1.16 2010/06/02 13:53:04 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -88 +88 @@
    void TetRead(const xercesc::DOMElement* const);
    void TorusRead(const xercesc::DOMElement* const);
+   void GenTrapRead(const xercesc::DOMElement* const);
    void TrapRead(const xercesc::DOMElement* const);
    void TrdRead(const xercesc::DOMElement* const);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLWrite.hh,v 1.41 2009/04/24 15:34:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GDMLWrite.hh,v 1.42 2010/02/18 17:39:00 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -124 +124 @@
     xercesc::DOMDocument* doc;
     xercesc::DOMElement* extElement;
-    XMLCh tempStr[100];
+    XMLCh tempStr[10000];
 
 };

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLWriteSolids.hh,v 1.38 2009/04/24 15:34:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GDMLWriteSolids.hh,v 1.39 2010/06/02 13:53:04 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -63 +63 @@
 class G4Tet;
 class G4Torus;
+class G4GenericTrap;
 class G4Trap;
 class G4Trd;
@@ -102 +103 @@
    void TetWrite(xercesc::DOMElement*, const G4Tet* const);
    void TorusWrite(xercesc::DOMElement*, const G4Torus* const);
+   void GenTrapWrite(xercesc::DOMElement*, const G4GenericTrap* const);
    void TrapWrite(xercesc::DOMElement*, const G4Trap* const);
    void TrdWrite(xercesc::DOMElement*, const G4Trd* const);