Move around includes

Harvard-Neutrino · Sep 17, 2023 · 7290d77 · 7290d77
1 parent d05f2fc
commit 7290d77
Show file tree

Hide file tree

Showing 81 changed files with 224 additions and 116 deletions.
diff --git a/projects/crosssections/private/CrossSection.cxx b/projects/crosssections/private/CrossSection.cxx
@@ -1,5 +1,7 @@
 #include "LeptonInjector/crosssections/CrossSection.h"
 
+#include <vector>
+
 namespace LI {
 namespace crosssections {
 

diff --git a/projects/crosssections/private/CrossSectionCollection.cxx b/projects/crosssections/private/CrossSectionCollection.cxx
@@ -1,6 +1,4 @@
-/**
- * CrossSectionCollection.cxx
- */
+#include "LeptonInjector/crosssections/CrossSectionCollection.h"
 
 #include <map>
 #include <set>
@@ -11,7 +9,6 @@
 #include "LeptonInjector/dataclasses/Particle.h"
 
 #include "LeptonInjector/crosssections/CrossSection.h"
-#include "LeptonInjector/crosssections/CrossSectionCollection.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/DISFromSpline.cxx b/projects/crosssections/private/DISFromSpline.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/crosssections/DISFromSpline.h"
+
 #include <map>
 #include <set>
 #include <vector>
@@ -15,7 +17,6 @@
 #include "LeptonInjector/utilities/Random.h"
 
 #include "LeptonInjector/crosssections/CrossSection.h"
-#include "LeptonInjector/crosssections/DISFromSpline.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/Decay.cxx b/projects/crosssections/private/Decay.cxx
@@ -1,8 +1,9 @@
 #include "LeptonInjector/crosssections/Decay.h"
-#include "LeptonInjector/utilities/Constants.h"
 
 #include <rk/rk.hh>
 
+#include "LeptonInjector/utilities/Constants.h"
+
 namespace LI {
 namespace crosssections {
 

diff --git a/projects/crosssections/private/DipoleFromTable.cxx b/projects/crosssections/private/DipoleFromTable.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/crosssections/DipoleFromTable.h"
+
 #include <set>
 #include <memory>
 #include <string>
@@ -17,7 +19,6 @@
 #include "LeptonInjector/detector/MaterialModel.h"
 
 #include "LeptonInjector/crosssections/CrossSection.h"
-#include "LeptonInjector/crosssections/DipoleFromTable.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/DummyCrossSection.cxx b/projects/crosssections/private/DummyCrossSection.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/crosssections/DummyCrossSection.h"
+
 #include <map>
 #include <set>
 #include <vector>
@@ -15,7 +17,6 @@
 #include "LeptonInjector/utilities/Random.h"
 
 #include "LeptonInjector/crosssections/CrossSection.h"
-#include "LeptonInjector/crosssections/DummyCrossSection.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/ElasticScattering.cxx b/projects/crosssections/private/ElasticScattering.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/crosssections/ElasticScattering.h"
+
 #include <set>
 #include <vector>
 #include <string>
@@ -13,7 +15,6 @@
 #include "LeptonInjector/utilities/Integration.h"
 
 #include "LeptonInjector/crosssections/CrossSection.h"
-#include "LeptonInjector/crosssections/ElasticScattering.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/HNLDecay.cxx b/projects/crosssections/private/HNLDecay.cxx
@@ -1,3 +1,4 @@
+#include "LeptonInjector/crosssections/HNLDecay.h"
 
 #include <rk/rk.hh>
 #include <rk/geom3.hh>
@@ -13,7 +14,6 @@
 #include "LeptonInjector/detector/MaterialModel.h"
 
 #include "LeptonInjector/crosssections/Decay.h"
-#include "LeptonInjector/crosssections/HNLDecay.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/HNLFromSpline.cxx b/projects/crosssections/private/HNLFromSpline.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/crosssections/HNLFromSpline.h"
+
 #include <map>
 #include <set>
 #include <vector>
@@ -15,7 +17,6 @@
 #include "LeptonInjector/utilities/Random.h"
 
 #include "LeptonInjector/crosssections/CrossSection.h"
-#include "LeptonInjector/crosssections/HNLFromSpline.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/crosssections/private/NeutrissimoDecay.cxx b/projects/crosssections/private/NeutrissimoDecay.cxx
@@ -1,3 +1,4 @@
+#include "LeptonInjector/crosssections/NeutrissimoDecay.h"
 
 #include <rk/rk.hh>
 #include <rk/geom3.hh>
@@ -13,7 +14,6 @@
 #include "LeptonInjector/detector/MaterialModel.h"
 
 #include "LeptonInjector/crosssections/Decay.h"
-#include "LeptonInjector/crosssections/NeutrissimoDecay.h"
 
 namespace LI {
 namespace crosssections {

diff --git a/projects/dataclasses/private/DecayRecord.cxx b/projects/dataclasses/private/DecayRecord.cxx
@@ -1,7 +1,8 @@
+#include "LeptonInjector/dataclasses/DecayRecord.h"
+
 #include <tuple>
 
 #include "LeptonInjector/dataclasses/Particle.h"
-#include "LeptonInjector/dataclasses/DecayRecord.h"
 #include "LeptonInjector/dataclasses/DecaySignature.h"
 
 namespace LI {

diff --git a/projects/dataclasses/private/DecaySignature.cxx b/projects/dataclasses/private/DecaySignature.cxx
@@ -1,7 +1,8 @@
+#include "LeptonInjector/dataclasses/DecaySignature.h"
+
 #include <tuple>
 
 #include "LeptonInjector/dataclasses/Particle.h"
-#include "LeptonInjector/dataclasses/DecaySignature.h"
 
 namespace LI {
 namespace dataclasses {

diff --git a/projects/dataclasses/private/InteractionRecord.cxx b/projects/dataclasses/private/InteractionRecord.cxx
@@ -1,5 +1,7 @@
 #include "LeptonInjector/dataclasses/InteractionRecord.h"
 
+#include <tuple>
+
 namespace LI {
 namespace dataclasses {
 

diff --git a/projects/dataclasses/private/InteractionSignature.cxx b/projects/dataclasses/private/InteractionSignature.cxx
@@ -1,7 +1,7 @@
-#include <tuple>
-
 #include "LeptonInjector/dataclasses/InteractionSignature.h"
 
+#include <tuple>
+
 namespace LI {
 namespace dataclasses {
 

diff --git a/projects/dataclasses/private/InteractionTree.cxx b/projects/dataclasses/private/InteractionTree.cxx
@@ -1,8 +1,10 @@
 #include "LeptonInjector/dataclasses/InteractionTree.h"
 
+#include <memory>
+
 namespace LI {
 namespace dataclasses {
-  
+
 int InteractionTreeDatum::depth() const {
   int depth = 0;
   if(parent==NULL) return depth;

diff --git a/projects/dataclasses/private/Particle.cxx b/projects/dataclasses/private/Particle.cxx
@@ -1,8 +1,13 @@
-#include <map>
-#include <math.h> // adds sqrt, power functions
-#include <assert.h>
 #include "LeptonInjector/dataclasses/Particle.h"
 
+#include <math.h>
+#include <string>
+#include <stdint.h>
+#include <assert.h>
+#include <stdexcept>
+
+#include "LeptonInjector/utilities/Constants.h"
+
 namespace LI {
 namespace dataclasses {
     Particle::Particle(void){

diff --git a/projects/detector/private/Axis1D.cxx b/projects/detector/private/Axis1D.cxx
@@ -1,6 +1,7 @@
-#include "LeptonInjector/math/Vector3D.h"
 #include "LeptonInjector/detector/Axis1D.h"
 
+#include "LeptonInjector/math/Vector3D.h"
+
 namespace LI {
 namespace detector {
 

diff --git a/projects/detector/private/CartesianAxis1D.cxx b/projects/detector/private/CartesianAxis1D.cxx
@@ -1,6 +1,7 @@
-#include "LeptonInjector/math/Vector3D.h"
 #include "LeptonInjector/detector/CartesianAxis1D.h"
 
+#include "LeptonInjector/math/Vector3D.h"
+
 namespace LI {
 namespace detector {
 

diff --git a/projects/detector/private/ConstantDistribution1D.cxx b/projects/detector/private/ConstantDistribution1D.cxx
@@ -1,5 +1,7 @@
 #include "LeptonInjector/detector/ConstantDistribution1D.h"
 
+#include <vector>
+
 namespace LI {
 namespace detector {
 

diff --git a/projects/detector/private/DensityDistribution.cxx b/projects/detector/private/DensityDistribution.cxx
@@ -1,7 +1,7 @@
-#include <cmath>
-#include <iostream>
 #include "LeptonInjector/detector/DensityDistribution.h"
 
+#include <cmath>
+
 namespace LI {
 namespace detector {
 

diff --git a/projects/detector/private/Distribution1D.cxx b/projects/detector/private/Distribution1D.cxx
@@ -1,6 +1,7 @@
-#include "LeptonInjector/math/Vector3D.h"
 #include "LeptonInjector/detector/Distribution1D.h"
 
+#include "LeptonInjector/math/Vector3D.h"
+
 namespace LI {
 namespace detector {
 

diff --git a/projects/detector/private/EarthModel.cxx b/projects/detector/private/EarthModel.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/detector/EarthModel.h"
+
 #include <tuple>
 #include <string>
 #include <vector>
@@ -10,7 +12,6 @@
 
 #include "LeptonInjector/detector/ConstantDensityDistribution.h"
 #include "LeptonInjector/detector/RadialAxisPolynomialDensityDistribution.h"
-#include "LeptonInjector/detector/EarthModel.h"
 
 #include "LeptonInjector/geometry/Box.h"
 #include "LeptonInjector/geometry/Sphere.h"

diff --git a/projects/detector/private/ExponentialDistribution1D.cxx b/projects/detector/private/ExponentialDistribution1D.cxx
@@ -1,8 +1,8 @@
+#include "LeptonInjector/detector/ExponentialDistribution1D.h"
+
 #include <cmath>
 #include <vector>
 
-#include "LeptonInjector/detector/ExponentialDistribution1D.h"
-
 namespace LI {
 namespace detector {
 

diff --git a/projects/detector/private/MaterialModel.cxx b/projects/detector/private/MaterialModel.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/detector/MaterialModel.h"
+
 #include <map>
 #include <set>
 #include <string>
@@ -9,8 +11,6 @@
 #include "LeptonInjector/dataclasses/Particle.h"
 #include "LeptonInjector/utilities/Constants.h"
 
-#include "LeptonInjector/detector/MaterialModel.h"
-
 using namespace LI::detector ;
 
 MaterialModel::Component::Component(LI::dataclasses::Particle::ParticleType type)

diff --git a/projects/detector/private/Path.cxx b/projects/detector/private/Path.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/detector/Path.h"
+
 #include <map>
 #include <string>
 #include <vector>
@@ -7,7 +9,6 @@
 #include <algorithm>
 
 #include "LeptonInjector/dataclasses/Particle.h"
-#include "LeptonInjector/detector/Path.h"
 #include "LeptonInjector/geometry/Geometry.h"
 
 namespace LI {

diff --git a/projects/detector/private/PolynomialDistribution1D.cxx b/projects/detector/private/PolynomialDistribution1D.cxx
@@ -1,7 +1,8 @@
+#include "LeptonInjector/detector/PolynomialDistribution1D.h"
+
 #include <vector>
 
 #include "LeptonInjector/math/Polynomial.h"
-#include "LeptonInjector/detector/PolynomialDistribution1D.h"
 
 namespace LI {
 namespace detector {

diff --git a/projects/detector/private/RadialAxis1D.cxx b/projects/detector/private/RadialAxis1D.cxx
@@ -1,6 +1,7 @@
-#include "LeptonInjector/math/Vector3D.h"
 #include "LeptonInjector/detector/RadialAxis1D.h"
 
+#include "LeptonInjector/math/Vector3D.h"
+
 namespace LI {
 namespace detector {
 

diff --git a/projects/distributions/private/Distributions.cxx b/projects/distributions/private/Distributions.cxx
@@ -1,5 +1,7 @@
 #include "LeptonInjector/distributions/Distributions.h"
 
+#include <vector>
+
 namespace LI {
 namespace distributions {
 

diff --git a/projects/distributions/private/primary/direction/Cone.cxx b/projects/distributions/private/primary/direction/Cone.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/distributions/primary/direction/Cone.h"
+
 #include "LeptonInjector/math/Vector3D.h"
 #include "LeptonInjector/math/Quaternion.h"
 
@@ -7,7 +9,6 @@
 
 #include "LeptonInjector/distributions/Distributions.h"
 #include "LeptonInjector/distributions/primary/direction/PrimaryDirectionDistribution.h"
-#include "LeptonInjector/distributions/primary/direction/Cone.h"
 
 namespace LI {
 namespace distributions {

diff --git a/projects/distributions/private/primary/direction/FixedDirection.cxx b/projects/distributions/private/primary/direction/FixedDirection.cxx
@@ -1,10 +1,11 @@
+#include "LeptonInjector/distributions/primary/direction/FixedDirection.h"
+
 #include "LeptonInjector/math/Vector3D.h"
 
 #include "LeptonInjector/dataclasses/InteractionRecord.h"
 
 #include "LeptonInjector/distributions/Distributions.h"
 #include "LeptonInjector/distributions/primary/direction/PrimaryDirectionDistribution.h"
-#include "LeptonInjector/distributions/primary/direction/FixedDirection.h"
 
 namespace LI {
 namespace distributions {

diff --git a/projects/distributions/private/primary/direction/IsotropicDirection.cxx b/projects/distributions/private/primary/direction/IsotropicDirection.cxx
@@ -1,3 +1,5 @@
+#include "LeptonInjector/distributions/primary/direction/IsotropicDirection.h"
+
 #include "LeptonInjector/math/Vector3D.h"
 
 #include "LeptonInjector/dataclasses/InteractionRecord.h"
@@ -6,7 +8,6 @@
 
 #include "LeptonInjector/distributions/Distributions.h"
 #include "LeptonInjector/distributions/primary/direction/PrimaryDirectionDistribution.h"
-#include "LeptonInjector/distributions/primary/direction/IsotropicDirection.h"
 
 namespace LI {
 namespace distributions {

diff --git a/projects/distributions/private/primary/direction/PrimaryDirectionDistribution.cxx b/projects/distributions/private/primary/direction/PrimaryDirectionDistribution.cxx
@@ -1,9 +1,10 @@
+#include "LeptonInjector/distributions/primary/direction/PrimaryDirectionDistribution.h"
+
 #include "LeptonInjector/math/Vector3D.h"
 
 #include "LeptonInjector/dataclasses/InteractionRecord.h"
 
 #include "LeptonInjector/distributions/Distributions.h"
-#include "LeptonInjector/distributions/primary/direction/PrimaryDirectionDistribution.h"
 
 namespace LI {
 namespace distributions {

diff --git a/...s/distributions/private/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.cxx b/...s/distributions/private/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.cxx
@@ -1,11 +1,12 @@
+#include "LeptonInjector/distributions/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.h"
+
 #include "LeptonInjector/dataclasses/InteractionRecord.h"
 #include "LeptonInjector/utilities/Random.h"
 
 #include "LeptonInjector/utilities/Integration.h"
 
 #include "LeptonInjector/distributions/Distributions.h"
 #include "LeptonInjector/distributions/primary/energy/PrimaryEnergyDistribution.h"
-#include "LeptonInjector/distributions/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.h"
 
 namespace LI {
 namespace distributions {