Changeset 921 for trunk/source/geometry/management

Timestamp:

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

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

Location:

trunk/source/geometry/management

Files:

• History (modified) (2 diffs)
• include/G4VSolid.hh (modified) (3 diffs)
• src/G4VSolid.cc (modified) (4 diffs)

trunk/source/geometry/management/History

@@ -1 @@
-$Id: History,v 1.128 2008/07/15 10:27:55 gcosmo Exp $
+$Id: History,v 1.131 2008/09/23 13:10:55 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+September 23, 2008  G. Cosmo               geommng-V09-01-08
+- G4VSolid: explicitely reserve memory for polygon vectors in clipping
+  algorithm to help reducing memory footprint. Courtesy of P.Elmer, CMS.
+
+September 10, 2008  G. Cosmo               geommng-V09-01-07
+- G4VSolid: promote copy-constructor and assignment operator to public
+  to cope with specific use-case in ATLAS (see problem report #1023).
 
 July 15, 2008  G.Cosmo                     geommng-V09-01-06

trunk/source/geometry/management/include/G4VSolid.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VSolid.hh,v 1.28 2008/02/20 15:24:25 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VSolid.hh,v 1.29 2008/09/10 13:18:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
@@ -230 +230 @@
       // persistifiable objects.
 
+    G4VSolid(const G4VSolid& rhs);
+    G4VSolid& operator=(const G4VSolid& rhs); 
+      // Copy constructor and assignment operator.
+
   protected:  // with description
 
@@ -294 +298 @@
       // expressed by the first argument.
 
-  protected:  // without description
-
-    G4VSolid(const G4VSolid& rhs);
-    G4VSolid& operator=(const G4VSolid& rhs); 
-      // Protected copy constructor and assignment operator.
-
   protected:
 

trunk/source/geometry/management/src/G4VSolid.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VSolid.cc,v 1.37 2008/02/20 15:24:26 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VSolid.cc,v 1.39 2008/09/23 13:07:41 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // class G4VSolid
@@ -71 +71 @@
 //////////////////////////////////////////////////////////////////////////
 //
-// Protected copy constructor
+// Copy constructor
 //
 
@@ -181 +181 @@
 
   G4ThreeVectorList polygon;
+  polygon.reserve(4);
   polygon.push_back((*pVertices)[pSectionIndex]);
   polygon.push_back((*pVertices)[pSectionIndex+1]);
@@ -210 +211 @@
 {
   G4ThreeVectorList polygon;
+  polygon.reserve(4);
   polygon.push_back((*pVertices)[pSectionIndex]);
   polygon.push_back((*pVertices)[pSectionIndex+4]);