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

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/persistency/gdml/include

Files:

• G4GDMLEvaluator.hh (modified) (2 diffs)
• G4GDMLParameterisation.hh (modified) (2 diffs)
• G4GDMLParser.hh (modified) (6 diffs)
• G4GDMLParser.icc (modified) (8 diffs)
• G4GDMLRead.hh (modified) (2 diffs)
• G4GDMLReadStructure.hh (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLEvaluator.hh,v 1.17 2009/04/24 15:34:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLEvaluator.hh,v 1.18 2010/10/25 10:15:41 witoldp Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 //
@@ -54 +54 @@
    G4GDMLEvaluator();
 
+   void Clear();
    void DefineConstant(const G4String&, G4double);
    void DefineVariable(const G4String&, G4double);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParameterisation.hh,v 1.10 2008/07/16 15:46:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLParameterisation.hh,v 1.11 2010/10/14 16:19:40 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 //
@@ -73 +73 @@
       G4double dimension[16];
 
-      PARAMETER() { memset(dimension,0,sizeof(dimension)); }
+      PARAMETER() : pRot(0) { memset(dimension,0,sizeof(dimension)); }
    };
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParser.hh,v 1.59 2010/02/17 18:06:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLParser.hh,v 1.65 2010/11/17 10:47:02 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 //
@@ -45 +45 @@
 #include "G4GDMLWriteStructure.hh"
 #include "G4STRead.hh"
+#include "G4GDMLMessenger.hh"
+
+#include "G4TransportationManager.hh"
+#include "G4Navigator.hh"
+
 
 #define G4GDML_DEFAULT_SCHEMALOCATION G4String("http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd")
@@ -70 +75 @@
 
    inline void Write(const G4String& filename,
-                     const G4VPhysicalVolume* const pvol = 0,
+                     const G4VPhysicalVolume* pvol = 0,
                            G4bool storeReferences = true,
                      const G4String& SchemaLocation = G4GDML_DEFAULT_SCHEMALOCATION);
@@ -79 +84 @@
      // Alternative path for the schema location can be specified; by default
      // the URL to the GDML web site is used.
+
+   inline void Write(const G4String& filename,
+                     const G4LogicalVolume* lvol = 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. Same as method above except
+     // that the logical volume is provided here.
 
    inline G4LogicalVolume* ParseST(const G4String& name,
@@ -101 +118 @@
    inline G4LogicalVolume* GetVolume(const G4String& name) const;
    inline G4VPhysicalVolume* GetWorldVolume(const G4String& setupName="Default") const;
-   inline G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol);
+   inline G4GDMLAuxListType GetVolumeAuxiliaryInformation(G4LogicalVolume* logvol) const;
+   inline const G4GDMLAuxMapType* GetAuxMap() const;
    inline void StripNamePointers() const;
+   inline void SetStripFlag(G4bool);
    inline void SetOverlapCheck(G4bool);
+   inline void Clear();                  // Clears the evaluator
 
    // Methods for Writer
@@ -115 +135 @@
    G4GDMLReadStructure* reader;
    G4GDMLWriteStructure* writer;
-   G4bool urcode, uwcode;
+   G4GDMLMessenger* messenger;
+   G4bool urcode, uwcode, strip;
 
 };

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParser.icc,v 1.9 2010/02/17 18:06:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLParser.icc,v 1.15 2010/11/17 10:47:02 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 //
@@ -36 +36 @@
 void G4GDMLParser::Read(const G4String& filename, G4bool validate)
 {   
-  reader->Read(filename,validate,false);
+  reader->Read(filename,validate,false,strip);
 }
 
@@ -47 +47 @@
 inline
 void G4GDMLParser::Write(const G4String& filename,
-                         const G4VPhysicalVolume* const pvol,
+                         const G4VPhysicalVolume* pvol,
                                G4bool refs,
                          const G4String& schemaLocation)
@@ -56 +56 @@
   if (!pvol)
   {
-    G4VPhysicalVolume* worldPV = GetWorldVolume();
-    if (!worldPV)
-    {
-      G4Exception("G4DMLParser::Write()", "InvalidSetup", FatalException,
-                  "Detector-Construction needs to be registered first!");
-    }
-    lvol = worldPV->GetLogicalVolume();
+    lvol = G4TransportationManager::GetTransportationManager()->
+           GetNavigatorForTracking()->GetWorldVolume()->GetLogicalVolume();
   }
   else
   {
     lvol = pvol->GetLogicalVolume();
+  }
+
+  writer->Write(filename,lvol,schemaLocation,depth,refs);
+}
+
+inline
+void G4GDMLParser::Write(const G4String& filename,
+                         const G4LogicalVolume* lvol,
+                               G4bool refs,
+                         const G4String& schemaLocation)
+{ 
+  const G4int depth = 0;
+
+  if (!lvol)
+  {
+    lvol = G4TransportationManager::GetTransportationManager()->
+           GetNavigatorForTracking()->GetWorldVolume()->GetLogicalVolume();
   }
   writer->Write(filename,lvol,schemaLocation,depth,refs);
@@ -145 +157 @@
 inline 
 G4GDMLAuxListType
-G4GDMLParser::GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol)
+G4GDMLParser::GetVolumeAuxiliaryInformation(G4LogicalVolume* logvol) const
 {
   return reader->GetVolumeAuxiliaryInformation(logvol);
@@ -151 +163 @@
 
 inline
+const G4GDMLAuxMapType* G4GDMLParser::GetAuxMap() const
+{
+  return reader->GetAuxMap();
+}
+
+inline
 void G4GDMLParser::StripNamePointers() const
 {
@@ -156 +174 @@
 }
 
+inline void G4GDMLParser::SetStripFlag(G4bool flag)
+{
+  strip = flag;
+}
+
 inline void G4GDMLParser::SetOverlapCheck(G4bool flag)
 {
@@ -161 +184 @@
 }
 
+inline void G4GDMLParser::Clear()
+{
+  reader->Clear();
+}
+
 //
 // Methods for Writer

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLRead.hh,v 1.31 2009/05/12 15:46:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4GDMLRead.hh,v 1.33 2010/11/17 10:47:02 gcosmo Exp $
+// GEANT4 tag $Name: gdml-V09-03-09 $
 //
 // class G4GDMLRead
@@ -115 +115 @@
      // More pure virtual methods implemented in the reader plugin.
 
-   void Read(const G4String&, G4bool validation, G4bool isModule);
+   void Read(const G4String&, G4bool validation,
+             G4bool isModule, G4bool strip=true);
      //
      // Main method for reading GDML files.

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;
 };