Changeset 1228 for trunk/source/geometry/management/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (15 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/geometry/management/src

Files:

• G4BlockingList.cc (modified) (1 diff)
• G4ErrorCylSurfaceTarget.cc (modified) (1 diff)
• G4ErrorPlaneSurfaceTarget.cc (modified) (1 diff)
• G4ErrorSurfaceTarget.cc (modified) (1 diff)
• G4ErrorTanPlaneTarget.cc (modified) (1 diff)
• G4ErrorTarget.cc (modified) (1 diff)
• G4GeometryManager.cc (modified) (1 diff)
• G4IdentityTrajectoryFilter.cc (modified) (1 diff)
• G4LogicalVolume.cc (modified) (2 diffs)
• G4LogicalVolumeStore.cc (modified) (1 diff)
• G4PhysicalVolumeStore.cc (modified) (1 diff)
• G4ReflectedSolid.cc (modified) (1 diff)
• G4Region.cc (modified) (3 diffs)
• G4RegionStore.cc (modified) (1 diff)
• G4SmartVoxelHeader.cc (modified) (3 diffs)
• G4SmartVoxelNode.cc (modified) (1 diff)
• G4SmartVoxelProxy.cc (modified) (1 diff)
• G4SmartVoxelStat.cc (modified) (1 diff)
• G4SolidStore.cc (modified) (1 diff)
• G4VCurvedTrajectoryFilter.cc (modified) (1 diff)
• G4VNestedParameterisation.cc (modified) (1 diff)
• G4VPVDivisionFactory.cc (modified) (1 diff)
• G4VPVParameterisation.cc (modified) (1 diff)
• G4VPhysicalVolume.cc (modified) (1 diff)
• G4VSolid.cc (modified) (1 diff)
• G4VoxelLimits.cc (modified) (1 diff)

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

@@ -26 +26 @@
 //
 // $Id: G4BlockingList.cc,v 1.3 2006/06/29 18:33:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ErrorCylSurfaceTarget.cc,v 1.4 2007/06/20 12:50:48 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ErrorPlaneSurfaceTarget.cc,v 1.2 2007/06/19 11:28:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ErrorSurfaceTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ErrorTanPlaneTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ErrorTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4GeometryManager.cc,v 1.22 2008/05/16 13:46:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GeometryManager

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

@@ -26 +26 @@
 //
 // $Id: G4IdentityTrajectoryFilter.cc,v 1.4 2006/10/02 10:09:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 //
-// $Id: G4LogicalVolume.cc,v 1.33 2008/07/10 09:40:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4LogicalVolume.cc,v 1.34 2009/09/24 13:22:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -162 +162 @@
 G4int G4LogicalVolume::TotalVolumeEntities() const
 {
-  static G4int vols = 0;
-
-  vols++;
+  G4int vols = 1;
   for (G4PhysicalVolumeList::const_iterator itDau = fDaughters.begin();
        itDau != fDaughters.end(); itDau++)
   {
     G4VPhysicalVolume* physDaughter = (*itDau);
-    for (G4int i=0; i<physDaughter->GetMultiplicity(); i++)
-    {
-      physDaughter->GetLogicalVolume()->TotalVolumeEntities();
-    }
+    vols += physDaughter->GetMultiplicity()
+           *physDaughter->GetLogicalVolume()->TotalVolumeEntities();
   }
   return vols;

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

@@ -26 +26 @@
 //
 // $Id: G4LogicalVolumeStore.cc,v 1.19 2008/07/10 09:40:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4LogicalVolumeStore

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

@@ -26 +26 @@
 //
 // $Id: G4PhysicalVolumeStore.cc,v 1.20 2008/07/10 09:41:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PhysicalVolumeStore

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

@@ -27 +27 @@
 // $Id: G4ReflectedSolid.cc,v 1.11 2006/11/08 09:56:33 gcosmo Exp $
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation for G4ReflectedSolid class for boolean 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Region.cc,v 1.26 2008/07/15 10:27:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Region.cc,v 1.27 2009/11/27 16:34:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -48 +48 @@
 G4Region::G4Region(const G4String& pName)
   : fName(pName), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
-    fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
+    fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
+    fRegionalSteppingAction(0)
 {
   G4RegionStore* rStore = G4RegionStore::GetInstance();
@@ -72 +73 @@
 G4Region::G4Region( __void__& )
   : fName(""), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
-    fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
+    fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
+    fRegionalSteppingAction(0)
 {
   // Register to store

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

@@ -26 +26 @@
 //
 // $Id: G4RegionStore.cc,v 1.14 2008/07/10 09:46:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4RegionStore

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

@@ -25 +25 @@
 //
 //
-// $Id: G4SmartVoxelHeader.cc,v 1.31 2008/01/24 15:46:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4SmartVoxelHeader.cc,v 1.34 2009/10/30 14:05:47 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -366 +366 @@
         // Sanity check on extent
         //
-        G4double min, max;
+        G4double emin = kInfinity, emax = -kInfinity;
         G4VoxelLimits limits;
         G4AffineTransform origin;
-        pVolume->GetSolid()->CalculateExtent(axis, limits, origin, min, max);
-        if ( (std::fabs((min-fminExtent)/fminExtent) +
-              std::fabs((max-fmaxExtent)/fmaxExtent)) > 0.05)
+        pVolume->GetSolid()->CalculateExtent(axis, limits, origin, emin, emax);
+        if ( (std::fabs((emin-fminExtent)/fminExtent) +
+              std::fabs((emax-fmaxExtent)/fmaxExtent)) > 0.05)
         {
           G4cerr << "ERROR - G4SmartVoxelHeader::BuildReplicaVoxels()"
@@ -1038 +1038 @@
   for (nNode=0; nNode<noNodes; nNode++)
   {
+    // Get rid of possible excess capacity in the internal node vector
+    //
+    ((*nodeList)[nNode])->Shrink();
     G4SmartVoxelProxy* pProxyNode = new G4SmartVoxelProxy((*nodeList)[nNode]);
     if (!pProxyNode)

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

@@ -26 +26 @@
 //
 // $Id: G4SmartVoxelNode.cc,v 1.6 2006/06/29 18:33:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4SmartVoxelNode

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

@@ -26 +26 @@
 //
 // $Id: G4SmartVoxelProxy.cc,v 1.3 2006/06/29 18:33:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4SmartVoxelProxy

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

@@ -26 +26 @@
 //
 // $Id: G4SmartVoxelStat.cc,v 1.3 2006/06/29 18:33:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4SolidStore.cc,v 1.17 2007/04/10 10:13:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4SolidStore

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

@@ -26 +26 @@
 //
 // $Id: G4VCurvedTrajectoryFilter.cc,v 1.3 2006/06/29 18:33:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // --------------------------------------------------------------------
 

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

@@ -26 +26 @@
 //
 // $Id: G4VNestedParameterisation.cc,v 1.6 2006/06/29 18:33:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VNestedParameterisation implementation

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

@@ -26 +26 @@
 //
 // $Id: G4VPVDivisionFactory.cc,v 1.2 2006/06/29 18:34:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VPVDivisionFactory Implementation file

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

@@ -26 +26 @@
 //
 // $Id: G4VPVParameterisation.cc,v 1.8 2007/07/16 08:40:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Default implementations for Parameterisations that do not

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

@@ -26 +26 @@
 //
 // $Id: G4VPhysicalVolume.cc,v 1.14 2007/04/11 08:00:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4VSolid.cc,v 1.39 2008/09/23 13:07:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VSolid

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

@@ -26 +26 @@
 //
 // $Id: G4VoxelLimits.cc,v 1.11 2006/06/29 18:34:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VoxelLimits