Import Geant4 10.1.0 source tree

2016-06-10 12:08:39 +02:00
parent 286caacf06
commit c9b32a6c0a
5770 changed files with 1050949 additions and 367105 deletions
@@ -45,6 +45,7 @@

 #include <numeric>
 #include <boost/variant/get.hpp>
+#include <G4SystemOfUnits.hh>
 #include "CexmcASTEval.hh"


@@ -53,6 +53,7 @@
 #include <G4VTrajectory.hh>
 #include <G4TrajectoryContainer.hh>
 #include <G4Colour.hh>
+#include <G4SystemOfUnits.hh>
 #include "CexmcEventAction.hh"
 #include "CexmcEventActionMessenger.hh"
 #include "CexmcEventInfo.hh"
@@ -43,6 +43,7 @@

 #ifdef CEXMC_USE_GENBOD

+#include <G4SystemOfUnits.hh>
 #include "CexmcGenbod.hh"
 #include "CexmcException.hh"

@@ -63,6 +63,7 @@
 #include <G4LogicalVolume.hh>
 #include <G4Box.hh>
 #include <G4Tubs.hh>
+#include <G4SystemOfUnits.hh>
 #include "CexmcHistoManager.hh"
 #include "CexmcHistoManagerMessenger.hh"
 #include "CexmcProductionModel.hh"
@@ -1007,7 +1007,8 @@ void  CexmcRunManager::PrintReadRunData( void ) const
                        "all interactions" ) << ")" << std::endl;
        }
    }
-    G4cout << "  -- Base physics used (1 - QGSP_BERT, 2 - QGSP_BIC_EMY): " <<
+    G4cout << "  -- Base physics used"
+              "(1 - QGSP_BERT, 2 - QGSP_BIC_EMY, 3 - FTFP_BERT): " <<
              sObject.basePhysicsUsed << G4endl;
    G4cout << "  -- Production model (1 - pi0, 2 - eta): " <<
              sObject.productionModelType << G4endl;
@@ -42,7 +42,6 @@
 */

 #include <cmath>
-#include <G4SystemOfUnits.hh>
 #include <G4Polyline.hh>
 #include <G4Circle.hh>
 #include <G4Polyhedron.hh>
@@ -52,6 +51,7 @@
 #include <G4AffineTransform.hh>
 #include <G4Transform3D.hh>
 #include <G4Point3D.hh>
+#include <G4SystemOfUnits.hh>
 #include "CexmcScenePrimitives.hh"
 #include "CexmcScenePrimitivesMessenger.hh"
 #include "CexmcSetup.hh"
@@ -53,6 +53,7 @@
 #include <G4RegionStore.hh>
 #include <G4ProductionCuts.hh>
 #include <G4VUserPhysicsList.hh>
+#include <G4SystemOfUnits.hh>
 #include "CexmcSetup.hh"
 #include "CexmcPrimitiveScorer.hh"
 #include "CexmcTrackPoints.hh"