Changeset 921 for trunk/source/persistency

Timestamp:

Feb 16, 2009, 10:14:30 AM (17 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

Location:

trunk/source/persistency

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (1 diff)
• gdml/History (modified) (2 diffs)
• gdml/include/G4GDMLParser.hh (modified) (5 diffs)
• gdml/src/G4GDMLParser.cc (modified) (1 diff)

trunk/source/persistency/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.29 2007/11/02 16:22:05 gcosmo Exp $
+# $Id: GNUmakefile,v 1.30 2008/10/23 14:47:26 gcosmo Exp $
 # -----------------------------------------------------------------------
 # GNUmakefile for persistency library.  Gabriele Cosmo, 16/11/96.
@@ -6 +6 @@
 name := G4persistency
 
-SUBDIRS := mctruth
-SUBLIBS = G4mctruth
+SUBDIRS := mctruth ascii
+SUBLIBS = G4mctruth G4geomtext
 
 ifdef G4LIB_BUILD_GDML

trunk/source/persistency/History

@@ -15 +15 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+23 October, 08  G.Cosmo (persistency-V09-01-00)
+- Added "ascii" module from original implementation by P.Arce (CIEMAT).
+  First release.
+- Coworks with tag "config-V09-01-08".
 
 02 November, 07  G.Cosmo (persistency-V09-00-00)

trunk/source/persistency/gdml/History

@@ -1 @@
-$Id: History,v 1.89 2008/08/22 16:01:02 gcosmo Exp $
+$Id: History,v 1.98 2009/01/23 10:41:12 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+23 January 2009 Gabriele Cosmo (gdml-V09-02-01)
+- Changed post-fix"_refl" to "_PV" for placements made through the
+  reflection-factory.
+
+22 January 2009 Gabriele Cosmo (gdml-V09-02-00)
+- Added possibility to check overlaps by activating/de-activating the
+  built-in surface check for placement and parameterised volumes.
+  By default the overlap check is off. To activate it, use call to the
+  parser 'SetOverlapCheck(true)' before reading the GDML file.
+
+4 December 2008 Gabriele Cosmo (gdml-V09-01-21)
+- Updated default GDML schema location in G4GDMLParser to point to new
+  GDML schema.
+
+21 November 2008 Tatiana Nikitina (gdml-V09-01-20)
+- Updated schema to include new features introduced in reader/writer plugin.
+
+21 November 2008 Gabriele Cosmo (gdml-V09-01-19)
+- Added missing solid Elliptical-Cone to reader and writer.
+
+20 November 2008 Gabriele Cosmo (gdml-V09-01-18)
+- Implemented mechanism for importing GDML descriptions with extensions
+  to the GDML schema, identified by a new tag "extension".
+- Added implementation .cc file for G4GDMLParser.
+
+17 November 2008 Gabriele Cosmo (gdml-V09-01-17)
+- Get rid of module-name pre-pended to entity names.
+- Added StripNamePointers() method to G4GDMLParser, utility to be invoked in
+  the user-code to strip off pointers from entity names in a GDML modular setup
+  after loading all modules.
+
+14 November 2008 Gabriele Cosmo (gdml-V09-01-16)
+- Enhanced name stripping in G4GDMLRead, to remove also additional IDs
+  prepended to the original name of entities in the case of modular GDML files.
+
+13 November 2008 Gabriele Cosmo (gdml-V09-01-15)
+- Added support for new serializer API as introduced in Xerces-3.0.0.
+- Cleared compilation warnings on Intel-icc compiler.
 
 22 August 2008 Tatiana Nikitina (gdml-V09-01-14)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLParser.hh,v 1.53 2008/08/21 12:17:09 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4GDMLParser.hh,v 1.57 2009/01/22 11:02:07 gcosmo Exp $
+// GEANT4 tag $Name:  $
 //
 //
@@ -46 +46 @@
 #include "G4STRead.hh"
 
-#define G4GDML_DEFAULT_SCHEMALOCATION G4String("http://service-spi.web.cern.ch/service-spi/app/releases/GDML/GDML_2_10_0/src/GDMLSchema/gdml.xsd")
+#define G4GDML_DEFAULT_SCHEMALOCATION G4String("http://service-spi.web.cern.ch/service-spi/app/releases/GDML/schema/gdml.xsd")
 
 class G4GDMLParser
@@ -52 +52 @@
   public:  // with description
 
-   G4GDMLParser() { xercesc::XMLPlatformUtils::Initialize(); }
-   ~G4GDMLParser() { xercesc::XMLPlatformUtils::Terminate(); }
+   G4GDMLParser();
+   G4GDMLParser(G4GDMLReadStructure*);
+  ~G4GDMLParser();
      //
-     // Parser constructor & destructor
+     // Parser constructors & destructor
 
    inline void Read(const G4String& filename, G4bool Validate=true);
@@ -99 +100 @@
    inline G4VPhysicalVolume* GetWorldVolume(const G4String& setupName="Default");
    inline G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol);
+   inline void StripNamePointers() const;
+   inline void SetOverlapCheck(G4bool);
 
    // Methods for Writer
@@ -108 +111 @@
   private:
 
-   G4GDMLReadStructure reader;
-   G4GDMLWriteStructure writer;
+   G4GDMLReadStructure* reader;
+   G4GDMLWriteStructure* writer;
+   G4bool ucode;
 
 };

trunk/source/persistency/gdml/src/G4GDMLParser.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+//
+// $Id: G4GDMLParser.cc,v 1.13 2008/11/20 15:33:52 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
+//
+//
+// class G4GDMLParser Implementation
+//
+// -------------------------------------------------------------------------
+
 #include "G4GDMLParser.hh"
+
+G4GDMLParser::G4GDMLParser()
+  : ucode(false)
+{
+  reader = new G4GDMLReadStructure;
+  writer = new G4GDMLWriteStructure;
+  xercesc::XMLPlatformUtils::Initialize();
+}
+
+G4GDMLParser::G4GDMLParser(G4GDMLReadStructure* ext)
+  : ucode(true)
+{
+  reader = ext;
+  writer = new G4GDMLWriteStructure;
+  xercesc::XMLPlatformUtils::Initialize();
+}
+
+G4GDMLParser::~G4GDMLParser()
+{
+  xercesc::XMLPlatformUtils::Terminate();
+  delete writer;
+  if (!ucode) { delete reader; }
+}