[SyneRBI/SIRF] `Handle` everything (PR #1388)
Casper da Costa-Luis
add Utilities.Handle wrapper (fixes #1384)
- update SIRF
- update STIR
- update Reg
- update Gadgetron
- fix tests
- update docs & changelog
You can view, comment on, or merge this pull request online at:
https://github.com/SyneRBI/SIRF/pull/1388
Commit Summary
- 1c4b54a Handle wrapper
- 83469e9 Handle SIRF
- 3386056 Handle Reg
- 0626bb4 Handle Gadgetron
- a34c472 Handle STIR
File Changes
(7 files)
- M src/Registration/pReg/Reg.py (666)
- M src/Registration/pReg/tests/test_pReg.py (202)
- M src/common/SIRF.py (238)
- M src/common/Utilities.py (211)
- M src/xGadgetron/pGadgetron/Gadgetron.py (1017)
- M src/xSTIR/pSTIR/STIR.py (1226)
- M src/xSTIR/pSTIR/tests/test_algebra.py (2)
Patch Links:
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans commented on this pull request.
> @@ -210,10 +206,8 @@ def same_object(self):
return DataContainer()
def clone(self):
- assert self.handle is not None
In case handle is None, we'd now get a cryptic error without the assert?
> + def __getattr__(self, name):
+ assert self.valid
+ match name.split('_', 1)[0]:
+ case 'cSIRF':
+ func = getattr(pysirf, name)
+ case 'cReg':
+ import sirf.pyreg as pyreg
+ func = getattr(pyreg, name)
+ case 'cGT':
+ import sirf.pygadgetron as pygadgetron
+ func = getattr(pygadgetron, name)
+ case 'cSTIR':
+ import sirf.pystir as pystir
+ func = getattr(pystir, name)
+ case _:
+ raise AttributeError("namespace of %s" % name)
probably a bit cryptic error
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> @@ -210,10 +206,8 @@ def same_object(self):
return DataContainer()
def clone(self):
- assert self.handle is not None
Before, we'd just get AssertionError (no message).
Now, we'd get AttributeError: 'NoneType' object has no attribute 'cSIRF_clone' which to me seems an improvement.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 6 commits.
- fdcd949 Handle wrapper
- fa2c217 Handle SIRF
- cad2186 Handle Reg
- 36f5664 Handle Gadgetron
- fd0fd3c Handle STIR
- 5405662 Handle init
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 3 commits.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> + + def __str__(self): + return pyiutil.charDataFromHandle(self._handle) + + def __abs__(self): + return pyiutil.size_tDataFromHandle(self._handle) + + def __complex__(self, double=False): + if double: + return pyiutil.doubleReDataFromHandle(self._handle) + 1.j * pyiutil.doubleImDataFromHandle(self._handle) + return pyiutil.floatReDataFromHandle(self._handle) + 1.j * pyiutil.floatImDataFromHandle(self._handle) + + def __del__(self): + if self._handle is not None: + pyiutil.deleteDataHandle(self._handle) + self._handle = None # TODO: is this required?
ideally deleteDataHandle should transform the object to None, but I'm unsure
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 5 commits.
- d7b07a8 Handle Reg
- 492c209 Handle Gadgetron
- b838afe Handle STIR
- 91424d3 Handle init
- a8bf5e2 fix cGT_getImageDim missing return
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
casperdcl left a comment (SyneRBI/SIRF#1388)All tests passing; codacy can be ignored. 1k fewer lines :)
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans commented on this pull request.
> + + def __str__(self): + return pyiutil.charDataFromHandle(self._handle) + + def __abs__(self): + return pyiutil.size_tDataFromHandle(self._handle) + + def __complex__(self, double=False): + if double: + return pyiutil.doubleReDataFromHandle(self._handle) + 1.j * pyiutil.doubleImDataFromHandle(self._handle) + return pyiutil.floatReDataFromHandle(self._handle) + 1.j * pyiutil.floatImDataFromHandle(self._handle) + + def __del__(self): + if self._handle is not None: + pyiutil.deleteDataHandle(self._handle) + self._handle = None # TODO: is this required?
better safe than sorry
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans approved this pull request.
fine for me. I didn't check the detail of course.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.