Commit e8f7f39b authored by Daniel Winklehner's avatar Daniel Winklehner
Browse files

Forgot to uncomment repartitioning in one-bunch cyclotron tracking.

parent 33deec5b
...@@ -765,7 +765,7 @@ void Cyclotron::getFieldFromFile(const double &scaleFactor) { ...@@ -765,7 +765,7 @@ void Cyclotron::getFieldFromFile(const double &scaleFactor) {
*gmsg << "* ----------------------------------------------" << endl; *gmsg << "* ----------------------------------------------" << endl;
*gmsg << "* READ IN RING FIELD MAP " << endl; *gmsg << "* READ IN RING FIELD MAP " << endl;
*gmsg << "* (The first data block is useless) " << endl; *gmsg << "* (The first data block is useless) " << endl;
*gmsg << "* ----------------------------------------------" << endl; *gmsg << "* ----------------------------------------------" << endl;
BP.Bfact = scaleFactor; BP.Bfact = scaleFactor;
...@@ -791,7 +791,7 @@ void Cyclotron::getFieldFromFile(const double &scaleFactor) { ...@@ -791,7 +791,7 @@ void Cyclotron::getFieldFromFile(const double &scaleFactor) {
*gmsg << "* Stepsize in azimuth direction: " << BP.dtet << " [deg.]" << endl; *gmsg << "* Stepsize in azimuth direction: " << BP.dtet << " [deg.]" << endl;
for(int i = 0; i < 13; i++) for(int i = 0; i < 13; i++)
CHECK_CYC_FSCANF_EOF(fscanf(f, "%s", fout)); CHECK_CYC_FSCANF_EOF(fscanf(f, "%s", fout));
CHECK_CYC_FSCANF_EOF(fscanf(f, "%d", &Bfield.nrad)); CHECK_CYC_FSCANF_EOF(fscanf(f, "%d", &Bfield.nrad));
*gmsg << "* Index in radial direction: " << Bfield.nrad << endl; *gmsg << "* Index in radial direction: " << Bfield.nrad << endl;
......
...@@ -481,7 +481,7 @@ void ParallelCyclotronTracker::visitCyclotron(const Cyclotron &cycl) { ...@@ -481,7 +481,7 @@ void ParallelCyclotronTracker::visitCyclotron(const Cyclotron &cycl) {
// read field map on the middle plane of cyclotron. // read field map on the middle plane of cyclotron.
// currently scalefactor is set to 1.0 // currently scalefactor is set to 1.0
// TEMP changed 1.0 to getBScale() to test if we can sclae the midplane field -DW // TEMP changed 1.0 to getBScale() to test if we can scale the midplane field -DW
elptr->initialise(itsBunch, fieldflag, elptr->getBScale()); elptr->initialise(itsBunch, fieldflag, elptr->getBScale());
double BcParameter[8]; double BcParameter[8];
...@@ -2147,7 +2147,7 @@ void ParallelCyclotronTracker::Tracker_RK4() { ...@@ -2147,7 +2147,7 @@ void ParallelCyclotronTracker::Tracker_RK4() {
IpplTimings::stopTimer(TransformTimer_m); IpplTimings::stopTimer(TransformTimer_m);
// repartition(); //temporary deactivation -DW repartition();
itsBunch->computeSelfFields_cycl(temp_meangamma, 0.001 * meanR, quaternionToYAxis); itsBunch->computeSelfFields_cycl(temp_meangamma, 0.001 * meanR, quaternionToYAxis);
......
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