Import Geant4 11.0.0 source tree

2021-12-10 14:46:44 +01:00
parent 6399a014b6
commit 80e2389dd8
3932 changed files with 202519 additions and 246221 deletions
@@ -27,8 +27,6 @@
 //
 //

-#ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
-
 #ifndef G4RTXScanner_H
 #define G4RTXScanner_H 1

@@ -87,5 +85,3 @@ protected:
 };

 #endif
-
-#endif
@@ -50,13 +50,13 @@ public:
  {BuildVisAttsMap(solid);}

  // Required pure virtual functions, not used in Ray Tracer.
+  using G4VSceneHandler::AddPrimitive;
  void AddPrimitive(const G4Polyline&){}
  void AddPrimitive(const G4Text&){}
  void AddPrimitive(const G4Circle&){}
  void AddPrimitive(const G4Square&){}
  void AddPrimitive(const G4Polyhedron&){}
  void AddPrimitive(const G4Polymarker&){}
-  void AddPrimitive(const G4Scale&){}

  void ClearStore ();

@@ -28,8 +28,6 @@
 //
 // John Allison  11th September 2003

-#if defined (G4VIS_BUILD_RAYTRACERX_DRIVER) || (G4VIS_USE_RAYTRACERX)
-
 #ifndef G4RAYTRACERX_HH
 #define G4RAYTRACERX_HH

@@ -51,4 +49,3 @@ class G4RayTracerX : public G4VGraphicsSystem
 };

 #endif
-#endif
@@ -27,8 +27,6 @@

 // John Allison  17th March 2000

-#ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
-
 #ifndef G4RAYTRACERXVIEWER_HH
 #define G4RAYTRACERXVIEWER_HH

@@ -42,5 +40,3 @@ public:
 };

 #endif
-
-#endif
@@ -88,6 +88,10 @@ class G4TheMTRayTracer : public G4TheRayTracer
    // here or if SetScanner is not invoked before Trace(), a default
    // G4RTSimpleScanner will be used.

+  static G4TheMTRayTracer* Instance();
+  static G4TheMTRayTracer* Instance
+  (G4VFigureFileMaker* figMaker,G4VRTScanner* scanner);
+
  public:
    virtual ~G4TheMTRayTracer();

@@ -122,9 +122,9 @@ class G4TheRayTracer

  protected:
    G4RayShooter * theRayShooter;
-    G4VFigureFileMaker * theFigMaker;
+    static G4VFigureFileMaker * theFigMaker;
    G4RTMessenger * theMessenger;
-    G4VRTScanner * theScanner;
+    static G4VRTScanner * theScanner;

    G4EventManager * theEventManager;