Commit 9dbd7c1c authored by kraus's avatar kraus
Browse files

- 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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment