Skip to content

Refactor argument handling: simplify logic by using arg_len variable #915

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

Open
kaz2700 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor argument handling: simplify logic by using arg_len variable #915

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
29 changes: 16 additions & 13 deletions stingray/simulator/simulator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,26 +149,29 @@ def simulate(self, *args):
lightCurve : `LightCurve` object

"""
if isinstance(args[0], (numbers.Integral, float)) and len(args) == 1:
return self._simulate_power_law(args[0])

elif isinstance(args[0], astropy.modeling.Model) and len(args) == 1:
return self._simulate_model(args[0])

elif utils.is_string(args[0]) and len(args) == 2:
return self._simulate_model_string(args[0], args[1])

elif len(args) == 1:
arg_len = len(args)

if arg_len == 1:
if isinstance(args[0], (numbers.Integral, float)):
return self._simulate_power_law(args[0])

elif isinstance(args[0], astropy.modeling.Model):
return self._simulate_model(args[0])

return self._simulate_power_spectrum(args[0])

elif len(args) == 2:
elif arg_len == 2:
if utils.is_string(args[0]):
return self._simulate_model_string(args[0], args[1])
Copy link
Member

@matteobachetti matteobachetti Jun 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return self._simulate_model_string(args[0], args[1])
return self._simulate_model_string(*args)


return self._simulate_impulse_response(args[0], args[1])
Copy link
Member

@matteobachetti matteobachetti Jun 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return self._simulate_impulse_response(args[0], args[1])
return self._simulate_impulse_response(*args)


elif len(args) == 3:
elif arg_len == 3:
return self._simulate_impulse_response(args[0], args[1], args[2])
Copy link
Member

@matteobachetti matteobachetti Jun 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return self._simulate_impulse_response(args[0], args[1], args[2])
return self._simulate_impulse_response(*args)


else:
raise ValueError("Length of arguments must be 1, 2 or 3.")
raise ValueError("Length of arguments must be 1, 2, or 3.")


def simulate_channel(self, channel, *args):
"""
Expand Down
Loading