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 ...@@ -1036,8 +1036,6 @@ src/Structure/OpalWake.cpp -text
src/Structure/OpalWake.h -text src/Structure/OpalWake.h -text
src/Structure/PriEmissionPhysics.cpp -text src/Structure/PriEmissionPhysics.cpp -text
src/Structure/PriEmissionPhysics.h -text src/Structure/PriEmissionPhysics.h -text
src/Structure/Restart.cpp -text
src/Structure/Restart.h -text
src/Structure/SecondaryEmissionPhysics.cpp -text src/Structure/SecondaryEmissionPhysics.cpp -text
src/Structure/SecondaryEmissionPhysics.h -text src/Structure/SecondaryEmissionPhysics.h -text
src/Structure/SurfacePhysics.cpp -text src/Structure/SurfacePhysics.cpp -text
......
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
// //
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#include "Physics/Physics.h"
#include "AbsBeamline/Collimator.h" #include "AbsBeamline/Collimator.h"
#include "Physics/Physics.h"
#include "Algorithms/PartBunch.h" #include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h" #include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh" #include "Fields/Fieldmap.hh"
#include "Structure/LossDataSink.h" #include "Structure/LossDataSink.h"
#include "Solvers/SurfacePhysicsHandler.hh" #include "Solvers/SurfacePhysicsHandler.hh"
#include <memory> #include <memory>
extern Inform *gmsg; extern Inform *gmsg;
...@@ -168,10 +168,10 @@ inline bool Collimator::isInColl(Vector_t R, Vector_t P, double recpgamma) { ...@@ -168,10 +168,10 @@ inline bool Collimator::isInColl(Vector_t R, Vector_t P, double recpgamma) {
range of the collimator range of the collimator
*/ */
const double z = R(2) + P(2) * recpgamma; const double z = R(2) + P(2) * recpgamma;
if((z > position_m) && (z <= position_m + getElementLength())) { if((z > position_m) && (z <= position_m + getElementLength())) {
if(isAPepperPot_m) { if(isAPepperPot_m) {
/** /**
------------ ------------
|(0)| |(0)| |(0)| |(0)|
...@@ -187,13 +187,13 @@ inline bool Collimator::isInColl(Vector_t R, Vector_t P, double recpgamma) { ...@@ -187,13 +187,13 @@ inline bool Collimator::isInColl(Vector_t R, Vector_t P, double recpgamma) {
Observation: the area in a) is much larger than the Observation: the area in a) is much larger than the
area(s) (0). In a) particles are lost in (0) area(s) (0). In a) particles are lost in (0)
particles they are not lost. particles they are not lost.
*/ */
const double h = pitch_m; const double h = pitch_m;
const double xL = - 0.5 * h * (nHolesX_m - 1); const double xL = - 0.5 * h * (nHolesX_m - 1);
const double yL = - 0.5 * h * (nHolesY_m - 1); const double yL = - 0.5 * h * (nHolesY_m - 1);
bool alive = false; bool alive = false;
for(unsigned int m = 0; (m < nHolesX_m && (!alive)); m++) { for(unsigned int m = 0; (m < nHolesX_m && (!alive)); m++) {
for(unsigned int n = 0; (n < nHolesY_m && (!alive)); n++) { for(unsigned int n = 0; (n < nHolesY_m && (!alive)); n++) {
double x_m = xL + (m * h); double x_m = xL + (m * h);
...@@ -210,10 +210,10 @@ inline bool Collimator::isInColl(Vector_t R, Vector_t P, double recpgamma) { ...@@ -210,10 +210,10 @@ inline bool Collimator::isInColl(Vector_t R, Vector_t P, double recpgamma) {
return (R(0) <= -getXsize() || R(1) <= -getYsize() || R(0) >= getXsize() || R(1) >= getYsize()); return (R(0) <= -getXsize() || R(1) <= -getYsize() || R(0) >= getXsize() || R(1) >= getYsize());
} else if(isAWire_m) { } else if(isAWire_m) {
ERRORMSG("Not yet implemented"); ERRORMSG("Not yet implemented");
} else { } else {
// case of an elliptic collimator // case of an elliptic collimator
const double trm1 = ((R(0)*R(0))/(getXsize()*getXsize())); const double trm1 = ((R(0)*R(0))/(getXsize()*getXsize()));
const double trm2 = ((R(1)*R(1))/(getYsize()*getYsize())); const double trm2 = ((R(1)*R(1))/(getYsize()*getYsize()));
return (trm1 + trm2) > 1.0; return (trm1 + trm2) > 1.0;
} }
} }
...@@ -235,7 +235,7 @@ bool Collimator::apply(const size_t &i, const double &t, Vector_t &E, Vector_t & ...@@ -235,7 +235,7 @@ bool Collimator::apply(const size_t &i, const double &t, Vector_t &E, Vector_t &
if(pdead) { if(pdead) {
double frac = (R(2) - position_m) / P(2) * recpgamma; double frac = (R(2) - position_m) / P(2) * recpgamma;
lossDs_m->addParticle(R,P, RefPartBunch_m->ID[i], t + frac * RefPartBunch_m->getdT(), 0); lossDs_m->addParticle(R,P, RefPartBunch_m->ID[i], t + frac * RefPartBunch_m->getdT(), 0);
} }
return pdead; return pdead;
} }
...@@ -302,15 +302,15 @@ void Collimator::initialise(PartBunch *bunch, double &startField, double &endFie ...@@ -302,15 +302,15 @@ void Collimator::initialise(PartBunch *bunch, double &startField, double &endFie
position_m = startField; position_m = startField;
endField = position_m + getElementLength(); endField = position_m + getElementLength();
sphys_m = getSurfacePhysics(); sphys_m = getSurfacePhysics();
if (!sphys_m) { if (!sphys_m) {
if (filename_m == std::string("")) if (filename_m == std::string(""))
lossDs_m = std::unique_ptr<LossDataSink>(new LossDataSink(getName(), !Options::asciidump)); lossDs_m = std::unique_ptr<LossDataSink>(new LossDataSink(getName(), !Options::asciidump));
else else
lossDs_m = std::unique_ptr<LossDataSink>(new LossDataSink(filename_m.substr(0, filename_m.rfind(".")), !Options::asciidump)); lossDs_m = std::unique_ptr<LossDataSink>(new LossDataSink(filename_m.substr(0, filename_m.rfind(".")), !Options::asciidump));
} }
goOnline(); goOnline();
} }
...@@ -325,7 +325,7 @@ void Collimator::initialise(PartBunch *bunch, const double &scaleFactor) { ...@@ -325,7 +325,7 @@ void Collimator::initialise(PartBunch *bunch, const double &scaleFactor) {
else else
lossDs_m = std::unique_ptr<LossDataSink>(new LossDataSink(filename_m.substr(0, filename_m.rfind(".")), !Options::asciidump)); lossDs_m = std::unique_ptr<LossDataSink>(new LossDataSink(filename_m.substr(0, filename_m.rfind(".")), !Options::asciidump));
} }
goOnline(); goOnline();
} }
...@@ -423,7 +423,7 @@ void Collimator::setOutputFN(std::string fn) { ...@@ -423,7 +423,7 @@ void Collimator::setOutputFN(std::string fn) {
string Collimator::getOutputFN() { string Collimator::getOutputFN() {
if (filename_m == std::string("")) if (filename_m == std::string(""))
return getName(); return getName();
else else
return filename_m.substr(0, filename_m.rfind(".")); return filename_m.substr(0, filename_m.rfind("."));
} }
......
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
// //
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#include "Physics/Physics.h"
#include "AbsBeamline/Degrader.h" #include "AbsBeamline/Degrader.h"
#include "Algorithms/PartBunch.h" #include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h" #include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh" #include "Fields/Fieldmap.hh"
#include "Structure/LossDataSink.h" #include "Structure/LossDataSink.h"
#include "Physics/Physics.h"
#include <memory> #include <memory>
extern Inform *gmsg; extern Inform *gmsg;
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
// $Author: fci $ // $Author: fci $
// //
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#include "AbsBeamline/Monitor.h"
#include "Physics/Physics.h" #include "Physics/Physics.h"
#include "Algorithms/PartBunch.h" #include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h" #include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh" #include "Fields/Fieldmap.hh"
#include "Structure/LossDataSink.h" #include "Structure/LossDataSink.h"
#include "Utilities/Options.h" #include "Utilities/Options.h"
#include "AbsBeamline/Monitor.h"
#include <memory> #include <memory>
...@@ -85,7 +85,7 @@ bool Monitor::apply(const size_t &i, const double &t, Vector_t &E, Vector_t &B) ...@@ -85,7 +85,7 @@ bool Monitor::apply(const size_t &i, const double &t, Vector_t &E, Vector_t &B)
double frac = (position_m - R(2)) / (P(2) * recpgamma); double frac = (position_m - R(2)) / (P(2) * recpgamma);
lossDs_m->addParticle(Vector_t(R(0) + frac * P(0) * recpgamma, R(1) + frac * P(1) * recpgamma, position_m), lossDs_m->addParticle(Vector_t(R(0) + frac * P(0) * recpgamma, R(1) + frac * P(1) * recpgamma, position_m),
P, RefPartBunch_m->ID[i], t + frac * RefPartBunch_m->getdT(), 0); P, RefPartBunch_m->ID[i], t + frac * RefPartBunch_m->getdT(), 0);
} }
return false; return false;
...@@ -172,7 +172,7 @@ map<string, unsigned int> Monitor::h5pfiles_s = map<string, unsigned int>(); ...@@ -172,7 +172,7 @@ map<string, unsigned int> Monitor::h5pfiles_s = map<string, unsigned int>();
/* /*
if (!Options::enableHDF5) return; if (!Options::enableHDF5) return;
reduce(online_m, online_m, OpOr()); reduce(online_m, online_m, OpOr());
if(online_m) { if(online_m) {
...@@ -231,8 +231,8 @@ map<string, unsigned int> Monitor::h5pfiles_s = map<string, unsigned int>(); ...@@ -231,8 +231,8 @@ map<string, unsigned int> Monitor::h5pfiles_s = map<string, unsigned int>();
std::unique_ptr<char> varray(new char[nLoc * sizeof(double)]); std::unique_ptr<char> varray(new char[nLoc * sizeof(double)]);
double *fvalues = reinterpret_cast<double*>(varray.get()); double *fvalues = reinterpret_cast<double*>(varray.get());
h5_int64_t *ids = reinterpret_cast<h5_int64_t*>(varray.get()); h5_int64_t *ids = reinterpret_cast<h5_int64_t*>(varray.get());
FixMe: if I write with nLoc==0 -> rc == -2 FixMe: if I write with nLoc==0 -> rc == -2
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "AbsBeamline/Offset.h"
#include "math.h" #include "math.h"
#include "Utilities/OpalException.h" #include "Utilities/OpalException.h"
...@@ -32,7 +34,6 @@ ...@@ -32,7 +34,6 @@
#include "AbsBeamline/BeamlineVisitor.h" #include "AbsBeamline/BeamlineVisitor.h"
#include "Elements/OpalRing.h" #include "Elements/OpalRing.h"
#include "AbsBeamline/Offset.h"
double Offset::float_tolerance = 1e-12; double Offset::float_tolerance = 1e-12;
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
// //
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#include "Algorithms/PartPusher.h"
#include "AbsBeamline/SBend.h" #include "AbsBeamline/SBend.h"
#include "Algorithms/PartPusher.h"
#include "Algorithms/PartBunch.h" #include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h" #include "AbsBeamline/BeamlineVisitor.h"
#include "Fields/Fieldmap.hh" #include "Fields/Fieldmap.hh"
...@@ -1623,4 +1623,3 @@ bool SBend::TreatAsDrift(Inform &msg, double chordLength) { ...@@ -1623,4 +1623,3 @@ bool SBend::TreatAsDrift(Inform &msg, double chordLength) {
} else } else
return false; return false;
} }
/* /*
* Copyright (c) 2014, Chris Rogers * Copyright (c) 2014, Chris Rogers
* All rights reserved. * All rights reserved.
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
* 3. Neither the name of STFC nor the names of its contributors may be used to * 3. Neither the name of STFC nor the names of its contributors may be used to
* endorse or promote products derived from this software without specific * endorse or promote products derived from this software without specific
* prior written permission. * prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "AbsBeamline/VariableRFCavity.h"
#include "Physics/Physics.h" #include "Physics/Physics.h"
#include "Algorithms/PartBunch.h" #include "Algorithms/PartBunch.h"
#include "AbsBeamline/BeamlineVisitor.h" #include "AbsBeamline/BeamlineVisitor.h"
#include "AbsBeamline/VariableRFCavity.h"
VariableRFCavity::VariableRFCavity(const std::string &name) : Component(name) { VariableRFCavity::VariableRFCavity(const std::string &name) : Component(name) {
initNull(); // initialise everything to NULL initNull(); // initialise everything to NULL
...@@ -216,6 +217,3 @@ void VariableRFCavity::setLength(double length) { ...@@ -216,6 +217,3 @@ void VariableRFCavity::setLength(double length) {
_length = length; _length = length;
geometry.setElementLength(length); geometry.setElementLength(length);
} }
#include "Algorithms/AbstractTimeDependence.h"
#include <sstream> #include <sstream>
#include "AbstractTimeDependence.h"
std::map<std::string, AbstractTimeDependence*> AbstractTimeDependence::td_map = std::map<std::string, AbstractTimeDependence*> AbstractTimeDependence::td_map =
std::map<std::string, AbstractTimeDependence*>(); std::map<std::string, AbstractTimeDependence*>();
...@@ -32,4 +32,3 @@ std::string AbstractTimeDependence::getName(AbstractTimeDependence* time_dep) { ...@@ -32,4 +32,3 @@ std::string AbstractTimeDependence::getName(AbstractTimeDependence* time_dep) {
throw OpalException("AbstractTimeDependence::getTimeDependence", throw OpalException("AbstractTimeDependence::getTimeDependence",
"Could not find TimeDependence with address "+ss.str()); "Could not find TimeDependence with address "+ss.str());
} }
#include <cfloat>
#include <vector>
#include "Algorithms/PartBins.h" #include "Algorithms/PartBins.h"
#include "Algorithms/PBunchDefs.h" #include "Algorithms/PBunchDefs.h"
#include "Physics/Physics.h" #include "Physics/Physics.h"
#include <cfloat>
#include <vector>
extern Inform *gmsg; extern Inform *gmsg;
PartBins::PartBins(int bins, int sbins) : PartBins::PartBins(int bins, int sbins) :
......
#include <cfloat>
#include <vector>
#include "Algorithms/PartBinsCyc.h" #include "Algorithms/PartBinsCyc.h"
#include "Physics/Physics.h" #include "Physics/Physics.h"
#include <cfloat>
#include <vector>
extern Inform *gmsg; extern Inform *gmsg;
// constructer function for cyclotron // constructer function for cyclotron
PartBinsCyc::PartBinsCyc(int specifiedNumBins, int bins, size_t partInBin[]) PartBinsCyc::PartBinsCyc(int specifiedNumBins, int bins, size_t partInBin[])
: PartBins::PartBins(specifiedNumBins, 0) { : PartBins::PartBins(specifiedNumBins, 0) {
bins_m = specifiedNumBins; // max bin number bins_m = specifiedNumBins; // max bin number
nemittedBins_m = bins; // the bin number with particles nemittedBins_m = bins; // the bin number with particles
binsEmitted_m = new bool[bins_m]; // flag whether the bin contain particles or not binsEmitted_m = new bool[bins_m]; // flag whether the bin contain particles or not
nBin_m = new size_t[bins_m]; // number of particles in the bins on the local node nBin_m = new size_t[bins_m]; // number of particles in the bins on the local node
...@@ -17,11 +17,11 @@ PartBinsCyc::PartBinsCyc(int specifiedNumBins, int bins, size_t partInBin[]) ...@@ -17,11 +17,11 @@ PartBinsCyc::PartBinsCyc(int specifiedNumBins, int bins, size_t partInBin[])
nBin_m[i] = 0; nBin_m[i] = 0;
binsEmitted_m[i] = false; binsEmitted_m[i] = false;
} }
for(int i = 0; i < nemittedBins_m; i++) { for(int i = 0; i < nemittedBins_m; i++) {
nBin_m[i] = partInBin[i]; nBin_m[i] = partInBin[i];
*gmsg << "Read in: Bin=" << i << " Particles Num=" << getTotalNumPerBin(i) << endl; *gmsg << "Read in: Bin=" << i << " Particles Num=" << getTotalNumPerBin(i) << endl;
binsEmitted_m[i] = true; binsEmitted_m[i] = true;
} }
...@@ -33,7 +33,7 @@ PartBinsCyc::PartBinsCyc(int specifiedNumBins, int bins) ...@@ -33,7 +33,7 @@ PartBinsCyc::PartBinsCyc(int specifiedNumBins, int bins)
: PartBins::PartBins(specifiedNumBins, 0) { : PartBins::PartBins(specifiedNumBins, 0) {
bins_m = specifiedNumBins; // max bin number bins_m = specifiedNumBins; // max bin number
nemittedBins_m = bins; // the bin number with particles nemittedBins_m = bins; // the bin number with particles
binsEmitted_m = new bool[bins_m]; // flag whether the bin contain particles or not binsEmitted_m = new bool[bins_m]; // flag whether the bin contain particles or not
nBin_m = new size_t[bins_m]; // number of particles in the bins on the local node nBin_m = new size_t[bins_m]; // number of particles in the bins on the local node
...@@ -59,4 +59,3 @@ PartBinsCyc::~PartBinsCyc() { ...@@ -59,4 +59,3 @@ PartBinsCyc::~PartBinsCyc() {
if(h_m) if(h_m)
delete h_m; delete h_m;
} }
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Structure/FieldSolver.h" // OPAL file #include "Structure/FieldSolver.h" // OPAL file
#include "Utilities/Options.h" // OPAL file #include "Utilities/Options.h" // OPAL file
#include "ListElem.h" #include "Algorithms/ListElem.h"
#include "BasicActions/Option.h" #include "BasicActions/Option.h"
#include <gsl/gsl_rng.h> #include <gsl/gsl_rng.h>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#include "Ippl.h" #include "Ippl.h"
#include "PBunchDefs.h" #include "Algorithms/PBunchDefs.h"
#include "Algorithms/Particle.h" #include "Algorithms/Particle.h"
#include "FixedAlgebra/FMatrix.h" #include "FixedAlgebra/FMatrix.h"
#include "FixedAlgebra/FVector.h" #include "FixedAlgebra/FVector.h"
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
void do_binaryRepart(); void do_binaryRepart();
/// per default the MT value of the field solver is used /// per default the MT value of the field solver is used
void set_nBinsLineDensity(int n); void set_nBinsLineDensity(int n);
...@@ -280,13 +280,13 @@ public: ...@@ -280,13 +280,13 @@ public:
//void computeSelfFields_cycl(double gamma); //void computeSelfFields_cycl(double gamma);
//void computeSelfFields_cycl(int b); //void computeSelfFields_cycl(int b);
// Replaced computeSelfFields_cycl() with versions that have meanR and the quaternion of the // Replaced computeSelfFields_cycl() with versions that have meanR and the quaternion of the
// rotation of the particle bunch in order to take into account the rotation // rotation of the particle bunch in order to take into account the rotation
// when finding the boundary conditions for the fieldsolver. -DW // when finding the boundary conditions for the fieldsolver. -DW
void computeSelfFields_cycl(double gamma, Vector_t const meanR=Vector_t(0.0, 0.0, 0.0), void computeSelfFields_cycl(double gamma, Vector_t const meanR=Vector_t(0.0, 0.0, 0.0),
Quaternion_t const quaternion=Quaternion_t(1.0, 0.0, 0.0, 0.0)); Quaternion_t const quaternion=Quaternion_t(1.0, 0.0, 0.0, 0.0));
void computeSelfFields_cycl(int b, Vector_t const meanR=Vector_t(0.0, 0.0, 0.0), void computeSelfFields_cycl(int b, Vector_t const meanR=Vector_t(0.0, 0.0, 0.0),
Quaternion_t const quaternion=Quaternion_t(1.0, 0.0, 0.0, 0.0)); Quaternion_t const quaternion=Quaternion_t(1.0, 0.0, 0.0, 0.0));
void resetInterpolationCache(bool clearCache = false); void resetInterpolationCache(bool clearCache = false);
...@@ -560,7 +560,7 @@ private: ...@@ -560,7 +560,7 @@ private:
/// Initialize the translation vector and rotation quaternion /// Initialize the translation vector and rotation quaternion
/// here. Cyclotron tracker will reset these values each timestep /// here. Cyclotron tracker will reset these values each timestep
/// TTracker can just use 0 translation and 0 rotation (quat[1 0 0 0]). /// TTracker can just use 0 translation and 0 rotation (quat[1 0 0 0]).
Vector_t globalMeanR_m = Vector_t(0.0, 0.0, 0.0); Vector_t globalMeanR_m = Vector_t(0.0, 0.0, 0.0);
Quaternion_t globalToLocalQuaternion_m = Quaternion_t(1.0, 0.0, 0.0, 0.0); Quaternion_t globalToLocalQuaternion_m = Quaternion_t(1.0, 0.0, 0.0, 0.0);
...@@ -688,7 +688,7 @@ private: ...@@ -688,7 +688,7 @@ private:
}; };
inline inline
bool PartBunch::isDcBeam() { return dcBeam_m;} bool PartBunch::isDcBeam() { return dcBeam_m;}
inline inline
......
...@@ -19,15 +19,15 @@ ...@@ -19,15 +19,15 @@
// //
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
#include <cfloat>
#include <cmath>
#include "Algorithms/Tracker.h" #include "Algorithms/Tracker.h"
#include "AbsBeamline/AlignWrapper.h" #include "AbsBeamline/AlignWrapper.h"
#include "AbsBeamline/Patch.h" #include "AbsBeamline/Patch.h"
#include "Algorithms/MapIntegrator.h" #include "Algorithms/MapIntegrator.h"
#include "Fields/BMultipoleField.h" #include "Fields/BMultipoleField.h"
#include <cfloat>
#include <cmath>
typedef FTps<double, 2> Series2; typedef FTps<double, 2> Series2;
typedef FTps<double, 6> Series; typedef FTps<double, 6> Series;