simplify

src/forwardproblem.cpp

@@ -315,16 +315,16 @@ void ForwardProblem::storeEvent() {
 }
 
 void ForwardProblem::store_pre_event_state(bool seflag, bool initial_event) {
-    /* if we need to do forward sensitivities later on we need to store the old
-     * x and the old xdot */
+    // if we need to do forward sensitivities later on,
+    // we need to store the old x and the old xdot
     if (solver->getSensitivityOrder() >= SensitivityOrder::first) {
         /* store x and xdot to compute jump in sensitivities */
         x_old_.copy(x_);
-    }
-    if (solver->computingFSA()) {
         model->fxdot(t_, x_, dx_, xdot_);
         xdot_old_.copy(xdot_);
         dx_old_.copy(dx_);
+    }
+    if (solver->computingFSA()) {
         /* compute event-time derivative only for primary events, we get
          * into trouble with multiple simultaneously firing events here (but
          * is this really well defined then?), in that case just use the
@@ -340,9 +340,6 @@ void ForwardProblem::store_pre_event_state(bool seflag, bool initial_event) {
         if (initial_event) // t0 has no parameter dependency
             std::fill(stau_.begin(), stau_.end(), 0.0);
     } else if (solver->computingASA()) {
-        model->fxdot(t_, x_, dx_, xdot_);
-        xdot_old_ = xdot_;
-        dx_old_ = dx_;
         /* store x to compute jump in discontinuity */
         x_old_disc_.push_back(x_old_);
         xdot_old_disc_.push_back(xdot_old_);