All tests pass in Beta, many new changes have been introduced, i think we're ready for another release #65

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.

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

Open

tpchuckles wants to merge 48 commits into main from beta

+5,171 −2,625

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ test_results/ @@
     !tests/outputs/figs/*.png
     *.jpg
     *.jpeg
+    *.sea
     # IDE and editor files
     .vscode/
@@ Expand Down @@

src/pyslice/backend.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,8 @@ def asarray(arraylike, dtype=None, device=None): @@
         return array
     def zeros(dims, dtype=DEFAULT_FLOAT_DTYPE, device=DEFAULT_DEVICE):
+        if isinstance(dtype,str):
+            dtype=DEFAULT_FLOAT_DTYPE if dtype=="float" else DEFAULT_COMPLEX_DTYPE
         if xp != np:
             array = xp.zeros(dims, dtype=dtype, device=device)
         else:
@@ Expand Down @@

src/pyslice/data/signal.py → src/pyslice/data/ALSONOTsignal.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -271,6 +271,7 @@ def to_dict(self,
  
                    if deep: value = type(value)([v.to_dict(hidden=hidden, properties=properties, deep=deep) for v in value]) #keep the iterable type and loop it converting each element to a dict\

                    result[key] = value

                else:

                    #print("TODICT",key,value)

                    result[key] = value

            return result

    @@ -282,6 +283,8 @@ def to_hdf5_group(self, parent_group: File|Group,
  
            """Save object to SEA formated HDF5 group."""

            sea_type = type(self).__name__ # Get the SEA class type

            if sea_type in ["TACAWData","WFData"]: # TWP 20260120: sea-eco appears to not know about TACAWData, so let's treat parent classes (not Dimensions and friends) as Signals

                sea_type = 'Signal'

            # Handle group name: use provided name, fall back to object's name attribute, or default

            if name is None:

    @@ -299,8 +302,16 @@ def to_hdf5_group(self, parent_group: File|Group,
  
                                    exclude_keys=exclude_keys)

            to_write = {**{k:v for k,v in to_write.items() if '_' not in str(k)},

                        **{k:v for k,v in to_write.items() if '_' in str(k)}}

            print("to_write.keys()",to_write.keys())

            #to_write[ "data" ]=to_write[ "array" ]

            storage_name_counts: Dict[str, int] = {}

            #print("to_write",to_write.items().keys())

            for key, val in to_write.items():

                #print("name",name,"key",key,"val",val,"type",type(val))

                if key in ["probe","cache_dir"]:

                    continue

                if key == "_array":

                    key = "data"

                if not hasattr(self, key):

                    continue

                storage_key = key[1:] if key.startswith('_') else key

    @@ -339,7 +350,7 @@ def to_sea(self, file_path: str,
  
            file.attrs['file_type'] = 'SEA-eco HDF5 file'.encode('utf-8')

            file.attrs['file_version'] = '0.0'.encode('utf-8')

            file.attrs['sea_type'] = type(self).__name__.encode('utf-8')

            #print("file.attrs",[ (k,file.attrs[k]) for k in file.attrs.keys() ])

            self.to_hdf5_group(parent_group=file, force_datasets=force_datasets)

            file.close()

    @@ -632,7 +643,7 @@ class Dimension(SEASerializable):
  
        def __init__(self, dimension: Dict|GeneralMetadata|None = None,

                     name: str = 'Unnamed Dimension',

                     space: Literal["position", "scattering", "temporal", "spectral"] | None = None,

                     scale: float|int|Iterable[float|int]|None = None,

                     scale: float|int|Iterable[float|int]|None = 1,

                     offset: float|int|Iterable[float|int]|None = None,

                     size: int|Iterable[int]|None = None,

                     units: str|Iterable[str] = '',

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

All tests pass in Beta, many new changes have been introduced, i think we're ready for another release #65

Diff view

Diff view

There are no files selected for viewing

Uh oh!

All tests pass in Beta, many new changes have been introduced, i think we're ready for another release #65

Are you sure you want to change the base?

All tests pass in Beta, many new changes have been introduced, i think we're ready for another release #65

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!