Merge remote-tracking branch 'origin/master' into back_propagate/DSSC_pulseid_checksum_condition
removing merging conflicts
Showing
- cal_tools/cal_tools/mdc_config.py 11 additions, 0 deletionscal_tools/cal_tools/mdc_config.py
- cal_tools/cal_tools/plotting.py 1 addition, 1 deletioncal_tools/cal_tools/plotting.py
- cal_tools/cal_tools/tools.py 53 additions, 8 deletionscal_tools/cal_tools/tools.py
- notebooks/AGIPD/AGIPD_Correct_and_Verify_Summary_NBC.ipynb 127 additions, 0 deletionsnotebooks/AGIPD/AGIPD_Correct_and_Verify_Summary_NBC.ipynb
- notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb 26 additions, 33 deletionsnotebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
- notebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb 70 additions, 149 deletionsnotebooks/AGIPD/PlotFromCalDB_AGIPD_NBC.ipynb
- notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC.ipynb 29 additions, 36 deletions...books/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC.ipynb
- notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb 27 additions, 14 deletions...aracterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
- notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb 12 additions, 16 deletions...books/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
- notebooks/FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb 18 additions, 20 deletionsnotebooks/FastCCD/PlotFromCalDB_FastCCD_NBC.ipynb
- notebooks/Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb 574 additions, 0 deletionsnotebooks/Jungfrau/PlotFromCalDB_Jungfrau_NBC.ipynb
- notebooks/LPD/LPDChar_Darks_NBC.ipynb 14 additions, 1 deletionnotebooks/LPD/LPDChar_Darks_NBC.ipynb
- notebooks/LPD/PlotFromCalDB_LPD_NBC.ipynb 52 additions, 37 deletionsnotebooks/LPD/PlotFromCalDB_LPD_NBC.ipynb
- notebooks/ePix/Characterize_Darks_ePix10K_NBC.ipynb 14 additions, 30 deletionsnotebooks/ePix/Characterize_Darks_ePix10K_NBC.ipynb
- notebooks/ePix/Characterize_Darks_ePix_NBC.ipynb 15 additions, 36 deletionsnotebooks/ePix/Characterize_Darks_ePix_NBC.ipynb
- notebooks/generic/PlotFromCalDB_Summary_NBC.ipynb 13 additions, 21 deletionsnotebooks/generic/PlotFromCalDB_Summary_NBC.ipynb
- webservice/manual_launch.py 1 addition, 1 deletionwebservice/manual_launch.py
- webservice/serve_overview.py 15 additions, 0 deletionswebservice/serve_overview.py
- webservice/templates/serve_overview.css 5 additions, 1 deletionwebservice/templates/serve_overview.css
- webservice/update_config.py 85 additions, 0 deletionswebservice/update_config.py
Loading
Please register or sign in to comment