11-bug-ThreeBodySpins (#43)

* fix constructor bug * patch up * prettier
mmikhasenko · Aug 14, 2024 · b95d0d2 · b95d0d2 · mmikhasenko · Aug 14, 2024
1 parent 77ee004
commit b95d0d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.cspell/julia.txt b/.cspell/julia.txt
@@ -12,6 +12,7 @@ inrange
 invperm
 isapprox
 iseven
+isnothing
 isodd
 isphysical
 ispositive

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ThreeBodyDecays"
 uuid = "e6563dab-9ca1-5843-bde3-2ccf38d63843"
 authors = ["Misha Mikhasenko <[email protected]>"]
-version = "0.12.0"
+version = "0.12.1"
 
 [deps]
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"

diff --git a/src/tbs_struct.jl b/src/tbs_struct.jl
@@ -34,15 +34,15 @@ function ThreeBodySpins(
     two_h1_or_h1,
     two_h2_or_h2,
     two_h3_or_h3;
-    h0 = -1, # unrealistic by default
-    two_h0 = -1,
-) # unrealistic by default
+    h0 = nothing,  # default to nothing
+    two_h0 = nothing, # default to nothing
+)
+    if isnothing(h0) && isnothing(two_h0)
+        error("Use either `two_h0=...`, or `h0=...` keyword argument.")
+    end
 
-    two_h0 == -1 &&
-        h0 == -1 &&
-        return error("Use either two_h0=..., or h0=... key word argument.")
     two_hs =
-        (h0 == -1 && two_h0 != -1) ?
+        (isnothing(h0) && !isnothing(two_h0)) ?
         SpinTuple(Tuple(Int[two_h1_or_h1, two_h2_or_h2, two_h3_or_h3, two_h0])) :
         SpinTuple(Tuple([two_h1_or_h1, two_h2_or_h2, two_h3_or_h3, h0] .|> x2))
     #

diff --git a/test/test_three_body_spins.jl b/test/test_three_body_spins.jl
@@ -20,6 +20,8 @@ end
     @test ThreeBodySpins("1", "1/2", "0"; h0 = "1/2") == ThreeBodySpins(2, 1, 0; two_h0 = 1)
     #
     @test ThreeBodySpins(1, 1 / 2, 0; h0 = 1 / 2) == ThreeBodySpins(2, 1, 0; two_h0 = 1)
+    @test all(ThreeBodySpins(1, 1, 0; h0 = i) isa SpinTuple for i = -10:10)
+    @test all(ThreeBodySpins(1, 2, 0; two_h0 = i) isa SpinTuple for i = -11:2:11)
     #
     @test_throws ErrorException ThreeBodySpins("0", "1/2", "1/2"; h0 = "1/2")
 end