Skip to content

[Issue180] took out useless params of Ves_get_sampleS #181

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 1 commit into from
Sep 10, 2019
Merged

[Issue180] took out useless params of Ves_get_sampleS #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions tofu/geom/_comp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def _Ves_get_sampleV(VPoly, Min1, Max1, Min2, Max2, dV,
return Pts, dV, ind, dVr


def _Ves_get_sampleS(VPoly, Min1, Max1, Min2, Max2, dS,
def _Ves_get_sampleS(VPoly, dS,
DS=None, dSMode='abs', ind=None, DIn=0., VIn=None,
VType='Tor', VLim=None, nVLim=None, Out='(X,Y,Z)',
margin=1.e-9, Multi=False, Ind=None):
Expand All @@ -284,8 +284,6 @@ def _Ves_get_sampleS(VPoly, Min1, Max1, Min2, Max2, dS,
assert type(Multi) is bool, "Arg Multi must be a bool !"

VLim = None if (VLim is None or nVLim==0) else np.array(VLim)
MinMax1 = np.array([Min1,Max1])
MinMax2 = np.array([Min2,Max2])

# Check if Multi
if nVLim>1:
Expand Down
3 changes: 1 addition & 2 deletions tofu/geom/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,7 @@ def get_sampleS(self, res=None, DS=None, resMode='abs',
VLim=np.ascontiguousarray(self.Lim), nVLim=self.noccur,
Out=Out, margin=1.e-9,
Multi=self.dgeom['Multi'], Ind=Ind)
args = [self.Poly, self.dgeom['P1Min'][0], self.dgeom['P1Max'][0],
self.dgeom['P2Min'][1], self.dgeom['P2Max'][1], res]
args = [self.Poly, res]
pts, dS, ind, reseff = _comp._Ves_get_sampleS(*args, **kwdargs)
return pts, dS, ind, reseff

Expand Down