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.

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

Merge Devopment into master #48

Merged
merged 41 commits into from
Oct 21, 2021
Merged

Merge Devopment into master #48

merged 41 commits into from
Oct 21, 2021

Conversation

samaloney
Copy link
Collaborator

No description provided.

rschwartz70 and others added 30 commits July 27, 2020 10:15
…alibration FITS files

stx_calibration_fits_demo : This procedure demonstrates the reading of a quicklook calibration FITS file, creating an array of the data and plotting each spectrum

asw_ql_calibration_spectrum :  This function reads a quicklook calibration fits file into a stx_asw_ql_calibration_spectrum structure along with associated data from the file

stx_convert_calibration_fits2array : This function checks all files in the specified directory and reads the calibration fits files. The spectra are put into an array and the associated metadata is stored in a structure. These variables can be optionally saved to a genx file.

stx_plot_calibration_run: This procedure produces a postscript plot of all individual calibration spectra. The plots are made over a set ACD range.
Meta data extracted from quicklook calibration FITS files and the quasi ELUT files processed for each. Contains processed gains and offsets that can be used to build the temperature dependence need for the TLUT.  Current temperature excursions and offset shifts are too small to deploy an actual TLUT, ras, 6-AUG-2020
Utility to convert bytarr masks (1s and 0s) to bits in an integer L64 word
These files build a meta data structure of the quicklook calibration spectra from the FITS files on pub023.  The meta data is extracted from those files, and the processed results are grabbed from pub023 using STX_CAL_GET_META.  Then after finding the files with short durations and baseline_holder on the TLUT derivative is computed using STX_CALIBRATION_TLUT_DERIVATIVE.
This code is used to build a database file of the processed calibration FITS files (L1) and from this compute the derivative of the ADC4096 channel vs temperature change. This derivative is exactly what is used to build the TLUT but the current temperature range and channel variability is too small to warrant a TLUT at this time. 6-aug-202
Thanks to Shane for pointing out that the cast on data (adata) needs to be long64
print_info is now keyword_set( print_info )
These files take the transmission layer components from Shane and format them into an IDL structure (and FITS file) so the transmission can be simply computed using xtrans
A flexible count integration tool to operate on Shane's Crab L1 full energy/pixel/detector/time FITS files
…ase In-flight quicklook calibration data

D8400.1 Report/feed-back on low-latency calibration of in-space data.

Low Latency Calibration of In-Space Data.doc  - Report on low-latency calibration of in-space data during Near Earth Commissioning Phase

stx_elut_comparison.pro - This procedure produces several plots indicating the differences between two ELUT csv files
stx_plot_calibration_run:
added keywords for selecting line style and colour for multiple runs
added _extra for additional plotting pass through
added rate and scaled keywords for plotting multiple calibration spectra on the same plot

stx_calibration_fits_demo:
added _extra keywords for pass through of plotting commands, stx_plot_calibration_run now takes additional info from the calibration_info structure

stx_elut_comparison:
added n_tbl_new candidate_new, candidate_current and n_tbl_current keywords as prospective candidate files generated from each calibration run have a different structure from the uploaded files usually stored in /dbase/detector
Initial version of SAS pipeline
nicHoch and others added 11 commits September 2, 2021 09:13
Updates in SAS pipeline, added a test script.
STIXdecomErrors_SKM044_Gordon_s.csv had commas at the end of each line. It caused crash in my system (Win10 + IDL8.5.1). Commas have been deleted because I noticed that other file, STIXdecomErrors_SKM053_Gordon_s.csv, does not contain commas at the end of each line. Now, both files are compatible.
- updated pixel data format
- dot product values can be passed out
-  background detector values no longer used for subtraction
Fixed bug: 'this_disp' is now defined at the beginning
Co-authored-by: Ewan Dickson <ewan.dickson@uni-graz.at>
Co-authored-by: Ewan Dickson <35922612+grazwegian@users.noreply.github.com>
* Work in progress level 2 FITS file converters

* Changes for OSPEX processing of L1 data - work in progress!

* Removed flare specific variables
Added ability to deal with single time bin background spectrum files

* Added demonstration keyword and files

* Added back nominal grid transmission factor of 0.25 until stix_gtrans32 is completely ready

* Replaced default 0.25 grid transmission with nominal on axis values

* Added energy_shift keyword to compensate for shift seen in November 2020
changed dist_factor to distance for ease of use
added defaults for optional keywords
Moved background subtraction to an IF block

* Update to OSPEX processing software

Single pixel, detector and time bin analysis can now be performed
Background grid pixelwise transmission based on nominal aperture areas
LLD and ULD energy bins can be removed if present in FITS file (default for OSPEX processing)

Livetime correction updated :
Livetime correction now applied before background subtraction
Livetime is calculated on a detector specific basis and summed rather than averaged beforehand
Improved flexibility to deal with LV1 vs LV4 data

* Transmission and time bin fixes

* Fix case on path to grid as some systems are case-sensitive

* Update to ospex conversion software
- detector dependent transmission implemented
- conversion of stix l4 spectrogram data to ospex possible
- removal of anomalous short time bins from spectrogram data
- refactoring of processes common to all science data levels
- stx_plot_pixel_data_example now more accurately named stx_convert_pixel_data

* Delete stx_plot_pixel_data_example.pro

stx_plot_pixel_data_example is replaced by stx_convert_pixel_data

* Optionally pass out OSPEX object

Co-authored-by: Ewan Dickson <ewan.dickson@uni-graz.at>
Co-authored-by: Ewan Dickson <35922612+grazwegian@users.noreply.github.com>
Copy link
Collaborator Author

@samaloney samaloney left a comment

Choose a reason for hiding this comment

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

Seems ok there's really only 13 files which changed the reset were all additions which I assumed are ok, I've pinged @grazwegian to comment on the changes where required.

@samaloney samaloney merged commit ed86655 into master Oct 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants