Merge branch 'master' of gitlab.psi.ch:OPAL/src

src/Classic/AbsBeamline/VariableRFCavity.cpp

@@ -163,9 +163,10 @@ bool VariableRFCavity::apply(const Vector_t &R, const Vector_t &P,
         double f = _frequency_td->getValue(t);
         double phi = _phase_td->getValue(t);
         E = Vector_t(0., 0., E0*sin(Physics::two_pi * f * t + phi));
+        return false;
     // std::cerr << "                        t: " << t << " f: " << f << " phi: " << phi << " E0: " << E0 << " E[2]: " << E[2] << std::endl;
     }
-    return false;
+    return true;
 }
 
 bool VariableRFCavity::applyToReferenceParticle(const Vector_t &R, const Vector_t &P,
@@ -180,9 +181,10 @@ bool VariableRFCavity::applyToReferenceParticle(const Vector_t &R, const Vector_
         double f = _frequency_td->getValue(t);
         double phi = _phase_td->getValue(t);
         E = Vector_t(0., 0., E0*sin(Physics::two_pi * f * t + phi));
+        return false;
     // std::cerr << "                        t: " << t << " f: " << f << " phi: " << phi << " E0: " << E0 << " E[2]: " << E[2] << std::endl;
     }
-    return false;
+    return true;
 }
 
 void VariableRFCavity::initialise(PartBunch *bunch, double &startField, double &endField) {
@@ -218,4 +220,4 @@ void VariableRFCavity::accept(BeamlineVisitor& visitor) const {
 void VariableRFCavity::setLength(double length) {
     _length = length;
     geometry.setElementLength(length);
-}
\ No newline at end of file
+}