actually create the callbacks

Author: isaacsas

src/structural_transformation/codegen.jl

@@ -524,18 +524,11 @@ function ODAEProblem{iip}(sys,
                                        use_union)
 
     has_difference = any(isdifferenceeq, eqs)
-    if has_continuous_events(sys)
-        event_cb = generate_rootfinding_callback(sys; kwargs...)
-    else
-        event_cb = nothing
-    end
-    difference_cb = has_difference ? generate_difference_cb(sys; kwargs...) : nothing
-    cb = merge_cb(event_cb, difference_cb)
-    cb = merge_cb(cb, callback)
+    cbs = process_events(sys; callback, has_difference, kwargs...)
 
-    if cb === nothing
+    if cbs === nothing
         ODEProblem{iip}(fun, u0, tspan, p; kwargs...)
     else
-        ODEProblem{iip}(fun, u0, tspan, p; callback = cb, kwargs...)
+        ODEProblem{iip}(fun, u0, tspan, p; callback = cbs, kwargs...)
     end
 end

src/systems/callbacks.jl

@@ -297,4 +297,27 @@ function generate_discrete_callbacks(sys::AbstractSystem, dvs = states(sys),
     end
 
     dbs
+end
+
+merge_cb(::Nothing, ::Nothing) = nothing
+merge_cb(::Nothing, x) = merge_cb(x, nothing)
+merge_cb(x, ::Nothing) = x
+merge_cb(x, y) = CallbackSet(x, y)
+
+function process_events(sys; callback = nothing, has_difference = false, kwargs...)
+    if has_continuous_events(sys)
+        contin_cb = generate_rootfinding_callback(sys; kwargs...)
+    else
+        contin_cb = nothing
+    end
+    if has_discrete_events(sys)
+        discrete_cb = generate_discrete_callbacks(sys; kwargs...)
+    else
+        discrete_cb = nothing
+    end
+    difference_cb = has_difference ? generate_difference_cb(sys; kwargs...) : nothing
+
+    cb = merge_cb(contin_cb, discrete_cb)
+    cb = merge_cb(cb, difference_cb)
+    merge_cb(cb, callback)
 end

src/systems/diffeqs/abstractodesystem.jl

@@ -635,26 +635,14 @@ function DiffEqBase.ODEProblem{iip}(sys::AbstractODESystem, u0map, tspan,
     f, u0, p = process_DEProblem(ODEFunction{iip}, sys, u0map, parammap;
                                  has_difference = has_difference,
                                  check_length, kwargs...)
-    if has_continuous_events(sys)
-        event_cb = generate_rootfinding_callback(sys; kwargs...)
-    else
-        event_cb = nothing
-    end
-    difference_cb = has_difference ? generate_difference_cb(sys; kwargs...) : nothing
-    cb = merge_cb(event_cb, difference_cb)
-    cb = merge_cb(cb, callback)
-
+    cbs = process_events(sys; callback, has_difference, kwargs...)
     kwargs = filter_kwargs(kwargs)
-    if cb === nothing
+    if cbs === nothing
         ODEProblem{iip}(f, u0, tspan, p; kwargs...)
     else
-        ODEProblem{iip}(f, u0, tspan, p; callback = cb, kwargs...)
+        ODEProblem{iip}(f, u0, tspan, p; callback = cbs, kwargs...)
     end
 end
-merge_cb(::Nothing, ::Nothing) = nothing
-merge_cb(::Nothing, x) = merge_cb(x, nothing)
-merge_cb(x, ::Nothing) = x
-merge_cb(x, y) = CallbackSet(x, y)
 get_callback(prob::ODEProblem) = prob.kwargs[:callback]
 
 """