jan/masque
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

[OASIS] cleanup

Browse source
This commit is contained in:
Jan Petykiewicz 2026-02-15 16:43:46 -08:00
commit c18e5b8d3e
1 changed files with 75 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

25
masque/file/oasis.py
View file

@ -622,10 +622,12 @@ def repetition_fata2masq(
) -> Repetition | None: ) -> Repetition | None:
mrep: Repetition | None mrep: Repetition | None
if isinstance(rep, fatamorgana.GridRepetition): if isinstance(rep, fatamorgana.GridRepetition):
mrep = Grid(a_vector=rep.a_vector, mrep = Grid(
a_vector = rep.a_vector,
b_vector = rep.b_vector, b_vector = rep.b_vector,
a_count = rep.a_count, a_count = rep.a_count,
b_count=rep.b_count) b_count = rep.b_count,
)
elif isinstance(rep, fatamorgana.ArbitraryRepetition): elif isinstance(rep, fatamorgana.ArbitraryRepetition):
displacements = numpy.cumsum(numpy.column_stack(( displacements = numpy.cumsum(numpy.column_stack((
rep.x_displacements, rep.x_displacements,
@ -647,14 +649,19 @@ def repetition_masq2fata(
frep: fatamorgana.GridRepetition | fatamorgana.ArbitraryRepetition | None frep: fatamorgana.GridRepetition | fatamorgana.ArbitraryRepetition | None
if isinstance(rep, Grid): if isinstance(rep, Grid):
a_vector = rint_cast(rep.a_vector) a_vector = rint_cast(rep.a_vector)
b_vector = rint_cast(rep.b_vector) if rep.b_vector is not None else None a_count = int(rep.a_count)
a_count = rint_cast(rep.a_count) if rep.b_count > 1:
b_count = rint_cast(rep.b_count) if rep.b_count is not None else None b_vector = rint_cast(rep.b_vector)
b_count = int(rep.b_count)
else:
b_vector = None
b_count = None
frep = fatamorgana.GridRepetition( frep = fatamorgana.GridRepetition(
a_vector=cast('list[int]', a_vector), a_vector = a_vector,
b_vector=cast('list[int] | None', b_vector), b_vector = b_vector,
a_count=cast('int', a_count), a_count = a_count,
b_count=cast('int | None', b_count), b_count = b_count,
) )
offset = (0, 0) offset = (0, 0)
elif isinstance(rep, Arbitrary): elif isinstance(rep, Arbitrary):