resolved merge conflict
Showing
- README.rst 16 additions, 10 deletionsREADME.rst
- cal_tools/cal_tools/lpdlib.py 347 additions, 0 deletionscal_tools/cal_tools/lpdlib.py
- notebooks/LPD/LPD_Correct_and_Verify.ipynb 127 additions, 373 deletionsnotebooks/LPD/LPD_Correct_and_Verify.ipynb
- notebooks/LPD/Mine_RadIntensity_vs_XGM_NBC.ipynb 497 additions, 0 deletionsnotebooks/LPD/Mine_RadIntensity_vs_XGM_NBC.ipynb
- notebooks/LPD/PlotFromCalDB.ipynb 112 additions, 112 deletionsnotebooks/LPD/PlotFromCalDB.ipynb
- notebooks/pnCCD/Characterize_NBC.ipynb 214 additions, 270 deletionsnotebooks/pnCCD/Characterize_NBC.ipynb
- xfel_calibrate/notebooks.py 7 additions, 1 deletionxfel_calibrate/notebooks.py
Loading
Please register or sign in to comment