Import Geant4 8.3.0 source tree

examples/extended/runAndEvent/RE02/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.2 2006/11/18 01:37:22 asaim Exp $
+$Id: History,v 1.3 2007/01/30 03:23:47 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,9 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
  
+Jan. 29, 07 M.Asai (exampleRE02-V08-02-00)
+- Fix missing null pointer protection in ComputeMaterial() method.
+
 Nov. 17, 06 T.Aso (exampleRE02-V08-01-00)
 - Reimplement the geometry with G4VNestedParameterization.
 - Modify the scorers according to the nested para,eterisation.

examples/extended/runAndEvent/RE02/src/RE02NestedPhantomParameterisation.cc

@@ -73,6 +73,7 @@ G4Material* RE02NestedPhantomParameterisation::ComputeMaterial(G4VPhysicalVolume
 							 const G4int copyNo, 
 							 const G4VTouchable* parentTouch)
 {
+  if(parentTouch==0) return fmat[0]; // protection for initialization and vis at idle state
   // Copy number of voxels. 
   // Copy number of X and Y are obtained from replication number.
   // Copy nymber of Z is the copy number of current voxel.
@@ -81,14 +82,9 @@ G4Material* RE02NestedPhantomParameterisation::ComputeMaterial(G4VPhysicalVolume
   G4int iz = copyNo;
   // For demonstration purpose,a couple of materials are chosen alternately.
   G4Material* mat=0;
-  if ( ix < 0 && iy < 0 ) return NULL;
   if ( ix%2 == 0 && iy%2 == 0 && iz%2 == 0 ) mat = fmat[0];
   else mat = fmat[1];
 
-  // Set material to the current logical volume.
-  G4LogicalVolume* currentLog = currentVol->GetLogicalVolume();
-  currentLog->SetMaterial(mat);
-
   return mat;
 }