Changeset 850 for trunk/source/geometry/management/src/G4Region.cc

Timestamp:

Sep 10, 2008, 5:40:37 PM (16 years ago)

Author:

garnier

Message:

geant4.8.2 beta

File:

• trunk/source/geometry/management/src/G4Region.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Region.cc,v 1.23 2007/04/26 21:20:53 asaim Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4Region.cc,v 1.26 2008/07/15 10:27:36 gcosmo Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // 
@@ -140 +140 @@
     G4VPVParameterisation* pParam = daughterPVol->GetParameterisation();
 
-    if (pParam->IsNested())
+    if (pParam->GetMaterialScanner())
     {
       size_t matNo = pParam->GetMaterialScanner()->GetNumberOfMaterials();
@@ -232 +232 @@
 // *******************************************************************
 //
-void G4Region::RemoveRootLogicalVolume(G4LogicalVolume* lv)
+void G4Region::RemoveRootLogicalVolume(G4LogicalVolume* lv, G4bool scan)
 {
   // Find and remove logical volume from the list
@@ -247 +247 @@
   }
 
-  // Scan recursively the tree of daugther volumes and reset regions
-  //
-  //ScanVolumeTree(lv, false);
-
-  // Update the materials list
-  //
-  //UpdateMaterialList();
+  if (scan)  // Update the materials list
+  {
+    UpdateMaterialList();
+  }
 
   // Set region as modified