Skip to content

Commit

Permalink
Merge pull request #153 from pllim/tst-warnings
Browse files Browse the repository at this point in the history
MNT: Replace deprecated dtypes in numpy 1.21
  • Loading branch information
pllim authored Jun 22, 2021
2 parents 54dcfbd + 3537b33 commit 1a58d33
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bc1.name = "release"
// Would be nice if Jenkins can access /grp/hst/cdbs/xxxx directly.
bc1.env_vars = ['TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory']
bc1.conda_channels = ['http://ssb.stsci.edu/astroconda']
bc1.conda_packages = ['python=3.6']
bc1.conda_packages = ['python=3.7']
bc1.build_cmds = ["pip install -e .[test,all]"]
bc1.test_cmds = ["pytest --basetemp=tests_output --junitxml results.xml --bigdata -v"]
bc1.failedUnstableThresh = 1
Expand Down
8 changes: 4 additions & 4 deletions acstools/acs_destripe.py
Original file line number Diff line number Diff line change
Expand Up @@ -643,13 +643,13 @@ def clean_streak(image, stat="pmode1", maxiter=15, sigrej=2.0,

# array to hold cumulative stripe amplitudes and latest row npix:
cumcorr = np.zeros(image.science.shape[0], dtype=np.float64)
cnpix = np.zeros(image.science.shape[0], dtype=np.int)
cnpix = np.zeros(image.science.shape[0], dtype=int)

# other arrays
corr_scale = np.empty(image.science.shape[0], dtype=np.float64)
npix = np.empty(image.science.shape[0], dtype=np.int)
npix = np.empty(image.science.shape[0], dtype=int)
sigcorr2 = np.zeros(image.science.shape[0], dtype=np.float64)
updrows = np.zeros(image.science.shape[0], dtype=np.int)
updrows = np.zeros(image.science.shape[0], dtype=int)

# for speed-up and to reduce rounding errors in ERR computations,
# keep a copy of the squared error array:
Expand Down Expand Up @@ -989,7 +989,7 @@ def djs_iterstat(InputArr, MaxIter=10, SigRej=3.0,
else:
break

logical_mask = SaveMask.astype(np.bool)
logical_mask = SaveMask.astype(bool)

if NLast > 1:
FMedian = np.median(InputArr[logical_mask])
Expand Down
2 changes: 1 addition & 1 deletion acstools/satdet.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ def make_mask(filename, ext, trail_coords, sublen=75, subwidth=200, order=3,
f'{image.shape}', AstropyUserWarning)

# Change to boolean mask
mask = mask.astype(np.bool)
mask = mask.astype(bool)

if plot and plt is not None:
# debugging array
Expand Down

0 comments on commit 1a58d33

Please sign in to comment.