Skip to content

Fix a couple of issues that arise with pathological data #268

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
stscirij wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix a couple of issues that arise with pathological data #268

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
12 changes: 8 additions & 4 deletions calcos/trace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,9 @@ def getScienceCentroid(rebinned_data, dq_array, xtract_info,
# number of iterations
cosutil.printWarning("Centroid calculation did not converge")
cosutil.printWarning("after %d iterations" % (n_iterations))
cosutil.printWarning(f"Setting centroid to default value of {startcenter}")
status = NO_CONVERGENCE
centroid = difference
centroid = startcenter
return status, centroid, goodcolumns, regions

def getBackgroundDQ(dqexclude):
Expand Down Expand Up @@ -508,9 +509,12 @@ def getCentroidError(events, info, goodcolumns, regions):
rowstop = regions['specstop']
centroid = getCentroid(counts_ij, goodcolumns, rowstart, rowstop,
background)
error = calculateCentroidError(counts_ij, goodcolumns, regions,
centroid, background=background)
return error
if centroid is not None:
error = calculateCentroidError(counts_ij, goodcolumns, regions,
centroid, background=background)
return error
else:
return None

def calculateCentroidError(data_ij, goodcolumns, regions,
centroid, background=0.0):
Expand Down
Loading