Include bayeux headers with explicit bayeux/ prefix

SuperNEMO-DBD · Mar 15, 2021 · cf38e71 · cf38e71
1 parent 1e8a44a
commit cf38e71
Show file tree

Hide file tree

Showing 55 changed files with 205 additions and 205 deletions.
diff --git a/modules/SNSimulation/snsim/base_physics_constructor.h b/modules/SNSimulation/snsim/base_physics_constructor.h
@@ -20,8 +20,8 @@
 
 // Third party:
 // - Bayeux/datatools :
-#include <datatools/factory_macros.h>
-#include <datatools/i_tree_dump.h>
+#include <bayeux/datatools/factory_macros.h>
+#include <bayeux/datatools/i_tree_dump.h>
 // - Geant4
 #include <G4VPhysicsConstructor.hh>
 #include <globals.hh>

diff --git a/modules/SNSimulation/snsim/biasing_manager.h b/modules/SNSimulation/snsim/biasing_manager.h
@@ -24,7 +24,7 @@
 
 // Third party:
 // - Bayeux/datatools :
-#include <datatools/logger.h>
+#include <bayeux/datatools/logger.h>
 
 namespace datatools {
 // Forward declaration:

diff --git a/modules/SNSimulation/snsim/detector_construction.h b/modules/SNSimulation/snsim/detector_construction.h
@@ -26,17 +26,17 @@
 // - Boost :
 #include <boost/scoped_ptr.hpp>
 // - Bayeux/datatools :
-#include <datatools/multi_properties.h>
-#include <datatools/properties.h>
+#include <bayeux/datatools/multi_properties.h>
+#include <bayeux/datatools/properties.h>
 // - Bayeux/mygsl :
-#include <mygsl/rng.h>
+#include <bayeux/mygsl/rng.h>
 // G4 stuff:
 #include <G4VUserDetectorConstruction.hh>
 
 // This project:
+#include <bayeux/mctools/step_hit_processor_factory.h>
 #include <snsim/loggable_support.h>
 #include <snsim/region_tools.h>
-#include <mctools/step_hit_processor_factory.h>
 
 class G4UserLimits;
 class G4VisAttributes;
@@ -245,7 +245,7 @@ class detector_construction : public G4VUserDetectorConstruction, public loggabl
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::detector_construction)
 
 #endif  // SNSIM_DETECTOR_CONSTRUCTION_H

diff --git a/modules/SNSimulation/snsim/electromagnetic_field.h b/modules/SNSimulation/snsim/electromagnetic_field.h
@@ -26,7 +26,7 @@
 #include <G4ElectroMagneticField.hh>
 #include <G4MagneticField.hh>
 // - Bayeux/geomtools :
-#include <geomtools/smart_id_locator.h>
+#include <bayeux/geomtools/smart_id_locator.h>
 
 // This project:
 #include <snsim/loggable_support.h>

diff --git a/modules/SNSimulation/snsim/em_field_g4_stuff.h b/modules/SNSimulation/snsim/em_field_g4_stuff.h
@@ -21,7 +21,7 @@
 
 // Third party:
 // - Bayeux/datatools :
-#include <datatools/i_tree_dump.h>
+#include <bayeux/datatools/i_tree_dump.h>
 
 class G4EquationOfMotion;
 class G4FieldManager;

diff --git a/modules/SNSimulation/snsim/em_physics_constructor.h b/modules/SNSimulation/snsim/em_physics_constructor.h
@@ -205,7 +205,7 @@ class em_physics_constructor : public base_physics_constructor {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::em_physics_constructor)
 
 #endif  // SNSIM_EM_PHYSICS_CONSTRUCTOR_H

diff --git a/modules/SNSimulation/snsim/event_action.h b/modules/SNSimulation/snsim/event_action.h
@@ -21,9 +21,9 @@
 #include <G4UserEventAction.hh>
 
 // This project:
-#include <mctools/base_step_hit_processor.h>
+#include <bayeux/mctools/base_step_hit_processor.h>
+#include <bayeux/mctools/simulated_data.h>
 #include <snsim/loggable_support.h>
