Update to work with new ComradeBase & VLBISkyModels

Project.toml

@@ -1,7 +1,7 @@
 name = "Comrade"
 uuid = "99d987ce-9a1e-4df8-bc0b-1ea019aa547b"
 authors = ["Paul Tiede <[email protected]>"]
-version = "0.10.4"
+version = "0.11.0"
 
 [deps]
 AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
@@ -68,7 +68,7 @@ AdvancedHMC = "0.6"
 ArgCheck = "2"
 AstroTime = "0.6,0.7"
 ChainRulesCore = "1"
-ComradeBase = "0.7"
+ComradeBase = "0.8"
 DelimitedFiles = "1"
 DensityInterface = "0.4"
 DimensionalData = "0.26, 0.27"
@@ -103,7 +103,7 @@ Tables = "1"
 TransformVariables = "0.8"
 VLBIImagePriors = "0.8"
 VLBILikelihoods = "^0.2.1"
-VLBISkyModels = "^0.5.5"
+VLBISkyModels = "0.6"
 julia = "1.9"
 
 [extras]

examples/intermediate/PolarizedImaging/main.jl

@@ -340,7 +340,7 @@ residual(post, xopt)
 # These look reasonable, although there may be some minor overfitting.
 # Let's compare our results to the ground truth values we know in this example.
 # First, we will load the polarized truth
-imgtrue = Comrade.load(joinpath(__DIR, "..", "..", "Data", "polarized_gaussian.fits"), IntensityMap{StokesParams})
+imgtrue = load_fits(joinpath(__DIR, "..", "..", "Data", "polarized_gaussian.fits"), IntensityMap{StokesParams})
 # Select a reasonable zoom in of the image.
 imgtruesub = regrid(imgtrue, imagepixels(fovx, fovy, nx*4, ny*4))
 img = intensitymap(Comrade.skymodel(post, xopt), axisdims(imgtruesub))

playground/selfcal.jl

@@ -95,7 +95,7 @@ function selfcal_submission(results::String, obs, outdir::String, nsamples::Int,
         obscal, _ = selfcal(obs, model)
 
         outim = @sprintf "image_%04d.fits" i
-        Comrade.save(joinpath(outdir, outim), img, damp)
+        save_fits(joinpath(outdir, outim), img, damp)
 
         outcal = @sprintf "selfcal_data_comrade_%04d.uvfits" i
         obscal.save_uvfits(joinpath(outdir, outcal))

src/Comrade.jl

@@ -32,7 +32,6 @@ using StructArrays: StructVector, StructArray, append!!
 import StructArrays
 using Tables
 import TransformVariables as TV
-import ComradeBase: save
 using ComradeBase: AbstractDomain, AbstractSingleDomain, AbstractRectiGrid
 using VLBISkyModels: FourierTransform, FourierDualDomain
 
@@ -45,7 +44,6 @@ using VLBISkyModels: FourierTransform, FourierDualDomain
 export linearpol, mbreve, evpa
 using ComradeBase: AbstractRectiGrid, AbstractDomain, UnstructuredDomain,
                    AbstractModel, AbstractPolarizedModel, AbstractHeader
-using ComradeBase: load