Changeset 1347 for trunk/source/persistency/gdml/include/G4GDMLReadStructure.hh

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/persistency/gdml/include/G4GDMLReadStructure.hh (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLReadStructure.hh,v 1.28 2009/09/24 15:04:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLReadStructure.hh,v 1.32 2010/11/02 10:39:27 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 //
@@ -54 +54 @@
 {
    G4String type;
-   G4double value;
+   G4String value;
 };
 
 typedef std::vector<G4GDMLAuxPairType> G4GDMLAuxListType;
-typedef std::map<const G4LogicalVolume*,G4GDMLAuxListType> G4GDMLAuxMapType;
+typedef std::map<G4LogicalVolume*,G4GDMLAuxListType> G4GDMLAuxMapType;
 typedef std::map<G4String, G4AssemblyVolume*> G4GDMLAssemblyMapType;
 
@@ -72 +72 @@
    G4LogicalVolume* GetVolume(const G4String&) const;
    G4AssemblyVolume* GetAssembly(const G4String&) const;
-   G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const);
+   G4GDMLAuxListType GetVolumeAuxiliaryInformation(G4LogicalVolume*) const;
    G4VPhysicalVolume* GetWorldVolume(const G4String&);
    const G4GDMLAuxMapType* GetAuxMap() const;
+   void Clear();   // Clears internal map and evaluator
 
    virtual void VolumeRead(const xercesc::DOMElement* const);
@@ -101 +102 @@
    G4GDMLAssemblyMapType assemblyMap;
    G4LogicalVolume *pMotherLogical;
-
+   std::map<std::string, G4VPhysicalVolume*> setuptoPV;
 };