Import Geant4 10.1.0 source tree

examples/extended/runAndEvent/RE06/src/RE06DetectorConstruction.cc

@@ -26,7 +26,7 @@
 /// \file RE06/src/RE06DetectorConstruction.cc
 /// \brief Implementation of the RE06DetectorConstruction class
 //
-// $Id: RE06DetectorConstruction.cc 75123 2013-10-28 09:53:28Z gcosmo $
+// $Id: RE06DetectorConstruction.cc 83381 2014-08-21 14:18:13Z gcosmo $
 // 
 
 #include "RE06DetectorConstruction.hh"
@@ -63,13 +63,14 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
+G4ThreadLocal G4bool RE06DetectorConstruction::fConstructedSDandField = false;
+
 RE06DetectorConstruction::RE06DetectorConstruction()
 : G4VUserDetectorConstruction(),
   fNumberOfLayers(40),
   fTotalThickness (2.0*m),
   fLayerThickness(0.),
   fConstructed(false),
-  fConstructedSDandField(false),
   fWorldMaterial(0),
   fAbsorberMaterial(0),
   fGapMaterial(0),
@@ -107,12 +108,11 @@ RE06DetectorConstruction::~RE06DetectorConstruction()
 
 G4VPhysicalVolume* RE06DetectorConstruction::Construct()
 {
-//  if(!fConstructed)
+  if(!fConstructed)
   {
     fConstructed = true;
     DefineMaterials();
     SetupGeometry();
-    SetupDetectors();
   }
   if (GetVerboseLevel()>0) {
     PrintCalorParameters();
@@ -120,9 +120,9 @@ G4VPhysicalVolume* RE06DetectorConstruction::Construct()
   return fWorldPhysical;
 }
 
-void RE06DetectorConstruction::ConstructSDandField() {
-
-//  if(!fConstructedSDandField)
+void RE06DetectorConstruction::ConstructSDandField() 
+{
+  if(!fConstructedSDandField)
   {
     fConstructedSDandField = true;
     SetupDetectors();