diff --git a/maria/_version.py b/maria/_version.py index 570e408..3b24160 100644 --- a/maria/_version.py +++ b/maria/_version.py @@ -13,5 +13,5 @@ __version_tuple__: VERSION_TUPLE version_tuple: VERSION_TUPLE -__version__ = version = "0.9.8.dev32" -__version_tuple__ = version_tuple = (0, 9, 8, "dev32") +__version__ = version = "1.0.0" +__version_tuple__ = version_tuple = (1, 0, 0) diff --git a/maria/instrument/__init__.py b/maria/instrument/__init__.py index e42239f..15908c1 100644 --- a/maria/instrument/__init__.py +++ b/maria/instrument/__init__.py @@ -372,7 +372,7 @@ def plot(self, units=None): ax.scatter( *getattr(offsets, offsets.units)[band_mask].T, label=uband, - s=5e-1, + s=0, color=band_color, ) diff --git a/maria/map/map.py b/maria/map/map.py index fa058ec..952fa94 100644 --- a/maria/map/map.py +++ b/maria/map/map.py @@ -176,7 +176,7 @@ def plot( vmin, vmax = np.interp([rel_vmin, rel_vmax], np.cumsum(w) / np.sum(w), d) map_im = ax.imshow( - self.data.T, + self.data[i_freq].T, cmap=cmap, interpolation="none", extent=map_extent, @@ -188,4 +188,4 @@ def plot( ax.set_ylabel(rf"$\Delta\,\theta_y$ [{units}]") cbar = fig.colorbar(map_im, ax=ax, shrink=1.0) - cbar.set_label("mJy km/s/pixel") + cbar.set_label("RJ temperature [K]") diff --git a/maria/map/mappers.py b/maria/map/mappers.py index 9752673..06c94e0 100644 --- a/maria/map/mappers.py +++ b/maria/map/mappers.py @@ -166,14 +166,12 @@ def run(self): for tod in self.tods: # compute detector offsets WRT the map + dx, dy = tod.coords.offsets(frame=self.frame, center=self.center) band_mask = tod.dets.band_name == band - if self.calibrate: - D = tod.data_calibrated.copy()[band_mask] - else: - D = tod.data.copy()[band_mask] + D = tod.cal[band_mask, None] * tod.data[band_mask] # windowing W = np.ones(D.shape[0])[:, None] * sp.signal.windows.tukey( @@ -203,14 +201,15 @@ def run(self): if "despline" in self.tod_postprocessing.keys(): B = utils.signal.get_bspline_basis( tod.time.compute(), - dk=self.tod_postprocessing["despline"].get("knot_spacing", 10), + spacing=self.tod_postprocessing["despline"].get( + "knot_spacing", 10 + ), order=self.tod_postprocessing["despline"].get( "spline_order", 3 ), ) A = np.linalg.inv(B @ B.T) @ B @ WD.T - WD -= A.T @ B map_sum = sp.stats.binned_statistic_2d( @@ -261,6 +260,12 @@ def run(self): self.map_weight[iband] = band_map_denom + # from maria.atmosphere import Spectrum + + # spectrum = Spectrum(region=tod.metadata.region) + + # transmission = spectrum.transmission(nu=150, zenith_pwv=tod.metadata.pwv, elevation=np.degrees(tod.coords.el)) + self.map = Map( data=self.map_data, weight=self.map_weight, diff --git a/maria/sim/base.py b/maria/sim/base.py index 92d0ed6..72f2089 100644 --- a/maria/sim/base.py +++ b/maria/sim/base.py @@ -2,6 +2,7 @@ import dask.array as da import numpy as np +import pandas as pd # noqa from todder import TOD from todder.coords import Coordinates, dx_dy_to_phi_theta @@ -144,4 +145,9 @@ def run(self, dtype=np.float32): coords=self.coords, ) + tod.cal = 1 / self.instrument.dets.dP_dTRJ # takes the data to TRJ + + # tod.metadata = pd.Series({"pwv": self.atmosphere.weather.pwv, + # "region": self.site.region}) + return tod