-#include <mctools/simulated_data.h>
 
 namespace datatools {
 // Forward declaration:
@@ -132,7 +132,7 @@ class event_action : public G4UserEventAction, public loggable_support {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::event_action)
 
 #endif  // SNSIM_EVENT_ACTION_H

diff --git a/modules/SNSimulation/snsim/loggable_support.h b/modules/SNSimulation/snsim/loggable_support.h
@@ -9,7 +9,7 @@
 
 // Third party:
 // - Bayeux/datatools :
-#include <datatools/logger.h>
+#include <bayeux/datatools/logger.h>
 
 namespace datatools {
 class properties;

diff --git a/modules/SNSimulation/snsim/magnetic_field.h b/modules/SNSimulation/snsim/magnetic_field.h
@@ -23,7 +23,7 @@
 // - Boost:
 #include <boost/cstdint.hpp>
 // - Bayeux/geomtools :
-#include <geomtools/smart_id_locator.h>
+#include <bayeux/geomtools/smart_id_locator.h>
 // - Geant4:
 #include <G4MagneticField.hh>
 

diff --git a/modules/SNSimulation/snsim/manager.h b/modules/SNSimulation/snsim/manager.h
@@ -42,23 +42,23 @@
 // - Boost:
 #include <boost/cstdint.hpp>
 // - Bayeux/datatools :
-#include <datatools/logger.h>
-#include <datatools/time_tools.h>
+#include <bayeux/datatools/logger.h>
+#include <bayeux/datatools/time_tools.h>
 // - Bayeux/mygsl :
-#include <mygsl/prng_state_manager.h>
-#include <mygsl/rng.h>
-#include <mygsl/seed_manager.h>
+#include <bayeux/mygsl/prng_state_manager.h>
+#include <bayeux/mygsl/rng.h>
+#include <bayeux/mygsl/seed_manager.h>
 // - Bayeux/geomtools :
-#include <geomtools/manager.h>
+#include <bayeux/geomtools/manager.h>
 // - Bayeux/genvtx :
-#include <genvtx/manager.h>
+#include <bayeux/genvtx/manager.h>
 // - Bayeux/genbb_help :
-#include <genbb_help/manager.h>
+#include <bayeux/genbb_help/manager.h>
 
 // This project:
+#include <bayeux/mctools/mctools_config.h>
+#include <bayeux/mctools/utils.h>
 #include <snsim/loggable_support.h>
-#include <mctools/mctools_config.h>
-#include <mctools/utils.h>
 
 namespace genvtx {
 class manager;
@@ -659,7 +659,7 @@ class manager : public loggable_support {
  * OCD support : interface *
  ***************************/
 
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::manager)
 
 #endif  // SNSIM_MANAGER_H

diff --git a/modules/SNSimulation/snsim/manager_parameters.h b/modules/SNSimulation/snsim/manager_parameters.h
@@ -42,7 +42,7 @@
 #include <boost/cstdint.hpp>
 
 // This project:
-#include <mctools/utils.h>
+#include <bayeux/mctools/utils.h>
 
 namespace snsim {
 

diff --git a/modules/SNSimulation/snsim/neutrons_physics_constructor.h b/modules/SNSimulation/snsim/neutrons_physics_constructor.h
@@ -73,7 +73,7 @@ class neutrons_physics_constructor : public base_physics_constructor {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::neutrons_physics_constructor)
 
 #endif  // SNSIM_NEUTRONS_PHYSICS_CONSTRUCTOR_H

diff --git a/modules/SNSimulation/snsim/particles_physics_constructor.h b/modules/SNSimulation/snsim/particles_physics_constructor.h
@@ -74,7 +74,7 @@ class particles_physics_constructor : public base_physics_constructor {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::particles_physics_constructor)
 
 #endif  // SNSIM_PARTICLES_PHYSICS_CONSTRUCTOR_H

diff --git a/modules/SNSimulation/snsim/physics_list.h b/modules/SNSimulation/snsim/physics_list.h
@@ -24,7 +24,7 @@
 // - Boost:
 #include <boost/scoped_ptr.hpp>
 // - Bayeux/datatools :
-#include <datatools/i_tree_dump.h>
+#include <bayeux/datatools/i_tree_dump.h>
 // - Geant4:
 #include "G4VModularPhysicsList.hh"
 
@@ -168,7 +168,7 @@ class physics_list : public G4VModularPhysicsList,
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::physics_list)
 
 #endif  // SNSIM_PHYSICS_LIST_H

diff --git a/modules/SNSimulation/snsim/physics_list_utils.h b/modules/SNSimulation/snsim/physics_list_utils.h
@@ -15,8 +15,8 @@
 // - Boost :
 #include <boost/cstdint.hpp>
 // - Bayeux/datatools :
-#include <datatools/handle.h>
-#include <datatools/properties.h>
+#include <bayeux/datatools/handle.h>
+#include <bayeux/datatools/properties.h>
 // - Geant4 :
 #include <G4BuilderType.hh>
 #include <G4VModularPhysicsList.hh>

diff --git a/modules/SNSimulation/snsim/primary_generator.h b/modules/SNSimulation/snsim/primary_generator.h
@@ -26,7 +26,7 @@
 // - Geant4
 #include <G4VUserPrimaryGeneratorAction.hh>
 // - Bayeux/geomtools:
-#include <geomtools/utils.h>
+#include <bayeux/geomtools/utils.h>
 
 // This project:
 #include <snsim/loggable_support.h>
@@ -135,7 +135,7 @@ class primary_generator : public G4VUserPrimaryGeneratorAction, public loggable_
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::primary_generator)
 
 #endif  // SNSIM_PRIMARY_GENERATOR_H

diff --git a/modules/SNSimulation/snsim/processes/em_extra_models.h b/modules/SNSimulation/snsim/processes/em_extra_models.h
@@ -18,8 +18,8 @@
 
 // Third party:
 // Bayeux/datatools:
-#include <datatools/enriched_base.h>
-#include <datatools/properties.h>
+#include <bayeux/datatools/enriched_base.h>
+#include <bayeux/datatools/properties.h>
 
 class G4EmConfigurator;
 
@@ -155,7 +155,7 @@ class em_extra_model : public datatools::enriched_base {
 }  // namespace snsim
 
 // /// OCD support : interface
-// #include <datatools/ocd_macros.h>
+// #include <bayeux/datatools/ocd_macros.h>
 // DOCD_CLASS_DECLARATION(mctools::g4::processes::em_extra_models)
 
 #endif  // SNSIM_PROCESSES_EM_EXTRA_MODELS_H

diff --git a/modules/SNSimulation/snsim/processes/em_model_factory.h b/modules/SNSimulation/snsim/processes/em_model_factory.h
@@ -23,7 +23,7 @@
 // Geant4:
 #include <G4VEmModel.hh>
 // Bayeux/datatools:
-#include <datatools/properties.h>
+#include <bayeux/datatools/properties.h>
 
 namespace snsim {
 

diff --git a/modules/SNSimulation/snsim/region_tools.h b/modules/SNSimulation/snsim/region_tools.h
@@ -24,12 +24,12 @@
 
 // Third party:
 // - Bayeux/datatools :
-#include <datatools/command_utils.h>
-#include <datatools/enriched_base.h>
-#include <datatools/i_tree_dump.h>
-#include <datatools/properties.h>
+#include <bayeux/datatools/command_utils.h>
+#include <bayeux/datatools/enriched_base.h>
+#include <bayeux/datatools/i_tree_dump.h>
+#include <bayeux/datatools/properties.h>
 // - Bayeux/geomtools :
-#include <geomtools/manager.h>
+#include <bayeux/geomtools/manager.h>
 
 namespace snsim {
 
@@ -148,7 +148,7 @@ class base_region_user_info : public G4VUserRegionInformation
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::region_info)
 
 #endif  // SNSIM_REGION_TOOLS_H

diff --git a/modules/SNSimulation/snsim/run_action.h b/modules/SNSimulation/snsim/run_action.h
@@ -24,16 +24,16 @@
 #include <boost/cstdint.hpp>
 #include <boost/scoped_ptr.hpp>
 // - Bayeux/datatools :
-#include <datatools/io_factory.h>
-#include <datatools/properties.h>
+#include <bayeux/datatools/io_factory.h>
+#include <bayeux/datatools/properties.h>
 // - Bayeux/brio :
-#include <brio/writer.h>
+#include <bayeux/brio/writer.h>
 // - Geant4 :
 #include <G4UserRunAction.hh>
 
 // This project:
+#include <bayeux/mctools/utils.h>
 #include <snsim/loggable_support.h>
-#include <mctools/utils.h>
 
 namespace datatools {
 class data_writer;
@@ -216,7 +216,7 @@ class run_action : public G4UserRunAction, public loggable_support {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::run_action)
 
 #endif  // SNSIM_RUN_ACTION_H

diff --git a/modules/SNSimulation/snsim/sensitive_detector.h b/modules/SNSimulation/snsim/sensitive_detector.h
@@ -26,7 +26,7 @@
 // - Boost:
 #include <boost/cstdint.hpp>
 // - Bayeux/datatools :
-#include <datatools/properties.h>
+#include <bayeux/datatools/properties.h>
 
 // For C++11 support, remove once Bayeux is c++11/Geant4 10.2 only
 #ifdef __clang__
@@ -39,7 +39,7 @@
 #endif
 
 // This project:
-#include <mctools/base_step_hit_processor.h>
+#include <bayeux/mctools/base_step_hit_processor.h>
 #include <snsim/loggable_support.h>
 #include <snsim/sensitive_hit.h>
 #include <snsim/sensitive_hit_collection.h>
@@ -241,7 +241,7 @@ class sensitive_detector : public G4VSensitiveDetector, public loggable_support
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::sensitive_detector)
 
 #endif  // SNSIM_SENSITIVE_DETECTOR_H

diff --git a/modules/SNSimulation/snsim/sensitive_hit.h b/modules/SNSimulation/snsim/sensitive_hit.h
@@ -21,7 +21,7 @@
 #include <G4VHit.hh>
 
 // This project:
-#include <mctools/base_step_hit.h>
+#include <bayeux/mctools/base_step_hit.h>
 
 namespace snsim {
 

diff --git a/modules/SNSimulation/snsim/simulation_module.h b/modules/SNSimulation/snsim/simulation_module.h
@@ -14,9 +14,9 @@
 
 // Third party:
 // - Bayeux/dpp :
-#include <dpp/base_module.h>
-#include <mygsl/prng_state_manager.h>
-#include <mygsl/seed_manager.h>
+#include <bayeux/dpp/base_module.h>
+#include <bayeux/mygsl/prng_state_manager.h>
+#include <bayeux/mygsl/seed_manager.h>
 
 // This project:
 #include <snsim/manager_parameters.h>
@@ -107,7 +107,7 @@ class simulation_module : public dpp::base_module {
 }  // namespace snsim
 
 // Object configuration description (OCD) support :
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::simulation_module)
 
 #endif  // SNSIM_SIMULATION_MODULE_H

diff --git a/modules/SNSimulation/snsim/stacking_action.h b/modules/SNSimulation/snsim/stacking_action.h
@@ -70,7 +70,7 @@ class stacking_action : public G4UserStackingAction, public loggable_support {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::stacking_action)
 
 #endif  // SNSIM_STACKING_ACTION_H

diff --git a/modules/SNSimulation/snsim/stepping_action.h b/modules/SNSimulation/snsim/stepping_action.h
@@ -85,7 +85,7 @@ class stepping_action : public G4UserSteppingAction, public loggable_support {
 }  // namespace snsim
 
 /// OCD support : interface
-#include <datatools/ocd_macros.h>
+#include <bayeux/datatools/ocd_macros.h>
 DOCD_CLASS_DECLARATION(snsim::stepping_action)
 
 #endif  // SNSIM_STEPPING_ACTION_H