Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/visualizer refactor #77

Merged
merged 5 commits into from
Apr 15, 2024
Merged

Feature/visualizer refactor #77

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31407d6
renaming variables and modules
Jammy2211 Apr 9, 2024
b72a77e
Dataset1D uses Visualizer
Jammy2211 Apr 9, 2024
bd146e6
fix imports
Jammy2211 Apr 9, 2024
b39814b
refacted to use new visualize API
Jammy2211 Apr 9, 2024
93642b2
black
Jammy2211 Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
renaming variables and modules
  • Loading branch information
@Jammy2211
Jammy2211 committed Apr 9, 2024
commit 31407d601b5e5cbfee9b2a62dcf7913893201490
42 changes: 21 additions & 21 deletions autocti/charge_injection/model/analysis.py
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

from autocti.charge_injection.imaging.imaging import ImagingCI
from autocti.charge_injection.fit import FitImagingCI
from autocti.charge_injection.model.visualizer import VisualizerImagingCI
from autocti.charge_injection.model.visualizer import PlotterInterfaceImagingCI
from autocti.charge_injection.model.result import ResultImagingCI
from autocti.clocker.two_d import Clocker2D
from autocti.charge_injection.hyper import HyperCINoiseCollection
@@ -302,23 +302,23 @@ def visualize_before_fit(self, paths: af.DirectoryPaths, model: af.Collection):
if conf.instance["visualize"]["plots"]["combined_only"]:
return

visualizer = VisualizerImagingCI(visualize_path=paths.image_path)
visualizer = PlotterInterfaceImagingCI(image_path=paths.image_path)

region_list = self.region_list_from(model=model)

if conf.instance["visualize"]["plots"]["dataset"]["fpr_non_uniformity"]:
region_list += ["fpr_non_uniformity"]

