Import Geant4 9.0.0 source tree

examples/novice/N04/src/ExN04CalorimeterROGeometry.cc

@@ -45,13 +45,14 @@ ExN04CalorimeterROGeometry::ExN04CalorimeterROGeometry()
 
 
 ExN04CalorimeterROGeometry::ExN04CalorimeterROGeometry(G4String aString)
-  : G4VReadOutGeometry(aString)
+  : G4VReadOutGeometry(aString), dummyMat(0)
 {
 #include "ExN04DetectorParameterDef.icc"
 }
 
 ExN04CalorimeterROGeometry::~ExN04CalorimeterROGeometry()
 {
+  delete dummyMat;
 }
 
 G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build()
@@ -59,7 +60,7 @@ G4VPhysicalVolume* ExN04CalorimeterROGeometry::Build()
   // A dummy material is used to fill the volumes of the readout geometry.
   // ( It will be allowed to set a NULL pointer in volumes of such virtual
   // division in future, since this material is irrelevant for tracking.)
-  G4Material* dummyMat  = new G4Material(name="dummyMat", 1., 1.*g/mole, 1.*g/cm3);
+  dummyMat  = new G4Material(name="dummyMat", 1., 1.*g/mole, 1.*g/cm3);
 
   //Builds the ReadOut World:
   G4Box *ROWorldBox = new G4Box("ROWorldBox", expHall_x, expHall_y, expHall_z);

examples/novice/N04/src/ExN04DetectorConstruction.cc

@@ -60,7 +60,18 @@ ExN04DetectorConstruction::ExN04DetectorConstruction()
 }
 
 ExN04DetectorConstruction::~ExN04DetectorConstruction()
-{;}
+{
+  delete Scinti;
+  delete Silicon;
+  delete Ar;
+  delete Lead;
+  delete Air;
+
+  delete O;
+  delete N;
+  delete C;
+  delete H;
+}
 
 void ExN04DetectorConstruction::DefineMaterials()
 {
@@ -71,10 +82,10 @@ void ExN04DetectorConstruction::DefineMaterials()
   G4double a, z, density;
   G4int nel;
 
-  G4Element* H = new G4Element("Hydrogen", "H", z=1., a=  1.01*g/mole);
-  G4Element* C = new G4Element("Carbon",   "C", z=6., a= 12.01*g/mole);
-  G4Element* N = new G4Element("Nitrogen", "N", z=7., a= 14.01*g/mole);
-  G4Element* O = new G4Element("Oxygen",   "O", z=8., a= 16.00*g/mole);
+  H = new G4Element("Hydrogen", "H", z=1., a=  1.01*g/mole);
+  C = new G4Element("Carbon",   "C", z=6., a= 12.01*g/mole);
+  N = new G4Element("Nitrogen", "N", z=7., a= 14.01*g/mole);
+  O = new G4Element("Oxygen",   "O", z=8., a= 16.00*g/mole);
 
   Air = new G4Material("Air", density= 1.29*mg/cm3, nel=2);
   Air->AddElement(N, 70.*perCent);

examples/novice/N04/src/ExN04RunAction.cc

@@ -25,7 +25,7 @@
 //
 //
 // $Id: ExN04RunAction.cc,v 1.5 2006/06/29 17:51:44 gunter Exp $
-// GEANT4 tag $Name: geant4-08-02 $
+// GEANT4 tag $Name: geant4-09-00 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/novice/N04/src/ExN04SteppingVerbose.cc

@@ -25,7 +25,7 @@
 //
 //
 // $Id: ExN04SteppingVerbose.cc,v 1.4 2006/06/29 17:51:55 gunter Exp $
-// GEANT4 tag $Name: geant4-08-02 $
+// GEANT4 tag $Name: geant4-09-00 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......