solver Merge conflicts
Showing
- cal_tools/cal_tools/ana_tools.py 6 additions, 4 deletionscal_tools/cal_tools/ana_tools.py
- notebooks/generic/PlotFromCalDB_NBC.ipynb 386 additions, 147 deletionsnotebooks/generic/PlotFromCalDB_NBC.ipynb
- notebooks/generic/PlotFromCalDB_Summary_NBC.ipynb 118 additions, 121 deletionsnotebooks/generic/PlotFromCalDB_Summary_NBC.ipynb
- reportservice/report_conf.yaml 509 additions, 67 deletionsreportservice/report_conf.yaml
- webservice/serve_overview.py 21 additions, 18 deletionswebservice/serve_overview.py
- webservice/serve_overview.yaml 1 addition, 0 deletionswebservice/serve_overview.yaml
- webservice/templates/last_characterizations.html 2 additions, 1 deletionwebservice/templates/last_characterizations.html
- webservice/templates/last_correction.html 1 addition, 1 deletionwebservice/templates/last_correction.html
- webservice/update_config.py 19 additions, 1 deletionwebservice/update_config.py
- webservice/webservice.py 3 additions, 1 deletionwebservice/webservice.py
- xfel_calibrate/calibrate.py 48 additions, 35 deletionsxfel_calibrate/calibrate.py
- xfel_calibrate/notebooks.py 7 additions, 0 deletionsxfel_calibrate/notebooks.py
Loading
Please register or sign in to comment