Merge branch 'main' into develop

PetchMa · web-flow · commit fc5435d94b9e · 2025-12-03T12:11:08.000-08:00
diff --git a/python/tarts/aggregatornet.py b/python/tarts/aggregatornet.py
@@ -15,6 +15,7 @@
 
 # Local/application imports
 from .utils import convert_zernikes_deploy
+from .utils import zernikes_to_dof_torch, dof_to_zernikes_torch
 
 
 class AggregatorNet(pl.LightningModule):
diff --git a/python/tarts/lightning_wavenet.py b/python/tarts/lightning_wavenet.py
@@ -26,7 +26,7 @@
     ZERNIKE_SCALE_FACTOR,
 )
 from .dataloader import Donuts, Donuts_Fullframe
-from .utils import convert_zernikes_deploy
+from .utils import convert_zernikes
 from .wavenet import WaveNet
 
 logger = logging.getLogger(__name__)

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`ZERNIKE_SCALE_FACTOR,`
`27`	`27`	`)`
`28`	`28`	`from .dataloader import Donuts, Donuts_Fullframe`
`29`		`-from .utils import convert_zernikes_deploy`
	`29`	`+from .utils import convert_zernikes`
`30`	`30`	`from .wavenet import WaveNet`
`31`	`31`
`32`	`32`	`logger = logging.getLogger(__name__)`