Fix formatting

Author: dominic-chang

examples/coordinate-example.jl

@@ -26,29 +26,19 @@ set_theme!(merge!(curr_theme, theme_latexfonts()))
 # A region spanned by radii between the horizon and 10M at varying inclinations will be ray traced onto the 15x15 
 # screen of the observer.
 
-metric = Krang.Kerr(0.01); # Kerr metric with a spin of 0.99
+metric = Krang.Kerr(0.99); # Kerr metric with a spin of 0.99
 θo = 45 * π / 180; # inclination angle of the observer. θo ∈ (0, π)
-ro  = 20.0
-sze = 40; # resolution of the screen is sze x sze
+sze = 400; # resolution of the screen is sze x sze
 rmin = Krang.horizon(metric); # minimum radius to be ray traced
-rmax = 6.0; # maximum radius to be ray traced
-ρmax = 10/ro; # horizontal and vertical limits of the screen
-
+rmax = 10.0; # maximum radius to be ray traced
+ρmax = 15.0; # horizontal and vertical limits of the screen
 
 # Initialize Camera and pre-allocate memory for data to be plotted
 coordinates = (zeros(sze, sze) for _ = 1:3)
-camera = Krang.SlowLightIntensityCamera(metric, θo, ro, -ρmax, ρmax, -ρmax, ρmax, sze);
-camera2 = Krang.SlowLightIntensityCamera(metric, θo, -10, 10, -10, 10, sze);
+camera = Krang.SlowLightIntensityCamera(metric, θo, -ρmax, ρmax, -ρmax, ρmax, sze);
 colormaps = (:afmhot, :afmhot, :hsv)
 colorrange = ((-20, 20), (0, rmax), (0, 2π))
 
-
-[i.screen_coordinate[1] for i in camera2.screen.pixels]  .≈ [i.screen_coordinate[1] .* ro for i in camera.screen.pixels]
-
-maximum([abs.(camera2.screen.pixels[i].η - camera.screen.pixels[i].η) for i in range(1, length(camera.screen.pixels))])
-maximum([abs.(camera2.screen.pixels[i].λ - camera.screen.pixels[i].λ) for i in range(1, length(camera.screen.pixels))])
-
-
 ## Defining a function to get the coordinates of the geometry
 # Let's define a function that will return the coordinates of a ray when it intersects with a cone of opening angle $\theta_s$.
 # Coordinate information can be accessed using the `emission_coordinates(pixel, θs, isindir, n)` function, which returns the 
@@ -87,12 +77,11 @@ function draw!(axes_list, camera, coordinates, rmin, rmax, θs)
     for (i, geometry) in enumerate(geometries)
         rendered_scene = coordinate_point.(camera.screen.pixels, Ref(geometry))
         for I in CartesianIndices(rendered_scene)
-            temp = rendered_scene[I][1]
-            times[I] =  temp 
+            times[I] = rendered_scene[I][1]
             radii[I] = rendered_scene[I][2]
-            azimuths[I] = mod2pi(rendered_scene[I][4]) # azimuths are in radians
+            azimuths[I] = rendered_scene[I][4]
         end
