Sourcery refactored master branch #24

sourcery-ai · 2020-06-11T09:35:47Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

sourcery-ai · 2020-06-11T09:35:49Z

octotribble/Combine_nod_spectra.py

-    if Pos == "All":
-        NodNum = len(Spectra)
-    else:
-        NodNum = len(Spectra) / 2.0
+    NodNum = len(Spectra) if Pos == "All" else len(Spectra) / 2.0


Function SumNods refactored with the following changes:

Replace if statement with if expression

sourcery-ai · 2020-06-11T09:35:49Z

octotribble/Compare_pipelines.py

-    if not len(w) or not len(tw):
+    if not (len(w) and len(tw)):


Function ccf_astro refactored with the following changes:

Simplify logical expression

sourcery-ai · 2020-06-11T09:35:49Z

octotribble/Compare_pipelines.py

-    elif sun and model:
+    elif sun:


Function main refactored with the following changes:

Remove redundant conditional

sourcery-ai · 2020-06-11T09:35:49Z

octotribble/Doppler_factor_test.py

-    y = wave * doppler_factor
-    return y
+    return wave * doppler_factor


Function doppler_factor_shift refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:50Z

octotribble/Doppler_factor_test.py

-    y = wave * (1 + beta)
-    return y
+    return wave * (1 + beta)


Function doppler_shift refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:51Z

octotribble/grid_chisquare.py

-    grid = Parallel(n_jobs=n_jobs)(delayed(chi_squared)(obs, model(a, b, *model_params))
-                                   for a in iter_1 for b in iter_2)
-    return grid
+    return Parallel(n_jobs=n_jobs)(
+        delayed(chi_squared)(obs, model(a, b, *model_params))
+        for a in iter_1
+        for b in iter_2
+    )


Function parallel_chisqr_2D refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:52Z

octotribble/grid_chisquare.py

-    grid = Parallel(n_jobs=n_jobs)(delayed(chi_squared)(obs, model(a, b, c, *model_params))
-                                   for a in iter_1 for b in iter_2 for c in iter_3)
-    return grid
+    return Parallel(n_jobs=n_jobs)(
+        delayed(chi_squared)(obs, model(a, b, c, *model_params))
+        for a in iter_1
+        for b in iter_2
+        for c in iter_3
+    )


Function parallel_chisqr_3D refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:52Z

octotribble/grid_chisquare.py

-    grid = Parallel(n_jobs=n_jobs)(delayed(chi_squared)(obs, model(a, b, c, d, *model_params))
-                                   for a in iter_1 for b in iter_2 for c in iter_3 for d in iter_4)
-    return grid
+    return Parallel(n_jobs=n_jobs)(
+        delayed(chi_squared)(obs, model(a, b, c, d, *model_params))
+        for a in iter_1
+        for b in iter_2
+        for c in iter_3
+        for d in iter_4
+    )


Function parallel_chisqr_4D refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:52Z

octotribble/obs_info.py

-    args = parser.parse_args()
-    return args
+    return parser.parse_args()


Function _parser refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:52Z

octotribble/phoenix_utils.py

-    if alpha is not None:
-        if abs(alpha) > 0.2:
-            print("Warning! Alpha is outside acceptable range -0.2->0.2")
-        closest_alpha = alphas[np.abs(alphas - alpha).argmin()]
-        phoenix_glob = ("/Z{2:+4.1f}.Alpha={3:+5.2f}/*{0:05d}{1:4.2f}"
-                        "{2:+4.1f}.Alpha={3:+5.2f}.PHOENIX*.fits"
-                        "").format(closest_teff, closest_logg, closest_feh,
-                                   closest_alpha)
-    else:
-        phoenix_glob = ("/Z{2:+4.1f}/*{0:05d}{1:4.2f}{2:+4.1f}.PHOENIX*.fits"
-                        "").format(closest_teff, closest_logg, closest_feh)
+    phoenix_glob = ("/Z{2:+4.1f}/*{0:05d}{1:4.2f}{2:+4.1f}.PHOENIX*.fits"
+                    "").format(closest_teff, closest_logg, closest_feh)


Function find_closest_phoenix refactored with the following changes:

Remove redundant conditional

sourcery-ai · 2020-06-11T09:35:55Z

octotribble/s_profile.py

-    s_lambda = s_amp * np.sinh(s_inner)
-    return s_lambda
+    return s_amp * np.sinh(s_inner)


Function s_profile refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:55Z

octotribble/script_template.py

-    args = parser.parse_args()
-    return args
+    return parser.parse_args()


Function _parser refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:55Z

octotribble/signaltonoise.py

-    snr = np.mean(spectra) / np.std(spectra, ddof=0)
-    return snr
+    return np.mean(spectra) / np.std(spectra, ddof=0)


Function snr refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:55Z

octotribble/snr_calculations.py

-    args = parser.parse_args()
-    return args
+    return parser.parse_args()


Function _parser refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:56Z

octotribble/snr_calculations.py

-    snr = np.mean(spectra) / np.std(spectra, ddof=ddof)
-    return snr
+    return np.mean(spectra) / np.std(spectra, ddof=ddof)


Function snr refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:58Z

octotribble/extraction/plot_mixed_combination.py

-    args = parser.parse_args()
-    return args
+    return parser.parse_args()


Function _parser refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:58Z

octotribble/extraction/plot_mixed_combination.py

-    if chip is None:
-        chips = range(1, 5)
-    else:
-        chips = [int(chip)]
-
+    chips = range(1, 5) if chip is None else [int(chip)]


Function main refactored with the following changes:

Replace if statement with if expression

sourcery-ai · 2020-06-11T09:35:58Z

octotribble/normalize/cont_norm.py

-    args = parser.parse_args()
-    return args
+    return parser.parse_args()


Function _parser refactored with the following changes:

Inline variable that is only used once

sourcery-ai · 2020-06-11T09:35:58Z

octotribble/normalize/cont_norm.py

-    if len(data) == 2:
-        fits.writeto(fitssave, norm_flux, header=hdr)
-    else:
-        fits.writeto(fitssave, norm_flux, header=hdr)
+    fits.writeto(fitssave, norm_flux, header=hdr)


Function main refactored with the following changes:

Hoist repeated code outside conditional statement

sourcery-ai · 2020-06-11T09:35:59Z

octotribble/normalize/fitsnorm.py

-    args = parser.parse_args()
-    return args
+    return parser.parse_args()


Function _parser refactored with the following changes:

Inline variable that is only used once

Refactored by Sourcery

dc7c0dc

sourcery-ai bot commented Jun 11, 2020

View reviewed changes

Bump pr with small change

fedf6a7

jason-neal merged commit 8df2d6d into master Feb 15, 2024
6 of 8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #24

Sourcery refactored master branch #24

sourcery-ai bot commented Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

sourcery-ai bot Jun 11, 2020

Sourcery refactored master branch #24

Sourcery refactored master branch #24

Conversation

sourcery-ai bot commented Jun 11, 2020

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment

sourcery-ai bot Jun 11, 2020

Choose a reason for hiding this comment