Skip to content

[Issue 189] Rays._checkformat_inputs_dgeom() is now a method instead … #193

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

Merged
Didou09 merged 3 commits into from
Sep 13, 2019
Merged

[Issue 189] Rays._checkformat_inputs_dgeom() is now a method instead … #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f060e3
[Issue 189] Rays._checkformat_inputs_dgeom() is now a method instead …
Sep 13, 2019
06ce30d
[Issue 189] PEP8 compliance
Sep 13, 2019
eddcc7b
Merge branch 'devel' into Issue189_SelfUndefined
Didou09 Sep 13, 2019
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
17 changes: 8 additions & 9 deletions tofu/geom/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3088,16 +3088,15 @@ def _checkformat_inputs_dES(self, val=None):
assert val.size==self._dgeom['nRays']
return val


@classmethod
def _checkformat_inputs_dgeom(cls, dgeom=None):
def _checkformat_inputs_dgeom(self, dgeom=None):
assert dgeom is not None
assert isinstance(dgeom,tuple) or isinstance(dgeom,dict)
lC = [k for k in cls._dcases.keys()
if (isinstance(dgeom,cls._dcases[k]['type'])
and all([kk in dgeom.keys() for kk in cls._dcases[k]['lk']]))]
lC = [k for k in self._dcases.keys()
if (isinstance(dgeom, self._dcases[k]['type'])
and all([kk in dgeom.keys()
for kk in self._dcases[k]['lk']]))]
if not len(lC)==1:
lstr = [v['lk'] for v in cls._dcases.values()]
lstr = [v['lk'] for v in self._dcases.values()]
msg = "Arg dgeom must be either:\n"
msg += " - dict with keys:\n"
msg += "\n - " + "\n - ".join(lstr)
Expand Down Expand Up @@ -3140,7 +3139,7 @@ def _checkformat_Du(arr, name):
elif case == 'C':
D = _checkformat_Du(dgeom['D'], 'D')
dins = {'pinhole':{'var':dgeom['pinhole'], 'vectnd':3}}
dins, err, msg = cls._check_InputsGeneric(dins)
dins, err, msg = self._check_InputsGeneric(dins)
if err:
raise Exception(msg)
pinhole = dins['pinhole']['var']
Expand Down Expand Up @@ -3169,7 +3168,7 @@ def _checkformat_Du(arr, name):
dins['l2'] = {'var':dgeom['l2'], 'int2float':None}
dins['n2'] = {'var':dgeom['n2'], 'float2int':None}

dins, err, msg = cls._check_InputsGeneric(dins)
dins, err, msg = self._check_InputsGeneric(dins)
if err:
raise Exception(msg)
dgeom = {'dX12':{}}
Expand Down
2 changes: 1 addition & 1 deletion tofu/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Do not edit, pipeline versioning governed by git tags!
__version__ = '1.4.1-51-g96c8cd8'
__version__ = '1.4.1-52-g6f060e3'