Skip to content
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

Jump to bottom

Fix error in sci energy channel config file #96

Merged
merged 2 commits into from
Aug 4, 2022
Merged

Fix error in sci energy channel config file #96

merged 2 commits into from
Aug 4, 2022

Conversation

samaloney
Copy link
Collaborator

@samaloney samaloney commented Jul 13, 2022 •
edited
Loading

Closes #95

grazwegian
grazwegian reviewed Jul 14, 2022
View reviewed changes
Copy link
Collaborator

@grazwegian grazwegian left a comment

Choose a reason for hiding this comment

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

I think we also have to change column 6 which is the bin width from 1 to 2

@samaloney
Copy link
Collaborator Author

Fixed the width too

@samaloney samaloney merged commit bc3ecfc into i4Ds:master Aug 4, 2022
grazwegian added a commit to grazwegian/STIX-GSW that referenced this pull request Aug 8, 2022
@grazwegian
Merge commit 'bc3ecfceee3785d0b07261df4f82b1a1a4e468f0' into OSPEX-up…
370954d 
…dates

* commit 'bc3ecfceee3785d0b07261df4f82b1a1a4e468f0':
  Fix error in sci energy channel config file (i4Ds#96)
  Added automatic check for energy shift (i4Ds#101)
  Added a few functionalities to stx_science_data_lightcurve (i4Ds#99)

# Conflicts:
#	stix/idl/processing/spectrogram/stx_convert_pixel_data.pro
#	stix/idl/processing/spectrogram/stx_convert_spectrogram.pro
grazwegian added a commit to grazwegian/STIX-GSW that referenced this pull request Aug 8, 2022
@grazwegian
Merge branch 'automatic-fitting' into XSPEC-conversion
044f7eb 
* automatic-fitting:
  Pass through additional useful keywords to the spectrum and srm FITS files
  Fix error in sci energy channel config file (i4Ds#96)
  Added automatic check for energy shift (i4Ds#101)
  Added a few functionalities to stx_science_data_lightcurve (i4Ds#99)
  stx_read_elut - fixed issue when filename keyword is not used

# Conflicts:
#	stix/idl/processing/spectrogram/stx_convert_pixel_data.pro
#	stix/idl/processing/spectrogram/stx_convert_science_data2ospex.pro
#	stix/idl/processing/spectrogram/stx_convert_spectrogram.pro
#	stix/idl/processing/spectrogram/stx_fsw_sd_spectrogram2ospex.pro
#	stix/idl/processing/spectrogram/stx_write_ospex_fits.pro
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grazwegian grazwegian grazwegian approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Error in ScienceEnergy channel config file.
2 participants
@samaloney @grazwegian