Changeset 1315 for trunk/source/geometry/volumes/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/geometry/volumes/include

Files:

• G4NavigationHistory.hh (modified) (3 diffs)
• G4ReflectionFactory.hh (modified) (2 diffs)

trunk/source/geometry/volumes/include/G4NavigationHistory.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4NavigationHistory.hh,v 1.14 2009/11/03 09:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4NavigationHistory.hh,v 1.18 2010/04/22 09:06:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // class G4NavigationHistory
@@ -47 +47 @@
 #include "geomdefs.hh"
 
-//#include "G4Allocator.hh"
 #include "G4AffineTransform.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4NavigationLevel.hh"
+#include "G4EnhancedVecAllocator.hh"
 
 #include <vector>
@@ -142 +142 @@
  private:
 
-  std::vector<G4NavigationLevel> fNavHistory;
-  //std::vector<G4NavigationLevel, G4Allocator<G4NavigationLevel> > fNavHistory;
+  std::vector<G4NavigationLevel,
+              G4EnhancedVecAllocator<G4NavigationLevel> > fNavHistory;
+    // The geometrical tree; uses specialized allocator to optimize
+    // memory handling and reduce possible fragmentation
 
   G4int fStackDepth;

trunk/source/geometry/volumes/include/G4ReflectionFactory.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ReflectionFactory.hh,v 1.4 2008/11/13 09:33:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ReflectionFactory.hh,v 1.5 2010/04/13 07:19:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -181 +181 @@
       // been reflected, after that placement or replication is performed.
 
+    void Reset();  
+      // Resets maps of constituent and reflected volumes.
+      // To be used exclusively when volumes are removed from the stores.
+
   protected: