Import Geant4 10.0.0 source tree

examples/extended/optical/LXe/src/LXeWLSFiber.cc

@@ -23,6 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
+// $Id: LXeWLSFiber.cc 77486 2013-11-25 10:14:16Z gcosmo $
+//
 /// \file optical/LXe/src/LXeWLSFiber.cc
 /// \brief Implementation of the LXeWLSFiber class
 //
@@ -51,41 +53,39 @@ LXeWLSFiber::LXeWLSFiber(G4RotationMatrix *pRot,
 {
   CopyValues();
 
-  if(!fClad2_log || fUpdated){
-    // The Fiber
-    //
-    G4Tubs* fiber_tube =
-      new G4Tubs("Fiber",fFiber_rmin,fFiber_rmax,fFiber_z,fFiber_sphi,fFiber_ephi);
+  // The Fiber
+  //
+  G4Tubs* fiber_tube =
+   new G4Tubs("Fiber",fFiber_rmin,fFiber_rmax,fFiber_z,fFiber_sphi,fFiber_ephi);
  
-    G4LogicalVolume* fiber_log =
+  G4LogicalVolume* fiber_log =
       new G4LogicalVolume(fiber_tube,G4Material::GetMaterial("PMMA"),
                           "Fiber",0,0,0);
  
-    // Cladding (first layer)
-    //
-    G4Tubs* clad1_tube =
+  // Cladding (first layer)
+  //
+  G4Tubs* clad1_tube =
       new G4Tubs("Cladding1",fClad1_rmin,fClad1_rmax,fClad1_z,fClad1_sphi,
                  fClad1_ephi);
  
-    G4LogicalVolume* clad1_log =
+  G4LogicalVolume* clad1_log =
       new G4LogicalVolume(clad1_tube,G4Material::GetMaterial("Pethylene1"),
                           "Cladding1",0,0,0);
  
-    // Cladding (second layer)
-    //
-    G4Tubs* clad2_tube =
+  // Cladding (second layer)
+  //
+  G4Tubs* clad2_tube =
       new G4Tubs("Cladding2",fClad2_rmin,fClad2_rmax,fClad2_z,fClad2_sphi,
                  fClad2_ephi);
  
-    fClad2_log =
+  fClad2_log =
       new G4LogicalVolume(clad2_tube,G4Material::GetMaterial("Pethylene2"),
                           "Cladding2",0,0,0);
  
-    new G4PVPlacement(0,G4ThreeVector(0.,0.,0.),fiber_log,
-                      "Fiber", clad1_log,false,0);
-    new G4PVPlacement(0,G4ThreeVector(0.,0.,0.),clad1_log,
-                      "Cladding1",fClad2_log,false,0);
-  }
+  new G4PVPlacement(0,G4ThreeVector(0.,0.,0.),fiber_log,
+                    "Fiber", clad1_log,false,0);
+  new G4PVPlacement(0,G4ThreeVector(0.,0.,0.),clad1_log,
+                    "Cladding1",fClad2_log,false,0);
 
   SetLogicalVolume(fClad2_log);
 }
@@ -93,7 +93,6 @@ LXeWLSFiber::LXeWLSFiber(G4RotationMatrix *pRot,
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void LXeWLSFiber::CopyValues(){
-  fUpdated=fConstructor->GetUpdated();
 
   fFiber_rmin = 0.00*cm;
   fFiber_rmax = 0.10*cm;