From 4b4c5ff68c936be5700c84c74820dd2e6e4aa0b5 Mon Sep 17 00:00:00 2001
From: ioannisPApapadopoulos <john.papadopoulos0@gmail.com>
Date: Sun, 19 May 2024 17:53:42 +0200
Subject: [PATCH] check change

---
 src/annulus.jl | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/annulus.jl b/src/annulus.jl
index ceff5ea..b66785c 100644
--- a/src/annulus.jl
+++ b/src/annulus.jl
@@ -216,35 +216,64 @@ function plotvalues(u::ApplyQuasiVector{T,typeof(*),<:Tuple{Weighted{<:Any,<:Zer
     w[x] .* U
 end
 
+
 # FastTransforms uses orthonormalized annulus OPs so we need to correct the normalization
 # Gives a vector with the weights of each m-mode.
-function normalize_mmodes(w::AnnulusWeight{T}, l::Int) where T
+function normalize_mmodes(w::AnnulusWeight{T}) where T
     (ρ,a,b) = convert(T,w.ρ), convert(T,w.a), convert(T,w.b)
     t = inv(one(T)-ρ^2)
     # contribution from non-normalized semiclassical Jacobi
-    jw = sum.(SemiclassicalJacobiWeight.(t,b,a,0:(l-1)))
+    jw = sum.(SemiclassicalJacobiWeight{T}.(t,b,a,0:∞))
     # π comes from contribution of Harmonic polynomials and t^(a+b+one(T)) from the change of variables
     m₀ =  sqrt( convert(T,π) / t^(a+b+one(T)) ) * sqrt(jw[1])
-    vcat([m₀], sqrt.( convert(T,π) ./ (2 * t.^( (a+b+2*one(T)):(convert(T,l)+a+b)))) .* sqrt.(jw[2:end]))
+    vcat([m₀], sqrt.( convert(T,π) ./ (2 * t.^( (a+b+one(T)) .+ one(T):∞))).* sqrt.(jw[2:end]))
 end
 
 # Creates vector correctly interlacing the denormalization
 # constants for each m-mode.
 function denormalize_annulus(A::AbstractVector, a, b, c, ρ, analysis=true)
-    supp = Int(last(blockcolsupport(A)))
-    l = length(A[Block.(1:supp)])
+    l = length(A)
     bl = [findblockindex(blockedrange(oneto(∞)), j) for j in 1:l]
     ℓ = [bl[j].I[1]-1 for j in 1:l] # degree
     k = [bl[j].α[1] for j in 1:l]   # index of degree
     m = [iseven(ℓ[j]) ? k[j]-isodd(k[j]) : k[j]-iseven(k[j]) for j in 1:l] # m-mode
     s = (-1).^Int.((ℓ .- m) ./ 2) # denormalization includes negatives (-1)^(degree - m)/2
     w = AnnulusWeight(ρ, a, b)
-    constants = normalize_mmodes(w, l) # m-mode constants
+    constants = normalize_mmodes(w)[1:l] # m-mode constants
     d = [inv(constants[mm+1]*ss) for (mm, ss) in zip(m, s)] # multiply by relevant (-1)
-    analysis && return [d.*A[1:l];A[l+1:end]] # multiply vector by denormalization if analysis
-    [A[1:l]./d;A[l+1:end]]  # divide vector by denormalization if synthesis
+    analysis && return d.*A # multiply vector by denormalization if analysis
+    A ./ d # divide vector by denormalization if synthesis
 end
 
+# # FastTransforms uses orthonormalized annulus OPs so we need to correct the normalization
+# # Gives a vector with the weights of each m-mode.
+# function normalize_mmodes(w::AnnulusWeight{T}, l::Int) where T
+#     (ρ,a,b) = convert(T,w.ρ), convert(T,w.a), convert(T,w.b)
+#     t = inv(one(T)-ρ^2)
+#     # contribution from non-normalized semiclassical Jacobi
+#     jw = sum.(SemiclassicalJacobiWeight.(t,b,a,0:(l-1)))
+#     # π comes from contribution of Harmonic polynomials and t^(a+b+one(T)) from the change of variables
+#     m₀ =  sqrt( convert(T,π) / t^(a+b+one(T)) ) * sqrt(jw[1])
+#     vcat([m₀], sqrt.( convert(T,π) ./ (2 * t.^( (a+b+2*one(T)):(convert(T,l)+a+b)))) .* sqrt.(jw[2:end]))
+# end
+
+# # Creates vector correctly interlacing the denormalization
+# # constants for each m-mode.
+# function denormalize_annulus(A::AbstractVector, a, b, c, ρ, analysis=true)
+#     supp = Int(last(blockcolsupport(A)))
+#     l = length(A[Block.(1:supp)])
+#     bl = [findblockindex(blockedrange(oneto(∞)), j) for j in 1:l]
+#     ℓ = [bl[j].I[1]-1 for j in 1:l] # degree
+#     k = [bl[j].α[1] for j in 1:l]   # index of degree
+#     m = [iseven(ℓ[j]) ? k[j]-isodd(k[j]) : k[j]-iseven(k[j]) for j in 1:l] # m-mode
+#     s = (-1).^Int.((ℓ .- m) ./ 2) # denormalization includes negatives (-1)^(degree - m)/2
+#     w = AnnulusWeight(ρ, a, b)
+#     constants = normalize_mmodes(w, l) # m-mode constants
+#     d = [inv(constants[mm+1]*ss) for (mm, ss) in zip(m, s)] # multiply by relevant (-1)
+#     analysis && return [d.*A[1:l];A[l+1:end]] # multiply vector by denormalization if analysis
+#     [A[1:l]./d;A[l+1:end]]  # divide vector by denormalization if synthesis
+# end
+
 struct ZernikeAnnulusTransform{T} <: Plan{T}
     N::Int
     ann2cxf::FastTransforms.FTPlan{T,2,FastTransforms.ANNULUS}