ART - renaming files to avoid identical names

- part 2: change includes

include/ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenrayEngine.h

@@ -25,8 +25,8 @@
 #include <VistaBase/VistaVector3D.h>
 
 // ITA includes
-#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Settings.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenraySettings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTSettings.h>
 #include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
 

include/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTEngine.h

@@ -25,7 +25,7 @@
 #include <VistaBase/VistaVector3D.h>
 
 // ITA includes
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTSettings.h>
 #include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
 

src/ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenrayEngine.cpp

-#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Engine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenrayEngine.h>
 
 // ITA includes
 #include "Worker.h"

src/ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Worker.h

@@ -25,13 +25,13 @@
 #include <VistaBase/VistaVector3D.h>
 
 // ITA includes
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTEngine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTSettings.h>
 
 #include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>
 #include <ITAPropagationPathSim/AtmosphericRayTracing/RayGrid.h>
 
-#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenraySettings.h>
 #include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/AdaptiveRayGrid.h>
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
 

src/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTEngine.cpp

-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTEngine.h>
 
 // ITA includes
 #include "AdaptiveSolver.h"

src/ITAPropagationPathSim/AtmosphericRayTracing/Simulation/AdaptiveSolver.h

@@ -19,7 +19,7 @@
 #ifndef IW_ITA_PROPAGATIONPATHSIM_ART_SIMULATION_ADAPTIVESOLVER
 #define IW_ITA_PROPAGATIONPATHSIM_ART_SIMULATION_ADAPTIVESOLVER
 
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTSettings.h>
 
 // ITA includes
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>

tests/AtmosphericRayTracing/EigenraySearch/EigenrayEngineTest.cpp

@@ -28,11 +28,11 @@
 #include <ITAGeo/Utils/JSON/PropagationPath.h>
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
 
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTEngine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTSettings.h>
 
-#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Engine.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/Settings.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenrayEngine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/EigenraySearch/EigenraySettings.h>
 
 
 //#include <cassert>

tests/AtmosphericRayTracing/SimulationEngineTest.cpp

@@ -22,7 +22,7 @@
 //#include <ITAStringUtils.h>
 
 #include <ITAGeo/Atmosphere/StratifiedAtmosphere.h>
-#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/Engine.h>
+#include <ITAPropagationPathSim/AtmosphericRayTracing/Simulation/ARTEngine.h>
 #include <ITAPropagationPathSim/AtmosphericRayTracing/ODESolver/ODESolver.h>
 
 #include <ITAPropagationPathSim/AtmosphericRayTracing/Rays.h>