Merge pull request #104 from bmad-sim/newmapparams

MapParams accepts parameters now

Author: mattsignorelli

Project.toml

@@ -1,7 +1,7 @@
 name = "Beamlines"
 uuid = "5bb90b03-0719-46b8-8ce4-1ef3afd3cd4b"
 authors = ["Matt Signorelli <mgs255@cornell.edu> and contributors"]
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

src/keymaps.jl

@@ -83,6 +83,8 @@ const PROPERTIES_MAP = Dict{Symbol,Type{<:AbstractParams}}(
   :is_crabcavity => RFParams,
 
   :transport_map => MapParams,
+  :transport_map_params => MapParams,
+
   :four_potential => FourPotentialParams,
 
   :alias => MetaParams,

src/misc.jl

@@ -1,8 +1,22 @@
-@kwdef struct MapParams{F<:Function} <: AbstractParams
-  transport_map::F = (v, q=nothing) -> (v, q)
+@kwdef mutable struct MapParams{F<:Function, P<:Tuple} <: AbstractParams
+  transport_map::F = (v, q, p=nothing) -> (v, q)
+  transport_map_params::P = ()
 end
 
-Base.isapprox(a::MapParams, b::MapParams) = a.transport_map == b.transport_map
+function Base.isapprox(a::MapParams, b::MapParams)
+  return a.transport_map == b.transport_map && 
+         all(a.transport_map_params .≈ b.transport_map_params)
+end
+
+# === THIS BLOCK WAS PARTIALLY WRITTEN BY CLAUDE ===
+# Generated function for arbitrary-length tuples
+@generated function deval(mp::MapParams{F,P}) where {F,P}
+    N = length(P.parameters)
+    # Use getfield with literal integer arguments
+    exprs = [:(deval(Base.getfield(mp.transport_map_params, $i))) for i in 1:N]
+    return :(MapParams(mp.transport_map, tuple($(exprs...))))
+end
+# === END CLAUDE ===
 
 @kwdef struct FourPotentialParams{F<:Function} <: AbstractParams
   four_potential::F = (x, y, s, t) -> (0, 0, 0, 0) # Returns phi, Ax, Ay, Az

test/runtests.jl

@@ -1259,7 +1259,11 @@ using ForwardDiff, GTPSA, ReverseDiff
     @test ele1.transport_map == g
     @test ele2.transport_map == g
     @test ele1 ≈ ele2
-
+    let
+      local a = 1
+      ele1.transport_map_params = (DefExpr(()->10*sin(a)), 100)
+      @test Beamlines.deval(ele1.MapParams) ≈ MapParams(ele1.transport_map, (10*sin(1),100.))
+    end
     # FourPotentialParams
     f = (x,y,s,t)->(1,2,3,4)
     g = (x,y,s,t)->(5,6,7,8)