1. itsBunch_m->get_pmean_Distribution() gives wronng results. 2....

1. itsBunch_m->get_pmean_Distribution() gives wronng results. 2. itsReference->getM() wrong referernce used in BorisPusher::kick

src/Algorithms/OrbitThreader.cpp

@@ -87,7 +87,9 @@ OrbitThreader::OrbitThreader(
     stepRange_m.enlargeIfOutside(0);
     stepRange_m.enlargeIfOutside(stepSizes_m.getNumStepsFinestResolution());
     distTrackBack_m = std::min(pathLength_m, std::max(0.0, maxDiffZBunch));
+    *gmsg << "OrbitThreader r= " << r_m << "p= " << p_m << "dt= " << dt_m << endl;
     computeBoundingBox();
+    *gmsg << "OrbitThreader r= " << r_m << "p= " << p_m << "dt= " << dt_m << endl;
 }
 
 void OrbitThreader::checkElementLengths(const std::set<std::shared_ptr<Component>>& fields) {
@@ -127,7 +129,7 @@ void OrbitThreader::execute() {
     Vector_t<double, 3> nextR = r_m / (Physics::c * dt_m);
     integrator_m.push(nextR, p_m, dt_m);
     nextR = nextR * Physics::c * dt_m;
-
+    *gmsg << "OrbitThreader nextR= " << nextR << endl;
     setDesignEnergy(allElements, visitedElements);
 
     auto elementSet = itsOpalBeamline_m.getElements(nextR);
@@ -450,9 +452,12 @@ void OrbitThreader::computeBoundingBox() {
 
 void OrbitThreader::updateBoundingBoxWithCurrentPosition() {
     Vector_t<double, 3> dR = Physics::c * dt_m * p_m / Util::getGamma(p_m);
+
+    *gmsg << "OrbitThreader dR1= " << dR << endl;
+
     /// \todo needs to be fixed
     /*
-    for (const Vector_t<double, 3>& pos : {r_m - 10 * dR, r_m + 10 * dR}) {
+      for (const Vector_t<double, 3>& pos : {r_m - 10 * dR, r_m + 10 * dR}) {
         globalBoundingBox_m.enlargeToContainPosition(pos);
     }
     */

src/Algorithms/ParallelTracker.cpp

@@ -318,10 +318,11 @@ void ParallelTracker::execute() {
 
     itsOpalBeamline_m.activateElements();
 
-    double momentum                     = euclidean_norm(itsBunch_m->get_pmean_Distribution());
+    double momentum = 7.335952e-04;  // \todo euclidean_norm(itsBunch_m->get_pmean_Distribution());
     CoordinateSystemTrafo beamlineToLab = itsOpalBeamline_m.getCSTrafoLab2Local().inverted();
     itsBunch_m->toLabTrafo_m            = beamlineToLab;
 
+    *gmsg << "ParallelTrack: momentum=  " << momentum << endl;
     itsBunch_m->RefPartR_m = beamlineToLab.transformTo(Vector_t<double, 3>(0.0));
     itsBunch_m->RefPartP_m = beamlineToLab.rotateTo(momentum * Vector_t<double, 3>(0, 0, 1));
 
@@ -361,8 +362,6 @@ void ParallelTracker::execute() {
     double time = itsBunch_m->getT() - globalTimeShift;
     itsBunch_m->setT(time);
 
-    // *gmsg << level1 << *itsBunch_m << endl;
-
     unsigned long long step = itsBunch_m->getGlobalTrackStep();
     OPALTimer::Timer myt1;
     *gmsg << "* Track start at: " << myt1.time() << ", t= " << Util::getTimeString(time) << "; "