Import Geant4 10.4.0 source tree

2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
@@ -8,6 +8,9 @@ http://g4advancedexamples.lngs.infn.it/Examples/hadrontherapy
             History file of the Hadrontherapy application
         ====================================================

+26.10.2017 D.Sorokin; Tag: hadrontherapy-V10-03-11
+	  - LaserDrivenBeamLine.cc build fix
+
 24.06.2017 G.A.P.Cirrone; Tag: hadrontherapy-V10-03-10
 	  - Added the batch.mac file 

@@ -1,4 +1,3 @@
-
 //
 // ********************************************************************
 // * License and Disclaimer                                           *
@@ -48,6 +48,7 @@
 #include "G4Material.hh"
 //
 #include "G4FieldManager.hh"
+#include "G4MagIntegratorDriver.hh"
 #include "G4MagIntegratorStepper.hh"
 #include "G4Mag_UsualEqRhs.hh"
 #include "G4ExplicitEuler.hh"
@@ -520,9 +520,9 @@ void PassiveCarbonBeamLine::HadrontherapyRippleFilter()
    
    LogicRippleFilterTrd -> SetVisAttributes(green);
    
-    G4int numberOfTrd = static_cast<int>(floor( RF_y / (RFtrd_bottom+distanceBetweenTrd) ));
+    G4int numberOfTrd = static_cast<int>(std::floor( RF_y / (RFtrd_bottom+distanceBetweenTrd) ));
    
-    G4int N = static_cast<int>( floor(numberOfTrd-1)/2 );
+    G4int N = static_cast<int>( std::floor(numberOfTrd-1)/2 );
    
    G4int copyNumber = 0;