Commit 9dbd7c1c authored by kraus's avatar kraus

- remove unused files

- putting own header file first
  o for reason see http://www.cplusplus.com/forum/articles/10627/#msg49679 and
                   http://www.cplusplus.com/forum/articles/10627/#msg49680
parent 814c8c73
......@@ -1036,8 +1036,6 @@ src/Structure/OpalWake.cpp -text
src/Structure/OpalWake.h -text
src/Structure/PriEmissionPhysics.cpp -text
src/Structure/PriEmissionPhysics.h -text
src/Structure/Restart.cpp -text
src/Structure/Restart.h -text
src/Structure/SecondaryEmissionPhysics.cpp -text
src/Structure/SecondaryEmissionPhysics.h -text
src/Structure/SurfacePhysics.cpp -text
......
......@@ -18,8 +18,8 @@
//
// ------------------------------------------------------------------------
#include "Physics/Physics.h"
#include "AbsBeamline/Collimator.h"
#include "Physics/Physics.h"
#include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh"
......
......@@ -18,12 +18,12 @@
//
// ------------------------------------------------------------------------
#include "Physics/Physics.h"
#include "AbsBeamline/Degrader.h"
#include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh"
#include "Structure/LossDataSink.h"
#include "Physics/Physics.h"
#include <memory>
extern Inform *gmsg;
......
......@@ -17,13 +17,13 @@
// $Author: fci $
//
// ------------------------------------------------------------------------
#include "AbsBeamline/Monitor.h"
#include "Physics/Physics.h"
#include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh"
#include "Structure/LossDataSink.h"
#include "Utilities/Options.h"
#include "AbsBeamline/Monitor.h"
#include <memory>
......
......@@ -25,6 +25,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "AbsBeamline/Offset.h"
#include "math.h"
#include "Utilities/OpalException.h"
......@@ -32,7 +34,6 @@
#include "AbsBeamline/BeamlineVisitor.h"
#include "Elements/OpalRing.h"
#include "AbsBeamline/Offset.h"
double Offset::float_tolerance = 1e-12;
......
......@@ -18,8 +18,8 @@
//
// ------------------------------------------------------------------------
#include "Algorithms/PartPusher.h"
#include "AbsBeamline/SBend.h"
#include "Algorithms/PartPusher.h"
#include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh"
......@@ -1623,4 +1623,3 @@ bool SBend::TreatAsDrift(Inform &msg, double chordLength) {
} else
return false;
}
......@@ -25,10 +25,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "AbsBeamline/VariableRFCavity.h"
#include "Physics/Physics.h"
#include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h"
#include "AbsBeamline/VariableRFCavity.h"
VariableRFCavity::VariableRFCavity(const std::string &name) : Component(name) {
initNull(); // initialise everything to NULL
......@@ -216,6 +217,3 @@ void VariableRFCavity::setLength(double length) {
_length = length;
geometry.setElementLength(length);
}
#include "Algorithms/AbstractTimeDependence.h"
#include <sstream>
#include "AbstractTimeDependence.h"
std::map<std::string, AbstractTimeDependence*> AbstractTimeDependence::td_map =
std::map<std::string, AbstractTimeDependence*>();
......@@ -32,4 +32,3 @@ std::string AbstractTimeDependence::getName(AbstractTimeDependence* time_dep) {
throw OpalException("AbstractTimeDependence::getTimeDependence",
"Could not find TimeDependence with address "+ss.str());
}
#include <cfloat>
#include <vector>
#include "Algorithms/PartBins.h"
#include "Algorithms/PBunchDefs.h"
#include "Physics/Physics.h"
#include <cfloat>
#include <vector>
extern Inform *gmsg;
PartBins::PartBins(int bins, int sbins) :
......
#include <cfloat>
#include <vector>
#include "Algorithms/PartBinsCyc.h"
#include "Physics/Physics.h"
#include <cfloat>
#include <vector>
extern Inform *gmsg;
// constructer function for cyclotron
......@@ -59,4 +59,3 @@ PartBinsCyc::~PartBinsCyc() {
if(h_m)
delete h_m;
}
......@@ -33,7 +33,7 @@
#include "Structure/FieldSolver.h" // OPAL file
#include "Utilities/Options.h" // OPAL file
#include "ListElem.h"
#include "Algorithms/ListElem.h"
#include "BasicActions/Option.h"
#include <gsl/gsl_rng.h>
......
......@@ -21,7 +21,7 @@
// ------------------------------------------------------------------------
#include "Ippl.h"
#include "PBunchDefs.h"
#include "Algorithms/PBunchDefs.h"
#include "Algorithms/Particle.h"
#include "FixedAlgebra/FMatrix.h"
#include "FixedAlgebra/FVector.h"
......
......@@ -19,15 +19,15 @@
//
// ------------------------------------------------------------------------
#include <cfloat>
#include <cmath>
#include "Algorithms/Tracker.h"
#include "AbsBeamline/AlignWrapper.h"
#include "AbsBeamline/Patch.h"
#include "Algorithms/MapIntegrator.h"
#include "Fields/BMultipoleField.h"
#include <cfloat>
#include <cmath>
typedef FTps<double, 2> Series2;
typedef FTps<double, 6> Series;
......
......@@ -25,9 +25,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "BeamlineGeometry/Euclid3DGeometry.h"
#include "Utilities/OpalException.h"
#include "math.h"
#include "BeamlineGeometry/Euclid3DGeometry.h"
Euclid3DGeometry::Euclid3DGeometry(Euclid3D transformation)
: BGeometryBase(), transformation_m(transformation) {
......@@ -67,4 +68,3 @@ Euclid3D Euclid3DGeometry::getTransform(double fromS, double toS) const {
Euclid3D Euclid3DGeometry::getTotalTransform() const {
return transformation_m;
}
#include <fstream>
#include <ios>
#include "Fields/Astra1DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
......@@ -8,6 +5,9 @@
#include "gsl/gsl_spline.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/Astra1DDynamic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/Astra1DElectroStatic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
......@@ -8,6 +5,9 @@
#include "gsl/gsl_spline.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/Astra1DElectroStatic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/Astra1DMagnetoStatic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
......@@ -9,6 +5,9 @@
#include "gsl/gsl_spline.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/Astra1DMagnetoStatic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <iostream>
#include "Fields/FM1DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <iostream>
FM1DDynamic::FM1DDynamic(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DDynamic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DDynamic_fast::FM1DDynamic_fast(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DElectroStatic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DElectroStatic::FM1DElectroStatic(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DElectroStatic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DElectroStatic_fast::FM1DElectroStatic_fast(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DMagnetoStatic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DMagnetoStatic::FM1DMagnetoStatic(std::string aFilename)
: Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DMagnetoStatic_fast.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include "gsl/gsl_fft_real.h"
#include <fstream>
#include <ios>
FM1DMagnetoStatic_fast::FM1DMagnetoStatic_fast(std::string aFilename):
Fieldmap(aFilename) {
......
#include <fstream>
#include <ios>
#include "Fields/FM1DProfile1.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
FM1DProfile1::FM1DProfile1(std::string aFilename):
Fieldmap(aFilename),
entranceParameter1_m(0.0),
......
#include <fstream>
#include <ios>
#include "Fields/FM1DProfile2.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
using Physics::c;
......
#include <fstream>
#include <ios>
#include "Fields/FM2DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
......
#include <fstream>
#include <ios>
#include "Fields/FM2DDynamic_cspline.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
......
#include <fstream>
#include <ios>
#include "Fields/FM2DElectroStatic.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DElectroStatic::FM2DElectroStatic(std::string aFilename)
......
#include <fstream>
#include <ios>
#include "Fields/FM2DElectroStatic_cspline.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DElectroStatic_cspline::FM2DElectroStatic_cspline(std::string aFilename):
......
#include <fstream>
#include <ios>
#include "Fields/FM2DMagnetoStatic.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DMagnetoStatic::FM2DMagnetoStatic(std::string aFilename):
......
#include <fstream>
#include <ios>
#include "Fields/FM2DMagnetoStatic_cspline.hh"
#include "Fields/Fieldmap.icc"
#include <fstream>
#include <ios>
using namespace std;
FM2DMagnetoStatic_cspline::FM2DMagnetoStatic_cspline(std::string aFilename):
......
#include <fstream>
#include <ios>
#include "Fields/FM3DDynamic.hh"
#include "Fields/Fieldmap.icc"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
using namespace std;
using Physics::mu_0;
......
#include <fstream>
#include <ios>
#include "Fields/FM3DH5Block.hh"
#include "Fields/Fieldmap.icc"
#include "H5hut.h"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
extern Inform *gmsg;
using namespace std;
......
#include <fstream>
#include <ios>
#include "Fields/FM3DH5Block_nonescale.hh"
#include "Fields/Fieldmap.icc"
#include "H5hut.h"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
extern Inform *gmsg;
using namespace std;
......
#include <fstream>
#include <ios>
#include "Fields/FM3DMagnetoStaticH5Block.hh"
#include "Fields/Fieldmap.icc"
#include "H5hut.h"
#include "Physics/Physics.h"
#include <fstream>
#include <ios>
extern Inform *gmsg;
using namespace std;
......
#include <iostream>
#include <fstream>
#include <ios>
#include "Fields/Fieldmap.hh"
#include "Fields/FM3DDynamic.hh"
#include "Fields/FM3DH5Block.hh"
......@@ -29,6 +26,10 @@
#include "Fields/FMDummy.hh"
#include "H5hut.h"
#include <iostream>
#include <fstream>
#include <ios>
#define REGISTER_PARSE_TYPE(X) template <> struct Fieldmap::TypeParseTraits<X> \
{ static const char* name; } ; const char* Fieldmap::TypeParseTraits<X>::name = #X
......
......@@ -25,6 +25,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "Fields/SectorMagneticFieldMap.h"
#include "Fields/SectorMagneticFieldMap/Mesh.h"
#include "Fields/SectorMagneticFieldMap/ThreeDGrid.h"
#include "Fields/SectorMagneticFieldMap/Interpolator3dGridTo3d.h"
#include "Utilities/LogicalError.h"
#include <math.h>
#include <algorithm>
......@@ -33,13 +40,6 @@
#include <fstream>
#include <string>
#include "Utilities/LogicalError.h"
#include "Fields/SectorMagneticFieldMap/Mesh.h"
#include "Fields/SectorMagneticFieldMap/ThreeDGrid.h"
#include "Fields/SectorMagneticFieldMap/Interpolator3dGridTo3d.h"
#include "Fields/SectorMagneticFieldMap.h"
// allow a fairly generous phi tolerance - we don't care about phi much and
// calculation can be flaky due to ascii truncation of double and conversions
// from polar to Cartesian
......@@ -429,4 +429,3 @@ ThreeDGrid* SectorMagneticFieldMap::IO::generateGrid
double dot_prod(Vector_t vec_1, Vector_t vec_2) {
return vec_1[0]*vec_2[0] + vec_1[1]*vec_2[1] + vec_1[2]*vec_2[2];
}
......@@ -25,8 +25,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "Utilities/LogicalError.h"
#include "Fields/SectorMagneticFieldMap/Interpolator3dGridTo3d.h"
#include "Utilities/LogicalError.h"
Interpolator3dGridTo3d::Interpolator3dGridTo3d
(const Interpolator3dGridTo3d& rhs) {
......@@ -77,5 +77,3 @@ void Interpolator3dGridTo3d::setAll(ThreeDGrid* grid,
);
}
}
......@@ -25,10 +25,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <iomanip>
#include "Fields/SectorMagneticFieldMap/Mesh.h"
#include <iomanip>
std::ostream& operator<<(std::ostream& out, const Mesh::Iterator& it) {
out << std::setw(5) << it.toInteger() << " ** ";
for (unsigned int i = 0; i < it.getState().size(); i++)
......@@ -39,4 +39,3 @@ std::ostream& operator<<(std::ostream& out, const Mesh::Iterator& it) {
<< it.getPosition()[i] << " ";
return out;
}
......@@ -25,6 +25,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "Fields/SectorMagneticFieldMap/SectorField.h"
#include <math.h>
#include <limits>
......@@ -33,8 +35,6 @@
#include "Utilities/LogicalError.h"
#include "Fields/SectorMagneticFieldMap/SectorField.h"
// note I don't use exactly max() as the bounding box because I don't want to
// accidentally wrap around due to some unforeseen floating point precision
// issue
......@@ -212,5 +212,3 @@ void SectorField::getFieldDimensions(double &xIni, double &xFinal,
yFinal = bbMax_m[1];
zFinal = bbMax_m[2];
}