-        coordinates = (times, radii, azimuths)
+        coordinates = (times, radii, mod2pi.(azimuths))
         for j = 1:3
             heatmap!(
                 axes_list[i][j],
@@ -104,33 +93,6 @@ function draw!(axes_list, camera, coordinates, rmin, rmax, θs)
     end
 end
 
-function draw2!(axes_list, camera, coordinates, rmin, rmax, θs)
-    times, radii, azimuths = coordinates
-    map(axes -> empty!.(axes), axes_list)
-
-    geometries = (Krang.ConeGeometry(θs, (i, rmin, rmax)) for i = 0:2)
-
-    for (i, geometry) in enumerate(geometries)
-        rendered_scene = coordinate_point.(camera.screen.pixels, Ref(geometry))
-        for I in CartesianIndices(rendered_scene)
-            temp = rendered_scene[I][1]
-            times[I] =  temp  == 0 ? 0 : temp - 2log(ro) -ro
-            radii[I] = rendered_scene[I][2]
-            azimuths[I] = mod2pi(rendered_scene[I][4]) # azimuths are in radians
-        end
-        coordinates = (times, radii, azimuths)
-        for j = 1:3
-            heatmap!(
-                axes_list[i][j],
-                coordinates[j],
-                colormap = colormaps[j],
-                colorrange = colorrange[j],
-            )
-        end
-    end
-end
-
-
 # Create Figure
 fig = Figure(resolution = (700, 700));
 axes_list = [
@@ -147,38 +109,15 @@ axes_list = [
     ] for i = 1:3
 ]
 
-draw2!(axes_list, camera, coordinates, rmin, rmax, π/2)
-display(fig)
-
-fig = Figure(resolution = (700, 700));
-axes_list = [
-    [
-        Axis(
-            fig[i, 1],
-            title = (i == 1 ? "Regularized Time" : ""),
-            titlesize = 20,
-            ylabel = (i == 1 ? L"n=0" : i == 2 ? L"n=1" : L"n=2"),
-            ylabelsize = 20,
-        ),
-        Axis(fig[i, 2], title = (i == 1 ? "Radius" : ""), titlesize = 20),
-        Axis(fig[i, 3], title = (i == 1 ? "Azimuth" : ""), titlesize = 20),
-    ] for i = 1:3
-]
-
-draw!(axes_list, camera2, coordinates, rmin, rmax, π/2)
-display(fig)
-
-
-
 # Create the animation of Cone of Emission Coordinates
-#recording = CairoMakie.record(
-#    fig,
-#    "coordinate.gif",
-#    range(0.0, π, length = 180),
-#    framerate = 12,
-#) do θs
-#    draw!(axes_list, camera, coordinates, rmin, rmax, θs)
-#end
+recording = CairoMakie.record(
+    fig,
+    "coordinate.gif",
+    range(0.0, π, length = 180),
+    framerate = 12,
+) do θs
+    draw!(axes_list, camera, coordinates, rmin, rmax, θs)
+end
 
 # ![Emission coordinates of cones](coordinate.gif)
 

examples/custom-material-example.jl

@@ -39,7 +39,7 @@ end
 # The emission to be ray traced is 
 metric = Krang.Kerr(0.99);
 θo = 85 * π / 180;
-ro  = 20.0
+ro = 20.0
 ρmax = 15/20;
 n = 0; # sub-image to ray trace
 
@@ -71,7 +71,7 @@ CMk.set_theme!(CMk.merge!(theme, CMk.theme_latexfonts()))
 fig = CMk.Figure(resolution = (700, 700));
 ax = CMk.Axis(fig[1, 1], title = "Emission_radius", titlesize = 20, aspect = 1)
 hm = CMk.heatmap!(ax, redshifts, colormap = :afmhot)
-CMk.contour!(ax, redshifts, levels =20, colormap=:viridis)
+CMk.contour!(ax, redshifts, levels = 20, colormap = :viridis)
 CMk.Colorbar(fig[1, 2], hm, label = "Redshifts", labelsize = 20)
 display(fig)
 CMk.save("redshifts.png", fig)
@@ -83,24 +83,16 @@ function draw!(ax, ro)
     #empty!(ax)
     empty!(fig)
     ax = CMk.Axis(fig[1, 1], title = "Emission_radius", titlesize = 20, aspect = 1)
-    hm = CMk.heatmap!(
-                ax,
-                redshifts,
-                colormap = :afmhot,
-            )
-    CMk.contour!(ax, redshifts, levels =20, colormap=:viridis)
+    hm = CMk.heatmap!(ax, redshifts, colormap = :afmhot)
+    CMk.contour!(ax, redshifts, levels = 20, colormap = :viridis)
     CMk.Colorbar(fig[1, 2], hm, label = "emission_radius", labelsize = 20)
 end
 
 
-recording = CMk.record(
-    fig,
-    "coordinate.gif",
-    range(1000, 20, length = 360),
-    framerate = 12,
-) do ro
-    draw!(ax, ro)
-end
+recording =
+    CMk.record(fig, "coordinate.gif", range(1000, 20, length = 360), framerate = 12) do ro
+        draw!(ax, ro)
+    end
 
 # ![redshifts](redshifts.png)
 

examples/mino-time-example.jl

@@ -82,7 +82,7 @@ recording =
                 colorrange = colorrange[i],
             )
             cb = GLMk.Colorbar(
-                fig[(i > 2 ? 2 : 1), (iszero(i % 2) ? 3 : 1)+1],
+                fig[(i > 2 ? 2 : 1), (iszero(i%2) ? 3 : 1)+1],
                 hm;
                 labelsize = 30,
                 ticklabelsize = 20,

examples/raytracing-mesh-example.jl

@@ -84,7 +84,7 @@ sphere = GLMk.Sphere(GLMk.Point(0.0, 0.0, 0.0), horizon(metric)) # Sphere to rep
 lines_to_plot = Krang.generate_ray.(camera.screen.pixels, 100) # 100 is the number of steps to take along the ray
 
 img = zeros(sze, sze)
-recording = GLMk.record(fig, "mesh.mp4", 1:sze*sze, framerate = 120) do i
+recording = GLMk.record(fig, "mesh.mp4", 1:(sze*sze), framerate = 120) do i
     line = lines_to_plot[i]
 
     img[i] = intersections[i]

src/geometries/geometry_types.jl

@@ -66,11 +66,12 @@ end
                     Intersection(zero(rs), rs, θs, zero(rs), νr, νθ), issuccess
                 else
                     rs, ϕs, νr, νθ, issuccess =
-                    @inline emission_coordinates_fast_light(pix, θs, isindir, n)
+                        @inline emission_coordinates_fast_light(pix, θs, isindir, n)
                     Intersection(zero(rs), rs, θs, ϕs, νr, νθ), issuccess
                 end
             else
-                ts, rs, ϕs, νr, νθ, issuccess = @inline emission_coordinates(pix, θs, isindir, n)
+                ts, rs, ϕs, νr, νθ, issuccess =
+                    @inline emission_coordinates(pix, θs, isindir, n)
                 Intersection(ts, rs, θs, ϕs, νr, νθ), issuccess
             end
 

src/materials/ElectronSynchrotronPowerLawPolarization.jl

@@ -15,7 +15,7 @@ Returns the screen polarization associated with a killing spinor κ as seen seen
 end
 
 function evpa(fα, fβ)
-     atan(-fα, fβ)
+    atan(-fα, fβ)
 end
 
 """

src/metrics/Kerr/emission_coordinates.jl

@@ -29,12 +29,7 @@ Returns 0 if the emission coordinates do not exist for that screen coordinate.
 - `isindir` : Is emission to observer direct or indirect
 - `n` : Image index
 """
-@inline function emission_radius(
-    pix::Krang.AbstractPixel,
-    θs::T,
-    isindir,
-    n,
-) where {T}
+@inline function emission_radius(pix::Krang.AbstractPixel, θs::T, isindir, n) where {T}
     α, β = screen_coordinate(pix)
     θo = inclination(pix)
     met = @inline metric(pix)
@@ -124,7 +119,15 @@ Emission azimuth for point at Mino time τ whose image appears at screen coordin
 - `τ` : Mino Time
 - `νr` : Sign of radial velocity direction at emission. This is always positive for case 3 and case 4 geodesics.
 """
-@inline function emission_azimuth(pix::AbstractPixel, θs, rs, τ::T, νr, isindir, n) where {T}
+@inline function emission_azimuth(
+    pix::AbstractPixel,
+    θs,
+    rs,
+    τ::T,
+    νr,
+    isindir,
+    n,
+) where {T}
     met = metric(pix)
     θo = inclination(pix)
 
@@ -150,7 +153,12 @@ coordinate (`α`, `β`) for an observer located at inclination θo.
 - `isindir` : Whether emission to observer is direct or indirect
 - `n` : Image index
 """
-@inline function emission_coordinates_fast_light(pix::AbstractPixel, θs::T, isindir, n) where {T}
+@inline function emission_coordinates_fast_light(
+    pix::AbstractPixel,
+    θs::T,
+    isindir,
+    n,
+) where {T}
     # NB: I do not return θs since it is already known, and returning it might encourage bad coding errors
     α, β = screen_coordinate(pix)
     θo = inclination(pix)

src/metrics/Kerr/misc.jl

@@ -966,7 +966,14 @@ See [`r_potential(x)`](@ref) for an implementation of \$\\mathcal{R}(r)\$.
     return It_w_I0_terms_case4(metric, rs, τ, roots, λ)
 end
 
-@inline function It_w_I0_terms_case2(metric::Kerr{T}, rs, τ, roots::NTuple{4}, λ, νr) where {T}
+@inline function It_w_I0_terms_case2(
+    metric::Kerr{T},
+    rs,
+    τ,
+    roots::NTuple{4},
+    λ,
+    νr,
+) where {T}
     r1, r2, r3, r4 = roots
     _, r31, r32, r41, r42, _ = _get_root_diffs(roots...)
     r43 = r4 - r3
@@ -1306,7 +1313,13 @@ Returns the radial integrals for the case where there are no real roots in the r
     return I1o_m_I0_terms, I2o_m_I0_terms, Ipo_m_I0_terms, Imo_m_I0_terms
 end
 
-@inline function radial_w_I0_terms_integrals(met::Kerr{T}, rs, roots::NTuple{4}, τ, νr) where {T}
+@inline function radial_w_I0_terms_integrals(
+    met::Kerr{T},
+    rs,
+    roots::NTuple{4},
+    τ,
+    νr,
+) where {T}
     numreals = sum(_isreal2.(roots))
     if numreals == 4
         I1, I2, Ip, Im =
@@ -1702,7 +1715,12 @@ See [`θ_potential(x)`](@ref) for an implementation of \$\\Theta(\theta)\$.
 - `isindir` : Is the path direct or indirect?
 - `n` : nth image ordered by minotime
 """
-@inline function Gθ(pix::AbstractPixel, θs::T, isindir, n)::Tuple{T,T,T,T,Bool,Bool} where {T}
+@inline function Gθ(
+    pix::AbstractPixel,
+    θs::T,
+    isindir,
+    n,
+)::Tuple{T,T,T,T,Bool,Bool} where {T}
     _, β = screen_coordinate(pix)
     met = metric(pix)
     θo = inclination(pix)

test/kerr_misc_tests.jl

@@ -346,8 +346,7 @@
 
                         θturning = acos(√up) * (1 + 1e-10)
                         @testset "Gθ" begin
-                            @testset "θs:$θs" for θs in
-                                                  clamp.(
+                            @testset "θs:$θs" for θs in clamp.(
                                 (1, 3) .* (acos(-√up) - acos(√up)) ./ 4 .+ acos(√up),
                                 0.0,
                                 π,
@@ -393,8 +392,7 @@
                             end
                         end
                         @testset "Gϕ" begin
-                            @testset "θs:$θs" for θs in
-                                                  clamp.(
+                            @testset "θs:$θs" for θs in clamp.(
                                 (1, 3) .* (acos(-√up) - acos(√up)) ./ 4 .+ acos(√up),
                                 0.0,
                                 π,
@@ -441,8 +439,7 @@
                             end
                         end
                         @testset "Gt" begin
-                            @testset "θs:$θs" for θs in
-                                                  clamp.(
+                            @testset "θs:$θs" for θs in clamp.(
                                 (1, 3) .* (acos(-√up) - acos(√up)) ./ 4 .+ acos(√up),
                                 0.0,
                                 π,