resolve conflicts with master
This commit is part of merge request !605. Comments created here will be created in the context of that merge request.
Showing
- docs/requirements.txt 1 addition, 2 deletionsdocs/requirements.txt
- docs/source/conf.py 23 additions, 24 deletionsdocs/source/conf.py
- notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb 130 additions, 110 deletionsnotebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
- notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb 100 additions, 86 deletionsnotebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
- notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb 308 additions, 221 deletionsnotebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
- notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_Summary.ipynb 32 additions, 50 deletions...ks/AGIPD/Characterize_AGIPD_Gain_FlatFields_Summary.ipynb
- notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb 3 additions, 8 deletions...aracterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
- notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb 297 additions, 302 deletions...books/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
- notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb 284 additions, 228 deletions...rau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
- notebooks/REMI/REMI_Digitize_and_Transform.ipynb 10 additions, 6 deletionsnotebooks/REMI/REMI_Digitize_and_Transform.ipynb
- notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb 97 additions, 128 deletionsnotebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
- notebooks/ePix100/Correction_ePix100_NBC.ipynb 298 additions, 222 deletionsnotebooks/ePix100/Correction_ePix100_NBC.ipynb
- notebooks/generic/overallmodules_Darks_Summary_NBC.ipynb 3 additions, 6 deletionsnotebooks/generic/overallmodules_Darks_Summary_NBC.ipynb
- notebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb 244 additions, 386 deletionsnotebooks/pnCCD/Characterize_pnCCD_Dark_NBC.ipynb
- notebooks/pnCCD/Correct_pnCCD_NBC.ipynb 448 additions, 484 deletionsnotebooks/pnCCD/Correct_pnCCD_NBC.ipynb
- setup.py 50 additions, 47 deletionssetup.py
- src/cal_tools/agipdlib.py 490 additions, 394 deletionssrc/cal_tools/agipdlib.py
- src/cal_tools/enums.py 32 additions, 22 deletionssrc/cal_tools/enums.py
- src/cal_tools/jungfraulib.py 62 additions, 0 deletionssrc/cal_tools/jungfraulib.py
- src/cal_tools/pnccdlib.py 35 additions, 51 deletionssrc/cal_tools/pnccdlib.py
Loading
Please register or sign in to comment