From 832e619d18cd402201d8518f53e0b27fb42ecec0 Mon Sep 17 00:00:00 2001 From: Ashton Bradley Date: Tue, 21 May 2024 15:41:00 +1200 Subject: [PATCH] autocorrelate doesnt care shifted, but bessel_reduce does --- example_figure/Manifest.toml | 84 ++++++++++++------------------------ example_figure/Project.toml | 1 + src/analysis.jl | 2 +- 3 files changed, 30 insertions(+), 57 deletions(-) diff --git a/example_figure/Manifest.toml b/example_figure/Manifest.toml index 1f5bc9f..05ca05f 100644 --- a/example_figure/Manifest.toml +++ b/example_figure/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.2" manifest_format = "2.0" -project_hash = "9ab6ea14001308ee199da609fbd6ab115cebd336" +project_hash = "741d70b2a8a58c64b709d7bb60b82f010cfeddbe" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] @@ -88,6 +88,11 @@ git-tree-sha1 = "9e2a6b69137e6969bab0152632dcb3bc108c8bdd" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" version = "1.0.8+1" +[[deps.CEnum]] +git-tree-sha1 = "389ad5c84de1ae7cf0e28e381131c98ea87d54fc" +uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82" +version = "0.5.0" + [[deps.Cairo_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] git-tree-sha1 = "a2f1c8c668c8e3cb4cca4e57a8efdb09067bb3fd" @@ -410,12 +415,6 @@ git-tree-sha1 = "ff38ba61beff76b8f4acad8ab0c97ef73bb670cb" uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" version = "3.3.9+0" -[[deps.GPUArraysCore]] -deps = ["Adapt"] -git-tree-sha1 = "ec632f177c0d990e64d955ccc1b8c04c485a0950" -uuid = "46192b85-c4d5-4398-a991-12ede77f4527" -version = "0.1.6" - [[deps.GR]] deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"] git-tree-sha1 = "ddda044ca260ee324c5fc07edb6d7cf3f0b9c350" @@ -469,6 +468,24 @@ git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3" uuid = "2e76f6c2-a576-52d4-95c1-20adfe4de566" version = "2.8.1+1" +[[deps.Hwloc]] +deps = ["CEnum", "Hwloc_jll", "Printf", "Statistics"] +git-tree-sha1 = "b923ef3260340042d8a06aceeb7c14546e6188aa" +uuid = "0e44f5e4-bd66-52a0-8798-143a42290a1d" +version = "3.0.1" + + [deps.Hwloc.extensions] + HwlocTrees = "AbstractTrees" + + [deps.Hwloc.weakdeps] + AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" + +[[deps.Hwloc_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "ca0f6bf568b4bfc807e7537f081c81e35ceca114" +uuid = "e33a78d0-f292-5ffc-b300-72abe9b543c8" +version = "2.10.0+0" + [[deps.Inflate]] git-tree-sha1 = "ea8031dea4aff6bd41f1df8f2fdfb25b33626381" uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" @@ -608,12 +625,6 @@ version = "0.16.3" deps = ["Artifacts", "Pkg"] uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3" -[[deps.LazyStack]] -deps = ["ChainRulesCore", "Compat", "LinearAlgebra"] -git-tree-sha1 = "aff621f1f49e9262a34aaf0d57d02ea3b35aec60" -uuid = "1fad7336-0346-5a1a-a56f-a06ba010965b" -version = "0.1.3" - [[deps.LibCURL]] deps = ["LibCURL_jll", "MozillaCACerts_jll"] uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" @@ -861,12 +872,6 @@ deps = ["Artifacts", "Libdl"] uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" version = "10.42.0+1" -[[deps.PackageExtensionCompat]] -git-tree-sha1 = "fb28e33b8a95c4cee25ce296c817d89cc2e53518" -uuid = "65ce6f38-6b18-4e1d-a461-8949797d7930" -version = "1.0.2" -weakdeps = ["Requires", "TOML"] - [[deps.PaddedViews]] deps = ["OffsetArrays"] git-tree-sha1 = "0fac6313486baae819364c52b4f483450a9d793f" @@ -1009,8 +1014,10 @@ uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" version = "2.9.4" [[deps.QuantumFluidSpectra]] -deps = ["FFTW", "JLD2", "PaddedViews", "QuadGK", "SpecialFunctions", "TensorCast", "Tullio", "UnPack"] -git-tree-sha1 = "c70a0b308ae94b122624c8540e6ee8f7f9159092" +deps = ["FFTW", "Hwloc", "JLD2", "PaddedViews", "QuadGK", "SpecialFunctions", "Tullio", "UnPack"] +git-tree-sha1 = "64f48c983b98af3e0311030599faeae572baf95f" +repo-rev = "additive-densities" +repo-url = "https://github.com/AshtonSBradley/QuantumFluidSpectra.jl.git" uuid = "8ddfec37-9569-48bd-b1f3-d8731767ee3a" version = "0.1.7" @@ -1188,24 +1195,6 @@ git-tree-sha1 = "d1bf48bfcc554a3761a133fe3a9bb01488e06916" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" version = "0.33.21" -[[deps.Strided]] -deps = ["LinearAlgebra", "StridedViews", "TupleTools"] -git-tree-sha1 = "40c69be0e1b72ee2f42923b7d1ff13e0b04e675c" -uuid = "5e0ebb24-38b0-5f93-81fe-25c709ecae67" -version = "2.0.4" - -[[deps.StridedViews]] -deps = ["LinearAlgebra", "PackageExtensionCompat"] -git-tree-sha1 = "5b765c4e401693ab08981989f74a36a010aa1d8e" -uuid = "4db3bf67-4bd7-4b4e-b153-31dc3fb37143" -version = "0.2.2" - - [deps.StridedViews.extensions] - StridedViewsCUDAExt = "CUDA" - - [deps.StridedViews.weakdeps] - CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba" - [[deps.StringManipulation]] deps = ["PrecompileTools"] git-tree-sha1 = "a04cabe79c5f01f4d723cc6704070ada0b9d46d5" @@ -1239,12 +1228,6 @@ deps = ["ArgTools", "SHA"] uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" version = "1.10.0" -[[deps.TensorCast]] -deps = ["ChainRulesCore", "Compat", "LazyStack", "LinearAlgebra", "MacroTools", "Random", "StaticArrays", "TransmuteDims"] -git-tree-sha1 = "82a477d3afe53673393dd387806e34cd682a5ac4" -uuid = "02d47bb6-7ce6-556a-be16-bb1710789e2b" -version = "0.4.8" - [[deps.TensorCore]] deps = ["LinearAlgebra"] git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6" @@ -1294,12 +1277,6 @@ version = "0.4.80" OnlineStatsBase = "925886fa-5bf2-5e8e-b522-a9147a512338" Referenceables = "42d2dcc6-99eb-4e98-b66c-637b7d73030e" -[[deps.TransmuteDims]] -deps = ["Adapt", "ChainRulesCore", "GPUArraysCore", "LinearAlgebra", "Requires", "Strided"] -git-tree-sha1 = "5b6f1f2ba5e91983eabc47cb362f92d9a96b579f" -uuid = "24ddb15e-299a-5cc3-8414-dbddc482d9ca" -version = "0.1.16" - [[deps.Tullio]] deps = ["DiffRules", "LinearAlgebra", "Requires"] git-tree-sha1 = "6d476962ba4e435d7f4101a403b1d3d72afe72f3" @@ -1318,11 +1295,6 @@ version = "0.3.7" FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -[[deps.TupleTools]] -git-tree-sha1 = "41d61b1c545b06279871ef1a4b5fcb2cac2191cd" -uuid = "9d95972d-f1c8-5527-a6e0-b4b365fa01f6" -version = "1.5.0" - [[deps.URIs]] git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" diff --git a/example_figure/Project.toml b/example_figure/Project.toml index dc6c4c9..331bfde 100644 --- a/example_figure/Project.toml +++ b/example_figure/Project.toml @@ -6,4 +6,5 @@ QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" QuantumFluidSpectra = "8ddfec37-9569-48bd-b1f3-d8731767ee3a" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc" VortexDistributions = "b688e990-d167-11e8-1f13-43a2532b2fa8" diff --git a/src/analysis.jl b/src/analysis.jl index e545395..137feab 100644 --- a/src/analysis.jl +++ b/src/analysis.jl @@ -326,7 +326,7 @@ function cross_correlate(ψ1,ψ2,X,K) ifft!(ϕ1) dμk = prod(DK)*(2*π)^(n/2) ϕ1 .*= dμk - return ϕ1 |> fftshift + return ϕ1 end