Import Geant4 11.2.2 source tree

source/visualization/Vtk/src/G4VtkClipClosedSurfacePipeline.cc

@@ -28,15 +28,15 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkClipPolyData.h"
-#include "vtkPlane.h"
-#include "vtkPlaneCollection.h"
-#include "vtkPolyDataAlgorithm.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkPolyDataNormals.h"
-#include "vtkProperty.h"
-#include "vtkSmartPointer.h"
+#include <vtkActor.h>
+#include <vtkClipPolyData.h>
+#include <vtkPlane.h>
+#include <vtkPlaneCollection.h>
+#include <vtkPolyDataAlgorithm.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPolyDataNormals.h>
+#include <vtkProperty.h>
+#include <vtkSmartPointer.h>
 #include <vtkClipClosedSurface.h>
 
 G4VtkClipClosedSurfacePipeline::G4VtkClipClosedSurfacePipeline(

source/visualization/Vtk/src/G4VtkClipOpenPipeline.cc

@@ -28,14 +28,14 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkClipPolyData.h"
-#include "vtkPlane.h"
-#include "vtkPolyDataAlgorithm.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkPolyDataNormals.h"
-#include "vtkProperty.h"
-#include "vtkSmartPointer.h"
+#include <vtkActor.h>
+#include <vtkClipPolyData.h>
+#include <vtkPlane.h>
+#include <vtkPolyDataAlgorithm.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPolyDataNormals.h>
+#include <vtkProperty.h>
+#include <vtkSmartPointer.h>
 #include <vtkClipClosedSurface.h>
 
 G4VtkClipOpenPipeline::G4VtkClipOpenPipeline(G4String nameIn, const G4VtkVisContext& vcIn,

source/visualization/Vtk/src/G4VtkCutterPipeline.cc

@@ -29,13 +29,13 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkCutter.h"
-#include "vtkPlane.h"
-#include "vtkPolyDataAlgorithm.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
-#include "vtkSmartPointer.h"
+#include <vtkActor.h>
+#include <vtkCutter.h>
+#include <vtkPlane.h>
+#include <vtkPolyDataAlgorithm.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkSmartPointer.h>
 
 G4VtkCutterPipeline::G4VtkCutterPipeline(G4String nameIn, const G4VtkVisContext& vcIn,
                                          vtkSmartPointer<vtkPolyDataAlgorithm> filter,

source/visualization/Vtk/src/G4VtkImagePipeline.cc

@@ -31,15 +31,15 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkImageActor.h"
-#include "vtkImageAlgorithm.h"
-#include "vtkImageMapper3D.h"
-#include "vtkImageProperty.h"
-#include "vtkImageReader2.h"
-#include "vtkImageReader2Factory.h"
-#include "vtkMatrix4x4.h"
-#include "vtkSmartPointer.h"
-#include "vtkImageFlip.h"
+#include <vtkImageActor.h>
+#include <vtkImageAlgorithm.h>
+#include <vtkImageMapper3D.h>
+#include <vtkImageProperty.h>
+#include <vtkImageReader2.h>
+#include <vtkImageReader2Factory.h>
+#include <vtkMatrix4x4.h>
+#include <vtkSmartPointer.h>
+#include <vtkImageFlip.h>
 
 G4VtkImagePipeline::G4VtkImagePipeline(const G4String& nameIn, const G4VtkVisContext& vcIn)
   : G4VVtkPipeline(nameIn, "G4VtkImagePipeline", vcIn, false, vcIn.fViewer->renderer)

source/visualization/Vtk/src/G4VtkMessenger.cc

@@ -35,7 +35,7 @@
 #include "G4VtkSceneHandler.hh"
 #include "G4VtkViewer.hh"
 
-#include "vtkObject.h"
+#include <vtkObject.h>
 
 G4VtkMessenger* G4VtkMessenger::fpInstance = nullptr;
 

source/visualization/Vtk/src/G4VtkOffscreenViewer.cc

@@ -27,8 +27,8 @@
 #include "G4VtkSceneHandler.hh"
 #include "G4VSceneHandler.hh"
 
-#include "vtkWindowToImageFilter.h"
-#include "vtkPNGWriter.h"
+#include <vtkWindowToImageFilter.h>
+#include <vtkPNGWriter.h>
 
 G4VtkOffscreenViewer::G4VtkOffscreenViewer(G4VSceneHandler& sceneHandler, const G4String& name)
   : G4VtkViewer(sceneHandler, name)

source/visualization/Vtk/src/G4VtkPolydataInstanceAppendPipeline.cc

@@ -28,16 +28,16 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkAppendPolyData.h"
-#include "vtkDataArray.h"
-#include "vtkDoubleArray.h"
-#include "vtkGeneralTransform.h"
-#include "vtkPointData.h"
-#include "vtkPolyData.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
-#include "vtkTransformPolyDataFilter.h"
+#include <vtkActor.h>
+#include <vtkAppendPolyData.h>
+#include <vtkDataArray.h>
+#include <vtkDoubleArray.h>
+#include <vtkGeneralTransform.h>
+#include <vtkPointData.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkTransformPolyDataFilter.h>
 
 std::size_t G4VtkPolydataInstanceAppendPipeline::MakeHash(const G4Polyhedron& polyhedron,
                                                           const G4VtkVisContext& vc)

source/visualization/Vtk/src/G4VtkPolydataInstanceBakePipeline.cc

@@ -28,13 +28,13 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkDataArray.h"
-#include "vtkDoubleArray.h"
-#include "vtkPointData.h"
-#include "vtkPolyData.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
+#include <vtkActor.h>
+#include <vtkDataArray.h>
+#include <vtkDoubleArray.h>
+#include <vtkPointData.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
 
 std::size_t G4VtkPolydataInstanceBakePipeline::MakeHash(const G4Polyhedron& polyhedron,
                                                         const G4VtkVisContext& vc)

source/visualization/Vtk/src/G4VtkPolydataInstancePipeline.cc

@@ -25,8 +25,8 @@
 
 #include "G4VtkPolydataInstancePipeline.hh"
 
-#include "vtkDoubleArray.h"
-#include "vtkPoints.h"
+#include <vtkDoubleArray.h>
+#include <vtkPoints.h>
 
 G4VtkPolydataInstancePipeline::G4VtkPolydataInstancePipeline(G4String nameIn,
                                                              const G4VtkVisContext& vcIn)

source/visualization/Vtk/src/G4VtkPolydataInstanceTensorPipeline.cc

@@ -28,14 +28,14 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkDataArray.h"
-#include "vtkDoubleArray.h"
-#include "vtkPointData.h"
-#include "vtkPolyData.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
-#include "vtkTensorGlyphColor.h"
+#include <vtkActor.h>
+#include <vtkDataArray.h>
+#include <vtkDoubleArray.h>
+#include <vtkPointData.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkTensorGlyphColor.h>
 
 std::size_t G4VtkPolydataInstanceTensorPipeline::MakeHash(const G4Polyhedron& polyhedron,
                                                           const G4VtkVisContext& vc)

source/visualization/Vtk/src/G4VtkPolydataPipeline.cc

@@ -33,15 +33,15 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkCleanPolyData.h"
-#include "vtkLine.h"
-#include "vtkMatrix4x4.h"
-#include "vtkPolyDataAlgorithm.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkPolyDataNormals.h"
-#include "vtkProperty.h"
-#include "vtkTriangleFilter.h"
+#include <vtkActor.h>
+#include <vtkCleanPolyData.h>
+#include <vtkLine.h>
+#include <vtkMatrix4x4.h>
+#include <vtkPolyDataAlgorithm.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPolyDataNormals.h>
+#include <vtkProperty.h>
+#include <vtkTriangleFilter.h>
 
 std::size_t G4VtkPolydataPipeline::MakeHash(const G4Polyhedron& polyhedron,
                                             const G4VtkVisContext& vc)

source/visualization/Vtk/src/G4VtkPolydataPolygonPipeline.cc

@@ -29,11 +29,11 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
-#include "vtkRegularPolygonSource.h"
-#include "vtkVertexGlyphFilter.h"
+#include <vtkActor.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRegularPolygonSource.h>
+#include <vtkVertexGlyphFilter.h>
 
 std::size_t G4VtkPolydataPolygonPipeline::MakeHash(const G4VisAttributes* pVA)
 {

source/visualization/Vtk/src/G4VtkPolydataPolyline2DPipeline.cc

@@ -30,15 +30,15 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkActor2D.h"
-#include "vtkCoordinate.h"
-#include "vtkLine.h"
-#include "vtkPolyDataAlgorithm.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkPolyDataMapper2D.h"
-#include "vtkProperty.h"
-#include "vtkProperty2D.h"
+#include <vtkActor.h>
+#include <vtkActor2D.h>
+#include <vtkCoordinate.h>
+#include <vtkLine.h>
+#include <vtkPolyDataAlgorithm.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPolyDataMapper2D.h>
+#include <vtkProperty.h>
+#include <vtkProperty2D.h>
 
 std::size_t G4VtkPolydataPolyline2DPipeline::MakeHash(const G4VisAttributes* pVA)
 {

source/visualization/Vtk/src/G4VtkPolydataPolylinePipeline.cc

@@ -27,8 +27,8 @@
 
 #include "G4VisAttributes.hh"
 
-#include "vtkActor.h"
-#include "vtkProperty.h"
+#include <vtkActor.h>
+#include <vtkProperty.h>
 
 std::size_t G4VtkPolydataPolylinePipeline::MakeHash(const G4VisAttributes* pVA)
 {

source/visualization/Vtk/src/G4VtkPolydataSpherePipeline.cc

@@ -29,10 +29,10 @@
 #include "G4VtkViewer.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkActor.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
-#include "vtkVertexGlyphFilter.h"
+#include <vtkActor.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkVertexGlyphFilter.h>
 
 std::size_t G4VtkPolydataSpherePipeline::MakeHash(const G4VisAttributes* pVA)
 {

source/visualization/Vtk/src/G4VtkQtViewer.cc

@@ -34,24 +34,24 @@
 #include "G4VtkQtSceneHandler.hh"
 #include "G4VtkUtility.hh"
 
-#include "qcoreapplication.h"
-#include "qlabel.h"
-#include "qlayout.h"
-#include "qlineedit.h"
-#include "qopenglcontext.h"
-#include "qpushbutton.h"
-#include "qthread.h"
-#include "qtreewidget.h"
-#include "vtkActor.h"
-#include "vtkCamera.h"
-#include "vtkCylinderSource.h"
-#include "vtkGenericOpenGLRenderWindow.h"
-#include "vtkNamedColors.h"
-#include "vtkNew.h"
-#include "vtkPolyDataMapper.h"
-#include "vtkProperty.h"
-#include "vtkRenderer.h"
-#include "vtkVersion.h"
+#include <qcoreapplication.h>
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qlineedit.h>
+#include <qopenglcontext.h>
+#include <qpushbutton.h>
+#include <qthread.h>
+#include <qtreewidget.h>
+#include <vtkActor.h>
+#include <vtkCamera.h>
+#include <vtkCylinderSource.h>
+#include <vtkGenericOpenGLRenderWindow.h>
+#include <vtkNamedColors.h>
+#include <vtkNew.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkVersion.h>
 
 #include <array>
 

source/visualization/Vtk/src/G4VtkSceneHandler.cc

@@ -51,10 +51,10 @@
 #include "G4VtkStore.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtkColorTransferFunction.h"
-#include "vtkContourValues.h"
-#include "vtkPiecewiseFunction.h"
-#include "vtkVolumeProperty.h"
+#include <vtkColorTransferFunction.h>
+#include <vtkContourValues.h>
+#include <vtkPiecewiseFunction.h>
+#include <vtkVolumeProperty.h>
 
 #include <cstdlib>
 

source/visualization/Vtk/src/G4VtkStore.cc

@@ -57,22 +57,28 @@
 #include "G4VtkTextPipeline.hh"
 #include "G4VtkUnstructuredGridPipeline.hh"
 
+#ifndef WIN32
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wextra-semi"
-#include "vtkNew.h"
-#include "vtkSmartPointer.h"
-#include "vtkBillboardTextActor3D.h"
-#include "vtkLine.h"
-#include "vtkMatrix3x3.h"
-#include "vtkOBJReader.h"
-#include "vtkPLYReader.h"
-#include "vtkSTLReader.h"
-#include "vtkPolyDataReader.h"
-#include "vtkProperty.h"
-#include "vtkProperty2D.h"
-#include "vtkRegularPolygonSource.h"
-#include "vtkTextProperty.h"
+#endif
+
+#include <vtkNew.h>
+#include <vtkSmartPointer.h>
+#include <vtkBillboardTextActor3D.h>
+#include <vtkLine.h>
+#include <vtkMatrix3x3.h>
+#include <vtkOBJReader.h>
+#include <vtkPLYReader.h>
+#include <vtkSTLReader.h>
+#include <vtkPolyDataReader.h>
+#include <vtkProperty.h>
+#include <vtkProperty2D.h>
+#include <vtkRegularPolygonSource.h>
+#include <vtkTextProperty.h>
+
+#ifndef WIN32
 #pragma GCC diagnostic pop
+#endif
 
 G4VtkStore::G4VtkStore(G4String nameIn) : name(nameIn) {}
 

source/visualization/Vtk/src/G4VtkText2DPipeline.cc

@@ -32,8 +32,8 @@
 #include "G4VisAttributes.hh"
 #include "G4VtkViewer.hh"
 
-#include "vtkTextActor.h"
-#include "vtkTextProperty.h"
+#include <vtkTextActor.h>
+#include <vtkTextProperty.h>
 
 std::size_t G4VtkText2DPipeline::MakeHash(const G4Text& text, const G4VtkVisContext& /*vc*/,
                                           const G4VisAttributes* pVA)

source/visualization/Vtk/src/G4VtkTextPipeline.cc

@@ -32,8 +32,8 @@
 #include "G4VisAttributes.hh"
 #include "G4VtkViewer.hh"
 
-#include "vtkBillboardTextActor3D.h"
-#include "vtkTextProperty.h"
+#include <vtkBillboardTextActor3D.h>
+#include <vtkTextProperty.h>
 
 std::size_t G4VtkTextPipeline::MakeHash(const G4Text& text, const G4VtkVisContext& /*vc*/,
                                         const G4VisAttributes* pVA)

source/visualization/Vtk/src/G4VtkUnstructuredGridPipeline.cc

@@ -23,27 +23,27 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 
-#include "vtkPoints.h"
-#include "vtkCellArray.h"
-#include "vtkCharArray.h"
-#include "vtkUnstructuredGrid.h"
-#include "vtkDataSetMapper.h"
-#include "vtkUnstructuredGridVolumeMapper.h"
-#include "vtkUnstructuredGridVolumeRayCastMapper.h"
-#include "vtkUnstructuredGridVolumeZSweepMapper.h"
-#include "vtkOpenGLProjectedTetrahedraMapper.h"
-#include "vtkActor.h"
-#include "vtkColorTransferFunction.h"
-#include "vtkPiecewiseFunction.h"
-#include "vtkLookupTable.h"
-#include "vtkVolumeProperty.h"
-#include "vtkVolume.h"
-#include "vtkNew.h"
-#include "vtkTetra.h"
-#include "vtkVoxel.h"
-// #include "vtkCleanUnstructuredGrid.h"
-#include "vtkDataSetTriangleFilter.h"
-#include "vtkClipDataSet.h"
+#include <vtkPoints.h>
+#include <vtkCellArray.h>
+#include <vtkCharArray.h>
+#include <vtkUnstructuredGrid.h>
+#include <vtkDataSetMapper.h>
+#include <vtkUnstructuredGridVolumeMapper.h>
+#include <vtkUnstructuredGridVolumeRayCastMapper.h>
+#include <vtkUnstructuredGridVolumeZSweepMapper.h>
+#include <vtkOpenGLProjectedTetrahedraMapper.h>
+#include <vtkActor.h>
+#include <vtkColorTransferFunction.h>
+#include <vtkPiecewiseFunction.h>
+#include <vtkLookupTable.h>
+#include <vtkVolumeProperty.h>
+#include <vtkVolume.h>
+#include <vtkNew.h>
+#include <vtkTetra.h>
+#include <vtkVoxel.h>
+// #include <vtkCleanUnstructuredGrid.h>
+#include <vtkDataSetTriangleFilter.h>
+#include <vtkClipDataSet.h>
 
 #include "G4VtkUnstructuredGridPipeline.hh"
 #include "G4VtkVisContext.hh"

source/visualization/Vtk/src/G4VtkUtility.cc

@@ -32,8 +32,8 @@
 #include "G4Transform3D.hh"
 #include "G4Colour.hh"
 
-#include "vtkMatrix4x4.h"
-#include "vtkPlane.h"
+#include <vtkMatrix4x4.h>
+#include <vtkPlane.h>
 
 vtkSmartPointer<vtkMatrix4x4> G4Transform3DToVtkMatrix4x4(const G4Transform3D& g4Trans)
 {

source/visualization/Vtk/src/G4VtkViewer.cc

@@ -27,6 +27,8 @@
 
 #include "G4VtkViewer.hh"
 
+#include <CLHEP/Units/PhysicalConstants.h>
+
 #include "G4Transform3D.hh"
 #include "G4VSceneHandler.hh"
 #include "G4VtkCutterPipeline.hh"
@@ -38,43 +40,43 @@
 #include "G4VtkUtility.hh"
 #include "G4VtkVisContext.hh"
 
-#include "vtk3DSImporter.h"
-#include "vtkBMPWriter.h"
-#include "vtkIVExporter.h"  // open inventor
-#include "vtkImageWriter.h"
-#include "vtkImplicitPlaneRepresentation.h"
-#include "vtkImplicitPlaneWidget2.h"
-#include "vtkJPEGWriter.h"
-#include "vtkLightCollection.h"
-#include "vtkOBJExporter.h"
-#include "vtkOBJImporter.h"
-#include "vtkGLTFExporter.h"
-#include "vtkOOGLExporter.h"
-#include "vtkJSONRenderWindowExporter.h"
-#include "vtkVtkJSSceneGraphSerializer.h"
-//#include "vtkBufferedArchiver.h"
-#include "vtkPNGWriter.h"
-#include "vtkPNMWriter.h"
-#include "vtkPOVExporter.h"
-#include "vtkPostScriptWriter.h"
-#include "vtkRIBExporter.h"  // Renderman
-#include "vtkRendererCollection.h"
-#include "vtkSingleVTPExporter.h"
-#include "vtkTIFFWriter.h"
-#include "vtkVRMLExporter.h"
-#include "vtkVRMLImporter.h"
-#include "vtkWindowToImageFilter.h"
-#include "vtkX3DExporter.h"
+#include <vtk3DSImporter.h>
+#include <vtkBMPWriter.h>
+#include <vtkIVExporter.h>  // open inventor
+#include <vtkImageWriter.h>
+#include <vtkImplicitPlaneRepresentation.h>
+#include <vtkImplicitPlaneWidget2.h>
+#include <vtkJPEGWriter.h>
+#include <vtkLightCollection.h>
+#include <vtkOBJExporter.h>
+#include <vtkOBJImporter.h>
+#include <vtkGLTFExporter.h>
+#include <vtkOOGLExporter.h>
+#include <vtkJSONRenderWindowExporter.h>
+#include <vtkVtkJSSceneGraphSerializer.h>
+//#include <vtkBufferedArchiver.h>
+#include <vtkPNGWriter.h>
+#include <vtkPNMWriter.h>
+#include <vtkPOVExporter.h>
+#include <vtkPostScriptWriter.h>
+#include <vtkRIBExporter.h>  // Renderman
+#include <vtkRendererCollection.h>
+#include <vtkSingleVTPExporter.h>
+#include <vtkTIFFWriter.h>
+#include <vtkVRMLExporter.h>
+#include <vtkVRMLImporter.h>
+#include <vtkWindowToImageFilter.h>
+#include <vtkX3DExporter.h>
 
 // Readers (vtkDataReader)
 
-#include "vtkCameraPass.h"
-#include "vtkOpenGLRenderer.h"
-#include "vtkRenderPass.h"
-#include "vtkRenderPassCollection.h"
-#include "vtkSequencePass.h"
-#include "vtkShadowMapBakerPass.h"
-#include "vtkShadowMapPass.h"
+#include <vtkCameraPass.h>
+#include <vtkOpenGLRenderer.h>
+#include <vtkRenderPass.h>
+#include <vtkRenderPassCollection.h>
+#include <vtkSequencePass.h>
+#include <vtkShadowMapBakerPass.h>
+#include <vtkShadowMapPass.h>
 
 G4VtkViewer::G4VtkViewer(G4VSceneHandler& sceneHandler, const G4String& name)
   : G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name)
@@ -177,7 +179,7 @@ void G4VtkViewer::SetView()
 
   vtkCamera* activeCamera = renderer->GetActiveCamera();
   activeCamera->SetFocalPoint(targetPosition.x(), targetPosition.y(), targetPosition.z());
-  activeCamera->SetViewAngle(2*fieldHalfAngle / M_PI * 180);
+  activeCamera->SetViewAngle(2*fieldHalfAngle / CLHEP::pi * 180);
   activeCamera->SetPosition(cameraPosition.x(), cameraPosition.y(), cameraPosition.z());
   activeCamera->SetParallelScale(cameraDistance / zoomFactor);
 
@@ -702,9 +704,9 @@ void G4VtkViewer::AddImageOverlay(const G4String& fileName, const G4double alpha
   G4cout << xScale << " " << yScale << G4endl;
   auto transformation = G4Transform3D::Identity;
   auto scal = G4Scale3D(xScale, yScale, 1);
-  auto rotx = G4RotateX3D(rotation[0]/180*M_PI);
-  auto roty = G4RotateY3D(rotation[1]/180*M_PI);
-  auto rotz = G4RotateZ3D(rotation[2]/180*M_PI);
+  auto rotx = G4RotateX3D(rotation[0]/180*CLHEP::pi);
+  auto roty = G4RotateY3D(rotation[1]/180*CLHEP::pi);
+  auto rotz = G4RotateZ3D(rotation[2]/180*CLHEP::pi);
   auto tranImg = G4Translate3D(  -std::fabs(imageBottomLeft[0] + imageTopRight[0]) / 2.0,
                                  -std::fabs(imageBottomLeft[1] + imageTopRight[1]) / 2.0,
                                  0);

source/visualization/Vtk/src/vtkTensorGlyphColor.cxx

@@ -14,20 +14,20 @@
 =========================================================================*/
 #include "vtkTensorGlyphColor.h"
 
-#include "vtkCell.h"
-#include "vtkCellArray.h"
-#include "vtkDataSet.h"
-#include "vtkDoubleArray.h"
-#include "vtkExecutive.h"
-#include "vtkFloatArray.h"
-#include "vtkInformation.h"
-#include "vtkInformationVector.h"
-#include "vtkMath.h"
-#include "vtkObjectFactory.h"
-#include "vtkPointData.h"
-#include "vtkPolyData.h"
-#include "vtkStreamingDemandDrivenPipeline.h"
-#include "vtkTransform.h"
+#include <vtkCell.h>
+#include <vtkCellArray.h>
+#include <vtkDataSet.h>
+#include <vtkDoubleArray.h>
+#include <vtkExecutive.h>
+#include <vtkFloatArray.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkMath.h>
+#include <vtkObjectFactory.h>
+#include <vtkPointData.h>
+#include <vtkPolyData.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+#include <vtkTransform.h>
 
 vtkStandardNewMacro(vtkTensorGlyphColor)