Changeset 1315 for trunk/source/geometry/volumes

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

Files:

• History (modified) (2 diffs)
• include/G4NavigationHistory.hh (modified) (3 diffs)
• include/G4ReflectionFactory.hh (modified) (2 diffs)
• src/G4NavigationHistory.cc (modified) (3 diffs)
• src/G4ReflectionFactory.cc (modified) (2 diffs)

trunk/source/geometry/volumes/History

@@ -1 @@
-$Id: History,v 1.163 2009/11/06 11:35:03 gcosmo Exp $
+$Id: History,v 1.170 2010/04/23 10:27:49 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Apr 23rd, 2010      G.Cosmo - geomvol-V09-03-06
+- Corrected initialisation of dummy copy-ctor in G4EnhancedVecAllocator,
+  fixing compilation problem on WIN32-VC.
+
+Apr 22nd, 2010      G.Cosmo - geomvol-V09-03-05
+- Make use of specialized allocator for handling internal vector in
+  G4NavigatorHistory, globally controlling the memory pool.
+  Measured ~2% average run-time speed-up.
+
+Apr 15th, 2010      G.Cosmo - geomvol-V09-03-04
+- Combine use of G4Allocator for vectors in G4NavigationHistory with use
+  of assign().
+
+Apr 13th, 2010      G.Cosmo - geomvol-V09-03-03
+- Added Reset() method to G4ReflectionFactory for clearing maps of
+  constituent and reflected volumes.
+
+Apr 9th, 2010       G.Cosmo - geomvol-V09-03-02
+- Use more elegant solution in G4NavigationHistory copy-ctor. Adopt assign().
+
+Mar 31th, 2010      G.Cosmo - geomvol-V09-03-01
+- Restore original vector allocation, but adopt simple loop copy within
+  copy-constructor. Should provide slight performance improvement and keep
+  locality.
+
+Dec 11th, 2009      G.Cosmo - geomvol-V09-03-00
+- Use G4Allocator for vectors in G4NavigationHistory, to optimise memory
+  management and reduce fragmentation.
 
 Nov 6th, 2009       G.Cosmo - geomvol-V09-02-04

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:  
 

trunk/source/geometry/volumes/src/G4NavigationHistory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4NavigationHistory.cc,v 1.11 2009/08/03 16:27:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4NavigationHistory.cc,v 1.15 2010/04/22 09:06:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -38 +38 @@
 #include "G4ios.hh"
 
+// Initialise static data for the specialized memory pool
+// for the internal STL vector of histories  ...
+//
+G4ChunkIndexType* G4AllocStats::allocStat = 0;
+G4int             G4AllocStats::totSpace = 0;
+G4int             G4AllocStats::numCat = 0;
+
 G4NavigationHistory::G4NavigationHistory()
   : fNavHistory(kHistoryMax), fStackDepth(0)
@@ -45 +52 @@
 
 G4NavigationHistory::G4NavigationHistory(const G4NavigationHistory &h)
-  : fNavHistory(h.fNavHistory), fStackDepth(h.fStackDepth)
+  : fStackDepth(h.fStackDepth)
 {
+  fNavHistory.assign(h.fNavHistory.begin(),h.fNavHistory.end());
 }
 

trunk/source/geometry/volumes/src/G4ReflectionFactory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ReflectionFactory.cc,v 1.9 2008/11/13 09:33:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ReflectionFactory.cc,v 1.10 2010/04/13 07:19:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -761 +761 @@
 //_____________________________________________________________________________
 
+void
+G4ReflectionFactory::Reset()
+{
+  fConstituentLVMap.~map();
+  fReflectedLVMap.~map();
+}
+
+//_____________________________________________________________________________
+
 void G4ReflectionFactory::PrintConstituentLVMap()
 {