visualizer.visualize_dataset(dataset=self.dataset)
visualizer.visualize_dataset_regions(
visualizer.dataset(dataset=self.dataset)
visualizer.dataset_regions(
dataset=self.dataset, region_list=region_list
)

if self.dataset_full is not None:
visualizer.visualize_dataset(
visualizer.dataset(
dataset=self.dataset_full, folder_suffix="_full"
)
visualizer.visualize_dataset_regions(
visualizer.dataset_regions(
dataset=self.dataset_full,
region_list=region_list,
folder_suffix="_full",
@@ -330,7 +330,7 @@ def visualize_before_fit_combined(
if analyses is None:
return

visualizer = VisualizerImagingCI(visualize_path=paths.image_path)
visualizer = PlotterInterfaceImagingCI(image_path=paths.image_path)

region_list = self.region_list_from(model=model)

@@ -345,11 +345,11 @@ def visualize_before_fit_combined(
fpr_value_list=fpr_value_list,
)

visualizer.visualize_dataset_combined(
visualizer.dataset_combined(
dataset_list=dataset_list,
)

visualizer.visualize_dataset_regions_combined(
visualizer.dataset_regions_combined(
dataset_list=dataset_list,
region_list=region_list,
)
@@ -362,12 +362,12 @@ def visualize_before_fit_combined(
fpr_value_list=fpr_value_list,
)

visualizer.visualize_dataset_combined(
visualizer.dataset_combined(
dataset_list=dataset_full_list,
folder_suffix="_full",
filename_suffix="_full",
)
visualizer.visualize_dataset_regions_combined(
visualizer.dataset_regions_combined(
dataset_list=dataset_full_list,
region_list=region_list,
folder_suffix="_full",
@@ -386,9 +386,9 @@ def visualize(
fit = self.fit_via_instance_from(instance=instance)
region_list = self.region_list_from(model=instance)

visualizer = VisualizerImagingCI(visualize_path=paths.image_path)
visualizer.visualize_fit(fit=fit, during_analysis=during_analysis)
visualizer.visualize_fit_1d_regions(
visualizer = PlotterInterfaceImagingCI(image_path=paths.image_path)
visualizer.fit(fit=fit, during_analysis=during_analysis)
visualizer.fit_1d_regions(
fit=fit, during_analysis=during_analysis, region_list=region_list
)

@@ -397,10 +397,10 @@ def visualize(
instance=instance, dataset=self.dataset_full
)

visualizer.visualize_fit(
visualizer.fit(
fit=fit_full, during_analysis=during_analysis, folder_suffix="_full"
)
visualizer.visualize_fit_1d_regions(
visualizer.fit_1d_regions(
fit=fit_full,
during_analysis=during_analysis,
region_list=region_list,
@@ -430,11 +430,11 @@ def visualize_combined(

region_list = self.region_list_from(model=instance)

visualizer = VisualizerImagingCI(visualize_path=paths.image_path)
visualizer.visualize_fit_combined(
visualizer = PlotterInterfaceImagingCI(image_path=paths.image_path)
visualizer.fit_combined(
fit_list=fit_list, during_analysis=during_analysis
)
visualizer.visualize_fit_1d_regions_combined(
visualizer.fit_1d_regions_combined(
fit_list=fit_list,
region_list=region_list,
during_analysis=during_analysis,
@@ -453,12 +453,12 @@ def visualize_combined(
fpr_value_list=fpr_value_list,
)

visualizer.visualize_fit_combined(
visualizer.fit_combined(
fit_list=fit_full_list,
during_analysis=during_analysis,
folder_suffix="_full",
)
visualizer.visualize_fit_1d_regions_combined(
visualizer.fit_1d_regions_combined(
fit_list=fit_full_list,
region_list=region_list,
during_analysis=during_analysis,
24 changes: 12 additions & 12 deletions autocti/charge_injection/model/visualizer.py → ...arge_injection/model/plotter_interface.py
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

import autocti.plot as aplt

from autocti.model.visualizer import Visualizer
from autocti.model.visualizer import PlotterInterface
from autocti.model.visualizer import plot_setting

from autocti import exc
@@ -14,8 +14,8 @@
logger.setLevel(level="INFO")


class VisualizerImagingCI(Visualizer):
def visualize_dataset(self, dataset, folder_suffix: str = ""):
class PlotterInterfaceImagingCI(PlotterInterface):
def dataset(self, dataset, folder_suffix: str = ""):
def should_plot(name):
return plot_setting(section="dataset", name=name)

@@ -36,7 +36,7 @@ def should_plot(name):
cosmic_ray_map=should_plot("cosmic_ray_map"),
)

def visualize_dataset_regions(self, dataset, region_list, folder_suffix: str = ""):
def dataset_regions(self, dataset, region_list, folder_suffix: str = ""):
def should_plot(name):
return plot_setting(section="dataset", name=name)

@@ -65,7 +65,7 @@ def should_plot(name):
f"VISUALIZATION - Could not visualize the ImagingCI 1D {region}"
)

def visualize_dataset_combined(
def dataset_combined(
self, dataset_list, folder_suffix: str = "", filename_suffix: str = ""
):
def should_plot(name):
@@ -113,7 +113,7 @@ def should_plot(name):
filename_suffix=filename_suffix,
)

def visualize_dataset_regions_combined(
def dataset_regions_combined(
self,
dataset_list,
region_list,
@@ -172,7 +172,7 @@ def should_plot(name):
filename_suffix=f"{filename_suffix}",
)

def visualize_fit(self, fit, during_analysis, folder_suffix: str = ""):
def fit(self, fit, during_analysis, folder_suffix: str = ""):
def should_plot(name):
return plot_setting(section="fit", name=name)

@@ -207,12 +207,12 @@ def should_plot(name):
)

if should_plot("all_at_end_fits"):
self.visualize_fit_in_fits(fit=fit)
self.fit_in_fits(fit=fit)

if should_plot("subplot_fit"):
fit_plotter.subplot_fit()

def visualize_fit_1d_regions(
def fit_1d_regions(
self, fit, region_list, during_analysis, folder_suffix: str = ""
):
def should_plot(name):
@@ -263,7 +263,7 @@ def should_plot(name):
f"VISUALIZATION - Could not visualize the ImagingCI 1D {region}"
)

def visualize_fit_combined(
def fit_combined(
self, fit_list, during_analysis, folder_suffix: str = ""
):
def should_plot(name):
@@ -296,7 +296,7 @@ def should_plot(name):
func_name="figures_2d", figure_name="chi_squared_map"
)

def visualize_fit_1d_regions_combined(
def fit_1d_regions_combined(
self, fit_list, region_list, during_analysis, folder_suffix: str = ""
):
def should_plot(name):
@@ -382,7 +382,7 @@ def should_plot(name):
figure_name=figure_name,
)

def visualize_fit_in_fits(self, fit):
def fit_in_fits(self, fit):
mat_plot_2d = self.mat_plot_2d_from(subfolders="fit_imaging/fit", format="fit")

fit_plotter = aplt.FitImagingCIPlotter(
42 changes: 21 additions & 21 deletions autocti/dataset_1d/model/analysis.py
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

from autocti.dataset_1d.dataset_1d.dataset_1d import Dataset1D
from autocti.dataset_1d.fit import FitDataset1D
from autocti.dataset_1d.model.visualizer import VisualizerDataset1D
from autocti.dataset_1d.model.visualizer import PlotterInterfaceDataset1D
from autocti.dataset_1d.model.result import ResultDataset1D
from autocti.model.analysis import AnalysisCTI
from autocti.model.settings import SettingsCTI1D
@@ -186,17 +186,17 @@ def output_dataset(dataset, prefix):
def visualize_before_fit(self, paths: af.DirectoryPaths, model: af.Collection):
region_list = self.region_list_from()

visualizer = VisualizerDataset1D(visualize_path=paths.image_path)
visualizer.visualize_dataset(dataset=self.dataset)
visualizer.visualize_dataset_regions(
visualizer = PlotterInterfaceDataset1D(image_path=paths.image_path)
visualizer.dataset(dataset=self.dataset)
visualizer.dataset_regions(
dataset=self.dataset, region_list=region_list
)

if self.dataset_full is not None:
visualizer.visualize_dataset(
visualizer.dataset(
dataset=self.dataset_full, folder_suffix="_full"
)
visualizer.visualize_dataset_regions(
visualizer.dataset_regions(
dataset=self.dataset_full,
region_list=region_list,
folder_suffix="_full",
@@ -208,7 +208,7 @@ def visualize_before_fit_combined(
if analyses is None:
return

visualizer = VisualizerDataset1D(visualize_path=paths.image_path)
visualizer = PlotterInterfaceDataset1D(image_path=paths.image_path)

region_list = self.region_list_from()

@@ -220,10 +220,10 @@ def visualize_before_fit_combined(
fpr_value_list=fpr_value_list,
)

visualizer.visualize_dataset_combined(
visualizer.dataset_combined(
dataset_list=dataset_list,
)
visualizer.visualize_dataset_regions_combined(
visualizer.dataset_regions_combined(
dataset_list=dataset_list,
region_list=region_list,
)
@@ -236,10 +236,10 @@ def visualize_before_fit_combined(
fpr_value_list=fpr_value_list,
)

visualizer.visualize_dataset_combined(
visualizer.dataset_combined(
dataset_list=dataset_full_list, folder_suffix="_full"
)
visualizer.visualize_dataset_regions_combined(
visualizer.dataset_regions_combined(
dataset_list=dataset_full_list,
region_list=region_list,
folder_suffix="_full",
@@ -253,20 +253,20 @@ def visualize(
):
region_list = self.region_list_from()

visualizer = VisualizerDataset1D(visualize_path=paths.image_path)
visualizer = PlotterInterfaceDataset1D(image_path=paths.image_path)

fit = self.fit_via_instance_from(instance=instance)
visualizer.visualize_fit(fit=fit, during_analysis=during_analysis)
visualizer.visualize_fit_regions(
visualizer.fit(fit=fit, during_analysis=during_analysis)
visualizer.fit_regions(
fit=fit, region_list=region_list, during_analysis=during_analysis
)

if self.dataset_full is not None:
fit = self.fit_via_instance_and_dataset_from(
instance=instance, dataset=self.dataset_full
)
visualizer.visualize_fit(fit=fit, during_analysis=during_analysis)
visualizer.visualize_fit_regions(
visualizer.fit(fit=fit, during_analysis=during_analysis)
visualizer.fit_regions(
fit=fit, region_list=region_list, during_analysis=during_analysis
)

@@ -293,11 +293,11 @@ def visualize_combined(

region_list = self.region_list_from()

visualizer = VisualizerDataset1D(visualize_path=paths.image_path)
visualizer.visualize_fit_combined(
visualizer = PlotterInterfaceDataset1D(image_path=paths.image_path)
visualizer.fit_combined(
fit_list=fit_list, during_analysis=during_analysis
)
visualizer.visualize_fit_region_combined(
visualizer.fit_region_combined(
fit_list=fit_list,
region_list=region_list,
during_analysis=during_analysis,
@@ -316,10 +316,10 @@ def visualize_combined(
fpr_value_list=fpr_value_list,
)

visualizer.visualize_fit_combined(
visualizer.fit_combined(
fit_list=fit_full_list, during_analysis=during_analysis
)
visualizer.visualize_fit_region_combined(
visualizer.fit_region_combined(
fit_list=fit_full_list,
region_list=region_list,
during_analysis=during_analysis,
Loading