diff --git a/src/AbsBeamline/Probe.cpp b/src/AbsBeamline/Probe.cpp index 0304b6cf9d087070acf13b3d1d9121708ec7dc6c..12dab2d04e22fec64184802a2479dc459bb3019b 100644 --- a/src/AbsBeamline/Probe.cpp +++ b/src/AbsBeamline/Probe.cpp @@ -99,8 +99,8 @@ bool Probe::doCheck(PartBunch_t* bunch, const int turnnumber, const double t, co // dist1 > 0, right hand, dt > 0; dist1 < 0, left hand, dt < 0 double dist1 = (A_m * bunch->R(i)(0) + B_m * bunch->R(i)(1) + C_m) / R_m; // [m] double dist2 = dist1 * std::sqrt(1.0 + 1.0 / tangle / tangle); - double dt = - dist2 / (std::sqrt(1.0 - 1.0 / (1.0 + dot(bunch->P(i), bunch->P(i)))) * Physics::c); + //double dt = + // dist2 / (std::sqrt(1.0 - 1.0 / (1.0 + dot(bunch->P(i), bunch->P(i)))) * Physics::c); // ADA probepoint = bunch->R(i) + dist2 * bunch->P(i) / euclidean_norm(bunch->P(i)); probepoint = bunch->R(i) + dist2 * bunch->P(i) / std::sqrt(dot(bunch->P(i), bunch->P(i))); diff --git a/src/AbsBeamline/Ring.cpp b/src/AbsBeamline/Ring.cpp index 77e61b6a25542d618e8fe48b1ef5e142cc088e09..5c8c5d66426bc7674d4b4e0760f1b6a388b2f9a2 100644 --- a/src/AbsBeamline/Ring.cpp +++ b/src/AbsBeamline/Ring.cpp @@ -125,7 +125,7 @@ bool Ring::apply( const double Q = Qview(id); const double M = Mview(id); - const short int Bin = Binview(id); + // const short int Bin = Binview(id); gmsgALL << getName() << ": particle " << id << " at " << R << " m out of the field map boundary" << endl; diff --git a/src/PartBunch/#[-Wunused-variable]# b/src/PartBunch/#[-Wunused-variable]# new file mode 100644 index 0000000000000000000000000000000000000000..091276e8d88504da43085e1b5da7541ad81073bd --- /dev/null +++ b/src/PartBunch/#[-Wunused-variable]# @@ -0,0 +1,2 @@ + 499 | int tag = 101; + \ No newline at end of file diff --git a/src/Structure/H5PartWrapper.cpp b/src/Structure/H5PartWrapper.cpp index 212567b6133ca60e83d336c43c0a8d124406ae36..4180ea11f446caff2323b3a0ea479e78e5234cb9 100644 --- a/src/Structure/H5PartWrapper.cpp +++ b/src/Structure/H5PartWrapper.cpp @@ -484,7 +484,7 @@ void H5PartWrapper::copyStepData(h5_file_t source) { void H5PartWrapper::sendFailureMessage( bool failed, const std::string& where, const std::string& what) { - int tag = 101; + // int tag = 101; /* \todo Message* mess = new Message(); putMessage(*mess, failed); Ippl::Comm->broadcast_all(mess, tag); @@ -496,8 +496,8 @@ void H5PartWrapper::sendFailureMessage( void H5PartWrapper::receiveFailureMessage( int sourceNode, const std::string& where, const std::string& what) { - int tag = 101; - bool failed; + // int tag = 101; + bool failed=false; /* \todo Message* mess = Ippl::Comm->receive_block(sourceNode, tag); getMessage(*mess, failed);