diff --git a/.codecov.yml b/.codecov.yml index 5a94096..4af5eb2 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,14 +1,14 @@ coverage: status: - project: # more options at https://docs.codecov.com/docs/commit-status + project: # more options at https://docs.codecov.com/docs/commit-status default: target: auto # use the coverage from the base commit, fail if coverage is lower - threshold: 0% # allow the coverage to drop by + threshold: 0% # allow the coverage to drop by comment: layout: " diff, flags, files" behavior: default require_changes: false - require_base: false # [true :: must have a base report to post] - require_head: false # [true :: must have a head report to post] + require_base: false # [true :: must have a base report to post] + require_head: false # [true :: must have a head report to post] hide_project_coverage: false # [true :: only show coverage on the git diff aka patch coverage] diff --git a/.codespell/ignore_words.txt b/.codespell/ignore_words.txt index 9757d7c..04b4fcf 100644 --- a/.codespell/ignore_words.txt +++ b/.codespell/ignore_words.txt @@ -4,8 +4,5 @@ ;; abbreviation for "materials" often used in a journal title mater -;; alternative use of socioeconomic -socio-economic - ;; Frobenius norm used in np.linalg.norm fro diff --git a/.flake8 b/.flake8 index 2d2cb16..04d2d0b 100644 --- a/.flake8 +++ b/.flake8 @@ -1,3 +1,5 @@ +# As of now, flake8 does not natively support configuration via pyproject.toml +# https://github.com/microsoft/vscode-flake8/issues/135 [flake8] exclude = .git, diff --git a/.github/ISSUE_TEMPLATE/release_checklist.md b/.github/ISSUE_TEMPLATE/release_checklist.md index 0f56027..6107962 100644 --- a/.github/ISSUE_TEMPLATE/release_checklist.md +++ b/.github/ISSUE_TEMPLATE/release_checklist.md @@ -6,30 +6,41 @@ labels: "release" assignees: "" --- -### PyPI/GitHub release checklist: +### PyPI/GitHub rc-release preparation checklist: - [ ] All PRs/issues attached to the release are merged. - [ ] All the badges on the README are passing. - [ ] License information is verified as correct. If you are unsure, please comment below. - [ ] Locally rendered documentation contains all appropriate pages, including API references (check no modules are - missing), tutorials, and other human written text is up-to-date with any changes in the code. -- [ ] Installation instructions in the README, documentation and on the website (e.g., diffpy.org) are updated. + missing), tutorials, and other human-written text is up-to-date with any changes in the code. +- [ ] Installation instructions in the README, documentation, and the website are updated. - [ ] Successfully run any tutorial examples or do functional testing with the latest Python version. - [ ] Grammar and writing quality are checked (no typos). +- [ ] Install `pip install build twine`, run `python -m build` and `twine check dist/*` to ensure that the package can be built and is correctly formatted for PyPI release. -Please mention @sbillinge here when you are ready for PyPI/GitHub release. Include any additional comments necessary, such as -version information and details about the pre-release here: +Please tag the maintainer (e.g., @username) in the comment here when you are ready for the PyPI/GitHub release. Include any additional comments necessary, such as version information and details about the pre-release here: -### conda-forge release checklist: +### PyPI/GitHub full-release preparation checklist: - +- [ ] Create a new conda environment and install the rc from PyPI (`pip install ==??`) +- [ ] License information on PyPI is correct. +- [ ] Docs are deployed successfully to `https:///`. +- [ ] Successfully run all tests, tutorial examples or do functional testing. +Please let the maintainer know that all checks are done and the package is ready for full release. + +### conda-forge release preparation checklist: + + + +- [ ] Ensure that the full release has appeared on PyPI successfully. - [ ] New package dependencies listed in `conda.txt` and `test.txt` are added to `meta.yaml` in the feedstock. -- [ ] All relevant issues in the feedstock are addressed in the release PR. +- [ ] Close any open issues on the feedstock. Reach out to the maintainer if you have questions. +- [ ] Tag the maintainer for conda-forge release. ### Post-release checklist -- [ ] Run tutorial examples and conduct functional testing using the installation guide in the README. Attach screenshots/results as comments. -- [ ] Documentation (README, tutorials, API references, and websites) is deployed without broken links or missing figures. +- [ ] Run tutorial examples and conduct functional testing using the installation guide in the README. Attach screenshots/results as comments. +- [ ] Documentation (README, tutorials, API references, and websites) is deployed without broken links or missing figures. diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 0000000..1099d86 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -0,0 +1,15 @@ +### What problem does this PR address? + + + +### What should the reviewer(s) do? + + + + diff --git a/.github/workflows/build-wheel-release-upload.yml b/.github/workflows/build-wheel-release-upload.yml index 8c575c5..00f39f4 100644 --- a/.github/workflows/build-wheel-release-upload.yml +++ b/.github/workflows/build-wheel-release-upload.yml @@ -4,13 +4,15 @@ on: workflow_dispatch: push: tags: - - '*' # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml + - "*" # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml jobs: release: - uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0 + uses: scikit-package/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0 with: project: diffpy.srmise + c_extension: false + maintainer_GITHUB_username: sbillinge secrets: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} PAT_TOKEN: ${{ secrets.PAT_TOKEN }} diff --git a/.github/workflows/check-news-item.yml b/.github/workflows/check-news-item.yml index 960756f..e6f5a5e 100644 --- a/.github/workflows/check-news-item.yml +++ b/.github/workflows/check-news-item.yml @@ -3,10 +3,10 @@ name: Check for News on: pull_request_target: branches: - - main + - main jobs: - build: - uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0 + check-news-item: + uses: scikit-package/release-scripts/.github/workflows/_check-news-item.yml@v0 with: project: diffpy.srmise diff --git a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml index f4ad74a..9f677b4 100644 --- a/.github/workflows/matrix-and-codecov-on-merge-to-main.yml +++ b/.github/workflows/matrix-and-codecov-on-merge-to-main.yml @@ -11,8 +11,8 @@ on: workflow_dispatch: jobs: - coverage: - uses: Billingegroup/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0 + matrix-coverage: + uses: scikit-package/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0 with: project: diffpy.srmise c_extension: false diff --git a/.github/workflows/publish-docs-on-release.yml b/.github/workflows/publish-docs-on-release.yml new file mode 100644 index 0000000..6df1afc --- /dev/null +++ b/.github/workflows/publish-docs-on-release.yml @@ -0,0 +1,12 @@ +name: Deploy Documentation on Release + +on: + workflow_dispatch: + +jobs: + docs: + uses: scikit-package/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0 + with: + project: diffpy.srmise + c_extension: false + headless: false diff --git a/.github/workflows/tests-on-pr.yml b/.github/workflows/tests-on-pr.yml index 201dad7..55091e8 100644 --- a/.github/workflows/tests-on-pr.yml +++ b/.github/workflows/tests-on-pr.yml @@ -1,15 +1,12 @@ name: Tests on PR on: - push: - branches: - - main pull_request: workflow_dispatch: jobs: - validate: - uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0 + tests-on-pr: + uses: scikit-package/release-scripts/.github/workflows/_tests-on-pr.yml@v0 with: project: diffpy.srmise c_extension: false diff --git a/.gitignore b/.gitignore index a25212e..099e294 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ __pycache__/ .Python env/ build/ +_build/ develop-eggs/ dist/ downloads/ @@ -90,10 +91,3 @@ target/ # Ipython Notebook .ipynb_checkpoints - -# version information -setup.cfg -/src/diffpy/*/version.cfg - -# Rever -rever/ diff --git a/.isort.cfg b/.isort.cfg index e0926f4..7ce0fb1 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,4 +1,5 @@ [settings] +# Keep import statement below line_length character limit line_length = 115 multi_line_output = 3 include_trailing_comma = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9cf0556..0e4a84d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,14 +1,14 @@ default_language_version: - python: python3 + python: python3 ci: - autofix_commit_msg: | - [pre-commit.ci] auto fixes from pre-commit hooks - autofix_prs: true - autoupdate_branch: 'pre-commit-autoupdate' - autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' - autoupdate_schedule: monthly - skip: [no-commit-to-branch] - submodules: false + autofix_commit_msg: | + [pre-commit.ci] auto fixes from pre-commit hooks + autofix_prs: true + autoupdate_branch: "pre-commit-autoupdate" + autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate" + autoupdate_schedule: monthly + skip: [no-commit-to-branch] + submodules: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.6.0 @@ -47,6 +47,20 @@ repos: - repo: https://github.com/codespell-project/codespell rev: v2.3.0 hooks: - - id: codespell - additional_dependencies: - - tomli + - id: codespell + additional_dependencies: + - tomli + # prettier - multi formatter for .json, .yml, and .md files + - repo: https://github.com/pre-commit/mirrors-prettier + rev: f12edd9c7be1c20cfa42420fd0e6df71e42b51ea # frozen: v4.0.0-alpha.8 + hooks: + - id: prettier + additional_dependencies: + - "prettier@^3.2.4" + # docformatter - PEP 257 compliant docstring formatter + - repo: https://github.com/s-weigand/docformatter + rev: 5757c5190d95e5449f102ace83df92e7d3b06c6c + hooks: + - id: docformatter + additional_dependencies: [tomli] + args: [--in-place, --config, ./pyproject.toml] diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..47f7a01 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,13 @@ +version: 2 + +build: + os: "ubuntu-22.04" + tools: + python: "latest" + +python: + install: + - requirements: requirements/docs.txt + +sphinx: + configuration: doc/source/conf.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1466de7..ab00ed6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,5 @@ ============= -Release Notes +Release notes ============= .. current developments diff --git a/CODE_OF_CONDUCT.rst b/CODE_OF_CONDUCT.rst index ff9c356..e8199ca 100644 --- a/CODE_OF_CONDUCT.rst +++ b/CODE_OF_CONDUCT.rst @@ -8,7 +8,7 @@ Our Pledge We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, +identity and expression, level of experience, education, socioeconomic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation. diff --git a/LICENSE_PDFgui.rst b/LICENSE-PDFgui.rst similarity index 100% rename from LICENSE_PDFgui.rst rename to LICENSE-PDFgui.rst diff --git a/doc/source/index.rst b/doc/source/index.rst deleted file mode 100644 index 417085e..0000000 --- a/doc/source/index.rst +++ /dev/null @@ -1,47 +0,0 @@ -####### -|title| -####### - -.. |title| replace:: diffpy.srmise documentation - -diffpy.srmise - Peak extraction and peak fitting tool for atomic pair distribution functions.. - -| Software version |release|. -| Last updated |today|. - -======= -Authors -======= - -diffpy.srmise is developed by Billinge Group -and its community contributors. - -For a detailed list of contributors see -https://github.com/diffpy/diffpy.srmise/graphs/contributors. - -============ -Installation -============ - -See the `README `_ -file included with the distribution. - -================= -Table of contents -================= -.. toctree:: - :maxdepth: 1 - :titlesonly: - - tutorial/index - extending - Package API - release - license - -======= -Indices -======= - -* :ref:`genindex` -* :ref:`search` diff --git a/doc/Makefile b/docs/Makefile similarity index 100% rename from doc/Makefile rename to docs/Makefile diff --git a/doc/examples/README.rst b/docs/examples/README.rst similarity index 99% rename from doc/examples/README.rst rename to docs/examples/README.rst index fa2b571..a656fb9 100644 --- a/doc/examples/README.rst +++ b/docs/examples/README.rst @@ -82,7 +82,7 @@ directory, :: tar xvzf archivename.tar.gz -From a command window change to the *doc/examples* directory of the new +From a command window change to the *docs/examples* directory of the new folder. For example, a Windows' user who extracted *archivename.zip* in the folder *C:\\Research* would type :: diff --git a/doc/examples/data/Ag_nyquist_qmax30.gr b/docs/examples/data/Ag_nyquist_qmax30.gr similarity index 100% rename from doc/examples/data/Ag_nyquist_qmax30.gr rename to docs/examples/data/Ag_nyquist_qmax30.gr diff --git a/doc/examples/data/C60_fine_qmax21.gr b/docs/examples/data/C60_fine_qmax21.gr similarity index 100% rename from doc/examples/data/C60_fine_qmax21.gr rename to docs/examples/data/C60_fine_qmax21.gr diff --git a/doc/examples/data/C60baseline.dat b/docs/examples/data/C60baseline.dat similarity index 100% rename from doc/examples/data/C60baseline.dat rename to docs/examples/data/C60baseline.dat diff --git a/doc/examples/data/TiO2_fine_qmax26.gr b/docs/examples/data/TiO2_fine_qmax26.gr similarity index 100% rename from doc/examples/data/TiO2_fine_qmax26.gr rename to docs/examples/data/TiO2_fine_qmax26.gr diff --git a/doc/examples/extract_single_peak.py b/docs/examples/extract_single_peak.py similarity index 100% rename from doc/examples/extract_single_peak.py rename to docs/examples/extract_single_peak.py diff --git a/doc/examples/fit_initial.py b/docs/examples/fit_initial.py similarity index 92% rename from doc/examples/fit_initial.py rename to docs/examples/fit_initial.py index fa9961c..57af2d7 100644 --- a/doc/examples/fit_initial.py +++ b/docs/examples/fit_initial.py @@ -10,14 +10,16 @@ # See LICENSE.txt for license information. # ############################################################################## -"""Example of peak fitting C60 PDF (unnormalized) with unreliable uncertainties. - -Peak fitting in SrMise means fitting a model of initial peaks, which may be -specified manually or estimated with a clustering-based convenience function, -just as with specifying initial peaks for peak extraction. Unlike peak -extraction, it does not attempt to add or remove peaks, apply termination -ripples, or otherwise do anything beyond chi-square fitting using the specified -grid.""" +"""Example of peak fitting C60 PDF (unnormalized) with unreliable +uncertainties. + +Peak fitting in SrMise means fitting a model of initial peaks, which may +be specified manually or estimated with a clustering-based convenience +function, just as with specifying initial peaks for peak extraction. +Unlike peak extraction, it does not attempt to add or remove peaks, +apply termination ripples, or otherwise do anything beyond chi-square +fitting using the specified grid. +""" import matplotlib.pyplot as plt diff --git a/doc/examples/images/extract_single_peak1.png b/docs/examples/images/extract_single_peak1.png similarity index 100% rename from doc/examples/images/extract_single_peak1.png rename to docs/examples/images/extract_single_peak1.png diff --git a/doc/examples/images/extract_single_peak2.png b/docs/examples/images/extract_single_peak2.png similarity index 100% rename from doc/examples/images/extract_single_peak2.png rename to docs/examples/images/extract_single_peak2.png diff --git a/doc/examples/images/extract_single_peak3.png b/docs/examples/images/extract_single_peak3.png similarity index 100% rename from doc/examples/images/extract_single_peak3.png rename to docs/examples/images/extract_single_peak3.png diff --git a/doc/examples/images/fit_initial1.png b/docs/examples/images/fit_initial1.png similarity index 100% rename from doc/examples/images/fit_initial1.png rename to docs/examples/images/fit_initial1.png diff --git a/doc/examples/images/fit_initial2.png b/docs/examples/images/fit_initial2.png similarity index 100% rename from doc/examples/images/fit_initial2.png rename to docs/examples/images/fit_initial2.png diff --git a/doc/examples/images/parameter_summary1.png b/docs/examples/images/parameter_summary1.png similarity index 100% rename from doc/examples/images/parameter_summary1.png rename to docs/examples/images/parameter_summary1.png diff --git a/doc/examples/images/parameter_summary2.png b/docs/examples/images/parameter_summary2.png similarity index 100% rename from doc/examples/images/parameter_summary2.png rename to docs/examples/images/parameter_summary2.png diff --git a/doc/examples/images/parameter_summary3.png b/docs/examples/images/parameter_summary3.png similarity index 100% rename from doc/examples/images/parameter_summary3.png rename to docs/examples/images/parameter_summary3.png diff --git a/doc/examples/images/parameter_summary4.png b/docs/examples/images/parameter_summary4.png similarity index 100% rename from doc/examples/images/parameter_summary4.png rename to docs/examples/images/parameter_summary4.png diff --git a/doc/examples/images/query_results1.png b/docs/examples/images/query_results1.png similarity index 100% rename from doc/examples/images/query_results1.png rename to docs/examples/images/query_results1.png diff --git a/doc/examples/images/query_results2.png b/docs/examples/images/query_results2.png similarity index 100% rename from doc/examples/images/query_results2.png rename to docs/examples/images/query_results2.png diff --git a/doc/examples/images/query_results3.png b/docs/examples/images/query_results3.png similarity index 100% rename from doc/examples/images/query_results3.png rename to docs/examples/images/query_results3.png diff --git a/doc/examples/multimodel_known_dG1.py b/docs/examples/multimodel_known_dG1.py similarity index 98% rename from doc/examples/multimodel_known_dG1.py rename to docs/examples/multimodel_known_dG1.py index f1fe508..3d52ec0 100644 --- a/doc/examples/multimodel_known_dG1.py +++ b/docs/examples/multimodel_known_dG1.py @@ -10,8 +10,8 @@ # See LICENSE.txt for license information. # ############################################################################## -"""Extract multiple models from crystalline PDF with known uncertainties for -use in later AIC-driven multimodeling analysis. +"""Extract multiple models from crystalline PDF with known uncertainties +for use in later AIC-driven multimodeling analysis. The multimodel approach generates many models of varying complexity by assuming a range of experimental uncertainties are physically plausible. This example diff --git a/doc/examples/multimodel_known_dG2.py b/docs/examples/multimodel_known_dG2.py similarity index 99% rename from doc/examples/multimodel_known_dG2.py rename to docs/examples/multimodel_known_dG2.py index 59add2e..142df83 100644 --- a/doc/examples/multimodel_known_dG2.py +++ b/docs/examples/multimodel_known_dG2.py @@ -10,7 +10,8 @@ # See LICENSE.txt for license information. # ############################################################################## -"""AIC-driven multimodel analysis of crystalline PDF with known uncertainties. +"""AIC-driven multimodel analysis of crystalline PDF with known +uncertainties. The multimodel approach generates many models of varying complexity by assuming a range of experimental uncertainties are physically plausible. This example diff --git a/doc/examples/multimodel_unknown_dG1.py b/docs/examples/multimodel_unknown_dG1.py similarity index 96% rename from doc/examples/multimodel_unknown_dG1.py rename to docs/examples/multimodel_unknown_dG1.py index 4570f78..45324ee 100644 --- a/doc/examples/multimodel_unknown_dG1.py +++ b/docs/examples/multimodel_unknown_dG1.py @@ -10,8 +10,8 @@ # See LICENSE.txt for license information. # ############################################################################## -"""Extract multiple models from nanoparticle PDF with unknown uncertainties for -use in later AIC-driven multimodeling analysis. +"""Extract multiple models from nanoparticle PDF with unknown +uncertainties for use in later AIC-driven multimodeling analysis. The multimodel approach generates many models of varying complexity by assuming a range of experimental uncertainties are physically plausible. This example diff --git a/doc/examples/multimodel_unknown_dG2.py b/docs/examples/multimodel_unknown_dG2.py similarity index 100% rename from doc/examples/multimodel_unknown_dG2.py rename to docs/examples/multimodel_unknown_dG2.py diff --git a/doc/examples/output/extract_single_peak.pwa b/docs/examples/output/extract_single_peak.pwa similarity index 92% rename from doc/examples/output/extract_single_peak.pwa rename to docs/examples/output/extract_single_peak.pwa index 9aa363b..dc3d7d5 100644 --- a/doc/examples/output/extract_single_peak.pwa +++ b/docs/examples/output/extract_single_peak.pwa @@ -6,7 +6,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/extract_single_peak.srmise b/docs/examples/output/extract_single_peak.srmise similarity index 99% rename from doc/examples/output/extract_single_peak.srmise rename to docs/examples/output/extract_single_peak.srmise index 0a57729..613f35c 100644 --- a/doc/examples/output/extract_single_peak.srmise +++ b/docs/examples/output/extract_single_peak.srmise @@ -38,7 +38,7 @@ cres=0.10472 ModelEvaluator=AIC Range=[2.0, 3.5] # Metadata -filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr' +filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr' nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/fit_initial.pwa b/docs/examples/output/fit_initial.pwa similarity index 94% rename from doc/examples/output/fit_initial.pwa rename to docs/examples/output/fit_initial.pwa index 31b0b8d..00911a7 100644 --- a/doc/examples/output/fit_initial.pwa +++ b/docs/examples/output/fit_initial.pwa @@ -6,7 +6,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/fit_initial.srmise b/docs/examples/output/fit_initial.srmise similarity index 99% rename from doc/examples/output/fit_initial.srmise rename to docs/examples/output/fit_initial.srmise index 9deeec6..d4e2a24 100644 --- a/doc/examples/output/fit_initial.srmise +++ b/docs/examples/output/fit_initial.srmise @@ -130,7 +130,7 @@ cres=0.05 ModelEvaluator=AIC Range=[1.0, 7.25] # Metadata -filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr' +filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr' nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/known_dG_aics.dat b/docs/examples/output/known_dG_aics.dat similarity index 100% rename from doc/examples/output/known_dG_aics.dat rename to docs/examples/output/known_dG_aics.dat diff --git a/doc/examples/output/known_dG_m0.pwa b/docs/examples/output/known_dG_m0.pwa similarity index 94% rename from doc/examples/output/known_dG_m0.pwa rename to docs/examples/output/known_dG_m0.pwa index d384002..e30d990 100644 --- a/doc/examples/output/known_dG_m0.pwa +++ b/docs/examples/output/known_dG_m0.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/known_dG_m1.pwa b/docs/examples/output/known_dG_m1.pwa similarity index 94% rename from doc/examples/output/known_dG_m1.pwa rename to docs/examples/output/known_dG_m1.pwa index 6c93d54..553019f 100644 --- a/doc/examples/output/known_dG_m1.pwa +++ b/docs/examples/output/known_dG_m1.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/known_dG_m12.pwa b/docs/examples/output/known_dG_m12.pwa similarity index 94% rename from doc/examples/output/known_dG_m12.pwa rename to docs/examples/output/known_dG_m12.pwa index a64f88b..351091c 100644 --- a/doc/examples/output/known_dG_m12.pwa +++ b/docs/examples/output/known_dG_m12.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/known_dG_m8.pwa b/docs/examples/output/known_dG_m8.pwa similarity index 94% rename from doc/examples/output/known_dG_m8.pwa rename to docs/examples/output/known_dG_m8.pwa index 8067ee2..ed045b6 100644 --- a/doc/examples/output/known_dG_m8.pwa +++ b/docs/examples/output/known_dG_m8.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/known_dG_models.dat b/docs/examples/output/known_dG_models.dat similarity index 71% rename from doc/examples/output/known_dG_models.dat rename to docs/examples/output/known_dG_models.dat index 5fe1270..12f1d23 100644 --- a/doc/examples/output/known_dG_models.dat +++ b/docs/examples/output/known_dG_models.dat @@ -5277,6 +5277,6 @@ sag4 (g6 S'\x00\xec{\xf3\xe9\xce\xba?' tRp753 -aaaS"History written: Wed Jul 1 09:54:31 2015\nproduced by luke\ndiffpy.srmise version 0.5.2\n##### PDF Peak Extraction\n## BaselineFunctions\n# BaselineFunction 0\nfunction='Polynomial'\nmodule='diffpy.srmise.baselines.polynomial'\nbase=None\ndegree=1\n\n## PeakFunctions\n# PeakFunction 0\nfunction='GaussianOverR'\nmodule='diffpy.srmise.peaks.gaussianoverr'\nbase=None\nmaxwidth=0.7\n\n# PeakFunction 1\nfunction='TerminationRipples'\nmodule='diffpy.srmise.peaks.terminationripples'\nbase=0\nsupersample=5.0\nqmax=30.0\nextension=4.0\n\n# BaselineObject\nowner=0\npars=[-0.51041840174180308, 0.0084074335508157114]\nfree=[True, True]\nremovable=False\nstatic_owner=False\n\n## InitialPeaks\n# SrMiseMetadata\npf=[0]\ncres=0.10472\nModelEvaluator=AIC\nRange=[10.9, 15]\n# Metadata\nfilename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr'\nnyquist=True\nqmax=30.0\nqmax_reportedbypdf=30.0\nqmax_fromdata=29.729728241905356\nscale=False\nsupersample=4.0\n\n##### start data\n#L x y dx dy edy\n0.10472 -0.848217 0 0.276527 0.497353\n0.20944 -0.438975 0 0.375888 0.497353\n0.314159 -0.0724599 0 0.399338 0.497353\n0.418879 0.0701041 0 0.406243 0.497353\n0.523599 0.241004 0 0.40927 0.497353\n0.628319 -1.08142 0 0.410872 0.497353\n0.733038 -0.730527 0 0.411821 0.497353\n0.837758 -0.789248 0 0.412439 0.497353\n0.942478 -0.479976 0 0.412843 0.497353\n1.0472 -0.551525 0 0.413149 0.497353\n1.15192 -0.52763 0 0.413394 0.497353\n1.25664 -0.478534 0 0.41357 0.497353\n1.36136 -0.745365 0 0.41365 0.497353\n1.46608 -0.851118 0 0.414021 0.497353\n1.5708 -0.850263 0 0.413873 0.497353\n1.67552 -0.859146 0 0.413961 0.497353\n1.78024 -0.944151 0 0.414016 0.497353\n1.88496 -0.957457 0 0.414068 0.497353\n1.98968 -0.942436 0 0.414069 0.497353\n2.0944 -1.06201 0 0.414189 0.497353\n2.19911 -0.986944 0 0.41417 0.497353\n2.30383 -1.15517 0 0.414207 0.497353\n2.40855 -0.998036 0 0.4142 0.497353\n2.51327 -1.07553 0 0.414251 0.497353\n2.61799 -0.660581 0 0.414287 0.497353\n2.72271 2.09696 0 0.414276 0.497353\n2.82743 8.65415 0 0.414235 0.497353\n2.93215 9.77508 0 0.414368 0.497353\n3.03687 3.94327 0 0.414316 0.497353\n3.14159 -0.251454 0 0.414294 0.497353\n3.24631 -1.59266 0 0.414334 0.497353\n3.35103 -1.87634 0 0.414372 0.497353\n3.45575 -2.07954 0 0.414336 0.497353\n3.56047 -2.09388 0 0.414361 0.497353\n3.66519 -2.13669 0 0.414378 0.497353\n3.76991 -1.95955 0 0.414216 0.497353\n3.87463 -1.37209 0 0.414521 0.497353\n3.97935 -0.0329757 0 0.41436 0.497353\n4.08407 1.10031 0 0.414367 0.497353\n4.18879 0.469554 0 0.414408 0.497353\n4.29351 -1.15114 0 0.414303 0.497353\n4.39823 -2.15357 0 0.414507 0.497353\n4.50295 -2.41179 0 0.414366 0.497353\n4.60767 -2.41213 0 0.414445 0.497353\n4.71239 -1.88485 0 0.414396 0.497353\n4.81711 0.46476 0 0.414419 0.497353\n4.92183 5.56323 0 0.41442 0.497353\n5.02655 8.65254 0 0.414425 0.497353\n5.13127 5.24024 0 0.41438 0.497353\n5.23599 0.0409454 0 0.414433 0.497353\n5.34071 -2.48627 0 0.41447 0.497353\n5.44543 -3.02423 0 0.414428 0.497353\n5.55015 -2.60297 0 0.414347 0.497353\n5.65487 -0.84228 0 0.414496 0.497353\n5.75959 1.18901 0 0.414408 0.497353\n5.86431 0.894119 0 0.41444 0.497353\n5.96903 -1.28837 0 0.414399 0.497353\n6.07375 -2.72173 0 0.414454 0.497353\n6.17847 -2.7103 0 0.414469 0.497353\n6.28318 -0.941738 0 0.414354 0.497353\n6.3879 2.42598 0 0.414536 0.497353\n6.49263 4.33279 0 0.414436 0.497353\n6.59734 2.21093 0 0.41439 0.497353\n6.70207 -1.306 0 0.414491 0.497353\n6.80678 -3.03265 0 0.414432 0.497353\n6.9115 -2.90582 0 0.414391 0.497353\n7.01622 -1.87167 0 0.41448 0.497353\n7.12094 -1.23044 0 0.414423 0.497353\n7.22566 -1.92941 0 0.414359 0.497353\n7.33038 -2.5179 0 0.414509 0.497353\n7.4351 -0.969886 0 0.41442 0.497353\n7.53982 3.96972 0 0.414436 0.497353\n7.64454 8.8855 0 0.41445 0.497353\n7.74926 7.4236 0 0.414469 0.497353\n7.85398 1.53836 0 0.414469 0.497353\n7.9587 -2.44643 0 0.414443 0.497353\n8.06342 -3.26112 0 0.414411 0.497353\n8.16814 -2.94882 0 0.414522 0.497353\n8.27286 -2.90904 0 0.41438 0.497353\n8.37758 -3.05689 0 0.414496 0.497353\n8.4823 -1.78758 0 0.414444 0.497353\n8.58702 1.38353 0 0.414446 0.497353\n8.69174 3.94127 0 0.41445 0.497353\n8.79646 2.45676 0 0.414399 0.497353\n8.90118 -0.591625 0 0.414515 0.497353\n9.0059 -1.30696 0 0.414422 0.497353\n9.11062 0.12014 0 0.414465 0.497353\n9.21534 0.431331 0 0.414439 0.497353\n9.32006 -1.16176 0 0.414455 0.497353\n9.42478 -1.8613 0 0.41443 0.497353\n9.5295 -0.544258 0 0.414482 0.497353\n9.63422 0.450605 0 0.414444 0.497353\n9.73894 -0.669103 0 0.414465 0.497353\n9.84366 -1.7389 0 0.414464 0.497353\n9.94838 -0.816268 0 0.414442 0.497353\n10.0531 0.290376 0 0.414455 0.497353\n10.1578 0.0115737 0 0.414453 0.497353\n10.2625 1.15071 0 0.414487 0.497353\n10.3673 5.36598 0 0.414456 0.497353\n10.472 7.70779 0 0.414461 0.497353\n10.5767 4.12092 0 0.414484 0.497353\n10.6814 -1.35374 0 0.414425 0.497353\n10.7861 -4.23359 0 0.414497 0.497353\n10.8909 -4.71367 0 0.414424 0.497353\n10.9956 -3.61547 0 0.414463 0.497353\n11.1003 -0.719766 0 0.414456 0.497353\n11.205 2.04711 0 0.414463 0.497353\n11.3097 1.71502 0 0.414441 0.497353\n11.4145 -0.861729 0 0.414477 0.497353\n11.5192 -2.49413 0 0.414453 0.497353\n11.6239 -2.74042 0 0.414485 0.497353\n11.7286 -2.25884 0 0.414466 0.497353\n11.8333 -0.265838 0 0.414432 0.497353\n11.9381 1.90138 0 0.414504 0.497353\n12.0428 1.58808 0 0.414449 0.497353\n12.1475 0.0070566 0 0.414473 0.497353\n12.2522 -0.295937 0 0.414475 0.497353\n12.3569 0.0151809 0 0.414424 0.497353\n12.4617 0.90539 0 0.414498 0.497353\n12.5664 3.2162 0 0.414433 0.497353\n12.6711 4.236 0 0.414449 0.497353\n12.7758 1.95719 0 0.414468 0.497353\n12.8805 -0.763835 0 0.414439 0.497353\n12.9853 -1.66267 0 0.414462 0.497353\n13.09 -1.55113 0 0.414458 0.497353\n13.1947 -0.362846 0 0.414474 0.497353\n13.2994 0.530654 0 0.414469 0.497353\n13.4041 -0.240443 0 0.414474 0.497353\n13.5089 -1.58126 0 0.414444 0.497353\n13.6136 -1.90816 0 0.414468 0.497353\n13.7183 -1.58124 0 0.41445 0.497353\n13.823 -0.47036 0 0.414455 0.497353\n13.9277 0.0528224 0 0.414455 0.497353\n14.0325 -1.06936 0 0.414474 0.497353\n14.1372 -2.69992 0 0.41446 0.497353\n14.2419 -2.63203 0 0.41443 0.497353\n14.3466 -0.307332 0 0.414487 0.497353\n14.4513 2.93352 0 0.414453 0.497353\n14.5561 3.69013 0 0.414472 0.497353\n14.6608 1.35399 0 0.414434 0.497353\n14.7655 -0.4856 0 0.414482 0.497353\n14.8702 -0.000276016 0 0.414449 0.497353\n14.9749 2.48563 0 0.414464 0.497353\n15.0797 4.27674 0 0.414459 0.497353\n15.1844 3.33366 0 0.41448 0.497353\n15.2891 1.21759 0 0.414457 0.497353\n15.3938 -0.37143 0 0.414471 0.497353\n15.4985 -1.80234 0 0.414452 0.497353\n15.6032 -2.85825 0 0.414473 0.497353\n15.708 -3.70676 0 0.414457 0.497353\n15.8127 -4.2802 0 0.414474 0.497353\n15.9174 -3.47037 0 0.414451 0.497353\n16.0221 -0.522252 0 0.414455 0.497353\n16.1268 2.43719 0 0.414459 0.497353\n16.2316 2.03817 0 0.414473 0.497353\n16.3363 -0.703543 0 0.414468 0.497353\n16.441 -1.77019 0 0.41448 0.497353\n16.5457 0.231127 0 0.414477 0.497353\n16.6504 2.64325 0 0.414463 0.497353\n16.7552 2.8064 0 0.414479 0.497353\n16.8599 1.24821 0 0.414472 0.497353\n16.9646 0.147782 0 0.414471 0.497353\n17.0693 -0.285568 0 0.414463 0.497353\n17.174 -0.467344 0 0.414472 0.497353\n17.2788 -0.778432 0 0.414461 0.497353\n17.3835 -0.588839 0 0.414454 0.497353\n17.4882 0.996117 0 0.414463 0.497353\n17.5929 3.103 0 0.414464 0.497353\n17.6976 3.11809 0 0.414474 0.497353\n17.8024 0.614726 0 0.414465 0.497353\n17.9071 -1.62203 0 0.414465 0.497353\n18.0118 -2.07547 0 0.41448 0.497353\n18.1165 -1.83835 0 0.414466 0.497353\n18.2212 -2.03303 0 0.414484 0.497353\n18.326 -2.36859 0 0.414472 0.497353\n18.4307 -2.10356 0 0.414457 0.497353\n18.5354 -1.36772 0 0.414466 0.497353\n18.6401 -0.713728 0 0.414465 0.497353\n18.7448 -0.0613967 0 0.414472 0.497353\n18.8496 1.14241 0 0.41448 0.497353\n18.9543 2.73659 0 0.414472 0.497353\n19.059 2.89613 0 0.414476 0.497353\n19.1637 1.20826 0 0.414465 0.497353\n19.2684 0.137683 0 0.414472 0.497353\n19.3732 1.07538 0 0.414477 0.497353\n19.4779 1.56895 0 0.414466 0.497353\n19.5826 -0.10718 0 0.414469 0.497353\n19.6873 -1.77146 0 0.414461 0.497353\n19.792 -1.19471 0 0.414458 0.497353\n19.8968 0.0394425 0 0.414477 0.497353\n20.0015 -0.209379 0 0.414475 0.497353\n20.1062 -0.746729 0 0.414462 0.497353\n20.2109 0.0585856 0 0.41447 0.497353\n20.3156 0.860572 0 0.414472 0.497353\n20.4203 0.243239 0 0.414467 0.497353\n20.5251 -1.16833 0 0.41447 0.497353\n20.6298 -1.58629 0 0.414473 0.497353\n20.7345 -1.08777 0 0.414483 0.497353\n20.8392 -0.300338 0 0.414478 0.497353\n20.944 0.29465 0 0.414476 0.497353\n21.0487 0.425193 0 0.414469 0.497353\n21.1534 -0.00136946 0 0.414465 0.497353\n21.2581 -0.393033 0 0.414473 0.497353\n21.3628 0.387682 0 0.414463 0.497353\n21.4675 1.6689 0 0.414463 0.497353\n21.5723 1.4581 0 0.414459 0.497353\n21.677 -0.361992 0 0.414462 0.497353\n21.7817 -1.00177 0 0.414469 0.497353\n21.8864 0.0128308 0 0.414467 0.497353\n21.9912 0.809515 0 0.414477 0.497353\n22.0959 0.672339 0 0.414477 0.497353\n22.2006 0.272683 0 0.414474 0.497353\n22.3053 -0.111194 0 0.41448 0.497353\n22.41 -0.327024 0 0.414476 0.497353\n22.5147 0.0407522 0 0.414467 0.497353\n22.6195 0.533048 0 0.414474 0.497353\n22.7242 0.0614679 0 0.414475 0.497353\n22.8289 -0.830564 0 0.414475 0.497353\n22.9336 -0.355731 0 0.414475 0.497353\n23.0384 0.411435 0 0.414477 0.497353\n23.1431 -0.198643 0 0.414481 0.497353\n23.2478 -1.53097 0 0.414475 0.497353\n23.3525 -1.8586 0 0.41448 0.497353\n23.4572 -1.25444 0 0.41448 0.497353\n23.5619 0.0161056 0 0.414478 0.497353\n23.6667 1.66708 0 0.414479 0.497353\n23.7714 2.42556 0 0.414481 0.497353\n23.8761 1.63544 0 0.41448 0.497353\n23.9808 0.480166 0 0.414483 0.497353\n24.0855 0.0681919 0 0.414479 0.497353\n24.1903 -0.367436 0 0.414473 0.497353\n24.295 -0.985321 0 0.414472 0.497353\n24.3997 -1.42046 0 0.414469 0.497353\n24.5044 -1.35023 0 0.414474 0.497353\n24.6091 -0.437157 0 0.414467 0.497353\n24.7139 1.26422 0 0.414462 0.497353\n24.8186 1.92459 0 0.414465 0.497353\n24.9233 1.10257 0 0.414468 0.497353\n25.028 0.232537 0 0.414472 0.497353\n25.1327 0.313857 0 0.414476 0.497353\n25.2375 0.347515 0 0.41448 0.497353\n25.3422 0.0119498 0 0.414475 0.497353\n25.4469 -0.627585 0 0.414474 0.497353\n25.5516 -1.41904 0 0.414471 0.497353\n25.6563 -1.73891 0 0.414463 0.497353\n25.7611 -1.39368 0 0.414465 0.497353\n25.8658 -0.98749 0 0.414462 0.497353\n25.9705 -0.709065 0 0.414461 0.497353\n26.0752 0.00727748 0 0.414463 0.497353\n26.1799 0.820796 0 0.414465 0.497353\n26.2847 1.28029 0 0.414468 0.497353\n26.3894 1.20257 0 0.414464 0.497353\n26.4941 0.847178 0 0.41447 0.497353\n26.5988 0.532713 0 0.414472 0.497353\n26.7035 0.449797 0 0.414474 0.497353\n26.8083 0.311282 0 0.414476 0.497353\n26.913 -0.0359985 0 0.414474 0.497353\n27.0177 -0.0274541 0 0.414472 0.497353\n27.1224 -0.168312 0 0.414475 0.497353\n27.2271 -0.539714 0 0.414476 0.497353\n27.3319 -0.629106 0 0.414471 0.497353\n27.4366 -0.218378 0 0.414468 0.497353\n27.5413 0.255966 0 0.414467 0.497353\n27.646 0.536293 0 0.414469 0.497353\n27.7507 0.399817 0 0.414473 0.497353\n27.8555 0.11408 0 0.414476 0.497353\n27.9602 -0.17124 0 0.414475 0.497353\n28.0649 -0.82576 0 0.414473 0.497353\n28.1696 -1.63377 0 0.414469 0.497353\n28.2743 -1.91638 0 0.41447 0.497353\n28.379 -1.1421 0 0.414474 0.497353\n28.4838 0.377505 0 0.414475 0.497353\n28.5885 1.61749 0 0.414476 0.497353\n28.6932 1.60999 0 0.414476 0.497353\n28.7979 0.924994 0 0.414476 0.497353\n28.9027 0.539661 0 0.414475 0.497353\n29.0074 0.273788 0 0.414475 0.497353\n29.1121 -0.140046 0 0.41447 0.497353\n29.2168 -0.202034 0 0.414471 0.497353\n29.3215 0.433365 0 0.414469 0.497353\n29.4262 1.13571 0 0.414469 0.497353\n29.531 0.836727 0 0.414468 0.497353\n29.6357 -0.101336 0 0.414469 0.497353\n29.7404 -0.669691 0 0.41447 0.497353\n29.8451 -0.721992 0 0.414471 0.497353\n29.9499 -0.766688 0 0.414472 0.497353\n30.0546 -0.547158 0 0.414473 0.497353\n30.1593 -0.308248 0 0.414473 0.497353\n30.264 -0.255524 0 0.414473 0.497353\n30.3687 -0.551494 0 0.414474 0.497353\n30.4734 -0.636365 0 0.414471 0.497353\n30.5782 -0.34684 0 0.41447 0.497353\n30.6829 -0.16534 0 0.414469 0.497353\n30.7876 -0.175003 0 0.414473 0.497353\n30.8923 0.0582915 0 0.414478 0.497353\n30.9971 0.617427 0 0.414476 0.497353\n31.1018 1.14323 0 0.414472 0.497353\n31.2065 1.20366 0 0.414469 0.497353\n31.3112 1.01078 0 0.414467 0.497353\n31.4159 0.829863 0 0.414469 0.497353\n31.5206 0.342908 0 0.414471 0.497353\n31.6254 -0.438775 0 0.414473 0.497353\n31.7301 -0.98495 0 0.414474 0.497353\n31.8348 -0.949941 0 0.414473 0.497353\n31.9395 -0.536897 0 0.414469 0.497353\n32.0442 -0.098742 0 0.414469 0.497353\n32.149 0.198955 0 0.414469 0.497353\n32.2537 0.26835 0 0.414467 0.497353\n32.3584 0.158842 0 0.414467 0.497353\n32.4631 -0.217961 0 0.414468 0.497353\n32.5678 -0.359842 0 0.414469 0.497353\n32.6726 -0.400725 0 0.414469 0.497353\n32.7773 -0.388053 0 0.414472 0.497353\n32.882 -0.53186 0 0.414471 0.497353\n32.9867 -0.452224 0 0.414473 0.497353\n33.0914 -0.258411 0 0.414473 0.497353\n33.1962 -0.0783268 0 0.414472 0.497353\n33.3009 0.34702 0 0.414477 0.497353\n33.4056 0.813758 0 0.414477 0.497353\n33.5103 0.942157 0 0.414473 0.497353\n33.615 0.668602 0 0.414472 0.497353\n33.7198 0.416251 0 0.414469 0.497353\n33.8245 0.213257 0 0.414464 0.497353\n33.9292 0.128913 0 0.414463 0.497353\n34.0339 0.101085 0 0.414462 0.497353\n34.1386 0.126261 0 0.414463 0.497353\n34.2434 -0.088243 0 0.414466 0.497353\n34.3481 -0.505281 0 0.414463 0.497353\n34.4528 -0.865457 0 0.414461 0.497353\n34.5575 -0.931427 0 0.414465 0.497353\n34.6622 -0.677627 0 0.414469 0.497353\n34.767 -0.219618 0 0.414472 0.497353\n34.8717 0.262265 0 0.414475 0.497353\n34.9764 0.497295 0 0.414474 0.497353\n##### Results\nextraction_type='extract'\n### ModelCluster\npeak_funcs=[0]\nModelEvaluator=AIC\nslice=slice(None, 40, None)\n# BaselineObject\nowner=0\npars=[-0.49612799331518148, 0.009243028322946871]\nfree=[True, True]\nremovable=False\nstatic_owner=False\n\n## ModelPeaks\n# ModelPeak\nowner=1\npars=[11.257345641524847, -0.44326181455202407, 34.616301647118242]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[12.008712299446687, 0.31580138324858892, 54.419674496243019]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[12.65116694083374, -0.17004315124028255, 60.463492845884261]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[13.304659414498092, 0.070450559400331986, 49.892861341339824]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[13.919411195913245, -0.073794900748365463, 47.673856467841304]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[14.51438047487288, -0.43472084163912061, 59.87876735144706]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[15.239631252178969, 1.0190814364846466, 160.4906386912761]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n### start data\n#L r y dy\n10.9 -4.68486 0.497353\n11.0047 -3.42823 0.497353\n11.1094 -0.423569 0.497353\n11.2142 2.16651 0.497353\n11.3189 1.53018 0.497353\n11.4236 -1.07332 0.497353\n11.5283 -2.55496 0.497353\n11.633 -2.73133 0.497353\n11.7378 -2.15436 0.497353\n11.8425 -0.03493 0.497353\n11.9472 1.98801 0.497353\n12.0519 1.45359 0.497353\n12.1566 -0.0851001 0.497353\n12.2614 -0.26845 0.497353\n12.3661 0.0438283 0.497353\n12.4708 1.06552 0.497353\n12.5755 3.41162 0.497353\n12.6802 4.16027 0.497353\n12.785 1.67277 0.497353\n12.8897 -0.907877 0.497353\n12.9944 -1.68923 0.497353\n13.0991 -1.48603 0.497353\n13.2038 -0.242317 0.497353\n13.3086 0.533857 0.497353\n13.4133 -0.369666 0.497353\n13.518 -1.6523 0.497353\n13.6227 -1.90302 0.497353\n13.7274 -1.51247 0.497353\n13.8322 -0.37046 0.497353\n13.9369 0.0173898 0.497353\n14.0416 -1.22208 0.497353\n14.1463 -2.78774 0.497353\n14.251 -2.51037 0.497353\n14.3558 -0.0255009 0.497353\n14.4605 3.15137 0.497353\n14.5652 3.56679 0.497353\n14.6699 1.12682 0.497353\n14.7746 -0.544585 0.497353\n14.8794 0.160077 0.497353\n14.9841 2.71941 0.497353\n\n" +aaaS"History written: Wed Jul 1 09:54:31 2015\nproduced by luke\ndiffpy.srmise version 0.5.2\n##### PDF Peak Extraction\n## BaselineFunctions\n# BaselineFunction 0\nfunction='Polynomial'\nmodule='diffpy.srmise.baselines.polynomial'\nbase=None\ndegree=1\n\n## PeakFunctions\n# PeakFunction 0\nfunction='GaussianOverR'\nmodule='diffpy.srmise.peaks.gaussianoverr'\nbase=None\nmaxwidth=0.7\n\n# PeakFunction 1\nfunction='TerminationRipples'\nmodule='diffpy.srmise.peaks.terminationripples'\nbase=0\nsupersample=5.0\nqmax=30.0\nextension=4.0\n\n# BaselineObject\nowner=0\npars=[-0.51041840174180308, 0.0084074335508157114]\nfree=[True, True]\nremovable=False\nstatic_owner=False\n\n## InitialPeaks\n# SrMiseMetadata\npf=[0]\ncres=0.10472\nModelEvaluator=AIC\nRange=[10.9, 15]\n# Metadata\nfilename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr'\nnyquist=True\nqmax=30.0\nqmax_reportedbypdf=30.0\nqmax_fromdata=29.729728241905356\nscale=False\nsupersample=4.0\n\n##### start data\n#L x y dx dy edy\n0.10472 -0.848217 0 0.276527 0.497353\n0.20944 -0.438975 0 0.375888 0.497353\n0.314159 -0.0724599 0 0.399338 0.497353\n0.418879 0.0701041 0 0.406243 0.497353\n0.523599 0.241004 0 0.40927 0.497353\n0.628319 -1.08142 0 0.410872 0.497353\n0.733038 -0.730527 0 0.411821 0.497353\n0.837758 -0.789248 0 0.412439 0.497353\n0.942478 -0.479976 0 0.412843 0.497353\n1.0472 -0.551525 0 0.413149 0.497353\n1.15192 -0.52763 0 0.413394 0.497353\n1.25664 -0.478534 0 0.41357 0.497353\n1.36136 -0.745365 0 0.41365 0.497353\n1.46608 -0.851118 0 0.414021 0.497353\n1.5708 -0.850263 0 0.413873 0.497353\n1.67552 -0.859146 0 0.413961 0.497353\n1.78024 -0.944151 0 0.414016 0.497353\n1.88496 -0.957457 0 0.414068 0.497353\n1.98968 -0.942436 0 0.414069 0.497353\n2.0944 -1.06201 0 0.414189 0.497353\n2.19911 -0.986944 0 0.41417 0.497353\n2.30383 -1.15517 0 0.414207 0.497353\n2.40855 -0.998036 0 0.4142 0.497353\n2.51327 -1.07553 0 0.414251 0.497353\n2.61799 -0.660581 0 0.414287 0.497353\n2.72271 2.09696 0 0.414276 0.497353\n2.82743 8.65415 0 0.414235 0.497353\n2.93215 9.77508 0 0.414368 0.497353\n3.03687 3.94327 0 0.414316 0.497353\n3.14159 -0.251454 0 0.414294 0.497353\n3.24631 -1.59266 0 0.414334 0.497353\n3.35103 -1.87634 0 0.414372 0.497353\n3.45575 -2.07954 0 0.414336 0.497353\n3.56047 -2.09388 0 0.414361 0.497353\n3.66519 -2.13669 0 0.414378 0.497353\n3.76991 -1.95955 0 0.414216 0.497353\n3.87463 -1.37209 0 0.414521 0.497353\n3.97935 -0.0329757 0 0.41436 0.497353\n4.08407 1.10031 0 0.414367 0.497353\n4.18879 0.469554 0 0.414408 0.497353\n4.29351 -1.15114 0 0.414303 0.497353\n4.39823 -2.15357 0 0.414507 0.497353\n4.50295 -2.41179 0 0.414366 0.497353\n4.60767 -2.41213 0 0.414445 0.497353\n4.71239 -1.88485 0 0.414396 0.497353\n4.81711 0.46476 0 0.414419 0.497353\n4.92183 5.56323 0 0.41442 0.497353\n5.02655 8.65254 0 0.414425 0.497353\n5.13127 5.24024 0 0.41438 0.497353\n5.23599 0.0409454 0 0.414433 0.497353\n5.34071 -2.48627 0 0.41447 0.497353\n5.44543 -3.02423 0 0.414428 0.497353\n5.55015 -2.60297 0 0.414347 0.497353\n5.65487 -0.84228 0 0.414496 0.497353\n5.75959 1.18901 0 0.414408 0.497353\n5.86431 0.894119 0 0.41444 0.497353\n5.96903 -1.28837 0 0.414399 0.497353\n6.07375 -2.72173 0 0.414454 0.497353\n6.17847 -2.7103 0 0.414469 0.497353\n6.28318 -0.941738 0 0.414354 0.497353\n6.3879 2.42598 0 0.414536 0.497353\n6.49263 4.33279 0 0.414436 0.497353\n6.59734 2.21093 0 0.41439 0.497353\n6.70207 -1.306 0 0.414491 0.497353\n6.80678 -3.03265 0 0.414432 0.497353\n6.9115 -2.90582 0 0.414391 0.497353\n7.01622 -1.87167 0 0.41448 0.497353\n7.12094 -1.23044 0 0.414423 0.497353\n7.22566 -1.92941 0 0.414359 0.497353\n7.33038 -2.5179 0 0.414509 0.497353\n7.4351 -0.969886 0 0.41442 0.497353\n7.53982 3.96972 0 0.414436 0.497353\n7.64454 8.8855 0 0.41445 0.497353\n7.74926 7.4236 0 0.414469 0.497353\n7.85398 1.53836 0 0.414469 0.497353\n7.9587 -2.44643 0 0.414443 0.497353\n8.06342 -3.26112 0 0.414411 0.497353\n8.16814 -2.94882 0 0.414522 0.497353\n8.27286 -2.90904 0 0.41438 0.497353\n8.37758 -3.05689 0 0.414496 0.497353\n8.4823 -1.78758 0 0.414444 0.497353\n8.58702 1.38353 0 0.414446 0.497353\n8.69174 3.94127 0 0.41445 0.497353\n8.79646 2.45676 0 0.414399 0.497353\n8.90118 -0.591625 0 0.414515 0.497353\n9.0059 -1.30696 0 0.414422 0.497353\n9.11062 0.12014 0 0.414465 0.497353\n9.21534 0.431331 0 0.414439 0.497353\n9.32006 -1.16176 0 0.414455 0.497353\n9.42478 -1.8613 0 0.41443 0.497353\n9.5295 -0.544258 0 0.414482 0.497353\n9.63422 0.450605 0 0.414444 0.497353\n9.73894 -0.669103 0 0.414465 0.497353\n9.84366 -1.7389 0 0.414464 0.497353\n9.94838 -0.816268 0 0.414442 0.497353\n10.0531 0.290376 0 0.414455 0.497353\n10.1578 0.0115737 0 0.414453 0.497353\n10.2625 1.15071 0 0.414487 0.497353\n10.3673 5.36598 0 0.414456 0.497353\n10.472 7.70779 0 0.414461 0.497353\n10.5767 4.12092 0 0.414484 0.497353\n10.6814 -1.35374 0 0.414425 0.497353\n10.7861 -4.23359 0 0.414497 0.497353\n10.8909 -4.71367 0 0.414424 0.497353\n10.9956 -3.61547 0 0.414463 0.497353\n11.1003 -0.719766 0 0.414456 0.497353\n11.205 2.04711 0 0.414463 0.497353\n11.3097 1.71502 0 0.414441 0.497353\n11.4145 -0.861729 0 0.414477 0.497353\n11.5192 -2.49413 0 0.414453 0.497353\n11.6239 -2.74042 0 0.414485 0.497353\n11.7286 -2.25884 0 0.414466 0.497353\n11.8333 -0.265838 0 0.414432 0.497353\n11.9381 1.90138 0 0.414504 0.497353\n12.0428 1.58808 0 0.414449 0.497353\n12.1475 0.0070566 0 0.414473 0.497353\n12.2522 -0.295937 0 0.414475 0.497353\n12.3569 0.0151809 0 0.414424 0.497353\n12.4617 0.90539 0 0.414498 0.497353\n12.5664 3.2162 0 0.414433 0.497353\n12.6711 4.236 0 0.414449 0.497353\n12.7758 1.95719 0 0.414468 0.497353\n12.8805 -0.763835 0 0.414439 0.497353\n12.9853 -1.66267 0 0.414462 0.497353\n13.09 -1.55113 0 0.414458 0.497353\n13.1947 -0.362846 0 0.414474 0.497353\n13.2994 0.530654 0 0.414469 0.497353\n13.4041 -0.240443 0 0.414474 0.497353\n13.5089 -1.58126 0 0.414444 0.497353\n13.6136 -1.90816 0 0.414468 0.497353\n13.7183 -1.58124 0 0.41445 0.497353\n13.823 -0.47036 0 0.414455 0.497353\n13.9277 0.0528224 0 0.414455 0.497353\n14.0325 -1.06936 0 0.414474 0.497353\n14.1372 -2.69992 0 0.41446 0.497353\n14.2419 -2.63203 0 0.41443 0.497353\n14.3466 -0.307332 0 0.414487 0.497353\n14.4513 2.93352 0 0.414453 0.497353\n14.5561 3.69013 0 0.414472 0.497353\n14.6608 1.35399 0 0.414434 0.497353\n14.7655 -0.4856 0 0.414482 0.497353\n14.8702 -0.000276016 0 0.414449 0.497353\n14.9749 2.48563 0 0.414464 0.497353\n15.0797 4.27674 0 0.414459 0.497353\n15.1844 3.33366 0 0.41448 0.497353\n15.2891 1.21759 0 0.414457 0.497353\n15.3938 -0.37143 0 0.414471 0.497353\n15.4985 -1.80234 0 0.414452 0.497353\n15.6032 -2.85825 0 0.414473 0.497353\n15.708 -3.70676 0 0.414457 0.497353\n15.8127 -4.2802 0 0.414474 0.497353\n15.9174 -3.47037 0 0.414451 0.497353\n16.0221 -0.522252 0 0.414455 0.497353\n16.1268 2.43719 0 0.414459 0.497353\n16.2316 2.03817 0 0.414473 0.497353\n16.3363 -0.703543 0 0.414468 0.497353\n16.441 -1.77019 0 0.41448 0.497353\n16.5457 0.231127 0 0.414477 0.497353\n16.6504 2.64325 0 0.414463 0.497353\n16.7552 2.8064 0 0.414479 0.497353\n16.8599 1.24821 0 0.414472 0.497353\n16.9646 0.147782 0 0.414471 0.497353\n17.0693 -0.285568 0 0.414463 0.497353\n17.174 -0.467344 0 0.414472 0.497353\n17.2788 -0.778432 0 0.414461 0.497353\n17.3835 -0.588839 0 0.414454 0.497353\n17.4882 0.996117 0 0.414463 0.497353\n17.5929 3.103 0 0.414464 0.497353\n17.6976 3.11809 0 0.414474 0.497353\n17.8024 0.614726 0 0.414465 0.497353\n17.9071 -1.62203 0 0.414465 0.497353\n18.0118 -2.07547 0 0.41448 0.497353\n18.1165 -1.83835 0 0.414466 0.497353\n18.2212 -2.03303 0 0.414484 0.497353\n18.326 -2.36859 0 0.414472 0.497353\n18.4307 -2.10356 0 0.414457 0.497353\n18.5354 -1.36772 0 0.414466 0.497353\n18.6401 -0.713728 0 0.414465 0.497353\n18.7448 -0.0613967 0 0.414472 0.497353\n18.8496 1.14241 0 0.41448 0.497353\n18.9543 2.73659 0 0.414472 0.497353\n19.059 2.89613 0 0.414476 0.497353\n19.1637 1.20826 0 0.414465 0.497353\n19.2684 0.137683 0 0.414472 0.497353\n19.3732 1.07538 0 0.414477 0.497353\n19.4779 1.56895 0 0.414466 0.497353\n19.5826 -0.10718 0 0.414469 0.497353\n19.6873 -1.77146 0 0.414461 0.497353\n19.792 -1.19471 0 0.414458 0.497353\n19.8968 0.0394425 0 0.414477 0.497353\n20.0015 -0.209379 0 0.414475 0.497353\n20.1062 -0.746729 0 0.414462 0.497353\n20.2109 0.0585856 0 0.41447 0.497353\n20.3156 0.860572 0 0.414472 0.497353\n20.4203 0.243239 0 0.414467 0.497353\n20.5251 -1.16833 0 0.41447 0.497353\n20.6298 -1.58629 0 0.414473 0.497353\n20.7345 -1.08777 0 0.414483 0.497353\n20.8392 -0.300338 0 0.414478 0.497353\n20.944 0.29465 0 0.414476 0.497353\n21.0487 0.425193 0 0.414469 0.497353\n21.1534 -0.00136946 0 0.414465 0.497353\n21.2581 -0.393033 0 0.414473 0.497353\n21.3628 0.387682 0 0.414463 0.497353\n21.4675 1.6689 0 0.414463 0.497353\n21.5723 1.4581 0 0.414459 0.497353\n21.677 -0.361992 0 0.414462 0.497353\n21.7817 -1.00177 0 0.414469 0.497353\n21.8864 0.0128308 0 0.414467 0.497353\n21.9912 0.809515 0 0.414477 0.497353\n22.0959 0.672339 0 0.414477 0.497353\n22.2006 0.272683 0 0.414474 0.497353\n22.3053 -0.111194 0 0.41448 0.497353\n22.41 -0.327024 0 0.414476 0.497353\n22.5147 0.0407522 0 0.414467 0.497353\n22.6195 0.533048 0 0.414474 0.497353\n22.7242 0.0614679 0 0.414475 0.497353\n22.8289 -0.830564 0 0.414475 0.497353\n22.9336 -0.355731 0 0.414475 0.497353\n23.0384 0.411435 0 0.414477 0.497353\n23.1431 -0.198643 0 0.414481 0.497353\n23.2478 -1.53097 0 0.414475 0.497353\n23.3525 -1.8586 0 0.41448 0.497353\n23.4572 -1.25444 0 0.41448 0.497353\n23.5619 0.0161056 0 0.414478 0.497353\n23.6667 1.66708 0 0.414479 0.497353\n23.7714 2.42556 0 0.414481 0.497353\n23.8761 1.63544 0 0.41448 0.497353\n23.9808 0.480166 0 0.414483 0.497353\n24.0855 0.0681919 0 0.414479 0.497353\n24.1903 -0.367436 0 0.414473 0.497353\n24.295 -0.985321 0 0.414472 0.497353\n24.3997 -1.42046 0 0.414469 0.497353\n24.5044 -1.35023 0 0.414474 0.497353\n24.6091 -0.437157 0 0.414467 0.497353\n24.7139 1.26422 0 0.414462 0.497353\n24.8186 1.92459 0 0.414465 0.497353\n24.9233 1.10257 0 0.414468 0.497353\n25.028 0.232537 0 0.414472 0.497353\n25.1327 0.313857 0 0.414476 0.497353\n25.2375 0.347515 0 0.41448 0.497353\n25.3422 0.0119498 0 0.414475 0.497353\n25.4469 -0.627585 0 0.414474 0.497353\n25.5516 -1.41904 0 0.414471 0.497353\n25.6563 -1.73891 0 0.414463 0.497353\n25.7611 -1.39368 0 0.414465 0.497353\n25.8658 -0.98749 0 0.414462 0.497353\n25.9705 -0.709065 0 0.414461 0.497353\n26.0752 0.00727748 0 0.414463 0.497353\n26.1799 0.820796 0 0.414465 0.497353\n26.2847 1.28029 0 0.414468 0.497353\n26.3894 1.20257 0 0.414464 0.497353\n26.4941 0.847178 0 0.41447 0.497353\n26.5988 0.532713 0 0.414472 0.497353\n26.7035 0.449797 0 0.414474 0.497353\n26.8083 0.311282 0 0.414476 0.497353\n26.913 -0.0359985 0 0.414474 0.497353\n27.0177 -0.0274541 0 0.414472 0.497353\n27.1224 -0.168312 0 0.414475 0.497353\n27.2271 -0.539714 0 0.414476 0.497353\n27.3319 -0.629106 0 0.414471 0.497353\n27.4366 -0.218378 0 0.414468 0.497353\n27.5413 0.255966 0 0.414467 0.497353\n27.646 0.536293 0 0.414469 0.497353\n27.7507 0.399817 0 0.414473 0.497353\n27.8555 0.11408 0 0.414476 0.497353\n27.9602 -0.17124 0 0.414475 0.497353\n28.0649 -0.82576 0 0.414473 0.497353\n28.1696 -1.63377 0 0.414469 0.497353\n28.2743 -1.91638 0 0.41447 0.497353\n28.379 -1.1421 0 0.414474 0.497353\n28.4838 0.377505 0 0.414475 0.497353\n28.5885 1.61749 0 0.414476 0.497353\n28.6932 1.60999 0 0.414476 0.497353\n28.7979 0.924994 0 0.414476 0.497353\n28.9027 0.539661 0 0.414475 0.497353\n29.0074 0.273788 0 0.414475 0.497353\n29.1121 -0.140046 0 0.41447 0.497353\n29.2168 -0.202034 0 0.414471 0.497353\n29.3215 0.433365 0 0.414469 0.497353\n29.4262 1.13571 0 0.414469 0.497353\n29.531 0.836727 0 0.414468 0.497353\n29.6357 -0.101336 0 0.414469 0.497353\n29.7404 -0.669691 0 0.41447 0.497353\n29.8451 -0.721992 0 0.414471 0.497353\n29.9499 -0.766688 0 0.414472 0.497353\n30.0546 -0.547158 0 0.414473 0.497353\n30.1593 -0.308248 0 0.414473 0.497353\n30.264 -0.255524 0 0.414473 0.497353\n30.3687 -0.551494 0 0.414474 0.497353\n30.4734 -0.636365 0 0.414471 0.497353\n30.5782 -0.34684 0 0.41447 0.497353\n30.6829 -0.16534 0 0.414469 0.497353\n30.7876 -0.175003 0 0.414473 0.497353\n30.8923 0.0582915 0 0.414478 0.497353\n30.9971 0.617427 0 0.414476 0.497353\n31.1018 1.14323 0 0.414472 0.497353\n31.2065 1.20366 0 0.414469 0.497353\n31.3112 1.01078 0 0.414467 0.497353\n31.4159 0.829863 0 0.414469 0.497353\n31.5206 0.342908 0 0.414471 0.497353\n31.6254 -0.438775 0 0.414473 0.497353\n31.7301 -0.98495 0 0.414474 0.497353\n31.8348 -0.949941 0 0.414473 0.497353\n31.9395 -0.536897 0 0.414469 0.497353\n32.0442 -0.098742 0 0.414469 0.497353\n32.149 0.198955 0 0.414469 0.497353\n32.2537 0.26835 0 0.414467 0.497353\n32.3584 0.158842 0 0.414467 0.497353\n32.4631 -0.217961 0 0.414468 0.497353\n32.5678 -0.359842 0 0.414469 0.497353\n32.6726 -0.400725 0 0.414469 0.497353\n32.7773 -0.388053 0 0.414472 0.497353\n32.882 -0.53186 0 0.414471 0.497353\n32.9867 -0.452224 0 0.414473 0.497353\n33.0914 -0.258411 0 0.414473 0.497353\n33.1962 -0.0783268 0 0.414472 0.497353\n33.3009 0.34702 0 0.414477 0.497353\n33.4056 0.813758 0 0.414477 0.497353\n33.5103 0.942157 0 0.414473 0.497353\n33.615 0.668602 0 0.414472 0.497353\n33.7198 0.416251 0 0.414469 0.497353\n33.8245 0.213257 0 0.414464 0.497353\n33.9292 0.128913 0 0.414463 0.497353\n34.0339 0.101085 0 0.414462 0.497353\n34.1386 0.126261 0 0.414463 0.497353\n34.2434 -0.088243 0 0.414466 0.497353\n34.3481 -0.505281 0 0.414463 0.497353\n34.4528 -0.865457 0 0.414461 0.497353\n34.5575 -0.931427 0 0.414465 0.497353\n34.6622 -0.677627 0 0.414469 0.497353\n34.767 -0.219618 0 0.414472 0.497353\n34.8717 0.262265 0 0.414475 0.497353\n34.9764 0.497295 0 0.414474 0.497353\n##### Results\nextraction_type='extract'\n### ModelCluster\npeak_funcs=[0]\nModelEvaluator=AIC\nslice=slice(None, 40, None)\n# BaselineObject\nowner=0\npars=[-0.49612799331518148, 0.009243028322946871]\nfree=[True, True]\nremovable=False\nstatic_owner=False\n\n## ModelPeaks\n# ModelPeak\nowner=1\npars=[11.257345641524847, -0.44326181455202407, 34.616301647118242]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[12.008712299446687, 0.31580138324858892, 54.419674496243019]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[12.65116694083374, -0.17004315124028255, 60.463492845884261]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[13.304659414498092, 0.070450559400331986, 49.892861341339824]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[13.919411195913245, -0.073794900748365463, 47.673856467841304]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[14.51438047487288, -0.43472084163912061, 59.87876735144706]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[15.239631252178969, 1.0190814364846466, 160.4906386912761]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n### start data\n#L r y dy\n10.9 -4.68486 0.497353\n11.0047 -3.42823 0.497353\n11.1094 -0.423569 0.497353\n11.2142 2.16651 0.497353\n11.3189 1.53018 0.497353\n11.4236 -1.07332 0.497353\n11.5283 -2.55496 0.497353\n11.633 -2.73133 0.497353\n11.7378 -2.15436 0.497353\n11.8425 -0.03493 0.497353\n11.9472 1.98801 0.497353\n12.0519 1.45359 0.497353\n12.1566 -0.0851001 0.497353\n12.2614 -0.26845 0.497353\n12.3661 0.0438283 0.497353\n12.4708 1.06552 0.497353\n12.5755 3.41162 0.497353\n12.6802 4.16027 0.497353\n12.785 1.67277 0.497353\n12.8897 -0.907877 0.497353\n12.9944 -1.68923 0.497353\n13.0991 -1.48603 0.497353\n13.2038 -0.242317 0.497353\n13.3086 0.533857 0.497353\n13.4133 -0.369666 0.497353\n13.518 -1.6523 0.497353\n13.6227 -1.90302 0.497353\n13.7274 -1.51247 0.497353\n13.8322 -0.37046 0.497353\n13.9369 0.0173898 0.497353\n14.0416 -1.22208 0.497353\n14.1463 -2.78774 0.497353\n14.251 -2.51037 0.497353\n14.3558 -0.0255009 0.497353\n14.4605 3.15137 0.497353\n14.5652 3.56679 0.497353\n14.6699 1.12682 0.497353\n14.7746 -0.544585 0.497353\n14.8794 0.160077 0.497353\n14.9841 2.71941 0.497353\n\n" p754 a. diff --git a/doc/examples/output/parameter_summary.pwa b/docs/examples/output/parameter_summary.pwa similarity index 95% rename from doc/examples/output/parameter_summary.pwa rename to docs/examples/output/parameter_summary.pwa index e180383..068bee3 100644 --- a/doc/examples/output/parameter_summary.pwa +++ b/docs/examples/output/parameter_summary.pwa @@ -6,7 +6,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/TiO2_fine_qmax26.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/TiO2_fine_qmax26.gr nyquist=True qmax=26.0 qmax_reportedbypdf=26.0 diff --git a/doc/examples/output/parameter_summary.srmise b/docs/examples/output/parameter_summary.srmise similarity index 99% rename from doc/examples/output/parameter_summary.srmise rename to docs/examples/output/parameter_summary.srmise index cb9c966..79c9c23 100644 --- a/doc/examples/output/parameter_summary.srmise +++ b/docs/examples/output/parameter_summary.srmise @@ -73,7 +73,7 @@ cres=0.05 ModelEvaluator=AIC Range=[1.5, 10.0] # Metadata -filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/TiO2_fine_qmax26.gr' +filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/TiO2_fine_qmax26.gr' nyquist=True qmax=26.0 qmax_reportedbypdf=26.0 diff --git a/doc/examples/output/query_results.pwa b/docs/examples/output/query_results.pwa similarity index 94% rename from doc/examples/output/query_results.pwa rename to docs/examples/output/query_results.pwa index d1707d8..f64292f 100644 --- a/doc/examples/output/query_results.pwa +++ b/docs/examples/output/query_results.pwa @@ -6,7 +6,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/query_results.srmise b/docs/examples/output/query_results.srmise similarity index 99% rename from doc/examples/output/query_results.srmise rename to docs/examples/output/query_results.srmise index b4e22c7..9349c52 100644 --- a/doc/examples/output/query_results.srmise +++ b/docs/examples/output/query_results.srmise @@ -38,7 +38,7 @@ cres=0.10472 ModelEvaluator=AIC Range=[2.0, 10.0] # Metadata -filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/Ag_nyquist_qmax30.gr' +filename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/Ag_nyquist_qmax30.gr' nyquist=True qmax=30.0 qmax_reportedbypdf=30.0 diff --git a/doc/examples/output/unknown_dG_aics.dat b/docs/examples/output/unknown_dG_aics.dat similarity index 100% rename from doc/examples/output/unknown_dG_aics.dat rename to docs/examples/output/unknown_dG_aics.dat diff --git a/doc/examples/output/unknown_dG_m11.pwa b/docs/examples/output/unknown_dG_m11.pwa similarity index 95% rename from doc/examples/output/unknown_dG_m11.pwa rename to docs/examples/output/unknown_dG_m11.pwa index 37ad750..e570ea0 100644 --- a/doc/examples/output/unknown_dG_m11.pwa +++ b/docs/examples/output/unknown_dG_m11.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/unknown_dG_m17.pwa b/docs/examples/output/unknown_dG_m17.pwa similarity index 95% rename from doc/examples/output/unknown_dG_m17.pwa rename to docs/examples/output/unknown_dG_m17.pwa index 5419a2f..803bac0 100644 --- a/doc/examples/output/unknown_dG_m17.pwa +++ b/docs/examples/output/unknown_dG_m17.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/unknown_dG_m18.pwa b/docs/examples/output/unknown_dG_m18.pwa similarity index 95% rename from doc/examples/output/unknown_dG_m18.pwa rename to docs/examples/output/unknown_dG_m18.pwa index 7c24dcf..f58fedd 100644 --- a/doc/examples/output/unknown_dG_m18.pwa +++ b/docs/examples/output/unknown_dG_m18.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/unknown_dG_m5.pwa b/docs/examples/output/unknown_dG_m5.pwa similarity index 95% rename from doc/examples/output/unknown_dG_m5.pwa rename to docs/examples/output/unknown_dG_m5.pwa index 67b5bbd..d31907c 100644 --- a/doc/examples/output/unknown_dG_m5.pwa +++ b/docs/examples/output/unknown_dG_m5.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/unknown_dG_m7.pwa b/docs/examples/output/unknown_dG_m7.pwa similarity index 95% rename from doc/examples/output/unknown_dG_m7.pwa rename to docs/examples/output/unknown_dG_m7.pwa index 6becf13..787a503 100644 --- a/doc/examples/output/unknown_dG_m7.pwa +++ b/docs/examples/output/unknown_dG_m7.pwa @@ -12,7 +12,7 @@ diffpy.srmise version 0.5.2 ##### PDF Peak Extraction Summary # The information below is not sufficient to replicate extraction. ## PDF metadata -filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr +filename=/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr nyquist=True qmax=21.299999 qmax_reportedbypdf=21.299999 diff --git a/doc/examples/output/unknown_dG_models.dat b/docs/examples/output/unknown_dG_models.dat similarity index 53% rename from doc/examples/output/unknown_dG_models.dat rename to docs/examples/output/unknown_dG_models.dat index e4cb6d4..d76bd67 100644 --- a/doc/examples/output/unknown_dG_models.dat +++ b/docs/examples/output/unknown_dG_models.dat @@ -9909,6 +9909,6 @@ sag4 (g6 S"`\xa6'\xc5\t\xe1\xc2?" tRp1339 -aaaS"History written: Wed Jul 1 10:01:37 2015\nproduced by luke\ndiffpy.srmise version 0.5.2\n##### PDF Peak Extraction\n## BaselineFunctions\n# BaselineFunction 0\nfunction='FromSequence'\nmodule='diffpy.srmise.baselines.fromsequence'\nbase=None\ny=[-1475.0325650706627, -2950.0651301413254, -4425.0976952119881, -5900.1302602826509, -7375.1628253533127, -8850.1953904239745, -10325.227955494638, -11800.260520565302, -13275.293085635964, -14750.325650706625, -16225.358215777289, -17700.390780847953, -19175.423345918618, -20650.455910989276, -22125.488476059942, -23600.521041130603, -25075.553606201265, -26550.586171271931, -28025.459933459599, -29490.66450359999, -30922.864389112267, -32298.695523408274, -33596.022711102938, -34793.92402828217, -35872.675222770908, -36813.734114401064, -37599.724995279517, -38214.42303005611, -38643.368779986711, -38890.463187607907, -38978.523165803032, -38930.29758324947, -38767.462434741778, -38510.636440923663, -38179.39664801996, -37792.294027568765, -37366.869076153373, -36919.66741513431, -36465.762314723048, -36011.685031151355, -35557.60774757967, -35103.530464007978, -34649.453180436292, -34195.375896864593, -33741.298613292922, -33287.221329721207, -32833.144046149522, -32379.066762577819, -31924.989479006141, -31470.912195434459, -31016.83491186277, -30562.757628291063, -30108.680344719356, -29654.603061147711, -29200.525777575986, -28746.448494004322, -28292.371210432615, -27838.293926860926, -27384.216643289248, -26930.139359411234, -26474.542488478357, -26010.083575850655, -25528.358372275903, -25021.398910324362, -24481.667989050857, -23902.053658656267, -23275.863705149979, -22596.820135010832, -21859.053659849822, -21057.103538030915, -20189.157506289514, -19262.2608478449, -18284.582204221027, -17263.909088500266, -16207.653400662406, -15122.856942922259, -14016.196935068139, -12893.991529799485, -11762.205328065833, -10626.439769837914, -9490.3191584519027, -8354.1985470658783, -7218.0779356797575, -6081.9573242938068, -4945.8367129076605, -3809.7161015215393, -2673.5954901353934, -1537.4748787493209, -401.35426736339457, 734.76028191512512, 1862.3074495985777, 2947.158200990089, 3960.1884858314311, 4888.6048315275966, 5719.7202101002222, 6439.2477046714184, 7031.3497219455321, 7478.6872046947792, 7762.4688442382803, 7862.653161699448]\nx=[0.10000000000000001, 0.20000000000000001, 0.30000000000000004, 0.40000000000000002, 0.5, 0.59999999999999998, 0.70000000000000007, 0.80000000000000004, 0.90000000000000002, 1.0, 1.1000000000000001, 1.2000000000000002, 1.3000000000000003, 1.4000000000000001, 1.5000000000000002, 1.6000000000000001, 1.7000000000000002, 1.8000000000000003, 1.9000000000000001, 2.0, 2.1000000000000001, 2.2000000000000002, 2.3000000000000003, 2.4000000000000004, 2.5000000000000004, 2.6000000000000001, 2.7000000000000002, 2.8000000000000003, 2.9000000000000004, 3.0000000000000004, 3.1000000000000001, 3.2000000000000002, 3.3000000000000003, 3.4000000000000004, 3.5000000000000004, 3.6000000000000001, 3.7000000000000002, 3.8000000000000003, 3.9000000000000004, 4.0, 4.0999999999999996, 4.2000000000000002, 4.2999999999999998, 4.3999999999999995, 4.5, 4.5999999999999996, 4.7000000000000002, 4.7999999999999998, 4.9000000000000004, 5.0, 5.0999999999999996, 5.2000000000000002, 5.2999999999999998, 5.4000000000000004, 5.5, 5.5999999999999996, 5.7000000000000002, 5.7999999999999998, 5.9000000000000004, 6.0, 6.0999999999999996, 6.2000000000000002, 6.2999999999999998, 6.4000000000000004, 6.5, 6.5999999999999996, 6.7000000000000002, 6.7999999999999998, 6.9000000000000004, 7.0, 7.0999999999999996, 7.2000000000000002, 7.2999999999999998, 7.4000000000000004, 7.5, 7.5999999999999996, 7.7000000000000002, 7.7999999999999998, 7.9000000000000004, 8.0, 8.0999999999999996, 8.1999999999999993, 8.3000000000000007, 8.4000000000000004, 8.5, 8.5999999999999996, 8.6999999999999993, 8.8000000000000007, 8.9000000000000004, 9.0, 9.0999999999999996, 9.1999999999999993, 9.3000000000000007, 9.4000000000000004, 9.5, 9.5999999999999996, 9.7000000000000011, 9.8000000000000007, 9.9000000000000004, 10.0]\n\n## PeakFunctions\n# PeakFunction 0\nfunction='GaussianOverR'\nmodule='diffpy.srmise.peaks.gaussianoverr'\nbase=None\nmaxwidth=0.7\n\n# PeakFunction 1\nfunction='TerminationRipples'\nmodule='diffpy.srmise.peaks.terminationripples'\nbase=0\nsupersample=5.0\nqmax=21.299999\nextension=4.0\n\n# BaselineObject\nowner=0\npars=[]\nfree=[]\nremovable=False\nstatic_owner=False\n\n## InitialPeaks\n# SrMiseMetadata\npf=[0]\ncres=0.05\nModelEvaluator=AIC\nRange=[1.0, 7.25]\n# Metadata\nfilename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/doc/examples/data/C60_fine_qmax21.gr'\nnyquist=True\nqmax=21.299999\nqmax_reportedbypdf=21.299999\nqmax_fromdata=20.755266780473114\nscale=False\nsupersample=4.0\n\n##### start data\n#L x y dx dy edy\n0.01 18942.6 0 8.53691 11653.4\n0.02 37722.7 0 16.7546 11653.4\n0.03 56177.6 0 24.347 11653.4\n0.04 74143.9 0 31.0336 11653.4\n0.05 91457.9 0 36.571 11653.4\n0.06 107956 0 40.7633 11653.4\n0.07 123476 0 43.4706 11653.4\n0.08 137856 0 44.6161 11653.4\n0.09 150940 0 44.191 11653.4\n0.1 162578 0 42.2588 11653.4\n0.11 172629 0 38.9611 11653.4\n0.12 180964 0 34.5282 11653.4\n0.13 187472 0 29.307 11653.4\n0.14 192060 0 23.8359 11653.4\n0.15 194658 0 19.0276 11653.4\n0.16 195226 0 16.3851 11653.4\n0.17 193750 0 17.2383 11653.4\n0.18 190254 0 20.9462 11653.4\n0.19 184793 0 25.822 11653.4\n0.2 177460 0 30.698 11653.4\n0.21 168386 0 34.9379 11653.4\n0.22 157737 0 38.1842 11653.4\n0.23 145712 0 40.2361 11653.4\n0.24 132543 0 41.0033 11653.4\n0.25 118488 0 40.4884 11653.4\n0.26 103827 0 38.7838 11653.4\n0.27 88856.5 0 36.0754 11653.4\n0.28 73881.6 0 32.6565 11653.4\n0.29 59209 0 28.9558 11653.4\n0.3 45139.3 0 25.5728 11653.4\n0.31 31959.2 0 23.2628 11653.4\n0.32 19933.4 0 22.7026 11653.4\n0.33 9297.65 0 24.0285 11653.4\n0.34 251.704 0 26.7081 11653.4\n0.35 -7046.27 0 29.9659 11653.4\n0.36 -12484.5 0 33.1496 11653.4\n0.37 -16000.8 0 35.809 11653.4\n0.38 -17584.8 0 37.6619 11653.4\n0.39 -17278 0 38.5549 11653.4\n0.4 -15172.9 0 38.4411 11653.4\n0.41 -11410.1 0 37.3693 11653.4\n0.42 -6173.99 0 35.4819 11653.4\n0.43 312.641 0 33.0201 11653.4\n0.44 7795.7 0 30.331 11653.4\n0.45 15997.5 0 27.8677 11653.4\n0.46 24625.2 0 26.1426 11653.4\n0.47 33380 0 25.5822 11653.4\n0.48 41966.4 0 26.3124 11653.4\n0.49 50100.7 0 28.0791 11653.4\n0.5 57520.3 0 30.4057 11653.4\n0.51 63990.9 0 32.8044 11653.4\n0.52 69313.7 0 34.886 11653.4\n0.53 73330.8 0 36.3811 11653.4\n0.54 75929.5 0 37.131 11653.4\n0.55 77044.7 0 37.0761 11653.4\n0.56 76660.3 0 36.2478 11653.4\n0.57 74808.1 0 34.7652 11653.4\n0.58 71565.9 0 32.8355 11653.4\n0.59 67053.6 0 30.7514 11653.4\n0.6 61428.1 0 28.8765 11653.4\n0.61 54877.1 0 27.5925 11653.4\n0.62 47611.7 0 27.1928 11653.4\n0.63 39858.8 0 27.7571 11653.4\n0.64 31853 0 29.1121 11653.4\n0.65 23828 0 30.9201 11653.4\n0.66 16008.6 0 32.8095 11653.4\n0.67 8603.69 0 34.4622 11653.4\n0.68 1798.99 0 35.646 11653.4\n0.69 -4248.35 0 36.2199 11653.4\n0.7 -9414.3 0 36.1298 11653.4\n0.71 -13611.1 0 35.4048 11653.4\n0.72 -16789.1 0 34.1541 11653.4\n0.73 -18936.8 0 32.5637 11653.4\n0.74 -20079.9 0 30.8888 11653.4\n0.75 -20278.6 0 29.4309 11653.4\n0.76 -19624.1 0 28.4858 11653.4\n0.77 -18233.7 0 28.2603 11653.4\n0.78 -16245 0 28.7926 11653.4\n0.79 -13810.2 0 29.9374 11653.4\n0.8 -11089.1 0 31.4287 11653.4\n0.81 -8242.85 0 32.9701 11653.4\n0.82 -5427.21 0 34.3007 11653.4\n0.83 -2786.99 0 35.2261 11653.4\n0.84 -450.548 0 35.6277 11653.4\n0.85 1474.5 0 35.4644 11653.4\n0.86 2904.71 0 34.7693 11653.4\n0.87 3783.01 0 33.6482 11653.4\n0.88 4079.74 0 32.2736 11653.4\n0.89 3792.54 0 30.8738 11653.4\n0.9 2944.99 0 29.7056 11653.4\n0.91 1584.28 0 29.0051 11653.4\n0.92 -222.159 0 28.9205 11653.4\n0.93 -2390.68 0 29.4595 11653.4\n0.94 -4826.07 0 30.4869 11653.4\n0.95 -7426.55 0 31.7771 11653.4\n0.96 -10088.8 0 33.0821 11653.4\n0.97 -12713 0 34.1826 11653.4\n0.98 -15207.3 0 34.9156 11653.4\n0.99 -17492 0 35.1842 11653.4\n1 -19503 0 34.9606 11653.4\n1.01 -21193.7 0 34.2847 11653.4\n1.02 -22537 0 33.2613 11653.4\n1.03 -23525.9 0 32.053 11653.4\n1.04 -24172 0 30.8661 11653.4\n1.05 -24504.7 0 29.9216 11653.4\n1.06 -24568.6 0 29.4096 11653.4\n1.07 -24419.8 0 29.435 11653.4\n1.08 -24122.2 0 29.9825 11653.4\n1.09 -23743.2 0 30.9231 11653.4\n1.1 -23349 0 32.0586 11653.4\n1.11 -23000.1 0 33.1763 11653.4\n1.12 -22747 0 34.0897 11653.4\n1.13 -22626 0 34.6619 11653.4\n1.14 -22656.6 0 34.8154 11653.4\n1.15 -22838.5 0 34.5356 11653.4\n1.16 -23150.5 0 33.8694 11653.4\n1.17 -23550 0 32.922 11653.4\n1.18 -23973.8 0 31.8483 11653.4\n1.19 -24339.8 0 30.8363 11653.4\n1.2 -24550.2 0 30.0775 11653.4\n1.21 -24495 0 29.7246 11653.4\n1.22 -24056.8 0 29.8486 11653.4\n1.23 -23116.2 0 30.4155 11653.4\n1.24 -21557.6 0 31.2994 11653.4\n1.25 -19274.7 0 32.3219 11653.4\n1.26 -16176.8 0 33.2965 11653.4\n1.27 -12193.8 0 34.0627 11653.4\n1.28 -7281.75 0 34.5058 11653.4\n1.29 -1426.42 0 34.5652 11653.4\n1.3 5353.3 0 34.2379 11653.4\n1.31 13003.6 0 33.5775 11653.4\n1.32 21435 0 32.6893 11653.4\n1.33 30523.3 0 31.7209 11653.4\n1.34 40111.4 0 30.8441 11653.4\n1.35 50013.2 0 30.225 11653.4\n1.36 60017.9 0 29.9866 11653.4\n1.37 69896.1 0 30.1742 11653.4\n1.38 79406.9 0 30.7413 11653.4\n1.39 88304.8 0 31.5659 11653.4\n1.4 96348 0 32.4856 11653.4\n1.41 103306 0 33.3355 11653.4\n1.42 108970 0 33.9764 11653.4\n1.43 113155 0 34.312 11653.4\n1.44 115713 0 34.2965 11653.4\n1.45 116534 0 33.9373 11653.4\n1.46 115552 0 33.2933 11653.4\n1.47 112750 0 32.4696 11653.4\n1.48 108158 0 31.6062 11653.4\n1.49 101857 0 30.8589 11653.4\n1.5 93973.5 0 30.3705 11653.4\n1.51 84679 0 30.2374 11653.4\n1.52 74183.6 0 30.4828 11653.4\n1.53 62730.5 0 31.0503 11653.4\n1.54 50588.5 0 31.8217 11653.4\n1.55 38044 0 32.6485 11653.4\n1.56 25391.8 0 33.3847 11653.4\n1.57 12926.4 0 33.9104 11653.4\n1.58 932.466 0 34.1461 11653.4\n1.59 -10323.7 0 34.0596 11653.4\n1.6 -20602.4 0 33.668 11653.4\n1.61 -29697.7 0 33.0355 11653.4\n1.62 -37443.6 0 32.2668 11653.4\n1.63 -43718.3 0 31.4948 11653.4\n1.64 -48447.8 0 30.8606 11653.4\n1.65 -51607 0 30.486 11653.4\n1.66 -53219.5 0 30.444 11653.4\n1.67 -53355.7 0 30.7394 11653.4\n1.68 -52129.5 0 31.3074 11653.4\n1.69 -49693 0 32.033 11653.4\n1.7 -46230.6 0 32.7797 11653.4\n1.71 -41951.5 0 33.4173 11653.4\n1.72 -37082.2 0 33.8426 11653.4\n1.73 -31857.8 0 33.9912 11653.4\n1.74 -26513.5 0 33.8433 11653.4\n1.75 -21276.4 0 33.4249 11653.4\n1.76 -16357.9 0 32.805 11653.4\n1.77 -11945.9 0 32.0878 11653.4\n1.78 -8199.74 0 31.3994 11653.4\n1.79 -5244.58 0 30.8672 11653.4\n1.8 -3168.44 0 30.5942 11653.4\n1.81 -2020.1 0 30.6332 11653.4\n1.82 -1808.73 0 30.9733 11653.4\n1.83 -2505.02 0 31.5432 11653.4\n1.84 -4043.73 0 32.2308 11653.4\n1.85 -6327.61 0 32.9098 11653.4\n1.86 -9232.41 0 33.464 11653.4\n1.87 -12612.9 0 33.8044 11653.4\n1.88 -16309.4 0 33.8798 11653.4\n1.89 -20154.9 0 33.6813 11653.4\n1.9 -23982.3 0 33.2426 11653.4\n1.91 -27631.4 0 32.6362 11653.4\n1.92 -30955 0 31.9652 11653.4\n1.93 -33825.5 0 31.3483 11653.4\n1.94 -36139.1 0 30.9002 11653.4\n1.95 -37819.9 0 30.7067 11653.4\n1.96 -38822.6 0 30.804 11653.4\n1.97 -39133.3 0 31.1691 11653.4\n1.98 -38769.7 0 31.7268 11653.4\n1.99 -37779.1 0 32.3689 11653.4\n2 -36236.3 0 32.979 11653.4\n2.01 -34239.2 0 33.4534 11653.4\n2.02 -31903.8 0 33.7162 11653.4\n2.03 -29358.9 0 33.7281 11653.4\n2.04 -26739.8 0 33.4898 11653.4\n2.05 -24181.7 0 33.0417 11653.4\n2.06 -21813.7 0 32.4591 11653.4\n2.07 -19752.2 0 31.8427 11653.4\n2.08 -18095.5 0 31.3035 11653.4\n2.09 -16919.2 0 30.943 11653.4\n2.1 -16272 0 30.8304 11653.4\n2.11 -16173 0 30.9862 11653.4\n2.12 -16610.4 0 31.3767 11653.4\n2.13 -17541.3 0 31.9234 11653.4\n2.14 -18892.7 0 32.5224 11653.4\n2.15 -20564 0 33.0666 11653.4\n2.16 -22430.5 0 33.4642 11653.4\n2.17 -24348.5 0 33.6515 11653.4\n2.18 -26160.4 0 33.6004 11653.4\n2.19 -27701.2 0 33.3208 11653.4\n2.2 -28804.8 0 32.8593 11653.4\n2.21 -29311.4 0 32.2938 11653.4\n2.22 -29073.8 0 31.7227 11653.4\n2.23 -27963.7 0 31.2498 11653.4\n2.24 -25877.9 0 30.9645 11653.4\n2.25 -22742.8 0 30.9215 11653.4\n2.26 -18518.7 0 31.1275 11653.4\n2.27 -13202 0 31.5399 11653.4\n2.28 -6827.17 0 32.0779 11653.4\n2.29 533.184 0 32.6414 11653.4\n2.3 8769.9 0 33.1314 11653.4\n2.31 17739.6 0 33.4665 11653.4\n2.32 27268.5 0 33.5936 11653.4\n2.33 37157.5 0 33.4942 11653.4\n2.34 47187.9 0 33.1862 11653.4\n2.35 57128 0 32.7211 11653.4\n2.36 66740.2 0 32.178 11653.4\n2.37 75788.5 0 31.6526 11653.4\n2.38 84045.6 0 31.2409 11653.4\n2.39 91300 0 31.0207 11653.4\n2.4 97362.9 0 31.0335 11653.4\n2.41 102074 0 31.275 11653.4\n2.42 105306 0 31.696 11653.4\n2.43 106968 0 32.2149 11653.4\n2.44 107011 0 32.7365 11653.4\n2.45 105427 0 33.1698 11653.4\n2.46 102247 0 33.4432 11653.4\n2.47 97545.1 0 33.5136 11653.4\n2.48 91432.3 0 33.3712 11653.4\n2.49 84053.7 0 33.0405 11653.4\n2.5 75584.5 0 32.5774 11653.4\n2.51 66224.1 0 32.0612 11653.4\n2.52 56190.4 0 31.5838 11653.4\n2.53 45713.4 0 31.233 11653.4\n2.54 35028 0 31.0751 11653.4\n2.55 24367.9 0 31.1396 11653.4\n2.56 13958.9 0 31.4121 11653.4\n2.57 4012.96 0 31.8379 11653.4\n2.58 -5277.48 0 32.336 11653.4\n2.59 -13743.8 0 32.816 11653.4\n2.6 -21245.3 0 33.195 11653.4\n2.61 -27671.9 0 33.4107 11653.4\n2.62 -32945.9 0 33.4291 11653.4\n2.63 -37022.9 0 33.2488 11653.4\n2.64 -39891.6 0 32.9004 11653.4\n2.65 -41572.2 0 32.4429 11653.4\n2.66 -42114.7 0 31.9557 11653.4\n2.67 -41596 0 31.5261 11653.4\n2.68 -40116.2 0 31.2338 11653.4\n2.69 -37794.5 0 31.1341 11653.4\n2.7 -34765.2 0 31.2451 11653.4\n2.71 -31172.8 0 31.5439 11653.4\n2.72 -27167.4 0 31.9717 11653.4\n2.73 -22900.5 0 32.4485 11653.4\n2.74 -18520.4 0 32.8888 11653.4\n2.75 -14168.8 0 33.2176 11653.4\n2.76 -9976.72 0 33.3813 11653.4\n2.77 -6062.3 0 33.3544 11653.4\n2.78 -2528.15 0 33.1427 11653.4\n2.79 540.183 0 32.7822 11653.4\n2.8 3075.25 0 32.3344 11653.4\n2.81 5028.13 0 31.8774 11653.4\n2.82 6368.27 0 31.4938 11653.4\n2.83 7082.85 0 31.2549 11653.4\n2.84 7175.6 0 31.2054 11653.4\n2.85 6665.42 0 31.3538 11653.4\n2.86 5584.53 0 31.6696 11653.4\n2.87 3976.57 0 32.0918 11653.4\n2.88 1894.46 0 32.5418 11653.4\n2.89 -601.666 0 32.9401 11653.4\n2.9 -3446.6 0 33.219 11653.4\n2.91 -6572.02 0 33.3332 11653.4\n2.92 -9908.35 0 33.2654 11653.4\n2.93 -13386.4 0 33.0279 11653.4\n2.94 -16939 0 32.661 11653.4\n2.95 -20501.9 0 32.2279 11653.4\n2.96 -24015.2 0 31.805 11653.4\n2.97 -27423.8 0 31.4691 11653.4\n2.98 -30678.4 0 31.2828 11653.4\n2.99 -33735.5 0 31.281 11653.4\n3 -36558.1 0 31.4626 11653.4\n3.01 -39115.6 0 31.7913 11653.4\n3.02 -41383.9 0 32.2043 11653.4\n3.03 -43345.7 0 32.6257 11653.4\n3.04 -44989.8 0 32.9816 11653.4\n3.05 -46311.6 0 33.2121 11653.4\n3.06 -47312.7 0 33.2799 11653.4\n3.07 -48000.4 0 33.1752 11653.4\n3.08 -48388.2 0 32.9164 11653.4\n3.09 -48494.8 0 32.5479 11653.4\n3.1 -48344.1 0 32.1337 11653.4\n3.11 -47964.8 0 31.7475 11653.4\n3.12 -47389.8 0 31.46 11653.4\n3.13 -46655.4 0 31.3252 11653.4\n3.14 -45801.2 0 31.3678 11653.4\n3.15 -44868.4 0 31.5784 11653.4\n3.16 -43899.6 0 31.9156 11653.4\n3.17 -42937.2 0 32.3156 11653.4\n3.18 -42022.5 0 32.7054 11653.4\n3.19 -41194.4 0 33.0172 11653.4\n3.2 -40488.2 0 33.1983 11653.4\n3.21 -39933.9 0 33.2196 11653.4\n3.22 -39555.7 0 33.0783 11653.4\n3.23 -39370.2 0 32.7987 11653.4\n3.24 -39385.6 0 32.4286 11653.4\n3.25 -39601.1 0 32.0326 11653.4\n3.26 -40006.1 0 31.6816 11653.4\n3.27 -40579.8 0 31.4403 11653.4\n3.28 -41291.6 0 31.3539 11653.4\n3.29 -42101.2 0 31.4382 11653.4\n3.3 -42959.7 0 31.6762 11653.4\n3.31 -43809.9 0 32.0217 11653.4\n3.32 -44588.8 0 32.4106 11653.4\n3.33 -45228.6 0 32.7731 11653.4\n3.34 -45658.8 0 33.0468 11653.4\n3.35 -45809 0 33.1861 11653.4\n3.36 -45610.6 0 33.1689 11653.4\n3.37 -44999.9 0 32.999 11653.4\n3.38 -43919.8 0 32.7056 11653.4\n3.39 -42323.1 0 32.3393 11653.4\n3.4 -40173.9 0 31.9643 11653.4\n3.41 -37449.7 0 31.6484 11653.4\n3.42 -34143.3 0 31.4497 11653.4\n3.43 -30263.4 0 31.4054 11653.4\n3.44 -25835.3 0 31.523 11653.4\n3.45 -20901.6 0 31.779 11653.4\n3.46 -15521 0 32.1244 11653.4\n3.47 -9767.61 0 32.4953 11653.4\n3.48 -3729.62 0 32.8257 11653.4\n3.49 2492.93 0 33.0591 11653.4\n3.5 8790.54 0 33.1566 11653.4\n3.51 15047 0 33.103 11653.4\n3.52 21142.8 0 32.908 11653.4\n3.53 26957.7 0 32.6052 11653.4\n3.54 32375 0 32.2469 11653.4\n3.55 37284 0 31.8966 11653.4\n3.56 41584 0 31.6179 11653.4\n3.57 45186.2 0 31.4625 11653.4\n3.58 48017.3 0 31.4591 11653.4\n3.59 50020.8 0 31.6077 11653.4\n3.6 51159.1 0 31.8789 11653.4\n3.61 51414 0 32.2216 11653.4\n3.62 50787.8 0 32.5728 11653.4\n3.63 49302.3 0 32.8706 11653.4\n3.64 46998.7 0 33.0643 11653.4\n3.65 43935.9 0 33.1217 11653.4\n3.66 40188.6 0 33.0341 11653.4\n3.67 35844.8 0 32.8168 11653.4\n3.68 31003.6 0 32.5071 11653.4\n3.69 25772 0 32.1589 11653.4\n3.7 20261.5 0 31.8342 11653.4\n3.71 14585.3 0 31.5922 11653.4\n3.72 8855.41 0 31.4778 11653.4\n3.73 3179.21 0 31.5121 11653.4\n3.74 -2342.73 0 31.6877 11653.4\n3.75 -7619.03 0 31.9708 11653.4\n3.76 -12569.4 0 32.3081 11653.4\n3.77 -17125.9 0 32.6387 11653.4\n3.78 -21233.9 0 32.9046 11653.4\n3.79 -24852.4 0 33.0607 11653.4\n3.8 -27953.9 0 33.0815 11653.4\n3.81 -30523.7 0 32.9642 11653.4\n3.82 -32559.1 0 32.7292 11653.4\n3.83 -34067.9 0 32.4169 11653.4\n3.84 -35067.1 0 32.0821 11653.4\n3.85 -35580.5 0 31.7846 11653.4\n3.86 -35637.5 0 31.5791 11653.4\n3.87 -35271 0 31.5037 11653.4\n3.88 -34515.7 0 31.5721 11653.4\n3.89 -33406.5 0 31.7705 11653.4\n3.9 -31977.4 0 32.0609 11653.4\n3.91 -30260.2 0 32.3895 11653.4\n3.92 -28284.3 0 32.6972 11653.4\n3.93 -26076 0 32.9305 11653.4\n3.94 -23658.8 0 33.0501 11653.4\n3.95 -21053.8 0 33.0366 11653.4\n3.96 -18280.5 0 32.8928 11653.4\n3.97 -15357.4 0 32.6435 11653.4\n3.98 -12303.6 0 32.332 11653.4\n3.99 -9139.65 0 32.013 11653.4\n4 -5888.76 0 31.7441 11653.4\n4.01 -2578.12 0 31.5746 11653.4\n4.02 760.329 0 31.5361 11653.4\n4.03 4089.17 0 31.6352 11653.4\n4.04 7365.15 0 31.8525 11653.4\n4.05 10539.2 0 32.1467 11653.4\n4.06 13557 0 32.4638 11653.4\n4.07 16359.4 0 32.7473 11653.4\n4.08 18884.3 0 32.9482 11653.4\n4.09 21068 0 33.0328 11653.4\n4.1 22847 0 32.9875 11653.4\n4.11 24160.9 0 32.8205 11653.4\n4.12 24954.1 0 32.5607 11653.4\n4.13 25179 0 32.2531 11653.4\n4.14 24798.1 0 31.9523 11653.4\n4.15 23786.7 0 31.7128 11653.4\n4.16 22134.8 0 31.5785 11653.4\n4.17 19848.7 0 31.5745 11653.4\n4.18 16952.9 0 31.7008 11653.4\n4.19 13490 0 31.933 11653.4\n4.2 9521.46 0 32.2274 11653.4\n4.21 5126.58 0 32.5304 11653.4\n4.22 401.474 0 32.7883 11653.4\n4.23 -4542.97 0 32.9569 11653.4\n4.24 -9583.69 0 33.008 11653.4\n4.25 -14588.6 0 32.9337 11653.4\n4.26 -19420.2 0 32.7469 11653.4\n4.27 -23939.9 0 32.48 11653.4\n4.28 -28011.7 0 32.1795 11653.4\n4.29 -31507.2 0 31.899 11653.4\n4.3 -34309.6 0 31.6896 11653.4\n4.31 -36317.9 0 31.5897 11653.4\n4.32 -37450.4 0 31.6179 11653.4\n4.33 -37648.2 0 31.7682 11653.4\n4.34 -36877.6 0 32.0117 11653.4\n4.35 -35131.7 0 32.3032 11653.4\n4.36 -32431.8 0 32.5899 11653.4\n4.37 -28826.8 0 32.8214 11653.4\n4.38 -24392.9 0 32.9582 11653.4\n4.39 -19231.2 0 32.9776 11653.4\n4.4 -13465.5 0 32.8769 11653.4\n4.41 -7238.43 0 32.6736 11653.4\n4.42 -707.454 0 32.403 11653.4\n4.43 5959.94 0 32.1125 11653.4\n4.44 12591.4 0 31.8542 11653.4\n4.45 19014.8 0 31.6752 11653.4\n4.46 25064.3 0 31.6087 11653.4\n4.47 30584.7 0 31.6666 11653.4\n4.48 35437.1 0 31.8375 11653.4\n4.49 39502.6 0 32.089 11653.4\n4.5 42686.6 0 32.3746 11653.4\n4.51 44921.4 0 32.643 11653.4\n4.52 46168.3 0 32.8474 11653.4\n4.53 46418.3 0 32.953 11653.4\n4.54 45692.4 0 32.9425 11653.4\n4.55 44040.7 0 32.8181 11653.4\n4.56 41539.8 0 32.6014 11653.4\n4.57 38290.2 0 32.3301 11653.4\n4.58 34412.9 0 32.0521 11653.4\n4.59 30044.1 0 31.8173 11653.4\n4.6 25331.1 0 31.6688 11653.4\n4.61 20426.9 0 31.634 11653.4\n4.62 15484.4 0 31.719 11653.4\n4.63 10651.6 0 31.9073 11653.4\n4.64 6066.43 0 32.1633 11653.4\n4.65 1851.91 0 32.4403 11653.4\n4.66 -1887.54 0 32.6887 11653.4\n4.67 -5069.48 0 32.8655 11653.4\n4.68 -7635.8 0 32.9408 11653.4\n4.69 -9554.14 0 32.9022 11653.4\n4.7 -10818.4 0 32.7569 11653.4\n4.71 -11448 0 32.5299 11653.4\n4.72 -11486.8 0 32.2609 11653.4\n4.73 -11000.1 0 31.9975 11653.4\n4.74 -10072.1 0 31.7875 11653.4\n4.75 -8801.7 0 31.6692 11653.4\n4.76 -7298.05 0 31.6646 11653.4\n4.77 -5676.27 0 31.774 11653.4\n4.78 -4052.39 0 31.9764 11653.4\n4.79 -2538.71 0 32.234 11653.4\n4.8 -1239.22 0 32.4998 11653.4\n4.81 -245.526 0 32.7269 11653.4\n4.82 366.679 0 32.876 11653.4\n4.83 540.487 0 32.922 11653.4\n4.84 239.806 0 32.8576 11653.4\n4.85 -549.467 0 32.6941 11653.4\n4.86 -1819.18 0 32.46 11653.4\n4.87 -3539.58 0 32.1961 11653.4\n4.88 -5660.81 0 31.9497 11653.4\n4.89 -8115.23 0 31.7653 11653.4\n4.9 -10820.4 0 31.677 11653.4\n4.91 -13682.8 0 31.7009 11653.4\n4.92 -16601.4 0 31.832 11653.4\n4.93 -19472.6 0 32.0454 11653.4\n4.94 -22193.9 0 32.3017 11653.4\n4.95 -24668.2 0 32.5543 11653.4\n4.96 -26808.1 0 32.7589 11653.4\n4.97 -28539.1 0 32.8804 11653.4\n4.98 -29802.4 0 32.8983 11653.4\n4.99 -30557.5 0 32.8101 11653.4\n5 -30783.4 0 32.6311 11653.4\n5.01 -30479.2 0 32.3926 11653.4\n5.02 -29663.8 0 32.1365 11653.4\n5.03 -28375.4 0 31.9087 11653.4\n5.04 -26668.9 0 31.7506 11653.4\n5.05 -24613.9 0 31.6915 11653.4\n5.06 -22291.2 0 31.7419 11653.4\n5.07 -19789.8 0 31.8921 11653.4\n5.08 -17202.2 0 32.1136 11653.4\n5.09 -14621.1 0 32.3658 11653.4\n5.1 -12135.1 0 32.6034 11653.4\n5.11 -9824.96 0 32.7847 11653.4\n5.12 -7760.23 0 32.8787 11653.4\n5.13 -5996.2 0 32.8699 11653.4\n5.14 -4571.74 0 32.76 11653.4\n5.15 -3507.64 0 32.5683 11653.4\n5.16 -2805.86 0 32.3282 11653.4\n5.17 -2449.52 0 32.082 11653.4\n5.18 -2403.76 0 31.8741 11653.4\n5.19 -2617.36 0 31.7425 11653.4\n5.2 -3025.07 0 31.7114 11653.4\n5.21 -3550.57 0 31.7862 11653.4\n5.22 -4109.92 0 31.9525 11653.4\n5.23 -4615.34 0 32.1793 11653.4\n5.24 -4979.24 0 32.425 11653.4\n5.25 -5118.18 0 32.6458 11653.4\n5.26 -4956.82 0 32.8032 11653.4\n5.27 -4431.42 0 32.8705 11653.4\n5.28 -3493.02 0 32.8365 11653.4\n5.29 -2109.91 0 32.7073 11653.4\n5.3 -269.517 0 32.5055 11653.4\n5.31 2020.58 0 32.2664 11653.4\n5.32 4732.38 0 32.0322 11653.4\n5.33 7818.11 0 31.8455 11653.4\n5.34 11211.6 0 31.7403 11653.4\n5.35 14830.6 0 31.7359 11653.4\n5.36 18579.5 0 31.8329 11653.4\n5.37 22352.9 0 32.0126 11653.4\n5.38 26039.7 0 32.2418 11653.4\n5.39 29526.9 0 32.4788 11653.4\n5.4 32704.2 0 32.6816 11653.4\n5.41 35468.4 0 32.8149 11653.4\n5.42 37727 0 32.8563 11653.4\n5.43 39402.4 0 32.799 11653.4\n5.44 40434.8 0 32.6531 11653.4\n5.45 40784.7 0 32.4441 11653.4\n5.46 40434.7 0 32.2086 11653.4\n5.47 39390.4 0 31.9886 11653.4\n5.48 37680.7 0 31.824 11653.4\n5.49 35356.5 0 31.7449 11653.4\n5.5 32489.4 0 31.7659 11653.4\n5.51 29169.3 0 31.8825 11653.4\n5.52 25501.1 0 32.0729 11653.4\n5.53 21601.1 0 32.3017 11653.4\n5.54 17592.6 0 32.5278 11653.4\n5.55 13602.1 0 32.7112 11653.4\n5.56 9754.06 0 32.8202 11653.4\n5.57 6166.96 0 32.8366 11653.4\n5.58 2948.83 0 32.7578 11653.4\n5.59 193.521 0 32.5976 11653.4\n5.6 -2022.63 0 32.384 11653.4\n5.61 -3643.41 0 32.1546 11653.4\n5.62 -4634.59 0 31.9505 11653.4\n5.63 -4984.98 0 31.8088 11653.4\n5.64 -4706.62 0 31.7556 11653.4\n5.65 -3834.09 0 31.8003 11653.4\n5.66 -2422.95 0 31.9344 11653.4\n5.67 -547.494 0 32.1327 11653.4\n5.68 1702.24 0 32.3587 11653.4\n5.69 4224.06 0 32.572 11653.4\n5.7 6907.51 0 32.735 11653.4\n5.71 9638.21 0 32.8198 11653.4\n5.72 12302.2 0 32.8121 11653.4\n5.73 14790.1 0 32.7136 11653.4\n5.74 17001.4 0 32.5414 11653.4\n5.75 18848.2 0 32.3257 11653.4\n5.76 20258.3 0 32.1045 11653.4\n5.77 21177.7 0 31.9177 11653.4\n5.78 21572.7 0 31.7993 11653.4\n5.79 21430.9 0 31.771 11653.4\n5.8 20761.5 0 31.8378 11653.4\n5.81 19594.7 0 31.9869 11653.4\n5.82 17980.4 0 32.1905 11653.4\n5.83 15986.3 0 32.4116 11653.4\n5.84 13694.7 0 32.6105 11653.4\n5.85 11200 0 32.7527 11653.4\n5.86 8604.33 0 32.8137 11653.4\n5.87 6014.04 0 32.7834 11653.4\n5.88 3535.52 0 32.6673 11653.4\n5.89 1271.19 0 32.4856 11653.4\n5.9 -684.316 0 32.2702 11653.4\n5.91 -2247.67 0 32.0593 11653.4\n5.92 -3349.88 0 31.891 11653.4\n5.93 -3938.83 0 31.796 11653.4\n5.94 -3981.07 0 31.7916 11653.4\n5.95 -3463.01 0 31.8785 11653.4\n5.96 -2391.3 0 32.04 11653.4\n5.97 -792.533 0 32.2464 11653.4\n5.98 1287.86 0 32.4602 11653.4\n5.99 3787.26 0 32.6433 11653.4\n6 6628.25 0 32.764 11653.4\n6.01 9721.36 0 32.8018 11653.4\n6.02 12968.3 0 32.7503 11653.4\n6.03 16265.4 0 32.6189 11653.4\n6.04 19507.2 0 32.4303 11653.4\n6.05 22590.1 0 32.2177 11653.4\n6.06 25415.7 0 32.0192 11653.4\n6.07 27894.2 0 31.8705 11653.4\n6.08 29947.2 0 31.7989 11653.4\n6.09 31509.7 0 31.8175 11653.4\n6.1 32532.6 0 31.9224 11653.4\n6.11 32983.4 0 32.094 11653.4\n6.12 32847.5 0 32.3006 11653.4\n6.13 32127.3 0 32.505 11653.4\n6.14 30842.7 0 32.671 11653.4\n6.15 29029.1 0 32.77 11653.4\n6.16 26736.4 0 32.785 11653.4\n6.17 24026.6 0 32.7139 11653.4\n6.18 20971.6 0 32.569 11653.4\n6.19 17650.4 0 32.3758 11653.4\n6.2 14146.5 0 32.1684 11653.4\n6.21 10545.2 0 31.9838 11653.4\n6.22 6930.78 0 31.8556 11653.4\n6.23 3383.92 0 31.8073 11653.4\n6.24 -20.3692 0 31.8476 11653.4\n6.25 -3214.8 0 31.9686 11653.4\n6.26 -6141.32 0 32.1479 11653.4\n6.27 -8752.24 0 32.3525 11653.4\n6.28 -11010.9 0 32.5457 11653.4\n6.29 -12892 0 32.6936 11653.4\n6.3 -14381.3 0 32.7706 11653.4\n6.31 -15475 0 32.7637 11653.4\n6.32 -16179.1 0 32.6743 11653.4\n6.33 -16507.9 0 32.5182 11653.4\n6.34 -16482.9 0 32.3225 11653.4\n6.35 -16130.8 0 32.1221 11653.4\n6.36 -15482.5 0 31.9529 11653.4\n6.37 -14571 0 31.8458 11653.4\n6.38 -13430 0 31.8202 11653.4\n6.39 -12092.8 0 31.8808 11653.4\n6.4 -10591 0 32.0161 11653.4\n6.41 -8953.12 0 32.2009 11653.4\n6.42 -7204.83 0 32.4015 11653.4\n6.43 -5367.8 0 32.5822 11653.4\n6.44 -3460 0 32.7113 11653.4\n6.45 -1495.73 0 32.7666 11653.4\n6.46 513.937 0 32.7388 11653.4\n6.47 2560.53 0 32.6329 11653.4\n6.48 4637.47 0 32.4675 11653.4\n6.49 6739.13 0 32.2715 11653.4\n6.5 8860.04 0 32.0798 11653.4\n6.51 10993.9 0 31.9269 11653.4\n6.52 13132.8 0 31.8408 11653.4\n6.53 15266.5 0 31.8371 11653.4\n6.54 17382.1 0 31.9163 11653.4\n6.55 19463.2 0 32.0636 11653.4\n6.56 21490.6 0 32.2516 11653.4\n6.57 23441.5 0 32.4464 11653.4\n6.58 25290.7 0 32.6134 11653.4\n6.59 27010.6 0 32.7235 11653.4\n6.6 28572.4 0 32.7577 11653.4\n6.61 29946.9 0 32.7106 11653.4\n6.62 31105.5 0 32.5903 11653.4\n6.63 32021.5 0 32.418 11653.4\n6.64 32671.4 0 32.2239 11653.4\n6.65 33035.7 0 32.0427 11653.4\n6.66 33100.4 0 31.9071 11653.4\n6.67 32857.5 0 31.8419 11653.4\n6.68 32306 0 31.8589 11653.4\n6.69 31452.2 0 31.9548 11653.4\n6.7 30310.2 0 32.1115 11653.4\n6.71 28901.6 0 32.3004 11653.4\n6.72 27255 0 32.4873 11653.4\n6.73 25405.9 0 32.6393 11653.4\n6.74 23395.4 0 32.7299 11653.4\n6.75 21269.1 0 32.7437 11653.4\n6.76 19075.8 0 32.6786 11653.4\n6.77 16866.2 0 32.546 11653.4\n6.78 14691 0 32.3692 11653.4\n6.79 12599.5 0 32.1793 11653.4\n6.8 10637.8 0 32.0104 11653.4\n6.81 8847.7 0 31.8931 11653.4\n6.82 7264.77 0 31.8488 11653.4\n6.83 5917.6 0 31.8855 11653.4\n6.84 4826.72 0 31.9961 11653.4\n6.85 4003.95 0 32.1601 11653.4\n6.86 3452.07 0 32.3475 11653.4\n6.87 3164.8 0 32.5247 11653.4\n6.88 3127.07 0 32.6604 11653.4\n6.89 3315.64 0 32.7313 11653.4\n6.9 3700 0 32.7252 11653.4\n6.91 4243.46 0 32.6434 11653.4\n6.92 4904.55 0 32.5003 11653.4\n6.93 5638.51 0 32.321 11653.4\n6.94 6398.87 0 32.1373 11653.4\n6.95 7139.12 0 31.9821 11653.4\n6.96 7814.33 0 31.8836 11653.4\n6.97 8382.69 0 31.8599 11653.4\n6.98 8806.92 0 31.9151 11653.4\n6.99 9055.48 0 32.0388 11653.4\n7 9103.57 0 32.2081 11653.4\n7.01 8933.84 0 32.3921 11653.4\n7.02 8536.83 0 32.5581 11653.4\n7.03 7911.14 0 32.677 11653.4\n7.04 7063.23 0 32.7282 11653.4\n7.05 6007.04 0 32.7031 11653.4\n7.06 4763.23 0 32.6063 11653.4\n7.07 3358.29 0 32.4547 11653.4\n7.08 1823.43 0 32.275 11653.4\n7.09 193.29 0 32.0992 11653.4\n7.1 -1495.39 0 31.9589 11653.4\n7.11 -3205.16 0 31.8796 11653.4\n7.12 -4899.22 0 31.8759 11653.4\n7.13 -6542.74 0 31.9482 11653.4\n7.14 -8104.01 0 32.0829 11653.4\n7.15 -9555.48 0 32.2552 11653.4\n7.16 -10874.6 0 32.434 11653.4\n7.17 -12044.3 0 32.5875 11653.4\n7.18 -13053.6 0 32.6887 11653.4\n7.19 -13897.6 0 32.7205 11653.4\n7.2 -14577.1 0 32.6774 11653.4\n7.21 -15098.8 0 32.5671 11653.4\n7.22 -15474.3 0 32.409 11653.4\n7.23 -15719.5 0 32.2309 11653.4\n7.24 -15853.7 0 32.0646 11653.4\n7.25 -15898.8 0 31.9401 11653.4\n7.26 -15877.8 0 31.8803 11653.4\n7.27 -15814.5 0 31.8958 11653.4\n7.28 -15731.7 0 31.9837 11653.4\n7.29 -15650.6 0 32.1276 11653.4\n7.3 -15590.2 0 32.3011 11653.4\n7.31 -15566.1 0 32.4729 11653.4\n7.32 -15590.3 0 32.6127 11653.4\n7.33 -15670.8 0 32.6961 11653.4\n7.34 -15811.3 0 32.7088 11653.4\n7.35 -16011.4 0 32.6489 11653.4\n7.36 -16266.7 0 32.5268 11653.4\n7.37 -16569.2 0 32.364 11653.4\n7.38 -16907.8 0 32.1892 11653.4\n7.39 -17269.2 0 32.0338 11653.4\n7.4 -17638 0 31.9259 11653.4\n7.41 -17998.4 0 31.8851 11653.4\n7.42 -18334 0 31.9188 11653.4\n7.43 -18629.6 0 32.0206 11653.4\n7.44 -18870.9 0 32.1716 11653.4\n7.45 -19046.2 0 32.3442 11653.4\n7.46 -19145.9 0 32.5076 11653.4\n7.47 -19163.9 0 32.6328 11653.4\n7.48 -19097.1 0 32.6982 11653.4\n7.49 -18945.8 0 32.6926 11653.4\n7.5 -18713.8 0 32.6173 11653.4\n7.51 -18407.9 0 32.4853 11653.4\n7.52 -18037.9 0 32.3199 11653.4\n7.53 -17616 0 32.1505 11653.4\n7.54 -17156.1 0 32.0074 11653.4\n7.55 -16673.3 0 31.9166 11653.4\n7.56 -16183.6 0 31.8946 11653.4\n7.57 -15702.5 0 31.9453 11653.4\n7.58 -15245 0 32.0592 11653.4\n7.59 -14824.6 0 32.2152 11653.4\n7.6 -14453.1 0 32.385 11653.4\n7.61 -14139.6 0 32.5383 11653.4\n7.62 -13891 0 32.6481 11653.4\n7.63 -13710.8 0 32.6954 11653.4\n7.64 -13599.8 0 32.6723 11653.4\n7.65 -13555.8 0 32.5829 11653.4\n7.66 -13573.8 0 32.4429 11653.4\n7.67 -13646.2 0 32.277 11653.4\n7.68 -13763.5 0 32.1146 11653.4\n7.69 -13914.3 0 31.9851 11653.4\n7.7 -14086.2 0 31.9119 11653.4\n7.71 -14266.3 0 31.9083 11653.4\n7.72 -14441.5 0 31.9749 11653.4\n7.73 -14599.3 0 32.0992 11653.4\n7.74 -14728.4 0 32.2584 11653.4\n7.75 -14818.8 0 32.4236 11653.4\n7.76 -14862.6 0 32.5654 11653.4\n7.77 -14853.9 0 32.6591 11653.4\n7.78 -14789.3 0 32.6885 11653.4\n7.79 -14667.9 0 32.6487 11653.4\n7.8 -14491.1 0 32.5467 11653.4\n7.81 -14262.6 0 32.4004 11653.4\n7.82 -13988.3 0 32.2357 11653.4\n7.83 -13675.8 0 32.0819 11653.4\n7.84 -13333.9 0 31.9668 11653.4\n7.85 -12972.5 0 31.9114 11653.4\n7.86 -12602.2 0 31.9257 11653.4\n7.87 -12233.4 0 32.0069 11653.4\n7.88 -11875.9 0 32.1398 11653.4\n7.89 -11539.2 0 32.3003 11653.4\n7.9 -11231.2 0 32.4593 11653.4\n7.91 -10958.4 0 32.5887 11653.4\n7.92 -10725.5 0 32.666 11653.4\n7.93 -10535.6 0 32.6778 11653.4\n7.94 -10389.6 0 32.6223 11653.4\n7.95 -10286.6 0 32.5092 11653.4\n7.96 -10223.9 0 32.3584 11653.4\n7.97 -10197.2 0 32.1966 11653.4\n7.98 -10200.9 0 32.0528 11653.4\n7.99 -10228.4 0 31.9529 11653.4\n8 -10272.4 0 31.9151 11653.4\n8.01 -10325.1 0 31.9463 11653.4\n8.02 -10379 0 32.0406 11653.4\n8.03 -10426.7 0 32.1804 11653.4\n8.04 -10461.9 0 32.3403 11653.4\n8.05 -10478.9 0 32.4917 11653.4\n8.06 -10473.4 0 32.6079 11653.4\n8.07 -10442.3 0 32.6685 11653.4\n8.08 -10384.1 0 32.6633 11653.4\n8.09 -10298.7 0 32.5934 11653.4\n8.1 -10187.4 0 32.471 11653.4\n8.11 -10052.5 0 32.3176 11653.4\n8.12 -9897.85 0 32.1605 11653.4\n8.13 -9727.82 0 32.0279 11653.4\n8.14 -9547.51 0 31.9437 11653.4\n8.15 -9362.28 0 31.9234 11653.4\n8.16 -9177.53 0 31.9705 11653.4\n8.17 -8998.39 0 32.0762 11653.4\n8.18 -8829.43 0 32.221 11653.4\n8.19 -8674.47 0 32.3786 11653.4\n8.2 -8536.37 0 32.5209 11653.4\n8.21 -8416.89 0 32.6229 11653.4\n8.22 -8316.64 0 32.6669 11653.4\n8.23 -8235.01 0 32.6454 11653.4\n8.24 -8170.27 0 32.5623 11653.4\n8.25 -8119.63 0 32.4322 11653.4\n8.26 -8079.43 0 32.278 11653.4\n8.27 -8045.31 0 32.1272 11653.4\n8.28 -8012.45 0 32.0069 11653.4\n8.29 -7975.84 0 31.9389 11653.4\n8.3 -7930.52 0 31.9357 11653.4\n8.31 -7871.84 0 31.9976 11653.4\n8.32 -7795.73 0 32.1131 11653.4\n8.33 -7698.89 0 32.261 11653.4\n8.34 -7578.98 0 32.4146 11653.4\n8.35 -7434.73 0 32.5466 11653.4\n8.36 -7266.05 0 32.6338 11653.4\n8.37 -7074.02 0 32.6613 11653.4\n8.38 -6860.87 0 32.6243 11653.4\n8.39 -6629.86 0 32.5294 11653.4\n8.4 -6385.18 0 32.3934 11653.4\n8.41 -6131.7 0 32.2402 11653.4\n8.42 -5874.82 0 32.0972 11653.4\n8.43 -5620.14 0 31.9902 11653.4\n8.44 -5373.26 0 31.9387 11653.4\n8.45 -5139.48 0 31.9519 11653.4\n8.46 -4923.57 0 32.0273 11653.4\n8.47 -4729.52 0 32.1509 11653.4\n8.48 -4560.36 0 32.3001 11653.4\n8.49 -4418.01 0 32.448 11653.4\n8.5 -4303.19 0 32.5685 11653.4\n8.51 -4215.34 0 32.6405 11653.4\n8.52 -4152.67 0 32.6515 11653.4\n8.53 -4112.2 0 32.5998 11653.4\n8.54 -4089.92 0 32.4945 11653.4\n8.55 -4080.92 0 32.3542 11653.4\n8.56 -4079.62 0 32.2037 11653.4\n8.57 -4080.05 0 32.0699 11653.4\n8.58 -4076.04 0 31.9771 11653.4\n8.59 -4061.55 0 31.9421 11653.4\n8.6 -4030.95 0 31.9712 11653.4\n8.61 -3979.2 0 32.059 11653.4\n8.62 -3902.14 0 32.1892 11653.4\n8.63 -3796.67 0 32.3381 11653.4\n8.64 -3660.86 0 32.4791 11653.4\n8.65 -3494.07 0 32.5873 11653.4\n8.66 -3296.98 0 32.6437 11653.4\n8.67 -3071.54 0 32.6388 11653.4\n8.68 -2820.91 0 32.5735 11653.4\n8.69 -2549.34 0 32.4592 11653.4\n8.7 -2261.95 0 32.3162 11653.4\n8.71 -1964.54 0 32.1698 11653.4\n8.72 -1663.34 0 32.0463 11653.4\n8.73 -1364.73 0 31.9681 11653.4\n8.74 -1074.98 0 31.9493 11653.4\n8.75 -799.962 0 31.9934 11653.4\n8.76 -544.924 0 32.092 11653.4\n8.77 -314.261 0 32.2271 11653.4\n8.78 -111.325 0 32.3742 11653.4\n8.79 61.7014 0 32.507 11653.4\n8.8 203.898 0 32.6022 11653.4\n8.81 315.629 0 32.6432 11653.4\n8.82 398.525 0 32.623 11653.4\n8.83 455.389 0 32.5453 11653.4\n8.84 490.075 0 32.4238 11653.4\n8.85 507.3 0 32.2798 11653.4\n8.86 512.434 0 32.1391 11653.4\n8.87 511.258 0 32.0269 11653.4\n8.88 509.701 0 31.9636 11653.4\n8.89 513.58 0 31.9606 11653.4\n8.9 528.34 0 32.0185 11653.4\n8.91 558.819 0 32.1263 11653.4\n8.92 609.034 0 32.2645 11653.4\n8.93 682.01 0 32.4081 11653.4\n8.94 779.654 0 32.5314 11653.4\n8.95 902.673 0 32.6129 11653.4\n8.96 1050.56 0 32.6384 11653.4\n8.97 1221.6 0 32.6037 11653.4\n8.98 1413 0 32.5149 11653.4\n8.99 1620.96 0 32.3876 11653.4\n9 1840.91 0 32.2444 11653.4\n9.01 2067.66 0 32.1108 11653.4\n9.02 2295.67 0 32.0108 11653.4\n9.03 2519.3 0 31.9627 11653.4\n9.04 2733.02 0 31.9751 11653.4\n9.05 2931.72 0 32.0457 11653.4\n9.06 3110.86 0 32.1613 11653.4\n9.07 3266.72 0 32.301 11653.4\n9.08 3396.55 0 32.4395 11653.4\n9.09 3498.66 0 32.5523 11653.4\n9.1 3572.51 0 32.6198 11653.4\n9.11 3618.73 0 32.6301 11653.4\n9.12 3639.05 0 32.5818 11653.4\n9.13 3636.26 0 32.4832 11653.4\n9.14 3614.03 0 32.3518 11653.4\n9.15 3576.8 0 32.2109 11653.4\n9.16 3529.49 0 32.0856 11653.4\n9.17 3477.37 0 31.9986 11653.4\n9.18 3425.76 0 31.9656 11653.4\n9.19 3379.81 0 31.9927 11653.4\n9.2 3344.26 0 32.0746 11653.4\n9.21 3323.28 0 32.1964 11653.4\n9.22 3320.2 0 32.3358 11653.4\n9.23 3337.47 0 32.4678 11653.4\n9.24 3376.46 0 32.5692 11653.4\n9.25 3437.49 0 32.6222 11653.4\n9.26 3519.78 0 32.6178 11653.4\n9.27 3621.5 0 32.5568 11653.4\n9.28 3739.89 0 32.45 11653.4\n9.29 3871.36 0 32.3162 11653.4\n9.3 4011.7 0 32.1793 11653.4\n9.31 4156.27 0 32.0637 11653.4\n9.32 4300.19 0 31.9904 11653.4\n9.33 4438.63 0 31.9727 11653.4\n9.34 4566.99 0 32.0138 11653.4\n9.35 4681.16 0 32.1059 11653.4\n9.36 4777.68 0 32.2321 11653.4\n9.37 4853.93 0 32.3697 11653.4\n9.38 4908.25 0 32.4939 11653.4\n9.39 4940.04 0 32.5829 11653.4\n9.4 4949.79 0 32.6212 11653.4\n9.41 4939.06 0 32.6023 11653.4\n9.42 4910.43 0 32.5295 11653.4\n9.43 4867.4 0 32.4157 11653.4\n9.44 4814.21 0 32.281 11653.4\n9.45 4755.7 0 32.1493 11653.4\n9.46 4697.09 0 32.0444 11653.4\n9.47 4643.71 0 31.9853 11653.4\n9.48 4600.81 0 31.9826 11653.4\n9.49 4573.31 0 32.0368 11653.4\n9.5 4565.58 0 32.1378 11653.4\n9.51 4581.23 0 32.2672 11653.4\n9.52 4622.97 0 32.4016 11653.4\n9.53 4692.47 0 32.517 11653.4\n9.54 4790.24 0 32.5932 11653.4\n9.55 4915.69 0 32.6169 11653.4\n9.56 5067.05 0 32.5842 11653.4\n9.57 5241.47 0 32.5008 11653.4\n9.58 5435.18 0 32.3814 11653.4\n9.59 5643.56 0 32.2471 11653.4\n9.6 5861.43 0 32.1219 11653.4\n9.61 6083.16 0 32.0285 11653.4\n9.62 6303 0 31.9836 11653.4\n9.63 6515.29 0 31.9954 11653.4\n9.64 6714.69 0 32.0618 11653.4\n9.65 6896.42 0 32.1703 11653.4\n9.66 7056.47 0 32.3012 11653.4\n9.67 7191.76 0 32.4311 11653.4\n9.68 7300.29 0 32.5367 11653.4\n9.69 7381.2 0 32.5997 11653.4\n9.7 7434.85 0 32.6091 11653.4\n9.71 7462.76 0 32.5633 11653.4\n9.72 7467.55 0 32.4706 11653.4\n9.73 7452.86 0 32.347 11653.4\n9.74 7423.17 0 32.2147 11653.4\n9.75 7383.57 0 32.0973 11653.4\n9.76 7339.6 0 32.0158 11653.4\n9.77 7296.95 0 31.9853 11653.4\n9.78 7261.23 0 32.011 11653.4\n9.79 7237.71 0 32.0882 11653.4\n9.8 7231.08 0 32.2028 11653.4\n9.81 7245.23 0 32.3338 11653.4\n9.82 7283.07 0 32.4579 11653.4\n9.83 7346.35 0 32.553 11653.4\n9.84 7435.63 0 32.6025 11653.4\n9.85 7550.15 0 32.598 11653.4\n9.86 7687.89 0 32.5403 11653.4\n9.87 7845.6 0 32.4395 11653.4\n9.88 8018.92 0 32.3134 11653.4\n9.89 8202.53 0 32.1845 11653.4\n9.9 8390.37 0 32.0759 11653.4\n9.91 8575.81 0 32.0072 11653.4\n9.92 8751.99 0 31.9908 11653.4\n9.93 8912.02 0 32.0296 11653.4\n9.94 9049.27 0 32.1165 11653.4\n9.95 9157.66 0 32.2356 11653.4\n9.96 9231.85 0 32.3652 11653.4\n9.97 9267.53 0 32.4822 11653.4\n9.98 9261.52 0 32.566 11653.4\n9.99 9211.95 0 32.602 11653.4\n10 9118.33 0 32.584 11653.4\n10.01 8981.58 0 32.5152 11653.4\n10.02 8804.03 0 32.4078 11653.4\n10.03 8589.28 0 32.2807 11653.4\n10.04 8342.15 0 32.1567 11653.4\n10.05 8068.44 0 32.0579 11653.4\n10.06 7774.76 0 32.0022 11653.4\n10.07 7468.26 0 31.9998 11653.4\n10.08 7156.4 0 32.051 11653.4\n10.09 6846.65 0 32.1463 11653.4\n10.1 6546.23 0 32.2684 11653.4\n10.11 6261.84 0 32.3952 11653.4\n10.12 5999.45 0 32.5041 11653.4\n10.13 5764.06 0 32.576 11653.4\n10.14 5559.56 0 32.5984 11653.4\n10.15 5388.59 0 32.5676 11653.4\n10.16 5252.45 0 32.4889 11653.4\n10.17 5151.12 0 32.3762 11653.4\n10.18 5083.26 0 32.2496 11653.4\n10.19 5046.26 0 32.1315 11653.4\n10.2 5036.45 0 32.0433 11653.4\n10.21 5049.17 0 32.0009 11653.4\n10.22 5079.03 0 32.012 11653.4\n10.23 5120.12 0 32.0744 11653.4\n10.24 5166.23 0 32.1767 11653.4\n10.25 5211.12 0 32.3002 11653.4\n10.26 5248.78 0 32.4228 11653.4\n10.27 5273.6 0 32.5226 11653.4\n10.28 5280.65 0 32.5821 11653.4\n10.29 5265.79 0 32.5912 11653.4\n10.3 5225.86 0 32.5482 11653.4\n10.31 5158.78 0 32.4608 11653.4\n10.32 5063.57 0 32.3445 11653.4\n10.33 4940.39 0 32.2197 11653.4\n10.34 4790.51 0 32.109 11653.4\n10.35 4616.21 0 32.0321 11653.4\n10.36 4420.66 0 32.0032 11653.4\n10.37 4207.82 0 32.0273 11653.4\n10.38 3982.21 0 32.0999 11653.4\n10.39 3748.74 0 32.2078 11653.4\n10.4 3512.52 0 32.3313 11653.4\n10.41 3278.61 0 32.4483 11653.4\n10.42 3051.89 0 32.5381 11653.4\n10.43 2836.82 0 32.5849 11653.4\n10.44 2637.3 0 32.5808 11653.4\n10.45 2456.54 0 32.5264 11653.4\n10.46 2296.97 0 32.4315 11653.4\n10.47 2160.15 0 32.3128 11653.4\n10.48 2046.79 0 32.1913 11653.4\n10.49 1956.69 0 32.0889 11653.4\n10.5 1888.87 0 32.0241 11653.4\n10.51 1841.61 0 32.0085 11653.4\n10.52 1812.55 0 32.0451 11653.4\n10.53 1798.86 0 32.1269 11653.4\n10.54 1797.34 0 32.239 11653.4\n10.55 1804.65 0 32.3611 11653.4\n10.56 1817.38 0 32.4714 11653.4\n10.57 1832.28 0 32.5505 11653.4\n10.58 1846.37 0 32.5845 11653.4\n10.59 1857.06 0 32.5676 11653.4\n10.6 1862.27 0 32.5028 11653.4\n10.61 1860.47 0 32.4016 11653.4\n10.62 1850.78 0 32.2819 11653.4\n10.63 1832.9 0 32.165 11653.4\n10.64 1807.16 0 32.0719 11653.4\n10.65 1774.42 0 32.0195 11653.4\n10.66 1736.04 0 32.0172 11653.4\n10.67 1693.72 0 32.0654 11653.4\n10.68 1649.45 0 32.1551 11653.4\n10.69 1605.31 0 32.2701 11653.4\n10.7 1563.38 0 32.3895 11653.4\n10.71 1525.62 0 32.4921 11653.4\n10.72 1493.69 0 32.5598 11653.4\n10.73 1468.89 0 32.5809 11653.4\n10.74 1452.05 0 32.5517 11653.4\n10.75 1443.46 0 32.4775 11653.4\n10.76 1442.86 0 32.3713 11653.4\n10.77 1449.37 0 32.252 11653.4\n10.78 1461.57 0 32.1409 11653.4\n10.79 1477.53 0 32.0579 11653.4\n10.8 1494.88 0 32.0182 11653.4\n10.81 1510.94 0 32.0288 11653.4\n10.82 1522.8 0 32.0879 11653.4\n10.83 1527.5 0 32.1843 11653.4\n10.84 1522.14 0 32.3008 11653.4\n10.85 1504.06 0 32.4163 11653.4\n10.86 1470.95 0 32.5102 11653.4\n10.87 1420.99 0 32.5662 11653.4\n10.88 1353 0 32.5745 11653.4\n10.89 1266.44 0 32.5337 11653.4\n10.9 1161.59 0 32.4511 11653.4\n10.91 1039.45 0 32.3412 11653.4\n10.92 901.86 0 32.2236 11653.4\n10.93 751.359 0 32.1193 11653.4\n10.94 591.184 0 32.0471 11653.4\n10.95 425.136 0 32.0201 11653.4\n10.96 257.463 0 32.0432 11653.4\n10.97 92.7038 0 32.112 11653.4\n10.98 -64.4775 0 32.2139 11653.4\n10.99 -209.468 0 32.3305 11653.4\n11 -337.889 0 32.4409 11653.4\n11.01 -445.769 0 32.5255 11653.4\n11.02 -529.711 0 32.5694 11653.4\n11.03 -587.037 0 32.5652 11653.4\n11.04 -615.91 0 32.5136 11653.4\n11.05 -615.429 0 32.4237 11653.4\n11.06 -585.681 0 32.3115 11653.4\n11.07 -527.766 0 32.1969 11653.4\n11.08 -443.782 0 32.1005 11653.4\n11.09 -336.766 0 32.0397 11653.4\n11.1 -210.605 0 32.0255 11653.4\n11.11 -69.9154 0 32.0604 11653.4\n11.12 80.1157 0 32.138 11653.4\n11.13 233.901 0 32.2441 11653.4\n11.14 385.649 0 32.3595 11653.4\n11.15 529.56 0 32.4636 11653.4\n11.16 660.037 0 32.538 11653.4\n11.17 771.877 0 32.5697 11653.4\n11.18 860.457 0 32.5533 11653.4\n11.19 921.897 0 32.4916 11653.4\n11.2 953.197 0 32.3957 11653.4\n11.21 952.343 0 32.2824 11653.4\n11.22 918.374 0 32.172 11653.4\n11.23 851.413 0 32.0843 11653.4\n11.24 752.659 0 32.0352 11653.4\n11.25 624.341 0 32.0336 11653.4\n11.26 469.63 0 32.0797 11653.4\n11.27 292.521 0 32.1651 11653.4\n11.28 97.6872 0 32.2741 11653.4\n11.29 -109.695 0 32.3871 11653.4\n11.3 -324.129 0 32.4841 11653.4\n11.31 -540.002 0 32.5478 11653.4\n11.32 -751.779 0 32.5673 11653.4\n11.33 -954.201 0 32.5391 11653.4\n11.34 -1142.47 0 32.4684 11653.4\n11.35 -1312.39 0 32.3675 11653.4\n11.36 -1460.55 0 32.2543 11653.4\n11.37 -1584.38 0 32.1492 11653.4\n11.38 -1682.24 0 32.0709 11653.4\n11.39 -1753.49 0 32.0337 11653.4\n11.4 -1798.45 0 32.0443 11653.4\n11.41 -1818.35 0 32.1007 11653.4\n11.42 -1815.31 0 32.1925 11653.4\n11.43 -1792.21 0 32.303 11653.4\n11.44 -1752.55 0 32.4125 11653.4\n11.45 -1700.32 0 32.5014 11653.4\n11.46 -1639.79 0 32.5541 11653.4\n11.47 -1575.42 0 32.5615 11653.4\n11.48 -1511.59 0 32.5223 11653.4\n11.49 -1452.48 0 32.4435 11653.4\n11.5 -1401.91 0 32.339 11653.4\n11.51 -1363.19 0 32.2273 11653.4\n11.52 -1339 0 32.1285 11653.4\n11.53 -1331.29 0 32.0603 11653.4\n11.54 -1341.26 0 32.0351 11653.4\n11.55 -1369.28 0 32.0574 11653.4\n11.56 -1414.94 0 32.123 11653.4\n11.57 -1477.08 0 32.2201 11653.4\n11.58 -1553.81 0 32.3308 11653.4\n11.59 -1642.69 0 32.4355 11653.4\n11.6 -1740.76 0 32.5156 11653.4\n11.61 -1844.73 0 32.5569 11653.4\n11.62 -1951.1 0 32.5525 11653.4\n11.63 -2056.32 0 32.503 11653.4\n11.64 -2156.93 0 32.4173 11653.4\n11.65 -2249.73 0 32.3105 11653.4\n11.66 -2331.85 0 32.2016 11653.4\n11.67 -2400.92 0 32.1101 11653.4\n11.68 -2455.15 0 32.0526 11653.4\n11.69 -2493.35 0 32.0394 11653.4\n11.7 -2515.02 0 32.073 11653.4\n11.71 -2520.35 0 32.1471 11653.4\n11.72 -2510.14 0 32.2481 11653.4\n11.73 -2485.86 0 32.3579 11653.4\n11.74 -2449.46 0 32.4568 11653.4\n11.75 -2403.37 0 32.5273 11653.4\n11.76 -2350.36 0 32.5571 11653.4\n11.77 -2293.38 0 32.5411 11653.4\n11.78 -2235.5 0 32.4821 11653.4\n11.79 -2179.73 0 32.3905 11653.4\n11.8 -2128.91 0 32.2825 11653.4\n11.81 -2085.61 0 32.1774 11653.4\n11.82 -2052.01 0 32.094 11653.4\n11.83 -2029.82 0 32.0475 11653.4\n11.84 -2020.22 0 32.0462 11653.4\n11.85 -2023.83 0 32.0903 11653.4\n11.86 -2040.71 0 32.1717 11653.4\n11.87 -2070.32 0 32.2755 11653.4\n11.88 -2111.62 0 32.3832 11653.4\n11.89 -2163.1 0 32.4754 11653.4\n11.9 -2222.84 0 32.536 11653.4\n11.91 -2288.62 0 32.5543 11653.4\n11.92 -2358.07 0 32.5273 11653.4\n11.93 -2428.67 0 32.4598 11653.4\n11.94 -2497.98 0 32.3635 11653.4\n11.95 -2563.67 0 32.2558 11653.4\n11.96 -2623.65 0 32.1556 11653.4\n11.97 -2676.16 0 32.0812 11653.4\n11.98 -2719.81 0 32.0459 11653.4\n11.99 -2753.69 0 32.0561 11653.4\n12 -2777.34 0 32.1098 11653.4\n12.01 -2790.77 0 32.1973 11653.4\n12.02 -2794.5 0 32.3026 11653.4\n12.03 -2789.45 0 32.4068 11653.4\n12.04 -2776.91 0 32.4914 11653.4\n12.05 -2758.5 0 32.5415 11653.4\n12.06 -2736.03 0 32.5484 11653.4\n12.07 -2711.46 0 32.5109 11653.4\n12.08 -2686.76 0 32.4358 11653.4\n12.09 -2663.8 0 32.3362 11653.4\n12.1 -2644.33 0 32.2298 11653.4\n12.11 -2629.79 0 32.1357 11653.4\n12.12 -2621.33 0 32.0709 11653.4\n12.13 -2619.68 0 32.047 11653.4\n12.14 -2625.18 0 32.0683 11653.4\n12.15 -2637.7 0 32.131 11653.4\n12.16 -2656.7 0 32.2234 11653.4\n12.17 -2681.21 0 32.3289 11653.4\n12.18 -2709.94 0 32.4286 11653.4\n12.19 -2741.26 0 32.5048 11653.4\n12.2 -2773.37 0 32.5442 11653.4\n12.21 -2804.32 0 32.5398 11653.4\n12.22 -2832.18 0 32.4926 11653.4\n12.23 -2855.06 0 32.4108 11653.4\n12.24 -2871.3 0 32.309 11653.4\n12.25 -2879.48 0 32.2053 11653.4\n12.26 -2878.58 0 32.1182 11653.4\n12.27 -2867.98 0 32.0634 11653.4\n12.28 -2847.55 0 32.051 11653.4\n12.29 -2817.66 0 32.083 11653.4\n12.3 -2779.18 0 32.1535 11653.4\n12.31 -2733.47 0 32.2498 11653.4\n12.32 -2682.31 0 32.3543 11653.4\n12.33 -2627.88 0 32.4485 11653.4\n12.34 -2572.61 0 32.5156 11653.4\n12.35 -2519.13 0 32.544 11653.4\n12.36 -2470.14 0 32.5286 11653.4\n12.37 -2428.26 0 32.4723 11653.4\n12.38 -2395.96 0 32.385 11653.4\n12.39 -2375.38 0 32.2821 11653.4\n12.4 -2368.26 0 32.182 11653.4\n12.41 -2375.84 0 32.1027 11653.4\n12.42 -2398.77 0 32.0585 11653.4\n12.43 -2437.04 0 32.0574 11653.4\n12.44 -2489.98 0 32.0995 11653.4\n12.45 -2556.26 0 32.177 11653.4\n12.46 -2633.87 0 32.276 11653.4\n12.47 -2720.25 0 32.3785 11653.4\n12.48 -2812.29 0 32.4663 11653.4\n12.49 -2906.5 0 32.524 11653.4\n12.5 -2999.11 0 32.5414 11653.4\n12.51 -3086.23 0 32.5155 11653.4\n12.52 -3163.96 0 32.451 11653.4\n12.53 -3228.61 0 32.3593 11653.4\n12.54 -3276.8 0 32.2566 11653.4\n12.55 -3305.64 0 32.1612 11653.4\n12.56 -3312.86 0 32.0904 11653.4\n12.57 -3296.91 0 32.0568 11653.4\n12.58 -3257.05 0 32.0667 11653.4\n12.59 -3193.39 0 32.118 11653.4\n12.6 -3106.98 0 32.2014 11653.4\n12.61 -2999.72 0 32.3017 11653.4\n12.62 -2874.36 0 32.401 11653.4\n12.63 -2734.41 0 32.4817 11653.4\n12.64 -2584.06 0 32.5294 11653.4\n12.65 -2427.98 0 32.5359 11653.4\n12.66 -2271.23 0 32.5001 11653.4\n12.67 -2119.03 0 32.4284 11653.4\n12.68 -1976.6 0 32.3334 11653.4\n12.69 -1848.96 0 32.2321 11653.4\n12.7 -1740.74 0 32.1425 11653.4\n12.71 -1656.02 0 32.0808 11653.4\n12.72 -1598.11 0 32.0582 11653.4\n12.73 -1569.49 0 32.0787 11653.4\n12.74 -1571.66 0 32.1385 11653.4\n12.75 -1605.05 0 32.2266 11653.4\n12.76 -1669.04 0 32.3272 11653.4\n12.77 -1761.91 0 32.4223 11653.4\n12.78 -1880.9 0 32.4948 11653.4\n12.79 -2022.3 0 32.5322 11653.4\n12.8 -2181.55 0 32.528 11653.4\n12.81 -2353.38 0 32.4828 11653.4\n12.82 -2532.04 0 32.4048 11653.4\n12.83 -2711.42 0 32.3077 11653.4\n12.84 -2885.3 0 32.2088 11653.4\n12.85 -3047.56 0 32.1259 11653.4\n12.86 -3192.4 0 32.0739 11653.4\n12.87 -3314.51 0 32.0621 11653.4\n12.88 -3409.3 0 32.0928 11653.4\n12.89 -3473.04 0 32.1602 11653.4\n12.9 -3502.97 0 32.252 11653.4\n12.91 -3497.43 0 32.3518 11653.4\n12.92 -3455.93 0 32.4416 11653.4\n12.93 -3379.11 0 32.5055 11653.4\n12.94 -3268.77 0 32.5325 11653.4\n12.95 -3127.79 0 32.5178 11653.4\n12.96 -2960.04 0 32.464 11653.4\n12.97 -2770.2 0 32.3807 11653.4\n12.98 -2563.68 0 32.2827 11653.4\n12.99 -2346.34 0 32.1874 11653.4\n13 -2124.35 0 32.1119 11653.4\n13.01 -1903.95 0 32.0699 11653.4\n13.02 -1691.25 0 32.069 11653.4\n13.03 -1492.02 0 32.1092 11653.4\n13.04 -1311.5 0 32.1832 11653.4\n13.05 -1154.21 0 32.2775 11653.4\n13.06 -1023.82 0 32.3752 11653.4\n13.07 -923.054 0 32.4588 11653.4\n13.08 -853.573 0 32.5136 11653.4\n13.09 -815.96 0 32.53 11653.4\n13.1 -809.709 0 32.5051 11653.4\n13.11 -833.259 0 32.4435 11653.4\n13.12 -884.069 0 32.356 11653.4\n13.13 -958.716 0 32.2581 11653.4\n13.14 -1053.03 0 32.1674 11653.4\n13.15 -1162.25 0 32.1002 11653.4\n13.16 -1281.19 0 32.0687 11653.4\n13.17 -1404.42 0 32.0784 11653.4\n13.18 -1526.48 0 32.1277 11653.4\n13.19 -1642.02 0 32.2075 11653.4\n13.2 -1746 0 32.3033 11653.4\n13.21 -1833.84 0 32.398 11653.4\n13.22 -1901.57 0 32.4747 11653.4\n13.23 -1945.93 0 32.5198 11653.4\n13.24 -1964.45 0 32.5256 11653.4\n13.25 -1955.54 0 32.4911 11653.4\n13.26 -1918.44 0 32.4223 11653.4\n13.27 -1853.32 0 32.3315 11653.4\n13.28 -1761.14 0 32.2347 11653.4\n13.29 -1643.65 0 32.1494 11653.4\n13.3 -1503.29 0 32.0909 11653.4\n13.31 -1343.06 0 32.0697 11653.4\n13.32 -1166.43 0 32.0898 11653.4\n13.33 -977.209 0 32.1473 11653.4\n13.34 -779.384 0 32.2319 11653.4\n13.35 -577.014 0 32.3282 11653.4\n13.36 -374.085 0 32.419 11653.4\n13.37 -174.405 0 32.4882 11653.4\n13.38 18.5139 0 32.5236 11653.4\n13.39 201.531 0 32.5192 11653.4\n13.4 371.956 0 32.4756 11653.4\n13.41 527.589 0 32.4007 11653.4\n13.42 666.758 0 32.3077 11653.4\n13.43 788.321 0 32.2131 11653.4\n13.44 891.658 0 32.1339 11653.4\n13.45 976.645 0 32.0844 11653.4\n13.46 1043.61 0 32.0735 11653.4\n13.47 1093.3 0 32.1031 11653.4\n13.48 1126.77 0 32.1678 11653.4\n13.49 1145.38 0 32.2559 11653.4\n13.5 1150.69 0 32.3514 11653.4\n13.51 1144.4 0 32.4373 11653.4\n13.52 1128.31 0 32.4984 11653.4\n13.53 1104.23 0 32.524 11653.4\n13.54 1073.95 0 32.5097 11653.4\n13.55 1039.21 0 32.4579 11653.4\n13.56 1001.66 0 32.378 11653.4\n13.57 962.829 0 32.2841 11653.4\n13.58 924.15 0 32.1928 11653.4\n13.59 886.921 0 32.1207 11653.4\n13.6 852.323 0 32.0806 11653.4\n13.61 821.427 0 32.0799 11653.4\n13.62 795.199 0 32.1186 11653.4\n13.63 774.516 0 32.1896 11653.4\n13.64 760.175 0 32.28 11653.4\n13.65 752.895 0 32.3735 11653.4\n13.66 753.324 0 32.4534 11653.4\n13.67 762.037 0 32.5058 11653.4\n13.68 779.529 0 32.5213 11653.4\n13.69 806.203 0 32.4973 11653.4\n13.7 842.359 0 32.4381 11653.4\n13.71 888.167 0 32.3542 11653.4\n13.72 943.654 0 32.2605 11653.4\n13.73 1008.68 0 32.1737 11653.4\n13.74 1082.92 0 32.1094 11653.4\n13.75 1165.85 0 32.0792 11653.4\n13.76 1256.73 0 32.0887 11653.4\n13.77 1354.63 0 32.1359 11653.4\n13.78 1458.37 0 32.2123 11653.4\n13.79 1566.64 0 32.304 11653.4\n13.8 1677.91 0 32.3946 11653.4\n13.81 1790.57 0 32.4679 11653.4\n13.82 1902.89 0 32.511 11653.4\n13.83 2013.15 0 32.5164 11653.4\n13.84 2119.63 0 32.4832 11653.4\n13.85 2220.73 0 32.4173 11653.4\n13.86 2314.99 0 32.3303 11653.4\n13.87 2401.18 0 32.2377 11653.4\n13.88 2478.36 0 32.1562 11653.4\n13.89 2545.91 0 32.1003 11653.4\n13.9 2603.58 0 32.0802 11653.4\n13.91 2651.5 0 32.0994 11653.4\n13.92 2690.22 0 32.1545 11653.4\n13.93 2720.66 0 32.2354 11653.4\n13.94 2744.11 0 32.3274 11653.4\n13.95 2762.18 0 32.4141 11653.4\n13.96 2776.73 0 32.48 11653.4\n13.97 2789.79 0 32.5137 11653.4\n13.98 2803.47 0 32.5091 11653.4\n13.99 2819.88 0 32.4672 11653.4\n14 2840.99 0 32.3954 11653.4\n14.01 2868.57 0 32.3064 11653.4\n14.02 2904.03 0 32.216 11653.4\n14.03 2948.39 0 32.1405 11653.4\n14.04 3002.13 0 32.0935 11653.4\n14.05 3065.22 0 32.0834 11653.4\n14.06 3137.01 0 32.1121 11653.4\n14.07 3216.22 0 32.1743 11653.4\n14.08 3301 0 32.2587 11653.4\n14.09 3388.94 0 32.35 11653.4\n14.1 3477.13 0 32.432 11653.4\n14.11 3562.29 0 32.4901 11653.4\n14.12 3640.84 0 32.5141 11653.4\n14.13 3709.09 0 32.4998 11653.4\n14.14 3763.35 0 32.4499 11653.4\n14.15 3800.11 0 32.373 11653.4\n14.16 3816.2 0 32.283 11653.4\n14.17 3808.94 0 32.1957 11653.4\n14.18 3776.32 0 32.1269 11653.4\n14.19 3717.05 0 32.0891 11653.4\n14.2 3630.76 0 32.0889 11653.4\n14.21 3517.99 0 32.1265 11653.4\n14.22 3380.27 0 32.1949 11653.4\n14.23 3220.11 0 32.2818 11653.4\n14.24 3040.95 0 32.3715 11653.4\n14.25 2847.08 0 32.448 11653.4\n14.26 2643.53 0 32.4978 11653.4\n14.27 2435.91 0 32.5121 11653.4\n14.28 2230.21 0 32.4886 11653.4\n14.29 2032.6 0 32.4313 11653.4\n14.3 1849.22 0 32.3505 11653.4\n14.31 1685.9 0 32.2603 11653.4\n14.32 1547.98 0 32.1771 11653.4\n14.33 1440.04 0 32.1156 11653.4\n14.34 1365.72 0 32.0871 11653.4\n14.35 1327.53 0 32.0966 11653.4\n14.36 1326.72 0 32.1424 11653.4\n14.37 1363.18 0 32.2161 11653.4\n14.38 1435.39 0 32.3044 11653.4\n14.39 1540.42 0 32.3914 11653.4\n14.4 1674.01 0 32.4617 11653.4\n14.41 1830.63 0 32.5028 11653.4\n14.42 2003.71 0 32.5076 11653.4\n14.43 2185.8 0 32.4753 11653.4\n14.44 2368.83 0 32.4115 11653.4\n14.45 2544.37 0 32.3276 11653.4\n14.46 2703.98 0 32.2385 11653.4\n14.47 2839.46 0 32.1602 11653.4\n14.48 2943.19 0 32.1066 11653.4\n14.49 3008.41 0 32.0876 11653.4\n14.5 3029.48 0 32.1064 11653.4\n14.51 3002.15 0 32.1597 11653.4\n14.52 2923.7 0 32.2377 11653.4\n14.53 2793.1 0 32.3263 11653.4\n14.54 2611.07 0 32.4098 11653.4\n14.55 2380.12 0 32.4731 11653.4\n14.56 2104.43 0 32.5053 11653.4\n14.57 1789.8 0 32.5007 11653.4\n14.58 1443.42 0 32.4601 11653.4\n14.59 1073.65 0 32.3908 11653.4\n14.6 689.737 0 32.305 11653.4\n14.61 301.486 0 32.2179 11653.4\n14.62 -81.0806 0 32.1452 11653.4\n14.63 -448.081 0 32.1 11653.4\n14.64 -790.135 0 32.0904 11653.4\n14.65 -1098.71 0 32.1181 11653.4\n14.66 -1366.42 0 32.1781 11653.4\n14.67 -1587.34 0 32.2593 11653.4\n14.68 -1757.16 0 32.3473 11653.4\n14.69 -1873.42 0 32.4262 11653.4\n14.7 -1935.58 0 32.4822 11653.4\n14.71 -1945 0 32.5053 11653.4\n14.72 -1904.99 0 32.4915 11653.4\n14.73 -1820.58 0 32.4434 11653.4\n14.74 -1698.42 0 32.3694 11653.4\n14.75 -1546.47 0 32.2827 11653.4\n14.76 -1373.76 0 32.1988 11653.4\n14.77 -1190 0 32.1326 11653.4\n14.78 -1005.24 0 32.0962 11653.4\n14.79 -829.473 0 32.096 11653.4\n14.8 -672.29 0 32.1322 11653.4\n14.81 -542.482 0 32.198 11653.4\n14.82 -447.725 0 32.2815 11653.4\n14.83 -394.291 0 32.3677 11653.4\n14.84 -386.809 0 32.4413 11653.4\n14.85 -428.1 0 32.4891 11653.4\n14.86 -519.071 0 32.5029 11653.4\n14.87 -658.691 0 32.4803 11653.4\n14.88 -844.04 0 32.4252 11653.4\n14.89 -1070.43 0 32.3474 11653.4\n14.9 -1331.6 0 32.2608 11653.4\n14.91 -1619.97 0 32.1809 11653.4\n14.92 -1926.92 0 32.1219 11653.4\n14.93 -2243.17 0 32.0945 11653.4\n14.94 -2559.11 0 32.1038 11653.4\n14.95 -2865.2 0 32.1479 11653.4\n14.96 -3152.36 0 32.2188 11653.4\n14.97 -3412.26 0 32.3037 11653.4\n14.98 -3637.71 0 32.3873 11653.4\n14.99 -3822.91 0 32.4548 11653.4\n15 -3963.67 0 32.4943 11653.4\n15.01 -4057.53 0 32.4989 11653.4\n15.02 -4103.92 0 32.4677 11653.4\n15.03 -4104.09 0 32.4064 11653.4\n15.04 -4061.07 0 32.3258 11653.4\n15.05 -3979.58 0 32.2402 11653.4\n15.06 -3865.74 0 32.165 11653.4\n15.07 -3726.89 0 32.1137 11653.4\n15.08 -3571.24 0 32.0955 11653.4\n15.09 -3407.54 0 32.1138 11653.4\n15.1 -3244.73 0 32.1651 11653.4\n15.11 -3091.57 0 32.2402 11653.4\n15.12 -2956.27 0 32.3255 11653.4\n15.13 -2846.21 0 32.4057 11653.4\n15.14 -2767.58 0 32.4665 11653.4\n15.15 -2725.19 0 32.4974 11653.4\n15.16 -2722.26 0 32.4928 11653.4\n15.17 -2760.3 0 32.4537 11653.4\n15.18 -2839.08 0 32.3869 11653.4\n15.19 -2956.63 0 32.3044 11653.4\n15.2 -3109.35 0 32.2207 11653.4\n15.21 -3292.17 0 32.151 11653.4\n15.22 -3498.75 0 32.1077 11653.4\n15.23 -3721.79 0 32.0987 11653.4\n15.24 -3953.29 0 32.1256 11653.4\n15.25 -4184.9 0 32.1835 11653.4\n15.26 -4408.29 0 32.2617 11653.4\n15.27 -4615.45 0 32.3464 11653.4\n15.28 -4799.04 0 32.4223 11653.4\n15.29 -4952.68 0 32.4759 11653.4\n15.3 -5071.2 0 32.498 11653.4\n15.31 -5150.83 0 32.4846 11653.4\n15.32 -5189.34 0 32.4381 11653.4\n15.33 -5186.14 0 32.3668 11653.4\n15.34 -5142.25 0 32.2833 11653.4\n15.35 -5060.26 0 32.2025 11653.4\n15.36 -4944.19 0 32.1389 11653.4\n15.37 -4799.3 0 32.1041 11653.4\n15.38 -4631.89 0 32.1042 11653.4\n15.39 -4448.97 0 32.1392 11653.4\n15.4 -4258.01 0 32.2027 11653.4\n15.41 -4066.57 0 32.2833 11653.4\n15.42 -3882.05 0 32.3663 11653.4\n15.43 -3711.29 0 32.4371 11653.4\n15.44 -3560.39 0 32.4832 11653.4\n15.45 -3434.38 0 32.4963 11653.4\n15.46 -3337.07 0 32.4743 11653.4\n15.47 -3270.92 0 32.4211 11653.4\n15.48 -3236.9 0 32.3462 11653.4\n15.49 -3234.55 0 32.2627 11653.4\n15.5 -3261.97 0 32.1856 11653.4\n15.51 -3315.93 0 32.1288 11653.4\n15.52 -3392.08 0 32.1026 11653.4\n15.53 -3485.11 0 32.1116 11653.4\n15.54 -3589.04 0 32.1541 11653.4\n15.55 -3697.45 0 32.2225 11653.4\n15.56 -3803.85 0 32.3043 11653.4\n15.57 -3901.88 0 32.385 11653.4\n15.58 -3985.68 0 32.45 11653.4\n15.59 -4050.07 0 32.4881 11653.4\n15.6 -4090.86 0 32.4924 11653.4\n15.61 -4104.95 0 32.4624 11653.4\n15.62 -4090.52 0 32.4033 11653.4\n15.63 -4047.06 0 32.3255 11653.4\n15.64 -3975.41 0 32.243 11653.4\n15.65 -3877.69 0 32.1705 11653.4\n15.66 -3757.18 0 32.1211 11653.4\n15.67 -3618.19 0 32.1035 11653.4\n15.68 -3465.84 0 32.1211 11653.4\n15.69 -3305.81 0 32.1705 11653.4\n15.7 -3144.07 0 32.2428 11653.4\n15.71 -2986.62 0 32.3249 11653.4\n15.72 -2839.18 0 32.4021 11653.4\n15.73 -2706.95 0 32.4608 11653.4\n15.74 -2594.32 0 32.4905 11653.4\n15.75 -2504.74 0 32.4862 11653.4\n15.76 -2440.45 0 32.4486 11653.4\n15.77 -2402.48 0 32.3843 11653.4\n15.78 -2390.51 0 32.3049 11653.4\n15.79 -2402.9 0 32.2244 11653.4\n15.8 -2436.78 0 32.1573 11653.4\n15.81 -2488.15 0 32.1156 11653.4\n15.82 -2552.06 0 32.1069 11653.4\n15.83 -2622.8 0 32.1327 11653.4\n15.84 -2694.22 0 32.1883 11653.4\n15.85 -2759.93 0 32.2635 11653.4\n15.86 -2813.62 0 32.3449 11653.4\n15.87 -2849.37 0 32.4179 11653.4\n15.88 -2861.88 0 32.4695 11653.4\n15.89 -2846.73 0 32.4906 11653.4\n15.9 -2800.58 0 32.4777 11653.4\n15.91 -2721.36 0 32.433 11653.4\n15.92 -2608.34 0 32.3645 11653.4\n15.93 -2462.19 0 32.2843 11653.4\n15.94 -2284.97 0 32.2067 11653.4\n15.95 -2080.07 0 32.1457 11653.4\n15.96 -1852.03 0 32.1123 11653.4\n15.97 -1606.41 0 32.1124 11653.4\n15.98 -1349.53 0 32.1461 11653.4\n15.99 -1088.2 0 32.2072 11653.4\n16 -829.481 0 32.2845 11653.4\n16.01 -580.31 0 32.3643 11653.4\n16.02 -347.268 0 32.4322 11653.4\n16.03 -136.273 0 32.4762 11653.4\n16.04 47.667 0 32.4887 11653.4\n16.05 200.671 0 32.4674 11653.4\n16.06 320.146 0 32.4162 11653.4\n16.07 404.904 0 32.3441 11653.4\n16.08 455.205 0 32.2639 11653.4\n16.09 472.747 0 32.19 11653.4\n16.1 460.592 0 32.1357 11653.4\n16.11 423.026 0 32.1108 11653.4\n16.12 365.378 0 32.1197 11653.4\n16.13 293.778 0 32.1609 11653.4\n16.14 214.892 0 32.2267 11653.4\n16.15 135.631 0 32.3053 11653.4\n16.16 62.8403 0 32.3826 11653.4\n16.17 3.00694 0 32.4449 11653.4\n16.18 -38.0321 0 32.4811 11653.4\n16.19 -55.3447 0 32.4848 11653.4\n16.2 -45.1216 0 32.4555 11653.4\n16.21 -4.84439 0 32.3983 11653.4\n16.22 66.6027 0 32.3234 11653.4\n16.23 168.884 0 32.2442 11653.4\n16.24 300.226 0 32.1747 11653.4\n16.25 457.498 0 32.1275 11653.4\n16.26 636.351 0 32.1112 11653.4\n16.27 831.409 0 32.1287 11653.4\n16.28 1036.51 0 32.1767 11653.4\n16.29 1245 0 32.2465 11653.4\n16.3 1449.98 0 32.3257 11653.4\n16.31 1644.7 0 32.3998 11653.4\n16.32 1822.78 0 32.4559 11653.4\n16.33 1978.56 0 32.484 11653.4\n16.34 2107.35 0 32.4792 11653.4\n16.35 2205.64 0 32.4423 11653.4\n16.36 2271.25 0 32.38 11653.4\n16.37 2303.49 0 32.3031 11653.4\n16.38 2303.17 0 32.2255 11653.4\n16.39 2272.6 0 32.161 11653.4\n16.4 2215.48 0 32.1213 11653.4\n16.41 2136.77 0 32.1135 11653.4\n16.42 2042.47 0 32.139 11653.4\n16.43 1939.4 0 32.1931 11653.4\n16.44 1834.86 0 32.2661 11653.4\n16.45 1736.34 0 32.3448 11653.4\n16.46 1651.21 0 32.4152 11653.4\n16.47 1586.37 0 32.4647 11653.4\n16.48 1547.94 0 32.4847 11653.4\n16.49 1541 0 32.4717 11653.4\n16.5 1569.36 0 32.4279 11653.4\n16.51 1635.36 0 32.3612 11653.4\n16.52 1739.75 0 32.2834 11653.4\n16.53 1881.67 0 32.2084 11653.4\n16.54 2058.64 0 32.1495 11653.4\n16.55 2266.62 0 32.1175 11653.4\n16.56 2500.24 0 32.1181 11653.4\n16.57 2752.92 0 32.1511 11653.4\n16.58 3017.19 0 32.2106 11653.4\n16.59 3285 0 32.2857 11653.4\n16.6 3548.01 0 32.363 11653.4\n16.61 3797.95 0 32.4287 11653.4\n16.62 4026.97 0 32.4711 11653.4\n16.63 4227.98 0 32.4829 11653.4\n16.64 4394.91 0 32.462 11653.4\n16.65 4522.99 0 32.4121 11653.4\n16.66 4608.95 0 32.342 11653.4\n16.67 4651.17 0 32.2642 11653.4\n16.68 4649.71 0 32.1926 11653.4\n16.69 4606.35 0 32.14 11653.4\n16.7 4524.51 0 32.116 11653.4\n16.71 4409.1 0 32.1248 11653.4\n16.72 4266.32 0 32.1649 11653.4\n16.73 4103.42 0 32.2289 11653.4\n16.74 3928.35 0 32.3052 11653.4\n16.75 3749.51 0 32.3802 11653.4\n16.76 3575.32 0 32.4405 11653.4\n16.77 3413.93 0 32.4755 11653.4\n16.78 3272.86 0 32.4791 11653.4\n16.79 3158.69 0 32.4505 11653.4\n16.8 3076.8 0 32.395 11653.4\n16.81 3031.18 0 32.3223 11653.4\n16.82 3024.21 0 32.2454 11653.4\n16.83 3056.66 0 32.178 11653.4\n16.84 3127.59 0 32.1323 11653.4\n16.85 3234.49 0 32.1165 11653.4\n16.86 3373.33 0 32.1334 11653.4\n16.87 3538.79 0 32.1799 11653.4\n16.88 3724.52 0 32.2476 11653.4\n16.89 3923.38 0 32.3243 11653.4\n16.9 4127.8 0 32.3962 11653.4\n16.91 4330.1 0 32.4506 11653.4\n16.92 4522.83 0 32.4779 11653.4\n16.93 4699.11 0 32.4733 11653.4\n16.94 4852.94 0 32.4376 11653.4\n16.95 4979.41 0 32.3772 11653.4\n16.96 5074.99 0 32.3027 11653.4\n16.97 5137.62 0 32.2275 11653.4\n16.98 5166.82 0 32.165 11653.4\n16.99 5163.7 0 32.1265 11653.4\n17 5130.92 0 32.1189 11653.4\n17.01 5072.51 0 32.1435 11653.4\n17.02 4993.77 0 32.1959 11653.4\n17.03 4900.94 0 32.2666 11653.4\n17.04 4800.96 0 32.3428 11653.4\n17.05 4701.17 0 32.4109 11653.4\n17.06 4608.91 0 32.4589 11653.4\n17.07 4531.26 0 32.4783 11653.4\n17.08 4474.64 0 32.4657 11653.4\n17.09 4444.59 0 32.4234 11653.4\n17.1 4445.46 0 32.3589 11653.4\n17.11 4480.21 0 32.2836 11653.4\n17.12 4550.3 0 32.2109 11653.4\n17.13 4655.56 0 32.1539 11653.4\n17.14 4794.25 0 32.1229 11653.4\n17.15 4963.06 0 32.1234 11653.4\n17.16 5157.31 0 32.1553 11653.4\n17.17 5371.1 0 32.2128 11653.4\n17.18 5597.56 0 32.2855 11653.4\n17.19 5829.21 0 32.3604 11653.4\n17.2 6058.21 0 32.424 11653.4\n17.21 6276.74 0 32.4652 11653.4\n17.22 6477.37 0 32.4767 11653.4\n17.23 6653.33 0 32.4564 11653.4\n17.24 6798.86 0 32.4081 11653.4\n17.25 6909.46 0 32.3403 11653.4\n17.26 6982.07 0 32.265 11653.4\n17.27 7015.24 0 32.1957 11653.4\n17.28 7009.22 0 32.1448 11653.4\n17.29 6965.88 0 32.1215 11653.4\n17.3 6888.73 0 32.1299 11653.4\n17.31 6782.71 0 32.1686 11653.4\n17.32 6654.01 0 32.2305 11653.4\n17.33 6509.79 0 32.3044 11653.4\n17.34 6357.86 0 32.3771 11653.4\n17.35 6206.37 0 32.4355 11653.4\n17.36 6063.4 0 32.4695 11653.4\n17.37 5936.64 0 32.4731 11653.4\n17.38 5833.03 0 32.4455 11653.4\n17.39 5758.45 0 32.3918 11653.4\n17.4 5717.45 0 32.3215 11653.4\n17.41 5713.02 0 32.2471 11653.4\n17.42 5746.44 0 32.1818 11653.4\n17.43 5817.25 0 32.1375 11653.4\n17.44 5923.2 0 32.1221 11653.4\n17.45 6060.34 0 32.1384 11653.4\n17.46 6223.18 0 32.1834 11653.4\n17.47 6404.92 0 32.2489 11653.4\n17.48 6597.72 0 32.3231 11653.4\n17.49 6793 0 32.3928 11653.4\n17.5 6981.85 0 32.4456 11653.4\n17.51 7155.4 0 32.4721 11653.4\n17.52 7305.13 0 32.4678 11653.4\n17.53 7423.35 0 32.4333 11653.4\n17.54 7503.45 0 32.3749 11653.4\n17.55 7540.2 0 32.3029 11653.4\n17.56 7530.04 0 32.2301 11653.4\n17.57 7471.15 0 32.1696 11653.4\n17.58 7363.65 0 32.1322 11653.4\n17.59 7209.5 0 32.1246 11653.4\n17.6 7012.5 0 32.1483 11653.4\n17.61 6778.14 0 32.1989 11653.4\n17.62 6513.31 0 32.2672 11653.4\n17.63 6226.12 0 32.341 11653.4\n17.64 5925.47 0 32.407 11653.4\n17.65 5620.74 0 32.4536 11653.4\n17.66 5321.38 0 32.4726 11653.4\n17.67 5036.49 0 32.4606 11653.4\n17.68 4774.49 0 32.4199 11653.4\n17.69 4542.73 0 32.3576 11653.4\n17.7 4347.18 0 32.2848 11653.4\n17.71 4192.2 0 32.2145 11653.4\n17.72 4080.32 0 32.1593 11653.4\n17.73 4012.21 0 32.1291 11653.4\n17.74 3986.57 0 32.1294 11653.4\n17.75 4000.26 0 32.1601 11653.4\n17.76 4048.38 0 32.2155 11653.4\n17.77 4124.56 0 32.2857 11653.4\n17.78 4221.17 0 32.358 11653.4\n17.79 4329.7 0 32.4195 11653.4\n17.8 4441.1 0 32.4594 11653.4\n17.81 4546.23 0 32.4706 11653.4\n17.82 4636.2 0 32.4513 11653.4\n17.83 4702.82 0 32.4048 11653.4\n17.84 4738.91 0 32.3394 11653.4\n17.85 4738.67 0 32.2667 11653.4\n17.86 4697.91 0 32.1998 11653.4\n17.87 4614.25 0 32.1506 11653.4\n17.88 4487.23 0 32.128 11653.4\n17.89 4318.34 0 32.1361 11653.4\n17.9 4110.96 0 32.1734 11653.4\n17.91 3870.24 0 32.2331 11653.4\n17.92 3602.85 0 32.3043 11653.4\n17.93 3316.7 0 32.3744 11653.4\n17.94 3020.63 0 32.4309 11653.4\n17.95 2723.97 0 32.4637 11653.4\n17.96 2436.18 0 32.4671 11653.4\n17.97 2166.41 0 32.4406 11653.4\n17.98 1923.05 0 32.3888 11653.4\n17.99 1713.45 0 32.321 11653.4\n18 1543.49 0 32.2492 11653.4\n18.01 1417.33 0 32.1863 11653.4\n18.02 1337.24 0 32.1436 11653.4\n18.03 1303.42 0 32.1288 11653.4\n18.04 1314.04 0 32.1445 11653.4\n18.05 1365.2 0 32.188 11653.4\n18.06 1451.16 0 32.2512 11653.4\n18.07 1564.51 0 32.3229 11653.4\n18.08 1696.51 0 32.3901 11653.4\n18.09 1837.41 0 32.4409 11653.4\n18.1 1976.88 0 32.4665 11653.4\n18.11 2104.46 0 32.4622 11653.4\n18.12 2209.97 0 32.4288 11653.4\n18.13 2284.02 0 32.3724 11653.4\n18.14 2318.33 0 32.3028 11653.4\n18.15 2306.2 0 32.2326 11653.4\n18.16 2242.75 0 32.1742 11653.4\n18.17 2125.18 0 32.1382 11653.4\n18.18 1952.94 0 32.1311 11653.4\n18.19 1727.77 0 32.1542 11653.4\n18.2 1453.66 0 32.2032 11653.4\n18.21 1136.76 0 32.2692 11653.4\n18.22 785.087 0 32.3405 11653.4\n18.23 408.306 0 32.4042 11653.4\n18.24 17.3 0 32.4491 11653.4\n18.25 -376.231 0 32.4673 11653.4\n18.26 -760.244 0 32.4555 11653.4\n18.27 -1122.84 0 32.4159 11653.4\n18.28 -1452.72 0 32.3556 11653.4\n18.29 -1739.72 0 32.2851 11653.4\n18.3 -1975.13 0 32.2172 11653.4\n18.31 -2152.17 0 32.1639 11653.4\n18.32 -2266.2 0 32.1349 11653.4\n18.33 -2314.98 0 32.1354 11653.4\n18.34 -2298.75 0 32.1652 11653.4\n18.35 -2220.3 0 32.219 11653.4\n18.36 -2084.82 0 32.287 11653.4\n18.37 -1899.76 0 32.3571 11653.4\n18.38 -1674.56 0 32.4166 11653.4\n18.39 -1420.26 0 32.4552 11653.4\n18.4 -1149.12 0 32.4659 11653.4\n18.41 -874.14 0 32.447 11653.4\n18.42 -608.556 0 32.4017 11653.4\n18.43 -365.325 0 32.3382 11653.4\n18.44 -156.631 0 32.2677 11653.4\n18.45 6.5947 0 32.2027 11653.4\n18.46 115.092 0 32.155 11653.4\n18.47 161.637 0 32.1331 11653.4\n18.48 141.321 0 32.141 11653.4\n18.49 51.7431 0 32.1772 11653.4\n18.5 -106.9 0 32.2351 11653.4\n18.51 -331.821 0 32.3043 11653.4\n18.52 -617.751 0 32.3723 11653.4\n18.53 -957.147 0 32.4272 11653.4\n18.54 -1340.49 0 32.4592 11653.4\n18.55 -1756.63 0 32.4626 11653.4\n18.56 -2193.27 0 32.437 11653.4\n18.57 -2637.39 0 32.3869 11653.4\n18.58 -3075.76 0 32.3212 11653.4\n18.59 -3495.46 0 32.2515 11653.4\n18.6 -3884.37 0 32.1903 11653.4\n18.61 -4231.6 0 32.1487 11653.4\n18.62 -4527.93 0 32.134 11653.4\n18.63 -4766.13 0 32.149 11653.4\n18.64 -4941.21 0 32.1908 11653.4\n18.65 -5050.61 0 32.2518 11653.4\n18.66 -5094.26 0 32.3211 11653.4\n18.67 -5074.55 0 32.3862 11653.4\n18.68 -4996.22 0 32.4357 11653.4\n18.69 -4866.15 0 32.4606 11653.4\n18.7 -4693.06 0 32.4567 11653.4\n18.71 -4487.17 0 32.4248 11653.4\n18.72 -4259.77 0 32.3704 11653.4\n18.73 -4022.79 0 32.3033 11653.4\n18.74 -3788.29 0 32.2355 11653.4\n18.75 -3568.06 0 32.1789 11653.4\n18.76 -3373.12 0 32.144 11653.4\n18.77 -3213.32 0 32.1369 11653.4\n18.78 -3097.01 0 32.1588 11653.4\n18.79 -3030.69 0 32.2058 11653.4\n18.8 -3018.83 0 32.2694 11653.4\n18.81 -3063.72 0 32.3381 11653.4\n18.82 -3165.45 0 32.3996 11653.4\n18.83 -3321.89 0 32.443 11653.4\n18.84 -3528.87 0 32.4607 11653.4\n18.85 -3780.35 0 32.4496 11653.4\n18.86 -4068.7 0 32.4116 11653.4\n18.87 -4385.04 0 32.3535 11653.4\n18.88 -4719.58 0 32.2857 11653.4\n18.89 -5062.05 0 32.2202 11653.4\n18.9 -5402.09 0 32.1688 11653.4\n18.91 -5729.65 0 32.1408 11653.4\n18.92 -6035.4 0 32.1412 11653.4\n18.93 -6311.02 0 32.1698 11653.4\n18.94 -6549.56 0 32.2215 11653.4\n18.95 -6745.62 0 32.2869 11653.4\n18.96 -6895.57 0 32.3543 11653.4\n18.97 -6997.59 0 32.4115 11653.4\n18.98 -7051.75 0 32.4486 11653.4\n18.99 -7059.89 0 32.459 11653.4\n19 -7025.57 0 32.4408 11653.4\n19.01 -6953.81 0 32.3973 11653.4\n19.02 -6850.9 0 32.3362 11653.4\n19.03 -6724.11 0 32.2685 11653.4\n19.04 -6581.35 0 32.2062 11653.4\n19.05 -6430.86 0 32.1605 11653.4\n19.06 -6280.88 0 32.1397 11653.4\n19.07 -6139.3 0 32.1474 11653.4\n19.08 -6013.41 0 32.1823 11653.4\n19.09 -5909.57 0 32.238 11653.4\n19.1 -5833.05 0 32.3045 11653.4\n19.11 -5787.81 0 32.3698 11653.4\n19.12 -5776.44 0 32.4223 11653.4\n19.13 -5800.06 0 32.4527 11653.4\n19.14 -5858.34 0 32.4556 11653.4\n19.15 -5949.59 0 32.4306 11653.4\n19.16 -6070.85 0 32.3822 11653.4\n19.17 -6218.05 0 32.3188 11653.4\n19.18 -6386.23 0 32.2518 11653.4\n19.19 -6569.75 0 32.1932 11653.4\n19.2 -6762.56 0 32.1536 11653.4\n19.21 -6958.4 0 32.14 11653.4\n19.22 -7151.1 0 32.155 11653.4\n19.23 -7334.79 0 32.1957 11653.4\n19.24 -7504.11 0 32.2548 11653.4\n19.25 -7654.38 0 32.3217 11653.4\n19.26 -7781.76 0 32.3843 11653.4\n19.27 -7883.34 0 32.4316 11653.4\n19.28 -7957.17 0 32.4551 11653.4\n19.29 -8002.34 0 32.4508 11653.4\n19.3 -8018.88 0 32.4194 11653.4\n19.31 -8007.73 0 32.3666 11653.4\n19.32 -7970.65 0 32.3016 11653.4\n19.33 -7910.05 0 32.2361 11653.4\n19.34 -7828.9 0 32.1818 11653.4\n19.35 -7730.54 0 32.1485 11653.4\n19.36 -7618.5 0 32.1423 11653.4\n19.37 -7496.39 0 32.1641 11653.4\n19.38 -7367.73 0 32.21 11653.4\n19.39 -7235.81 0 32.2718 11653.4\n19.4 -7103.58 0 32.3383 11653.4\n19.41 -6973.61 0 32.3976 11653.4\n19.42 -6847.96 0 32.4392 11653.4\n19.43 -6728.22 0 32.4557 11653.4\n19.44 -6615.48 0 32.4444 11653.4\n19.45 -6510.36 0 32.407 11653.4\n19.46 -6413.05 0 32.3505 11653.4\n19.47 -6323.38 0 32.2846 11653.4\n19.48 -6240.9 0 32.2213 11653.4\n19.49 -6164.97 0 32.1719 11653.4\n19.5 -6094.82 0 32.1452 11653.4\n19.51 -6029.64 0 32.1461 11653.4\n19.52 -5968.68 0 32.1745 11653.4\n19.53 -5911.26 0 32.225 11653.4\n19.54 -5856.84 0 32.2887 11653.4\n19.55 -5805.05 0 32.3541 11653.4\n19.56 -5755.67 0 32.4095 11653.4\n19.57 -5708.63 0 32.4451 11653.4\n19.58 -5663.99 0 32.4547 11653.4\n19.59 -5621.85 0 32.4365 11653.4\n19.6 -5582.34 0 32.3939 11653.4\n19.61 -5545.55 0 32.3343 11653.4\n19.62 -5511.44 0 32.2684 11653.4\n19.63 -5479.79 0 32.2079 11653.4\n19.64 -5450.16 0 32.1637 11653.4\n19.65 -5421.84 0 32.1438 11653.4\n19.66 -5393.8 0 32.1517 11653.4\n19.67 -5364.75 0 32.186 11653.4\n19.68 -5333.07 0 32.2404 11653.4\n19.69 -5296.92 0 32.3052 11653.4\n19.7 -5254.27 0 32.3687 11653.4\n19.71 -5202.97 0 32.4196 11653.4\n19.72 -5140.85 0 32.4489 11653.4\n19.73 -5065.84 0 32.4515 11653.4\n19.74 -4976.03 0 32.427 11653.4\n19.75 -4869.85 0 32.3796 11653.4\n19.76 -4746.15 0 32.3179 11653.4\n19.77 -4604.26 0 32.2528 11653.4\n19.78 -4444.13 0 32.1959 11653.4\n19.79 -4266.32 0 32.1575 11653.4\n19.8 -4072.09 0 32.1446 11653.4\n19.81 -3863.38 0 32.1593 11653.4\n19.82 -3642.76 0 32.1991 11653.4\n19.83 -3413.38 0 32.2566 11653.4\n19.84 -3178.89 0 32.3216 11653.4\n19.85 -2943.31 0 32.3824 11653.4\n19.86 -2710.89 0 32.4282 11653.4\n19.87 -2485.95 0 32.4509 11653.4\n19.88 -2272.7 0 32.4465 11653.4\n19.89 -2075.1 0 32.4158 11653.4\n19.9 -1896.62 0 32.3643 11653.4\n19.91 -1740.17 0 32.3011 11653.4\n19.92 -1607.88 0 32.2375 11653.4\n19.93 -1501.07 0 32.1849 11653.4\n19.94 -1420.09 0 32.1527 11653.4\n19.95 -1364.33 0 32.1469 11653.4\n19.96 -1332.23 0 32.1683 11653.4\n19.97 -1321.27 0 32.2131 11653.4\n19.98 -1328.11 0 32.2732 11653.4\n19.99 -1348.67 0 32.3378 11653.4\n##### Results\nextraction_type='extract'\n### ModelCluster\npeak_funcs=[0]\nModelEvaluator=AIC\nslice=slice(None, 43, None)\n# BaselineObject\nowner=0\npars=[]\nfree=[]\nremovable=False\nstatic_owner=False\n\n## ModelPeaks\n# ModelPeak\nowner=1\npars=[1.4409645574666863, -1.2021756542216779, 35834.779473125469]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[2.438834586729778, -0.96289415777140697, 76731.43020027288]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[2.8449631419404557, -1.377022811246666, 20948.656697077673]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[3.6144870375166058, -0.96713516256064158, 74286.823948562524]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[4.1107321734767162, -0.98410710936823842, 56269.955304768802]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[4.5494140399501193, -0.9756431127837496, 81698.18210463904]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[4.8398410449548992, -1.4491665751304479, 21235.583150621042]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[5.4143786805580305, -1.1127424167906164, 63603.398981811821]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[5.9241758314319366, 1.5695897461410588, 195215.74804049844]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[6.7383992196340667, 0.05697362691040269, 168818.12286746191]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n### start data\n#L r y dy\n1 -19502.9 11653.4\n1.14749 -22788.9 11653.4\n1.29499 1852.19 11653.4\n1.44248 116074 11653.4\n1.58997 -10291.9 11653.4\n1.73746 -27861.6 11653.4\n1.88496 -18215.1 11653.4\n2.03245 -28714 11653.4\n2.17994 -26150.2 11653.4\n2.32743 34592.3 11653.4\n2.47493 94708.1 11653.4\n2.62242 -34046.8 11653.4\n2.76991 -6095.59 11653.4\n2.9174 -9022.01 11653.4\n3.0649 -47692.9 11653.4\n3.21239 -39823.5 11653.4\n3.35988 -45615.1 11653.4\n3.50737 13411.8 11653.4\n3.65487 42196.6 11653.4\n3.80236 -28611.3 11653.4\n3.94985 -21093.7 11653.4\n4.09735 22420.5 11653.4\n4.24484 -12021.5 11653.4\n4.39233 -17934.3 11653.4\n4.53982 45713.7 11653.4\n4.68732 -9106.12 11653.4\n4.83481 459.793 11653.4\n4.9823 -30024.4 11653.4\n5.12979 -6029.52 11653.4\n5.27729 -3788.41 11653.4\n5.42478 38601.6 11653.4\n5.57227 5401.92 11653.4\n5.71976 12241.1 11653.4\n5.86726 6715.96 11653.4\n6.01475 11253.1 11653.4\n6.16224 26161.1 11653.4\n6.30973 -15451.2 11653.4\n6.45723 -45.4651 11653.4\n6.60472 29243.8 11653.4\n6.75221 20789.5 11653.4\n6.8997 3686.4 11653.4\n7.0472 6321.19 11653.4\n7.19469 -14234.2 11653.4\n\n" +aaaS"History written: Wed Jul 1 10:01:37 2015\nproduced by luke\ndiffpy.srmise version 0.5.2\n##### PDF Peak Extraction\n## BaselineFunctions\n# BaselineFunction 0\nfunction='FromSequence'\nmodule='diffpy.srmise.baselines.fromsequence'\nbase=None\ny=[-1475.0325650706627, -2950.0651301413254, -4425.0976952119881, -5900.1302602826509, -7375.1628253533127, -8850.1953904239745, -10325.227955494638, -11800.260520565302, -13275.293085635964, -14750.325650706625, -16225.358215777289, -17700.390780847953, -19175.423345918618, -20650.455910989276, -22125.488476059942, -23600.521041130603, -25075.553606201265, -26550.586171271931, -28025.459933459599, -29490.66450359999, -30922.864389112267, -32298.695523408274, -33596.022711102938, -34793.92402828217, -35872.675222770908, -36813.734114401064, -37599.724995279517, -38214.42303005611, -38643.368779986711, -38890.463187607907, -38978.523165803032, -38930.29758324947, -38767.462434741778, -38510.636440923663, -38179.39664801996, -37792.294027568765, -37366.869076153373, -36919.66741513431, -36465.762314723048, -36011.685031151355, -35557.60774757967, -35103.530464007978, -34649.453180436292, -34195.375896864593, -33741.298613292922, -33287.221329721207, -32833.144046149522, -32379.066762577819, -31924.989479006141, -31470.912195434459, -31016.83491186277, -30562.757628291063, -30108.680344719356, -29654.603061147711, -29200.525777575986, -28746.448494004322, -28292.371210432615, -27838.293926860926, -27384.216643289248, -26930.139359411234, -26474.542488478357, -26010.083575850655, -25528.358372275903, -25021.398910324362, -24481.667989050857, -23902.053658656267, -23275.863705149979, -22596.820135010832, -21859.053659849822, -21057.103538030915, -20189.157506289514, -19262.2608478449, -18284.582204221027, -17263.909088500266, -16207.653400662406, -15122.856942922259, -14016.196935068139, -12893.991529799485, -11762.205328065833, -10626.439769837914, -9490.3191584519027, -8354.1985470658783, -7218.0779356797575, -6081.9573242938068, -4945.8367129076605, -3809.7161015215393, -2673.5954901353934, -1537.4748787493209, -401.35426736339457, 734.76028191512512, 1862.3074495985777, 2947.158200990089, 3960.1884858314311, 4888.6048315275966, 5719.7202101002222, 6439.2477046714184, 7031.3497219455321, 7478.6872046947792, 7762.4688442382803, 7862.653161699448]\nx=[0.10000000000000001, 0.20000000000000001, 0.30000000000000004, 0.40000000000000002, 0.5, 0.59999999999999998, 0.70000000000000007, 0.80000000000000004, 0.90000000000000002, 1.0, 1.1000000000000001, 1.2000000000000002, 1.3000000000000003, 1.4000000000000001, 1.5000000000000002, 1.6000000000000001, 1.7000000000000002, 1.8000000000000003, 1.9000000000000001, 2.0, 2.1000000000000001, 2.2000000000000002, 2.3000000000000003, 2.4000000000000004, 2.5000000000000004, 2.6000000000000001, 2.7000000000000002, 2.8000000000000003, 2.9000000000000004, 3.0000000000000004, 3.1000000000000001, 3.2000000000000002, 3.3000000000000003, 3.4000000000000004, 3.5000000000000004, 3.6000000000000001, 3.7000000000000002, 3.8000000000000003, 3.9000000000000004, 4.0, 4.0999999999999996, 4.2000000000000002, 4.2999999999999998, 4.3999999999999995, 4.5, 4.5999999999999996, 4.7000000000000002, 4.7999999999999998, 4.9000000000000004, 5.0, 5.0999999999999996, 5.2000000000000002, 5.2999999999999998, 5.4000000000000004, 5.5, 5.5999999999999996, 5.7000000000000002, 5.7999999999999998, 5.9000000000000004, 6.0, 6.0999999999999996, 6.2000000000000002, 6.2999999999999998, 6.4000000000000004, 6.5, 6.5999999999999996, 6.7000000000000002, 6.7999999999999998, 6.9000000000000004, 7.0, 7.0999999999999996, 7.2000000000000002, 7.2999999999999998, 7.4000000000000004, 7.5, 7.5999999999999996, 7.7000000000000002, 7.7999999999999998, 7.9000000000000004, 8.0, 8.0999999999999996, 8.1999999999999993, 8.3000000000000007, 8.4000000000000004, 8.5, 8.5999999999999996, 8.6999999999999993, 8.8000000000000007, 8.9000000000000004, 9.0, 9.0999999999999996, 9.1999999999999993, 9.3000000000000007, 9.4000000000000004, 9.5, 9.5999999999999996, 9.7000000000000011, 9.8000000000000007, 9.9000000000000004, 10.0]\n\n## PeakFunctions\n# PeakFunction 0\nfunction='GaussianOverR'\nmodule='diffpy.srmise.peaks.gaussianoverr'\nbase=None\nmaxwidth=0.7\n\n# PeakFunction 1\nfunction='TerminationRipples'\nmodule='diffpy.srmise.peaks.terminationripples'\nbase=0\nsupersample=5.0\nqmax=21.299999\nextension=4.0\n\n# BaselineObject\nowner=0\npars=[]\nfree=[]\nremovable=False\nstatic_owner=False\n\n## InitialPeaks\n# SrMiseMetadata\npf=[0]\ncres=0.05\nModelEvaluator=AIC\nRange=[1.0, 7.25]\n# Metadata\nfilename='/home/luke/Workspaces/MSU_Research/diffpy.srmise/docs/examples/data/C60_fine_qmax21.gr'\nnyquist=True\nqmax=21.299999\nqmax_reportedbypdf=21.299999\nqmax_fromdata=20.755266780473114\nscale=False\nsupersample=4.0\n\n##### start data\n#L x y dx dy edy\n0.01 18942.6 0 8.53691 11653.4\n0.02 37722.7 0 16.7546 11653.4\n0.03 56177.6 0 24.347 11653.4\n0.04 74143.9 0 31.0336 11653.4\n0.05 91457.9 0 36.571 11653.4\n0.06 107956 0 40.7633 11653.4\n0.07 123476 0 43.4706 11653.4\n0.08 137856 0 44.6161 11653.4\n0.09 150940 0 44.191 11653.4\n0.1 162578 0 42.2588 11653.4\n0.11 172629 0 38.9611 11653.4\n0.12 180964 0 34.5282 11653.4\n0.13 187472 0 29.307 11653.4\n0.14 192060 0 23.8359 11653.4\n0.15 194658 0 19.0276 11653.4\n0.16 195226 0 16.3851 11653.4\n0.17 193750 0 17.2383 11653.4\n0.18 190254 0 20.9462 11653.4\n0.19 184793 0 25.822 11653.4\n0.2 177460 0 30.698 11653.4\n0.21 168386 0 34.9379 11653.4\n0.22 157737 0 38.1842 11653.4\n0.23 145712 0 40.2361 11653.4\n0.24 132543 0 41.0033 11653.4\n0.25 118488 0 40.4884 11653.4\n0.26 103827 0 38.7838 11653.4\n0.27 88856.5 0 36.0754 11653.4\n0.28 73881.6 0 32.6565 11653.4\n0.29 59209 0 28.9558 11653.4\n0.3 45139.3 0 25.5728 11653.4\n0.31 31959.2 0 23.2628 11653.4\n0.32 19933.4 0 22.7026 11653.4\n0.33 9297.65 0 24.0285 11653.4\n0.34 251.704 0 26.7081 11653.4\n0.35 -7046.27 0 29.9659 11653.4\n0.36 -12484.5 0 33.1496 11653.4\n0.37 -16000.8 0 35.809 11653.4\n0.38 -17584.8 0 37.6619 11653.4\n0.39 -17278 0 38.5549 11653.4\n0.4 -15172.9 0 38.4411 11653.4\n0.41 -11410.1 0 37.3693 11653.4\n0.42 -6173.99 0 35.4819 11653.4\n0.43 312.641 0 33.0201 11653.4\n0.44 7795.7 0 30.331 11653.4\n0.45 15997.5 0 27.8677 11653.4\n0.46 24625.2 0 26.1426 11653.4\n0.47 33380 0 25.5822 11653.4\n0.48 41966.4 0 26.3124 11653.4\n0.49 50100.7 0 28.0791 11653.4\n0.5 57520.3 0 30.4057 11653.4\n0.51 63990.9 0 32.8044 11653.4\n0.52 69313.7 0 34.886 11653.4\n0.53 73330.8 0 36.3811 11653.4\n0.54 75929.5 0 37.131 11653.4\n0.55 77044.7 0 37.0761 11653.4\n0.56 76660.3 0 36.2478 11653.4\n0.57 74808.1 0 34.7652 11653.4\n0.58 71565.9 0 32.8355 11653.4\n0.59 67053.6 0 30.7514 11653.4\n0.6 61428.1 0 28.8765 11653.4\n0.61 54877.1 0 27.5925 11653.4\n0.62 47611.7 0 27.1928 11653.4\n0.63 39858.8 0 27.7571 11653.4\n0.64 31853 0 29.1121 11653.4\n0.65 23828 0 30.9201 11653.4\n0.66 16008.6 0 32.8095 11653.4\n0.67 8603.69 0 34.4622 11653.4\n0.68 1798.99 0 35.646 11653.4\n0.69 -4248.35 0 36.2199 11653.4\n0.7 -9414.3 0 36.1298 11653.4\n0.71 -13611.1 0 35.4048 11653.4\n0.72 -16789.1 0 34.1541 11653.4\n0.73 -18936.8 0 32.5637 11653.4\n0.74 -20079.9 0 30.8888 11653.4\n0.75 -20278.6 0 29.4309 11653.4\n0.76 -19624.1 0 28.4858 11653.4\n0.77 -18233.7 0 28.2603 11653.4\n0.78 -16245 0 28.7926 11653.4\n0.79 -13810.2 0 29.9374 11653.4\n0.8 -11089.1 0 31.4287 11653.4\n0.81 -8242.85 0 32.9701 11653.4\n0.82 -5427.21 0 34.3007 11653.4\n0.83 -2786.99 0 35.2261 11653.4\n0.84 -450.548 0 35.6277 11653.4\n0.85 1474.5 0 35.4644 11653.4\n0.86 2904.71 0 34.7693 11653.4\n0.87 3783.01 0 33.6482 11653.4\n0.88 4079.74 0 32.2736 11653.4\n0.89 3792.54 0 30.8738 11653.4\n0.9 2944.99 0 29.7056 11653.4\n0.91 1584.28 0 29.0051 11653.4\n0.92 -222.159 0 28.9205 11653.4\n0.93 -2390.68 0 29.4595 11653.4\n0.94 -4826.07 0 30.4869 11653.4\n0.95 -7426.55 0 31.7771 11653.4\n0.96 -10088.8 0 33.0821 11653.4\n0.97 -12713 0 34.1826 11653.4\n0.98 -15207.3 0 34.9156 11653.4\n0.99 -17492 0 35.1842 11653.4\n1 -19503 0 34.9606 11653.4\n1.01 -21193.7 0 34.2847 11653.4\n1.02 -22537 0 33.2613 11653.4\n1.03 -23525.9 0 32.053 11653.4\n1.04 -24172 0 30.8661 11653.4\n1.05 -24504.7 0 29.9216 11653.4\n1.06 -24568.6 0 29.4096 11653.4\n1.07 -24419.8 0 29.435 11653.4\n1.08 -24122.2 0 29.9825 11653.4\n1.09 -23743.2 0 30.9231 11653.4\n1.1 -23349 0 32.0586 11653.4\n1.11 -23000.1 0 33.1763 11653.4\n1.12 -22747 0 34.0897 11653.4\n1.13 -22626 0 34.6619 11653.4\n1.14 -22656.6 0 34.8154 11653.4\n1.15 -22838.5 0 34.5356 11653.4\n1.16 -23150.5 0 33.8694 11653.4\n1.17 -23550 0 32.922 11653.4\n1.18 -23973.8 0 31.8483 11653.4\n1.19 -24339.8 0 30.8363 11653.4\n1.2 -24550.2 0 30.0775 11653.4\n1.21 -24495 0 29.7246 11653.4\n1.22 -24056.8 0 29.8486 11653.4\n1.23 -23116.2 0 30.4155 11653.4\n1.24 -21557.6 0 31.2994 11653.4\n1.25 -19274.7 0 32.3219 11653.4\n1.26 -16176.8 0 33.2965 11653.4\n1.27 -12193.8 0 34.0627 11653.4\n1.28 -7281.75 0 34.5058 11653.4\n1.29 -1426.42 0 34.5652 11653.4\n1.3 5353.3 0 34.2379 11653.4\n1.31 13003.6 0 33.5775 11653.4\n1.32 21435 0 32.6893 11653.4\n1.33 30523.3 0 31.7209 11653.4\n1.34 40111.4 0 30.8441 11653.4\n1.35 50013.2 0 30.225 11653.4\n1.36 60017.9 0 29.9866 11653.4\n1.37 69896.1 0 30.1742 11653.4\n1.38 79406.9 0 30.7413 11653.4\n1.39 88304.8 0 31.5659 11653.4\n1.4 96348 0 32.4856 11653.4\n1.41 103306 0 33.3355 11653.4\n1.42 108970 0 33.9764 11653.4\n1.43 113155 0 34.312 11653.4\n1.44 115713 0 34.2965 11653.4\n1.45 116534 0 33.9373 11653.4\n1.46 115552 0 33.2933 11653.4\n1.47 112750 0 32.4696 11653.4\n1.48 108158 0 31.6062 11653.4\n1.49 101857 0 30.8589 11653.4\n1.5 93973.5 0 30.3705 11653.4\n1.51 84679 0 30.2374 11653.4\n1.52 74183.6 0 30.4828 11653.4\n1.53 62730.5 0 31.0503 11653.4\n1.54 50588.5 0 31.8217 11653.4\n1.55 38044 0 32.6485 11653.4\n1.56 25391.8 0 33.3847 11653.4\n1.57 12926.4 0 33.9104 11653.4\n1.58 932.466 0 34.1461 11653.4\n1.59 -10323.7 0 34.0596 11653.4\n1.6 -20602.4 0 33.668 11653.4\n1.61 -29697.7 0 33.0355 11653.4\n1.62 -37443.6 0 32.2668 11653.4\n1.63 -43718.3 0 31.4948 11653.4\n1.64 -48447.8 0 30.8606 11653.4\n1.65 -51607 0 30.486 11653.4\n1.66 -53219.5 0 30.444 11653.4\n1.67 -53355.7 0 30.7394 11653.4\n1.68 -52129.5 0 31.3074 11653.4\n1.69 -49693 0 32.033 11653.4\n1.7 -46230.6 0 32.7797 11653.4\n1.71 -41951.5 0 33.4173 11653.4\n1.72 -37082.2 0 33.8426 11653.4\n1.73 -31857.8 0 33.9912 11653.4\n1.74 -26513.5 0 33.8433 11653.4\n1.75 -21276.4 0 33.4249 11653.4\n1.76 -16357.9 0 32.805 11653.4\n1.77 -11945.9 0 32.0878 11653.4\n1.78 -8199.74 0 31.3994 11653.4\n1.79 -5244.58 0 30.8672 11653.4\n1.8 -3168.44 0 30.5942 11653.4\n1.81 -2020.1 0 30.6332 11653.4\n1.82 -1808.73 0 30.9733 11653.4\n1.83 -2505.02 0 31.5432 11653.4\n1.84 -4043.73 0 32.2308 11653.4\n1.85 -6327.61 0 32.9098 11653.4\n1.86 -9232.41 0 33.464 11653.4\n1.87 -12612.9 0 33.8044 11653.4\n1.88 -16309.4 0 33.8798 11653.4\n1.89 -20154.9 0 33.6813 11653.4\n1.9 -23982.3 0 33.2426 11653.4\n1.91 -27631.4 0 32.6362 11653.4\n1.92 -30955 0 31.9652 11653.4\n1.93 -33825.5 0 31.3483 11653.4\n1.94 -36139.1 0 30.9002 11653.4\n1.95 -37819.9 0 30.7067 11653.4\n1.96 -38822.6 0 30.804 11653.4\n1.97 -39133.3 0 31.1691 11653.4\n1.98 -38769.7 0 31.7268 11653.4\n1.99 -37779.1 0 32.3689 11653.4\n2 -36236.3 0 32.979 11653.4\n2.01 -34239.2 0 33.4534 11653.4\n2.02 -31903.8 0 33.7162 11653.4\n2.03 -29358.9 0 33.7281 11653.4\n2.04 -26739.8 0 33.4898 11653.4\n2.05 -24181.7 0 33.0417 11653.4\n2.06 -21813.7 0 32.4591 11653.4\n2.07 -19752.2 0 31.8427 11653.4\n2.08 -18095.5 0 31.3035 11653.4\n2.09 -16919.2 0 30.943 11653.4\n2.1 -16272 0 30.8304 11653.4\n2.11 -16173 0 30.9862 11653.4\n2.12 -16610.4 0 31.3767 11653.4\n2.13 -17541.3 0 31.9234 11653.4\n2.14 -18892.7 0 32.5224 11653.4\n2.15 -20564 0 33.0666 11653.4\n2.16 -22430.5 0 33.4642 11653.4\n2.17 -24348.5 0 33.6515 11653.4\n2.18 -26160.4 0 33.6004 11653.4\n2.19 -27701.2 0 33.3208 11653.4\n2.2 -28804.8 0 32.8593 11653.4\n2.21 -29311.4 0 32.2938 11653.4\n2.22 -29073.8 0 31.7227 11653.4\n2.23 -27963.7 0 31.2498 11653.4\n2.24 -25877.9 0 30.9645 11653.4\n2.25 -22742.8 0 30.9215 11653.4\n2.26 -18518.7 0 31.1275 11653.4\n2.27 -13202 0 31.5399 11653.4\n2.28 -6827.17 0 32.0779 11653.4\n2.29 533.184 0 32.6414 11653.4\n2.3 8769.9 0 33.1314 11653.4\n2.31 17739.6 0 33.4665 11653.4\n2.32 27268.5 0 33.5936 11653.4\n2.33 37157.5 0 33.4942 11653.4\n2.34 47187.9 0 33.1862 11653.4\n2.35 57128 0 32.7211 11653.4\n2.36 66740.2 0 32.178 11653.4\n2.37 75788.5 0 31.6526 11653.4\n2.38 84045.6 0 31.2409 11653.4\n2.39 91300 0 31.0207 11653.4\n2.4 97362.9 0 31.0335 11653.4\n2.41 102074 0 31.275 11653.4\n2.42 105306 0 31.696 11653.4\n2.43 106968 0 32.2149 11653.4\n2.44 107011 0 32.7365 11653.4\n2.45 105427 0 33.1698 11653.4\n2.46 102247 0 33.4432 11653.4\n2.47 97545.1 0 33.5136 11653.4\n2.48 91432.3 0 33.3712 11653.4\n2.49 84053.7 0 33.0405 11653.4\n2.5 75584.5 0 32.5774 11653.4\n2.51 66224.1 0 32.0612 11653.4\n2.52 56190.4 0 31.5838 11653.4\n2.53 45713.4 0 31.233 11653.4\n2.54 35028 0 31.0751 11653.4\n2.55 24367.9 0 31.1396 11653.4\n2.56 13958.9 0 31.4121 11653.4\n2.57 4012.96 0 31.8379 11653.4\n2.58 -5277.48 0 32.336 11653.4\n2.59 -13743.8 0 32.816 11653.4\n2.6 -21245.3 0 33.195 11653.4\n2.61 -27671.9 0 33.4107 11653.4\n2.62 -32945.9 0 33.4291 11653.4\n2.63 -37022.9 0 33.2488 11653.4\n2.64 -39891.6 0 32.9004 11653.4\n2.65 -41572.2 0 32.4429 11653.4\n2.66 -42114.7 0 31.9557 11653.4\n2.67 -41596 0 31.5261 11653.4\n2.68 -40116.2 0 31.2338 11653.4\n2.69 -37794.5 0 31.1341 11653.4\n2.7 -34765.2 0 31.2451 11653.4\n2.71 -31172.8 0 31.5439 11653.4\n2.72 -27167.4 0 31.9717 11653.4\n2.73 -22900.5 0 32.4485 11653.4\n2.74 -18520.4 0 32.8888 11653.4\n2.75 -14168.8 0 33.2176 11653.4\n2.76 -9976.72 0 33.3813 11653.4\n2.77 -6062.3 0 33.3544 11653.4\n2.78 -2528.15 0 33.1427 11653.4\n2.79 540.183 0 32.7822 11653.4\n2.8 3075.25 0 32.3344 11653.4\n2.81 5028.13 0 31.8774 11653.4\n2.82 6368.27 0 31.4938 11653.4\n2.83 7082.85 0 31.2549 11653.4\n2.84 7175.6 0 31.2054 11653.4\n2.85 6665.42 0 31.3538 11653.4\n2.86 5584.53 0 31.6696 11653.4\n2.87 3976.57 0 32.0918 11653.4\n2.88 1894.46 0 32.5418 11653.4\n2.89 -601.666 0 32.9401 11653.4\n2.9 -3446.6 0 33.219 11653.4\n2.91 -6572.02 0 33.3332 11653.4\n2.92 -9908.35 0 33.2654 11653.4\n2.93 -13386.4 0 33.0279 11653.4\n2.94 -16939 0 32.661 11653.4\n2.95 -20501.9 0 32.2279 11653.4\n2.96 -24015.2 0 31.805 11653.4\n2.97 -27423.8 0 31.4691 11653.4\n2.98 -30678.4 0 31.2828 11653.4\n2.99 -33735.5 0 31.281 11653.4\n3 -36558.1 0 31.4626 11653.4\n3.01 -39115.6 0 31.7913 11653.4\n3.02 -41383.9 0 32.2043 11653.4\n3.03 -43345.7 0 32.6257 11653.4\n3.04 -44989.8 0 32.9816 11653.4\n3.05 -46311.6 0 33.2121 11653.4\n3.06 -47312.7 0 33.2799 11653.4\n3.07 -48000.4 0 33.1752 11653.4\n3.08 -48388.2 0 32.9164 11653.4\n3.09 -48494.8 0 32.5479 11653.4\n3.1 -48344.1 0 32.1337 11653.4\n3.11 -47964.8 0 31.7475 11653.4\n3.12 -47389.8 0 31.46 11653.4\n3.13 -46655.4 0 31.3252 11653.4\n3.14 -45801.2 0 31.3678 11653.4\n3.15 -44868.4 0 31.5784 11653.4\n3.16 -43899.6 0 31.9156 11653.4\n3.17 -42937.2 0 32.3156 11653.4\n3.18 -42022.5 0 32.7054 11653.4\n3.19 -41194.4 0 33.0172 11653.4\n3.2 -40488.2 0 33.1983 11653.4\n3.21 -39933.9 0 33.2196 11653.4\n3.22 -39555.7 0 33.0783 11653.4\n3.23 -39370.2 0 32.7987 11653.4\n3.24 -39385.6 0 32.4286 11653.4\n3.25 -39601.1 0 32.0326 11653.4\n3.26 -40006.1 0 31.6816 11653.4\n3.27 -40579.8 0 31.4403 11653.4\n3.28 -41291.6 0 31.3539 11653.4\n3.29 -42101.2 0 31.4382 11653.4\n3.3 -42959.7 0 31.6762 11653.4\n3.31 -43809.9 0 32.0217 11653.4\n3.32 -44588.8 0 32.4106 11653.4\n3.33 -45228.6 0 32.7731 11653.4\n3.34 -45658.8 0 33.0468 11653.4\n3.35 -45809 0 33.1861 11653.4\n3.36 -45610.6 0 33.1689 11653.4\n3.37 -44999.9 0 32.999 11653.4\n3.38 -43919.8 0 32.7056 11653.4\n3.39 -42323.1 0 32.3393 11653.4\n3.4 -40173.9 0 31.9643 11653.4\n3.41 -37449.7 0 31.6484 11653.4\n3.42 -34143.3 0 31.4497 11653.4\n3.43 -30263.4 0 31.4054 11653.4\n3.44 -25835.3 0 31.523 11653.4\n3.45 -20901.6 0 31.779 11653.4\n3.46 -15521 0 32.1244 11653.4\n3.47 -9767.61 0 32.4953 11653.4\n3.48 -3729.62 0 32.8257 11653.4\n3.49 2492.93 0 33.0591 11653.4\n3.5 8790.54 0 33.1566 11653.4\n3.51 15047 0 33.103 11653.4\n3.52 21142.8 0 32.908 11653.4\n3.53 26957.7 0 32.6052 11653.4\n3.54 32375 0 32.2469 11653.4\n3.55 37284 0 31.8966 11653.4\n3.56 41584 0 31.6179 11653.4\n3.57 45186.2 0 31.4625 11653.4\n3.58 48017.3 0 31.4591 11653.4\n3.59 50020.8 0 31.6077 11653.4\n3.6 51159.1 0 31.8789 11653.4\n3.61 51414 0 32.2216 11653.4\n3.62 50787.8 0 32.5728 11653.4\n3.63 49302.3 0 32.8706 11653.4\n3.64 46998.7 0 33.0643 11653.4\n3.65 43935.9 0 33.1217 11653.4\n3.66 40188.6 0 33.0341 11653.4\n3.67 35844.8 0 32.8168 11653.4\n3.68 31003.6 0 32.5071 11653.4\n3.69 25772 0 32.1589 11653.4\n3.7 20261.5 0 31.8342 11653.4\n3.71 14585.3 0 31.5922 11653.4\n3.72 8855.41 0 31.4778 11653.4\n3.73 3179.21 0 31.5121 11653.4\n3.74 -2342.73 0 31.6877 11653.4\n3.75 -7619.03 0 31.9708 11653.4\n3.76 -12569.4 0 32.3081 11653.4\n3.77 -17125.9 0 32.6387 11653.4\n3.78 -21233.9 0 32.9046 11653.4\n3.79 -24852.4 0 33.0607 11653.4\n3.8 -27953.9 0 33.0815 11653.4\n3.81 -30523.7 0 32.9642 11653.4\n3.82 -32559.1 0 32.7292 11653.4\n3.83 -34067.9 0 32.4169 11653.4\n3.84 -35067.1 0 32.0821 11653.4\n3.85 -35580.5 0 31.7846 11653.4\n3.86 -35637.5 0 31.5791 11653.4\n3.87 -35271 0 31.5037 11653.4\n3.88 -34515.7 0 31.5721 11653.4\n3.89 -33406.5 0 31.7705 11653.4\n3.9 -31977.4 0 32.0609 11653.4\n3.91 -30260.2 0 32.3895 11653.4\n3.92 -28284.3 0 32.6972 11653.4\n3.93 -26076 0 32.9305 11653.4\n3.94 -23658.8 0 33.0501 11653.4\n3.95 -21053.8 0 33.0366 11653.4\n3.96 -18280.5 0 32.8928 11653.4\n3.97 -15357.4 0 32.6435 11653.4\n3.98 -12303.6 0 32.332 11653.4\n3.99 -9139.65 0 32.013 11653.4\n4 -5888.76 0 31.7441 11653.4\n4.01 -2578.12 0 31.5746 11653.4\n4.02 760.329 0 31.5361 11653.4\n4.03 4089.17 0 31.6352 11653.4\n4.04 7365.15 0 31.8525 11653.4\n4.05 10539.2 0 32.1467 11653.4\n4.06 13557 0 32.4638 11653.4\n4.07 16359.4 0 32.7473 11653.4\n4.08 18884.3 0 32.9482 11653.4\n4.09 21068 0 33.0328 11653.4\n4.1 22847 0 32.9875 11653.4\n4.11 24160.9 0 32.8205 11653.4\n4.12 24954.1 0 32.5607 11653.4\n4.13 25179 0 32.2531 11653.4\n4.14 24798.1 0 31.9523 11653.4\n4.15 23786.7 0 31.7128 11653.4\n4.16 22134.8 0 31.5785 11653.4\n4.17 19848.7 0 31.5745 11653.4\n4.18 16952.9 0 31.7008 11653.4\n4.19 13490 0 31.933 11653.4\n4.2 9521.46 0 32.2274 11653.4\n4.21 5126.58 0 32.5304 11653.4\n4.22 401.474 0 32.7883 11653.4\n4.23 -4542.97 0 32.9569 11653.4\n4.24 -9583.69 0 33.008 11653.4\n4.25 -14588.6 0 32.9337 11653.4\n4.26 -19420.2 0 32.7469 11653.4\n4.27 -23939.9 0 32.48 11653.4\n4.28 -28011.7 0 32.1795 11653.4\n4.29 -31507.2 0 31.899 11653.4\n4.3 -34309.6 0 31.6896 11653.4\n4.31 -36317.9 0 31.5897 11653.4\n4.32 -37450.4 0 31.6179 11653.4\n4.33 -37648.2 0 31.7682 11653.4\n4.34 -36877.6 0 32.0117 11653.4\n4.35 -35131.7 0 32.3032 11653.4\n4.36 -32431.8 0 32.5899 11653.4\n4.37 -28826.8 0 32.8214 11653.4\n4.38 -24392.9 0 32.9582 11653.4\n4.39 -19231.2 0 32.9776 11653.4\n4.4 -13465.5 0 32.8769 11653.4\n4.41 -7238.43 0 32.6736 11653.4\n4.42 -707.454 0 32.403 11653.4\n4.43 5959.94 0 32.1125 11653.4\n4.44 12591.4 0 31.8542 11653.4\n4.45 19014.8 0 31.6752 11653.4\n4.46 25064.3 0 31.6087 11653.4\n4.47 30584.7 0 31.6666 11653.4\n4.48 35437.1 0 31.8375 11653.4\n4.49 39502.6 0 32.089 11653.4\n4.5 42686.6 0 32.3746 11653.4\n4.51 44921.4 0 32.643 11653.4\n4.52 46168.3 0 32.8474 11653.4\n4.53 46418.3 0 32.953 11653.4\n4.54 45692.4 0 32.9425 11653.4\n4.55 44040.7 0 32.8181 11653.4\n4.56 41539.8 0 32.6014 11653.4\n4.57 38290.2 0 32.3301 11653.4\n4.58 34412.9 0 32.0521 11653.4\n4.59 30044.1 0 31.8173 11653.4\n4.6 25331.1 0 31.6688 11653.4\n4.61 20426.9 0 31.634 11653.4\n4.62 15484.4 0 31.719 11653.4\n4.63 10651.6 0 31.9073 11653.4\n4.64 6066.43 0 32.1633 11653.4\n4.65 1851.91 0 32.4403 11653.4\n4.66 -1887.54 0 32.6887 11653.4\n4.67 -5069.48 0 32.8655 11653.4\n4.68 -7635.8 0 32.9408 11653.4\n4.69 -9554.14 0 32.9022 11653.4\n4.7 -10818.4 0 32.7569 11653.4\n4.71 -11448 0 32.5299 11653.4\n4.72 -11486.8 0 32.2609 11653.4\n4.73 -11000.1 0 31.9975 11653.4\n4.74 -10072.1 0 31.7875 11653.4\n4.75 -8801.7 0 31.6692 11653.4\n4.76 -7298.05 0 31.6646 11653.4\n4.77 -5676.27 0 31.774 11653.4\n4.78 -4052.39 0 31.9764 11653.4\n4.79 -2538.71 0 32.234 11653.4\n4.8 -1239.22 0 32.4998 11653.4\n4.81 -245.526 0 32.7269 11653.4\n4.82 366.679 0 32.876 11653.4\n4.83 540.487 0 32.922 11653.4\n4.84 239.806 0 32.8576 11653.4\n4.85 -549.467 0 32.6941 11653.4\n4.86 -1819.18 0 32.46 11653.4\n4.87 -3539.58 0 32.1961 11653.4\n4.88 -5660.81 0 31.9497 11653.4\n4.89 -8115.23 0 31.7653 11653.4\n4.9 -10820.4 0 31.677 11653.4\n4.91 -13682.8 0 31.7009 11653.4\n4.92 -16601.4 0 31.832 11653.4\n4.93 -19472.6 0 32.0454 11653.4\n4.94 -22193.9 0 32.3017 11653.4\n4.95 -24668.2 0 32.5543 11653.4\n4.96 -26808.1 0 32.7589 11653.4\n4.97 -28539.1 0 32.8804 11653.4\n4.98 -29802.4 0 32.8983 11653.4\n4.99 -30557.5 0 32.8101 11653.4\n5 -30783.4 0 32.6311 11653.4\n5.01 -30479.2 0 32.3926 11653.4\n5.02 -29663.8 0 32.1365 11653.4\n5.03 -28375.4 0 31.9087 11653.4\n5.04 -26668.9 0 31.7506 11653.4\n5.05 -24613.9 0 31.6915 11653.4\n5.06 -22291.2 0 31.7419 11653.4\n5.07 -19789.8 0 31.8921 11653.4\n5.08 -17202.2 0 32.1136 11653.4\n5.09 -14621.1 0 32.3658 11653.4\n5.1 -12135.1 0 32.6034 11653.4\n5.11 -9824.96 0 32.7847 11653.4\n5.12 -7760.23 0 32.8787 11653.4\n5.13 -5996.2 0 32.8699 11653.4\n5.14 -4571.74 0 32.76 11653.4\n5.15 -3507.64 0 32.5683 11653.4\n5.16 -2805.86 0 32.3282 11653.4\n5.17 -2449.52 0 32.082 11653.4\n5.18 -2403.76 0 31.8741 11653.4\n5.19 -2617.36 0 31.7425 11653.4\n5.2 -3025.07 0 31.7114 11653.4\n5.21 -3550.57 0 31.7862 11653.4\n5.22 -4109.92 0 31.9525 11653.4\n5.23 -4615.34 0 32.1793 11653.4\n5.24 -4979.24 0 32.425 11653.4\n5.25 -5118.18 0 32.6458 11653.4\n5.26 -4956.82 0 32.8032 11653.4\n5.27 -4431.42 0 32.8705 11653.4\n5.28 -3493.02 0 32.8365 11653.4\n5.29 -2109.91 0 32.7073 11653.4\n5.3 -269.517 0 32.5055 11653.4\n5.31 2020.58 0 32.2664 11653.4\n5.32 4732.38 0 32.0322 11653.4\n5.33 7818.11 0 31.8455 11653.4\n5.34 11211.6 0 31.7403 11653.4\n5.35 14830.6 0 31.7359 11653.4\n5.36 18579.5 0 31.8329 11653.4\n5.37 22352.9 0 32.0126 11653.4\n5.38 26039.7 0 32.2418 11653.4\n5.39 29526.9 0 32.4788 11653.4\n5.4 32704.2 0 32.6816 11653.4\n5.41 35468.4 0 32.8149 11653.4\n5.42 37727 0 32.8563 11653.4\n5.43 39402.4 0 32.799 11653.4\n5.44 40434.8 0 32.6531 11653.4\n5.45 40784.7 0 32.4441 11653.4\n5.46 40434.7 0 32.2086 11653.4\n5.47 39390.4 0 31.9886 11653.4\n5.48 37680.7 0 31.824 11653.4\n5.49 35356.5 0 31.7449 11653.4\n5.5 32489.4 0 31.7659 11653.4\n5.51 29169.3 0 31.8825 11653.4\n5.52 25501.1 0 32.0729 11653.4\n5.53 21601.1 0 32.3017 11653.4\n5.54 17592.6 0 32.5278 11653.4\n5.55 13602.1 0 32.7112 11653.4\n5.56 9754.06 0 32.8202 11653.4\n5.57 6166.96 0 32.8366 11653.4\n5.58 2948.83 0 32.7578 11653.4\n5.59 193.521 0 32.5976 11653.4\n5.6 -2022.63 0 32.384 11653.4\n5.61 -3643.41 0 32.1546 11653.4\n5.62 -4634.59 0 31.9505 11653.4\n5.63 -4984.98 0 31.8088 11653.4\n5.64 -4706.62 0 31.7556 11653.4\n5.65 -3834.09 0 31.8003 11653.4\n5.66 -2422.95 0 31.9344 11653.4\n5.67 -547.494 0 32.1327 11653.4\n5.68 1702.24 0 32.3587 11653.4\n5.69 4224.06 0 32.572 11653.4\n5.7 6907.51 0 32.735 11653.4\n5.71 9638.21 0 32.8198 11653.4\n5.72 12302.2 0 32.8121 11653.4\n5.73 14790.1 0 32.7136 11653.4\n5.74 17001.4 0 32.5414 11653.4\n5.75 18848.2 0 32.3257 11653.4\n5.76 20258.3 0 32.1045 11653.4\n5.77 21177.7 0 31.9177 11653.4\n5.78 21572.7 0 31.7993 11653.4\n5.79 21430.9 0 31.771 11653.4\n5.8 20761.5 0 31.8378 11653.4\n5.81 19594.7 0 31.9869 11653.4\n5.82 17980.4 0 32.1905 11653.4\n5.83 15986.3 0 32.4116 11653.4\n5.84 13694.7 0 32.6105 11653.4\n5.85 11200 0 32.7527 11653.4\n5.86 8604.33 0 32.8137 11653.4\n5.87 6014.04 0 32.7834 11653.4\n5.88 3535.52 0 32.6673 11653.4\n5.89 1271.19 0 32.4856 11653.4\n5.9 -684.316 0 32.2702 11653.4\n5.91 -2247.67 0 32.0593 11653.4\n5.92 -3349.88 0 31.891 11653.4\n5.93 -3938.83 0 31.796 11653.4\n5.94 -3981.07 0 31.7916 11653.4\n5.95 -3463.01 0 31.8785 11653.4\n5.96 -2391.3 0 32.04 11653.4\n5.97 -792.533 0 32.2464 11653.4\n5.98 1287.86 0 32.4602 11653.4\n5.99 3787.26 0 32.6433 11653.4\n6 6628.25 0 32.764 11653.4\n6.01 9721.36 0 32.8018 11653.4\n6.02 12968.3 0 32.7503 11653.4\n6.03 16265.4 0 32.6189 11653.4\n6.04 19507.2 0 32.4303 11653.4\n6.05 22590.1 0 32.2177 11653.4\n6.06 25415.7 0 32.0192 11653.4\n6.07 27894.2 0 31.8705 11653.4\n6.08 29947.2 0 31.7989 11653.4\n6.09 31509.7 0 31.8175 11653.4\n6.1 32532.6 0 31.9224 11653.4\n6.11 32983.4 0 32.094 11653.4\n6.12 32847.5 0 32.3006 11653.4\n6.13 32127.3 0 32.505 11653.4\n6.14 30842.7 0 32.671 11653.4\n6.15 29029.1 0 32.77 11653.4\n6.16 26736.4 0 32.785 11653.4\n6.17 24026.6 0 32.7139 11653.4\n6.18 20971.6 0 32.569 11653.4\n6.19 17650.4 0 32.3758 11653.4\n6.2 14146.5 0 32.1684 11653.4\n6.21 10545.2 0 31.9838 11653.4\n6.22 6930.78 0 31.8556 11653.4\n6.23 3383.92 0 31.8073 11653.4\n6.24 -20.3692 0 31.8476 11653.4\n6.25 -3214.8 0 31.9686 11653.4\n6.26 -6141.32 0 32.1479 11653.4\n6.27 -8752.24 0 32.3525 11653.4\n6.28 -11010.9 0 32.5457 11653.4\n6.29 -12892 0 32.6936 11653.4\n6.3 -14381.3 0 32.7706 11653.4\n6.31 -15475 0 32.7637 11653.4\n6.32 -16179.1 0 32.6743 11653.4\n6.33 -16507.9 0 32.5182 11653.4\n6.34 -16482.9 0 32.3225 11653.4\n6.35 -16130.8 0 32.1221 11653.4\n6.36 -15482.5 0 31.9529 11653.4\n6.37 -14571 0 31.8458 11653.4\n6.38 -13430 0 31.8202 11653.4\n6.39 -12092.8 0 31.8808 11653.4\n6.4 -10591 0 32.0161 11653.4\n6.41 -8953.12 0 32.2009 11653.4\n6.42 -7204.83 0 32.4015 11653.4\n6.43 -5367.8 0 32.5822 11653.4\n6.44 -3460 0 32.7113 11653.4\n6.45 -1495.73 0 32.7666 11653.4\n6.46 513.937 0 32.7388 11653.4\n6.47 2560.53 0 32.6329 11653.4\n6.48 4637.47 0 32.4675 11653.4\n6.49 6739.13 0 32.2715 11653.4\n6.5 8860.04 0 32.0798 11653.4\n6.51 10993.9 0 31.9269 11653.4\n6.52 13132.8 0 31.8408 11653.4\n6.53 15266.5 0 31.8371 11653.4\n6.54 17382.1 0 31.9163 11653.4\n6.55 19463.2 0 32.0636 11653.4\n6.56 21490.6 0 32.2516 11653.4\n6.57 23441.5 0 32.4464 11653.4\n6.58 25290.7 0 32.6134 11653.4\n6.59 27010.6 0 32.7235 11653.4\n6.6 28572.4 0 32.7577 11653.4\n6.61 29946.9 0 32.7106 11653.4\n6.62 31105.5 0 32.5903 11653.4\n6.63 32021.5 0 32.418 11653.4\n6.64 32671.4 0 32.2239 11653.4\n6.65 33035.7 0 32.0427 11653.4\n6.66 33100.4 0 31.9071 11653.4\n6.67 32857.5 0 31.8419 11653.4\n6.68 32306 0 31.8589 11653.4\n6.69 31452.2 0 31.9548 11653.4\n6.7 30310.2 0 32.1115 11653.4\n6.71 28901.6 0 32.3004 11653.4\n6.72 27255 0 32.4873 11653.4\n6.73 25405.9 0 32.6393 11653.4\n6.74 23395.4 0 32.7299 11653.4\n6.75 21269.1 0 32.7437 11653.4\n6.76 19075.8 0 32.6786 11653.4\n6.77 16866.2 0 32.546 11653.4\n6.78 14691 0 32.3692 11653.4\n6.79 12599.5 0 32.1793 11653.4\n6.8 10637.8 0 32.0104 11653.4\n6.81 8847.7 0 31.8931 11653.4\n6.82 7264.77 0 31.8488 11653.4\n6.83 5917.6 0 31.8855 11653.4\n6.84 4826.72 0 31.9961 11653.4\n6.85 4003.95 0 32.1601 11653.4\n6.86 3452.07 0 32.3475 11653.4\n6.87 3164.8 0 32.5247 11653.4\n6.88 3127.07 0 32.6604 11653.4\n6.89 3315.64 0 32.7313 11653.4\n6.9 3700 0 32.7252 11653.4\n6.91 4243.46 0 32.6434 11653.4\n6.92 4904.55 0 32.5003 11653.4\n6.93 5638.51 0 32.321 11653.4\n6.94 6398.87 0 32.1373 11653.4\n6.95 7139.12 0 31.9821 11653.4\n6.96 7814.33 0 31.8836 11653.4\n6.97 8382.69 0 31.8599 11653.4\n6.98 8806.92 0 31.9151 11653.4\n6.99 9055.48 0 32.0388 11653.4\n7 9103.57 0 32.2081 11653.4\n7.01 8933.84 0 32.3921 11653.4\n7.02 8536.83 0 32.5581 11653.4\n7.03 7911.14 0 32.677 11653.4\n7.04 7063.23 0 32.7282 11653.4\n7.05 6007.04 0 32.7031 11653.4\n7.06 4763.23 0 32.6063 11653.4\n7.07 3358.29 0 32.4547 11653.4\n7.08 1823.43 0 32.275 11653.4\n7.09 193.29 0 32.0992 11653.4\n7.1 -1495.39 0 31.9589 11653.4\n7.11 -3205.16 0 31.8796 11653.4\n7.12 -4899.22 0 31.8759 11653.4\n7.13 -6542.74 0 31.9482 11653.4\n7.14 -8104.01 0 32.0829 11653.4\n7.15 -9555.48 0 32.2552 11653.4\n7.16 -10874.6 0 32.434 11653.4\n7.17 -12044.3 0 32.5875 11653.4\n7.18 -13053.6 0 32.6887 11653.4\n7.19 -13897.6 0 32.7205 11653.4\n7.2 -14577.1 0 32.6774 11653.4\n7.21 -15098.8 0 32.5671 11653.4\n7.22 -15474.3 0 32.409 11653.4\n7.23 -15719.5 0 32.2309 11653.4\n7.24 -15853.7 0 32.0646 11653.4\n7.25 -15898.8 0 31.9401 11653.4\n7.26 -15877.8 0 31.8803 11653.4\n7.27 -15814.5 0 31.8958 11653.4\n7.28 -15731.7 0 31.9837 11653.4\n7.29 -15650.6 0 32.1276 11653.4\n7.3 -15590.2 0 32.3011 11653.4\n7.31 -15566.1 0 32.4729 11653.4\n7.32 -15590.3 0 32.6127 11653.4\n7.33 -15670.8 0 32.6961 11653.4\n7.34 -15811.3 0 32.7088 11653.4\n7.35 -16011.4 0 32.6489 11653.4\n7.36 -16266.7 0 32.5268 11653.4\n7.37 -16569.2 0 32.364 11653.4\n7.38 -16907.8 0 32.1892 11653.4\n7.39 -17269.2 0 32.0338 11653.4\n7.4 -17638 0 31.9259 11653.4\n7.41 -17998.4 0 31.8851 11653.4\n7.42 -18334 0 31.9188 11653.4\n7.43 -18629.6 0 32.0206 11653.4\n7.44 -18870.9 0 32.1716 11653.4\n7.45 -19046.2 0 32.3442 11653.4\n7.46 -19145.9 0 32.5076 11653.4\n7.47 -19163.9 0 32.6328 11653.4\n7.48 -19097.1 0 32.6982 11653.4\n7.49 -18945.8 0 32.6926 11653.4\n7.5 -18713.8 0 32.6173 11653.4\n7.51 -18407.9 0 32.4853 11653.4\n7.52 -18037.9 0 32.3199 11653.4\n7.53 -17616 0 32.1505 11653.4\n7.54 -17156.1 0 32.0074 11653.4\n7.55 -16673.3 0 31.9166 11653.4\n7.56 -16183.6 0 31.8946 11653.4\n7.57 -15702.5 0 31.9453 11653.4\n7.58 -15245 0 32.0592 11653.4\n7.59 -14824.6 0 32.2152 11653.4\n7.6 -14453.1 0 32.385 11653.4\n7.61 -14139.6 0 32.5383 11653.4\n7.62 -13891 0 32.6481 11653.4\n7.63 -13710.8 0 32.6954 11653.4\n7.64 -13599.8 0 32.6723 11653.4\n7.65 -13555.8 0 32.5829 11653.4\n7.66 -13573.8 0 32.4429 11653.4\n7.67 -13646.2 0 32.277 11653.4\n7.68 -13763.5 0 32.1146 11653.4\n7.69 -13914.3 0 31.9851 11653.4\n7.7 -14086.2 0 31.9119 11653.4\n7.71 -14266.3 0 31.9083 11653.4\n7.72 -14441.5 0 31.9749 11653.4\n7.73 -14599.3 0 32.0992 11653.4\n7.74 -14728.4 0 32.2584 11653.4\n7.75 -14818.8 0 32.4236 11653.4\n7.76 -14862.6 0 32.5654 11653.4\n7.77 -14853.9 0 32.6591 11653.4\n7.78 -14789.3 0 32.6885 11653.4\n7.79 -14667.9 0 32.6487 11653.4\n7.8 -14491.1 0 32.5467 11653.4\n7.81 -14262.6 0 32.4004 11653.4\n7.82 -13988.3 0 32.2357 11653.4\n7.83 -13675.8 0 32.0819 11653.4\n7.84 -13333.9 0 31.9668 11653.4\n7.85 -12972.5 0 31.9114 11653.4\n7.86 -12602.2 0 31.9257 11653.4\n7.87 -12233.4 0 32.0069 11653.4\n7.88 -11875.9 0 32.1398 11653.4\n7.89 -11539.2 0 32.3003 11653.4\n7.9 -11231.2 0 32.4593 11653.4\n7.91 -10958.4 0 32.5887 11653.4\n7.92 -10725.5 0 32.666 11653.4\n7.93 -10535.6 0 32.6778 11653.4\n7.94 -10389.6 0 32.6223 11653.4\n7.95 -10286.6 0 32.5092 11653.4\n7.96 -10223.9 0 32.3584 11653.4\n7.97 -10197.2 0 32.1966 11653.4\n7.98 -10200.9 0 32.0528 11653.4\n7.99 -10228.4 0 31.9529 11653.4\n8 -10272.4 0 31.9151 11653.4\n8.01 -10325.1 0 31.9463 11653.4\n8.02 -10379 0 32.0406 11653.4\n8.03 -10426.7 0 32.1804 11653.4\n8.04 -10461.9 0 32.3403 11653.4\n8.05 -10478.9 0 32.4917 11653.4\n8.06 -10473.4 0 32.6079 11653.4\n8.07 -10442.3 0 32.6685 11653.4\n8.08 -10384.1 0 32.6633 11653.4\n8.09 -10298.7 0 32.5934 11653.4\n8.1 -10187.4 0 32.471 11653.4\n8.11 -10052.5 0 32.3176 11653.4\n8.12 -9897.85 0 32.1605 11653.4\n8.13 -9727.82 0 32.0279 11653.4\n8.14 -9547.51 0 31.9437 11653.4\n8.15 -9362.28 0 31.9234 11653.4\n8.16 -9177.53 0 31.9705 11653.4\n8.17 -8998.39 0 32.0762 11653.4\n8.18 -8829.43 0 32.221 11653.4\n8.19 -8674.47 0 32.3786 11653.4\n8.2 -8536.37 0 32.5209 11653.4\n8.21 -8416.89 0 32.6229 11653.4\n8.22 -8316.64 0 32.6669 11653.4\n8.23 -8235.01 0 32.6454 11653.4\n8.24 -8170.27 0 32.5623 11653.4\n8.25 -8119.63 0 32.4322 11653.4\n8.26 -8079.43 0 32.278 11653.4\n8.27 -8045.31 0 32.1272 11653.4\n8.28 -8012.45 0 32.0069 11653.4\n8.29 -7975.84 0 31.9389 11653.4\n8.3 -7930.52 0 31.9357 11653.4\n8.31 -7871.84 0 31.9976 11653.4\n8.32 -7795.73 0 32.1131 11653.4\n8.33 -7698.89 0 32.261 11653.4\n8.34 -7578.98 0 32.4146 11653.4\n8.35 -7434.73 0 32.5466 11653.4\n8.36 -7266.05 0 32.6338 11653.4\n8.37 -7074.02 0 32.6613 11653.4\n8.38 -6860.87 0 32.6243 11653.4\n8.39 -6629.86 0 32.5294 11653.4\n8.4 -6385.18 0 32.3934 11653.4\n8.41 -6131.7 0 32.2402 11653.4\n8.42 -5874.82 0 32.0972 11653.4\n8.43 -5620.14 0 31.9902 11653.4\n8.44 -5373.26 0 31.9387 11653.4\n8.45 -5139.48 0 31.9519 11653.4\n8.46 -4923.57 0 32.0273 11653.4\n8.47 -4729.52 0 32.1509 11653.4\n8.48 -4560.36 0 32.3001 11653.4\n8.49 -4418.01 0 32.448 11653.4\n8.5 -4303.19 0 32.5685 11653.4\n8.51 -4215.34 0 32.6405 11653.4\n8.52 -4152.67 0 32.6515 11653.4\n8.53 -4112.2 0 32.5998 11653.4\n8.54 -4089.92 0 32.4945 11653.4\n8.55 -4080.92 0 32.3542 11653.4\n8.56 -4079.62 0 32.2037 11653.4\n8.57 -4080.05 0 32.0699 11653.4\n8.58 -4076.04 0 31.9771 11653.4\n8.59 -4061.55 0 31.9421 11653.4\n8.6 -4030.95 0 31.9712 11653.4\n8.61 -3979.2 0 32.059 11653.4\n8.62 -3902.14 0 32.1892 11653.4\n8.63 -3796.67 0 32.3381 11653.4\n8.64 -3660.86 0 32.4791 11653.4\n8.65 -3494.07 0 32.5873 11653.4\n8.66 -3296.98 0 32.6437 11653.4\n8.67 -3071.54 0 32.6388 11653.4\n8.68 -2820.91 0 32.5735 11653.4\n8.69 -2549.34 0 32.4592 11653.4\n8.7 -2261.95 0 32.3162 11653.4\n8.71 -1964.54 0 32.1698 11653.4\n8.72 -1663.34 0 32.0463 11653.4\n8.73 -1364.73 0 31.9681 11653.4\n8.74 -1074.98 0 31.9493 11653.4\n8.75 -799.962 0 31.9934 11653.4\n8.76 -544.924 0 32.092 11653.4\n8.77 -314.261 0 32.2271 11653.4\n8.78 -111.325 0 32.3742 11653.4\n8.79 61.7014 0 32.507 11653.4\n8.8 203.898 0 32.6022 11653.4\n8.81 315.629 0 32.6432 11653.4\n8.82 398.525 0 32.623 11653.4\n8.83 455.389 0 32.5453 11653.4\n8.84 490.075 0 32.4238 11653.4\n8.85 507.3 0 32.2798 11653.4\n8.86 512.434 0 32.1391 11653.4\n8.87 511.258 0 32.0269 11653.4\n8.88 509.701 0 31.9636 11653.4\n8.89 513.58 0 31.9606 11653.4\n8.9 528.34 0 32.0185 11653.4\n8.91 558.819 0 32.1263 11653.4\n8.92 609.034 0 32.2645 11653.4\n8.93 682.01 0 32.4081 11653.4\n8.94 779.654 0 32.5314 11653.4\n8.95 902.673 0 32.6129 11653.4\n8.96 1050.56 0 32.6384 11653.4\n8.97 1221.6 0 32.6037 11653.4\n8.98 1413 0 32.5149 11653.4\n8.99 1620.96 0 32.3876 11653.4\n9 1840.91 0 32.2444 11653.4\n9.01 2067.66 0 32.1108 11653.4\n9.02 2295.67 0 32.0108 11653.4\n9.03 2519.3 0 31.9627 11653.4\n9.04 2733.02 0 31.9751 11653.4\n9.05 2931.72 0 32.0457 11653.4\n9.06 3110.86 0 32.1613 11653.4\n9.07 3266.72 0 32.301 11653.4\n9.08 3396.55 0 32.4395 11653.4\n9.09 3498.66 0 32.5523 11653.4\n9.1 3572.51 0 32.6198 11653.4\n9.11 3618.73 0 32.6301 11653.4\n9.12 3639.05 0 32.5818 11653.4\n9.13 3636.26 0 32.4832 11653.4\n9.14 3614.03 0 32.3518 11653.4\n9.15 3576.8 0 32.2109 11653.4\n9.16 3529.49 0 32.0856 11653.4\n9.17 3477.37 0 31.9986 11653.4\n9.18 3425.76 0 31.9656 11653.4\n9.19 3379.81 0 31.9927 11653.4\n9.2 3344.26 0 32.0746 11653.4\n9.21 3323.28 0 32.1964 11653.4\n9.22 3320.2 0 32.3358 11653.4\n9.23 3337.47 0 32.4678 11653.4\n9.24 3376.46 0 32.5692 11653.4\n9.25 3437.49 0 32.6222 11653.4\n9.26 3519.78 0 32.6178 11653.4\n9.27 3621.5 0 32.5568 11653.4\n9.28 3739.89 0 32.45 11653.4\n9.29 3871.36 0 32.3162 11653.4\n9.3 4011.7 0 32.1793 11653.4\n9.31 4156.27 0 32.0637 11653.4\n9.32 4300.19 0 31.9904 11653.4\n9.33 4438.63 0 31.9727 11653.4\n9.34 4566.99 0 32.0138 11653.4\n9.35 4681.16 0 32.1059 11653.4\n9.36 4777.68 0 32.2321 11653.4\n9.37 4853.93 0 32.3697 11653.4\n9.38 4908.25 0 32.4939 11653.4\n9.39 4940.04 0 32.5829 11653.4\n9.4 4949.79 0 32.6212 11653.4\n9.41 4939.06 0 32.6023 11653.4\n9.42 4910.43 0 32.5295 11653.4\n9.43 4867.4 0 32.4157 11653.4\n9.44 4814.21 0 32.281 11653.4\n9.45 4755.7 0 32.1493 11653.4\n9.46 4697.09 0 32.0444 11653.4\n9.47 4643.71 0 31.9853 11653.4\n9.48 4600.81 0 31.9826 11653.4\n9.49 4573.31 0 32.0368 11653.4\n9.5 4565.58 0 32.1378 11653.4\n9.51 4581.23 0 32.2672 11653.4\n9.52 4622.97 0 32.4016 11653.4\n9.53 4692.47 0 32.517 11653.4\n9.54 4790.24 0 32.5932 11653.4\n9.55 4915.69 0 32.6169 11653.4\n9.56 5067.05 0 32.5842 11653.4\n9.57 5241.47 0 32.5008 11653.4\n9.58 5435.18 0 32.3814 11653.4\n9.59 5643.56 0 32.2471 11653.4\n9.6 5861.43 0 32.1219 11653.4\n9.61 6083.16 0 32.0285 11653.4\n9.62 6303 0 31.9836 11653.4\n9.63 6515.29 0 31.9954 11653.4\n9.64 6714.69 0 32.0618 11653.4\n9.65 6896.42 0 32.1703 11653.4\n9.66 7056.47 0 32.3012 11653.4\n9.67 7191.76 0 32.4311 11653.4\n9.68 7300.29 0 32.5367 11653.4\n9.69 7381.2 0 32.5997 11653.4\n9.7 7434.85 0 32.6091 11653.4\n9.71 7462.76 0 32.5633 11653.4\n9.72 7467.55 0 32.4706 11653.4\n9.73 7452.86 0 32.347 11653.4\n9.74 7423.17 0 32.2147 11653.4\n9.75 7383.57 0 32.0973 11653.4\n9.76 7339.6 0 32.0158 11653.4\n9.77 7296.95 0 31.9853 11653.4\n9.78 7261.23 0 32.011 11653.4\n9.79 7237.71 0 32.0882 11653.4\n9.8 7231.08 0 32.2028 11653.4\n9.81 7245.23 0 32.3338 11653.4\n9.82 7283.07 0 32.4579 11653.4\n9.83 7346.35 0 32.553 11653.4\n9.84 7435.63 0 32.6025 11653.4\n9.85 7550.15 0 32.598 11653.4\n9.86 7687.89 0 32.5403 11653.4\n9.87 7845.6 0 32.4395 11653.4\n9.88 8018.92 0 32.3134 11653.4\n9.89 8202.53 0 32.1845 11653.4\n9.9 8390.37 0 32.0759 11653.4\n9.91 8575.81 0 32.0072 11653.4\n9.92 8751.99 0 31.9908 11653.4\n9.93 8912.02 0 32.0296 11653.4\n9.94 9049.27 0 32.1165 11653.4\n9.95 9157.66 0 32.2356 11653.4\n9.96 9231.85 0 32.3652 11653.4\n9.97 9267.53 0 32.4822 11653.4\n9.98 9261.52 0 32.566 11653.4\n9.99 9211.95 0 32.602 11653.4\n10 9118.33 0 32.584 11653.4\n10.01 8981.58 0 32.5152 11653.4\n10.02 8804.03 0 32.4078 11653.4\n10.03 8589.28 0 32.2807 11653.4\n10.04 8342.15 0 32.1567 11653.4\n10.05 8068.44 0 32.0579 11653.4\n10.06 7774.76 0 32.0022 11653.4\n10.07 7468.26 0 31.9998 11653.4\n10.08 7156.4 0 32.051 11653.4\n10.09 6846.65 0 32.1463 11653.4\n10.1 6546.23 0 32.2684 11653.4\n10.11 6261.84 0 32.3952 11653.4\n10.12 5999.45 0 32.5041 11653.4\n10.13 5764.06 0 32.576 11653.4\n10.14 5559.56 0 32.5984 11653.4\n10.15 5388.59 0 32.5676 11653.4\n10.16 5252.45 0 32.4889 11653.4\n10.17 5151.12 0 32.3762 11653.4\n10.18 5083.26 0 32.2496 11653.4\n10.19 5046.26 0 32.1315 11653.4\n10.2 5036.45 0 32.0433 11653.4\n10.21 5049.17 0 32.0009 11653.4\n10.22 5079.03 0 32.012 11653.4\n10.23 5120.12 0 32.0744 11653.4\n10.24 5166.23 0 32.1767 11653.4\n10.25 5211.12 0 32.3002 11653.4\n10.26 5248.78 0 32.4228 11653.4\n10.27 5273.6 0 32.5226 11653.4\n10.28 5280.65 0 32.5821 11653.4\n10.29 5265.79 0 32.5912 11653.4\n10.3 5225.86 0 32.5482 11653.4\n10.31 5158.78 0 32.4608 11653.4\n10.32 5063.57 0 32.3445 11653.4\n10.33 4940.39 0 32.2197 11653.4\n10.34 4790.51 0 32.109 11653.4\n10.35 4616.21 0 32.0321 11653.4\n10.36 4420.66 0 32.0032 11653.4\n10.37 4207.82 0 32.0273 11653.4\n10.38 3982.21 0 32.0999 11653.4\n10.39 3748.74 0 32.2078 11653.4\n10.4 3512.52 0 32.3313 11653.4\n10.41 3278.61 0 32.4483 11653.4\n10.42 3051.89 0 32.5381 11653.4\n10.43 2836.82 0 32.5849 11653.4\n10.44 2637.3 0 32.5808 11653.4\n10.45 2456.54 0 32.5264 11653.4\n10.46 2296.97 0 32.4315 11653.4\n10.47 2160.15 0 32.3128 11653.4\n10.48 2046.79 0 32.1913 11653.4\n10.49 1956.69 0 32.0889 11653.4\n10.5 1888.87 0 32.0241 11653.4\n10.51 1841.61 0 32.0085 11653.4\n10.52 1812.55 0 32.0451 11653.4\n10.53 1798.86 0 32.1269 11653.4\n10.54 1797.34 0 32.239 11653.4\n10.55 1804.65 0 32.3611 11653.4\n10.56 1817.38 0 32.4714 11653.4\n10.57 1832.28 0 32.5505 11653.4\n10.58 1846.37 0 32.5845 11653.4\n10.59 1857.06 0 32.5676 11653.4\n10.6 1862.27 0 32.5028 11653.4\n10.61 1860.47 0 32.4016 11653.4\n10.62 1850.78 0 32.2819 11653.4\n10.63 1832.9 0 32.165 11653.4\n10.64 1807.16 0 32.0719 11653.4\n10.65 1774.42 0 32.0195 11653.4\n10.66 1736.04 0 32.0172 11653.4\n10.67 1693.72 0 32.0654 11653.4\n10.68 1649.45 0 32.1551 11653.4\n10.69 1605.31 0 32.2701 11653.4\n10.7 1563.38 0 32.3895 11653.4\n10.71 1525.62 0 32.4921 11653.4\n10.72 1493.69 0 32.5598 11653.4\n10.73 1468.89 0 32.5809 11653.4\n10.74 1452.05 0 32.5517 11653.4\n10.75 1443.46 0 32.4775 11653.4\n10.76 1442.86 0 32.3713 11653.4\n10.77 1449.37 0 32.252 11653.4\n10.78 1461.57 0 32.1409 11653.4\n10.79 1477.53 0 32.0579 11653.4\n10.8 1494.88 0 32.0182 11653.4\n10.81 1510.94 0 32.0288 11653.4\n10.82 1522.8 0 32.0879 11653.4\n10.83 1527.5 0 32.1843 11653.4\n10.84 1522.14 0 32.3008 11653.4\n10.85 1504.06 0 32.4163 11653.4\n10.86 1470.95 0 32.5102 11653.4\n10.87 1420.99 0 32.5662 11653.4\n10.88 1353 0 32.5745 11653.4\n10.89 1266.44 0 32.5337 11653.4\n10.9 1161.59 0 32.4511 11653.4\n10.91 1039.45 0 32.3412 11653.4\n10.92 901.86 0 32.2236 11653.4\n10.93 751.359 0 32.1193 11653.4\n10.94 591.184 0 32.0471 11653.4\n10.95 425.136 0 32.0201 11653.4\n10.96 257.463 0 32.0432 11653.4\n10.97 92.7038 0 32.112 11653.4\n10.98 -64.4775 0 32.2139 11653.4\n10.99 -209.468 0 32.3305 11653.4\n11 -337.889 0 32.4409 11653.4\n11.01 -445.769 0 32.5255 11653.4\n11.02 -529.711 0 32.5694 11653.4\n11.03 -587.037 0 32.5652 11653.4\n11.04 -615.91 0 32.5136 11653.4\n11.05 -615.429 0 32.4237 11653.4\n11.06 -585.681 0 32.3115 11653.4\n11.07 -527.766 0 32.1969 11653.4\n11.08 -443.782 0 32.1005 11653.4\n11.09 -336.766 0 32.0397 11653.4\n11.1 -210.605 0 32.0255 11653.4\n11.11 -69.9154 0 32.0604 11653.4\n11.12 80.1157 0 32.138 11653.4\n11.13 233.901 0 32.2441 11653.4\n11.14 385.649 0 32.3595 11653.4\n11.15 529.56 0 32.4636 11653.4\n11.16 660.037 0 32.538 11653.4\n11.17 771.877 0 32.5697 11653.4\n11.18 860.457 0 32.5533 11653.4\n11.19 921.897 0 32.4916 11653.4\n11.2 953.197 0 32.3957 11653.4\n11.21 952.343 0 32.2824 11653.4\n11.22 918.374 0 32.172 11653.4\n11.23 851.413 0 32.0843 11653.4\n11.24 752.659 0 32.0352 11653.4\n11.25 624.341 0 32.0336 11653.4\n11.26 469.63 0 32.0797 11653.4\n11.27 292.521 0 32.1651 11653.4\n11.28 97.6872 0 32.2741 11653.4\n11.29 -109.695 0 32.3871 11653.4\n11.3 -324.129 0 32.4841 11653.4\n11.31 -540.002 0 32.5478 11653.4\n11.32 -751.779 0 32.5673 11653.4\n11.33 -954.201 0 32.5391 11653.4\n11.34 -1142.47 0 32.4684 11653.4\n11.35 -1312.39 0 32.3675 11653.4\n11.36 -1460.55 0 32.2543 11653.4\n11.37 -1584.38 0 32.1492 11653.4\n11.38 -1682.24 0 32.0709 11653.4\n11.39 -1753.49 0 32.0337 11653.4\n11.4 -1798.45 0 32.0443 11653.4\n11.41 -1818.35 0 32.1007 11653.4\n11.42 -1815.31 0 32.1925 11653.4\n11.43 -1792.21 0 32.303 11653.4\n11.44 -1752.55 0 32.4125 11653.4\n11.45 -1700.32 0 32.5014 11653.4\n11.46 -1639.79 0 32.5541 11653.4\n11.47 -1575.42 0 32.5615 11653.4\n11.48 -1511.59 0 32.5223 11653.4\n11.49 -1452.48 0 32.4435 11653.4\n11.5 -1401.91 0 32.339 11653.4\n11.51 -1363.19 0 32.2273 11653.4\n11.52 -1339 0 32.1285 11653.4\n11.53 -1331.29 0 32.0603 11653.4\n11.54 -1341.26 0 32.0351 11653.4\n11.55 -1369.28 0 32.0574 11653.4\n11.56 -1414.94 0 32.123 11653.4\n11.57 -1477.08 0 32.2201 11653.4\n11.58 -1553.81 0 32.3308 11653.4\n11.59 -1642.69 0 32.4355 11653.4\n11.6 -1740.76 0 32.5156 11653.4\n11.61 -1844.73 0 32.5569 11653.4\n11.62 -1951.1 0 32.5525 11653.4\n11.63 -2056.32 0 32.503 11653.4\n11.64 -2156.93 0 32.4173 11653.4\n11.65 -2249.73 0 32.3105 11653.4\n11.66 -2331.85 0 32.2016 11653.4\n11.67 -2400.92 0 32.1101 11653.4\n11.68 -2455.15 0 32.0526 11653.4\n11.69 -2493.35 0 32.0394 11653.4\n11.7 -2515.02 0 32.073 11653.4\n11.71 -2520.35 0 32.1471 11653.4\n11.72 -2510.14 0 32.2481 11653.4\n11.73 -2485.86 0 32.3579 11653.4\n11.74 -2449.46 0 32.4568 11653.4\n11.75 -2403.37 0 32.5273 11653.4\n11.76 -2350.36 0 32.5571 11653.4\n11.77 -2293.38 0 32.5411 11653.4\n11.78 -2235.5 0 32.4821 11653.4\n11.79 -2179.73 0 32.3905 11653.4\n11.8 -2128.91 0 32.2825 11653.4\n11.81 -2085.61 0 32.1774 11653.4\n11.82 -2052.01 0 32.094 11653.4\n11.83 -2029.82 0 32.0475 11653.4\n11.84 -2020.22 0 32.0462 11653.4\n11.85 -2023.83 0 32.0903 11653.4\n11.86 -2040.71 0 32.1717 11653.4\n11.87 -2070.32 0 32.2755 11653.4\n11.88 -2111.62 0 32.3832 11653.4\n11.89 -2163.1 0 32.4754 11653.4\n11.9 -2222.84 0 32.536 11653.4\n11.91 -2288.62 0 32.5543 11653.4\n11.92 -2358.07 0 32.5273 11653.4\n11.93 -2428.67 0 32.4598 11653.4\n11.94 -2497.98 0 32.3635 11653.4\n11.95 -2563.67 0 32.2558 11653.4\n11.96 -2623.65 0 32.1556 11653.4\n11.97 -2676.16 0 32.0812 11653.4\n11.98 -2719.81 0 32.0459 11653.4\n11.99 -2753.69 0 32.0561 11653.4\n12 -2777.34 0 32.1098 11653.4\n12.01 -2790.77 0 32.1973 11653.4\n12.02 -2794.5 0 32.3026 11653.4\n12.03 -2789.45 0 32.4068 11653.4\n12.04 -2776.91 0 32.4914 11653.4\n12.05 -2758.5 0 32.5415 11653.4\n12.06 -2736.03 0 32.5484 11653.4\n12.07 -2711.46 0 32.5109 11653.4\n12.08 -2686.76 0 32.4358 11653.4\n12.09 -2663.8 0 32.3362 11653.4\n12.1 -2644.33 0 32.2298 11653.4\n12.11 -2629.79 0 32.1357 11653.4\n12.12 -2621.33 0 32.0709 11653.4\n12.13 -2619.68 0 32.047 11653.4\n12.14 -2625.18 0 32.0683 11653.4\n12.15 -2637.7 0 32.131 11653.4\n12.16 -2656.7 0 32.2234 11653.4\n12.17 -2681.21 0 32.3289 11653.4\n12.18 -2709.94 0 32.4286 11653.4\n12.19 -2741.26 0 32.5048 11653.4\n12.2 -2773.37 0 32.5442 11653.4\n12.21 -2804.32 0 32.5398 11653.4\n12.22 -2832.18 0 32.4926 11653.4\n12.23 -2855.06 0 32.4108 11653.4\n12.24 -2871.3 0 32.309 11653.4\n12.25 -2879.48 0 32.2053 11653.4\n12.26 -2878.58 0 32.1182 11653.4\n12.27 -2867.98 0 32.0634 11653.4\n12.28 -2847.55 0 32.051 11653.4\n12.29 -2817.66 0 32.083 11653.4\n12.3 -2779.18 0 32.1535 11653.4\n12.31 -2733.47 0 32.2498 11653.4\n12.32 -2682.31 0 32.3543 11653.4\n12.33 -2627.88 0 32.4485 11653.4\n12.34 -2572.61 0 32.5156 11653.4\n12.35 -2519.13 0 32.544 11653.4\n12.36 -2470.14 0 32.5286 11653.4\n12.37 -2428.26 0 32.4723 11653.4\n12.38 -2395.96 0 32.385 11653.4\n12.39 -2375.38 0 32.2821 11653.4\n12.4 -2368.26 0 32.182 11653.4\n12.41 -2375.84 0 32.1027 11653.4\n12.42 -2398.77 0 32.0585 11653.4\n12.43 -2437.04 0 32.0574 11653.4\n12.44 -2489.98 0 32.0995 11653.4\n12.45 -2556.26 0 32.177 11653.4\n12.46 -2633.87 0 32.276 11653.4\n12.47 -2720.25 0 32.3785 11653.4\n12.48 -2812.29 0 32.4663 11653.4\n12.49 -2906.5 0 32.524 11653.4\n12.5 -2999.11 0 32.5414 11653.4\n12.51 -3086.23 0 32.5155 11653.4\n12.52 -3163.96 0 32.451 11653.4\n12.53 -3228.61 0 32.3593 11653.4\n12.54 -3276.8 0 32.2566 11653.4\n12.55 -3305.64 0 32.1612 11653.4\n12.56 -3312.86 0 32.0904 11653.4\n12.57 -3296.91 0 32.0568 11653.4\n12.58 -3257.05 0 32.0667 11653.4\n12.59 -3193.39 0 32.118 11653.4\n12.6 -3106.98 0 32.2014 11653.4\n12.61 -2999.72 0 32.3017 11653.4\n12.62 -2874.36 0 32.401 11653.4\n12.63 -2734.41 0 32.4817 11653.4\n12.64 -2584.06 0 32.5294 11653.4\n12.65 -2427.98 0 32.5359 11653.4\n12.66 -2271.23 0 32.5001 11653.4\n12.67 -2119.03 0 32.4284 11653.4\n12.68 -1976.6 0 32.3334 11653.4\n12.69 -1848.96 0 32.2321 11653.4\n12.7 -1740.74 0 32.1425 11653.4\n12.71 -1656.02 0 32.0808 11653.4\n12.72 -1598.11 0 32.0582 11653.4\n12.73 -1569.49 0 32.0787 11653.4\n12.74 -1571.66 0 32.1385 11653.4\n12.75 -1605.05 0 32.2266 11653.4\n12.76 -1669.04 0 32.3272 11653.4\n12.77 -1761.91 0 32.4223 11653.4\n12.78 -1880.9 0 32.4948 11653.4\n12.79 -2022.3 0 32.5322 11653.4\n12.8 -2181.55 0 32.528 11653.4\n12.81 -2353.38 0 32.4828 11653.4\n12.82 -2532.04 0 32.4048 11653.4\n12.83 -2711.42 0 32.3077 11653.4\n12.84 -2885.3 0 32.2088 11653.4\n12.85 -3047.56 0 32.1259 11653.4\n12.86 -3192.4 0 32.0739 11653.4\n12.87 -3314.51 0 32.0621 11653.4\n12.88 -3409.3 0 32.0928 11653.4\n12.89 -3473.04 0 32.1602 11653.4\n12.9 -3502.97 0 32.252 11653.4\n12.91 -3497.43 0 32.3518 11653.4\n12.92 -3455.93 0 32.4416 11653.4\n12.93 -3379.11 0 32.5055 11653.4\n12.94 -3268.77 0 32.5325 11653.4\n12.95 -3127.79 0 32.5178 11653.4\n12.96 -2960.04 0 32.464 11653.4\n12.97 -2770.2 0 32.3807 11653.4\n12.98 -2563.68 0 32.2827 11653.4\n12.99 -2346.34 0 32.1874 11653.4\n13 -2124.35 0 32.1119 11653.4\n13.01 -1903.95 0 32.0699 11653.4\n13.02 -1691.25 0 32.069 11653.4\n13.03 -1492.02 0 32.1092 11653.4\n13.04 -1311.5 0 32.1832 11653.4\n13.05 -1154.21 0 32.2775 11653.4\n13.06 -1023.82 0 32.3752 11653.4\n13.07 -923.054 0 32.4588 11653.4\n13.08 -853.573 0 32.5136 11653.4\n13.09 -815.96 0 32.53 11653.4\n13.1 -809.709 0 32.5051 11653.4\n13.11 -833.259 0 32.4435 11653.4\n13.12 -884.069 0 32.356 11653.4\n13.13 -958.716 0 32.2581 11653.4\n13.14 -1053.03 0 32.1674 11653.4\n13.15 -1162.25 0 32.1002 11653.4\n13.16 -1281.19 0 32.0687 11653.4\n13.17 -1404.42 0 32.0784 11653.4\n13.18 -1526.48 0 32.1277 11653.4\n13.19 -1642.02 0 32.2075 11653.4\n13.2 -1746 0 32.3033 11653.4\n13.21 -1833.84 0 32.398 11653.4\n13.22 -1901.57 0 32.4747 11653.4\n13.23 -1945.93 0 32.5198 11653.4\n13.24 -1964.45 0 32.5256 11653.4\n13.25 -1955.54 0 32.4911 11653.4\n13.26 -1918.44 0 32.4223 11653.4\n13.27 -1853.32 0 32.3315 11653.4\n13.28 -1761.14 0 32.2347 11653.4\n13.29 -1643.65 0 32.1494 11653.4\n13.3 -1503.29 0 32.0909 11653.4\n13.31 -1343.06 0 32.0697 11653.4\n13.32 -1166.43 0 32.0898 11653.4\n13.33 -977.209 0 32.1473 11653.4\n13.34 -779.384 0 32.2319 11653.4\n13.35 -577.014 0 32.3282 11653.4\n13.36 -374.085 0 32.419 11653.4\n13.37 -174.405 0 32.4882 11653.4\n13.38 18.5139 0 32.5236 11653.4\n13.39 201.531 0 32.5192 11653.4\n13.4 371.956 0 32.4756 11653.4\n13.41 527.589 0 32.4007 11653.4\n13.42 666.758 0 32.3077 11653.4\n13.43 788.321 0 32.2131 11653.4\n13.44 891.658 0 32.1339 11653.4\n13.45 976.645 0 32.0844 11653.4\n13.46 1043.61 0 32.0735 11653.4\n13.47 1093.3 0 32.1031 11653.4\n13.48 1126.77 0 32.1678 11653.4\n13.49 1145.38 0 32.2559 11653.4\n13.5 1150.69 0 32.3514 11653.4\n13.51 1144.4 0 32.4373 11653.4\n13.52 1128.31 0 32.4984 11653.4\n13.53 1104.23 0 32.524 11653.4\n13.54 1073.95 0 32.5097 11653.4\n13.55 1039.21 0 32.4579 11653.4\n13.56 1001.66 0 32.378 11653.4\n13.57 962.829 0 32.2841 11653.4\n13.58 924.15 0 32.1928 11653.4\n13.59 886.921 0 32.1207 11653.4\n13.6 852.323 0 32.0806 11653.4\n13.61 821.427 0 32.0799 11653.4\n13.62 795.199 0 32.1186 11653.4\n13.63 774.516 0 32.1896 11653.4\n13.64 760.175 0 32.28 11653.4\n13.65 752.895 0 32.3735 11653.4\n13.66 753.324 0 32.4534 11653.4\n13.67 762.037 0 32.5058 11653.4\n13.68 779.529 0 32.5213 11653.4\n13.69 806.203 0 32.4973 11653.4\n13.7 842.359 0 32.4381 11653.4\n13.71 888.167 0 32.3542 11653.4\n13.72 943.654 0 32.2605 11653.4\n13.73 1008.68 0 32.1737 11653.4\n13.74 1082.92 0 32.1094 11653.4\n13.75 1165.85 0 32.0792 11653.4\n13.76 1256.73 0 32.0887 11653.4\n13.77 1354.63 0 32.1359 11653.4\n13.78 1458.37 0 32.2123 11653.4\n13.79 1566.64 0 32.304 11653.4\n13.8 1677.91 0 32.3946 11653.4\n13.81 1790.57 0 32.4679 11653.4\n13.82 1902.89 0 32.511 11653.4\n13.83 2013.15 0 32.5164 11653.4\n13.84 2119.63 0 32.4832 11653.4\n13.85 2220.73 0 32.4173 11653.4\n13.86 2314.99 0 32.3303 11653.4\n13.87 2401.18 0 32.2377 11653.4\n13.88 2478.36 0 32.1562 11653.4\n13.89 2545.91 0 32.1003 11653.4\n13.9 2603.58 0 32.0802 11653.4\n13.91 2651.5 0 32.0994 11653.4\n13.92 2690.22 0 32.1545 11653.4\n13.93 2720.66 0 32.2354 11653.4\n13.94 2744.11 0 32.3274 11653.4\n13.95 2762.18 0 32.4141 11653.4\n13.96 2776.73 0 32.48 11653.4\n13.97 2789.79 0 32.5137 11653.4\n13.98 2803.47 0 32.5091 11653.4\n13.99 2819.88 0 32.4672 11653.4\n14 2840.99 0 32.3954 11653.4\n14.01 2868.57 0 32.3064 11653.4\n14.02 2904.03 0 32.216 11653.4\n14.03 2948.39 0 32.1405 11653.4\n14.04 3002.13 0 32.0935 11653.4\n14.05 3065.22 0 32.0834 11653.4\n14.06 3137.01 0 32.1121 11653.4\n14.07 3216.22 0 32.1743 11653.4\n14.08 3301 0 32.2587 11653.4\n14.09 3388.94 0 32.35 11653.4\n14.1 3477.13 0 32.432 11653.4\n14.11 3562.29 0 32.4901 11653.4\n14.12 3640.84 0 32.5141 11653.4\n14.13 3709.09 0 32.4998 11653.4\n14.14 3763.35 0 32.4499 11653.4\n14.15 3800.11 0 32.373 11653.4\n14.16 3816.2 0 32.283 11653.4\n14.17 3808.94 0 32.1957 11653.4\n14.18 3776.32 0 32.1269 11653.4\n14.19 3717.05 0 32.0891 11653.4\n14.2 3630.76 0 32.0889 11653.4\n14.21 3517.99 0 32.1265 11653.4\n14.22 3380.27 0 32.1949 11653.4\n14.23 3220.11 0 32.2818 11653.4\n14.24 3040.95 0 32.3715 11653.4\n14.25 2847.08 0 32.448 11653.4\n14.26 2643.53 0 32.4978 11653.4\n14.27 2435.91 0 32.5121 11653.4\n14.28 2230.21 0 32.4886 11653.4\n14.29 2032.6 0 32.4313 11653.4\n14.3 1849.22 0 32.3505 11653.4\n14.31 1685.9 0 32.2603 11653.4\n14.32 1547.98 0 32.1771 11653.4\n14.33 1440.04 0 32.1156 11653.4\n14.34 1365.72 0 32.0871 11653.4\n14.35 1327.53 0 32.0966 11653.4\n14.36 1326.72 0 32.1424 11653.4\n14.37 1363.18 0 32.2161 11653.4\n14.38 1435.39 0 32.3044 11653.4\n14.39 1540.42 0 32.3914 11653.4\n14.4 1674.01 0 32.4617 11653.4\n14.41 1830.63 0 32.5028 11653.4\n14.42 2003.71 0 32.5076 11653.4\n14.43 2185.8 0 32.4753 11653.4\n14.44 2368.83 0 32.4115 11653.4\n14.45 2544.37 0 32.3276 11653.4\n14.46 2703.98 0 32.2385 11653.4\n14.47 2839.46 0 32.1602 11653.4\n14.48 2943.19 0 32.1066 11653.4\n14.49 3008.41 0 32.0876 11653.4\n14.5 3029.48 0 32.1064 11653.4\n14.51 3002.15 0 32.1597 11653.4\n14.52 2923.7 0 32.2377 11653.4\n14.53 2793.1 0 32.3263 11653.4\n14.54 2611.07 0 32.4098 11653.4\n14.55 2380.12 0 32.4731 11653.4\n14.56 2104.43 0 32.5053 11653.4\n14.57 1789.8 0 32.5007 11653.4\n14.58 1443.42 0 32.4601 11653.4\n14.59 1073.65 0 32.3908 11653.4\n14.6 689.737 0 32.305 11653.4\n14.61 301.486 0 32.2179 11653.4\n14.62 -81.0806 0 32.1452 11653.4\n14.63 -448.081 0 32.1 11653.4\n14.64 -790.135 0 32.0904 11653.4\n14.65 -1098.71 0 32.1181 11653.4\n14.66 -1366.42 0 32.1781 11653.4\n14.67 -1587.34 0 32.2593 11653.4\n14.68 -1757.16 0 32.3473 11653.4\n14.69 -1873.42 0 32.4262 11653.4\n14.7 -1935.58 0 32.4822 11653.4\n14.71 -1945 0 32.5053 11653.4\n14.72 -1904.99 0 32.4915 11653.4\n14.73 -1820.58 0 32.4434 11653.4\n14.74 -1698.42 0 32.3694 11653.4\n14.75 -1546.47 0 32.2827 11653.4\n14.76 -1373.76 0 32.1988 11653.4\n14.77 -1190 0 32.1326 11653.4\n14.78 -1005.24 0 32.0962 11653.4\n14.79 -829.473 0 32.096 11653.4\n14.8 -672.29 0 32.1322 11653.4\n14.81 -542.482 0 32.198 11653.4\n14.82 -447.725 0 32.2815 11653.4\n14.83 -394.291 0 32.3677 11653.4\n14.84 -386.809 0 32.4413 11653.4\n14.85 -428.1 0 32.4891 11653.4\n14.86 -519.071 0 32.5029 11653.4\n14.87 -658.691 0 32.4803 11653.4\n14.88 -844.04 0 32.4252 11653.4\n14.89 -1070.43 0 32.3474 11653.4\n14.9 -1331.6 0 32.2608 11653.4\n14.91 -1619.97 0 32.1809 11653.4\n14.92 -1926.92 0 32.1219 11653.4\n14.93 -2243.17 0 32.0945 11653.4\n14.94 -2559.11 0 32.1038 11653.4\n14.95 -2865.2 0 32.1479 11653.4\n14.96 -3152.36 0 32.2188 11653.4\n14.97 -3412.26 0 32.3037 11653.4\n14.98 -3637.71 0 32.3873 11653.4\n14.99 -3822.91 0 32.4548 11653.4\n15 -3963.67 0 32.4943 11653.4\n15.01 -4057.53 0 32.4989 11653.4\n15.02 -4103.92 0 32.4677 11653.4\n15.03 -4104.09 0 32.4064 11653.4\n15.04 -4061.07 0 32.3258 11653.4\n15.05 -3979.58 0 32.2402 11653.4\n15.06 -3865.74 0 32.165 11653.4\n15.07 -3726.89 0 32.1137 11653.4\n15.08 -3571.24 0 32.0955 11653.4\n15.09 -3407.54 0 32.1138 11653.4\n15.1 -3244.73 0 32.1651 11653.4\n15.11 -3091.57 0 32.2402 11653.4\n15.12 -2956.27 0 32.3255 11653.4\n15.13 -2846.21 0 32.4057 11653.4\n15.14 -2767.58 0 32.4665 11653.4\n15.15 -2725.19 0 32.4974 11653.4\n15.16 -2722.26 0 32.4928 11653.4\n15.17 -2760.3 0 32.4537 11653.4\n15.18 -2839.08 0 32.3869 11653.4\n15.19 -2956.63 0 32.3044 11653.4\n15.2 -3109.35 0 32.2207 11653.4\n15.21 -3292.17 0 32.151 11653.4\n15.22 -3498.75 0 32.1077 11653.4\n15.23 -3721.79 0 32.0987 11653.4\n15.24 -3953.29 0 32.1256 11653.4\n15.25 -4184.9 0 32.1835 11653.4\n15.26 -4408.29 0 32.2617 11653.4\n15.27 -4615.45 0 32.3464 11653.4\n15.28 -4799.04 0 32.4223 11653.4\n15.29 -4952.68 0 32.4759 11653.4\n15.3 -5071.2 0 32.498 11653.4\n15.31 -5150.83 0 32.4846 11653.4\n15.32 -5189.34 0 32.4381 11653.4\n15.33 -5186.14 0 32.3668 11653.4\n15.34 -5142.25 0 32.2833 11653.4\n15.35 -5060.26 0 32.2025 11653.4\n15.36 -4944.19 0 32.1389 11653.4\n15.37 -4799.3 0 32.1041 11653.4\n15.38 -4631.89 0 32.1042 11653.4\n15.39 -4448.97 0 32.1392 11653.4\n15.4 -4258.01 0 32.2027 11653.4\n15.41 -4066.57 0 32.2833 11653.4\n15.42 -3882.05 0 32.3663 11653.4\n15.43 -3711.29 0 32.4371 11653.4\n15.44 -3560.39 0 32.4832 11653.4\n15.45 -3434.38 0 32.4963 11653.4\n15.46 -3337.07 0 32.4743 11653.4\n15.47 -3270.92 0 32.4211 11653.4\n15.48 -3236.9 0 32.3462 11653.4\n15.49 -3234.55 0 32.2627 11653.4\n15.5 -3261.97 0 32.1856 11653.4\n15.51 -3315.93 0 32.1288 11653.4\n15.52 -3392.08 0 32.1026 11653.4\n15.53 -3485.11 0 32.1116 11653.4\n15.54 -3589.04 0 32.1541 11653.4\n15.55 -3697.45 0 32.2225 11653.4\n15.56 -3803.85 0 32.3043 11653.4\n15.57 -3901.88 0 32.385 11653.4\n15.58 -3985.68 0 32.45 11653.4\n15.59 -4050.07 0 32.4881 11653.4\n15.6 -4090.86 0 32.4924 11653.4\n15.61 -4104.95 0 32.4624 11653.4\n15.62 -4090.52 0 32.4033 11653.4\n15.63 -4047.06 0 32.3255 11653.4\n15.64 -3975.41 0 32.243 11653.4\n15.65 -3877.69 0 32.1705 11653.4\n15.66 -3757.18 0 32.1211 11653.4\n15.67 -3618.19 0 32.1035 11653.4\n15.68 -3465.84 0 32.1211 11653.4\n15.69 -3305.81 0 32.1705 11653.4\n15.7 -3144.07 0 32.2428 11653.4\n15.71 -2986.62 0 32.3249 11653.4\n15.72 -2839.18 0 32.4021 11653.4\n15.73 -2706.95 0 32.4608 11653.4\n15.74 -2594.32 0 32.4905 11653.4\n15.75 -2504.74 0 32.4862 11653.4\n15.76 -2440.45 0 32.4486 11653.4\n15.77 -2402.48 0 32.3843 11653.4\n15.78 -2390.51 0 32.3049 11653.4\n15.79 -2402.9 0 32.2244 11653.4\n15.8 -2436.78 0 32.1573 11653.4\n15.81 -2488.15 0 32.1156 11653.4\n15.82 -2552.06 0 32.1069 11653.4\n15.83 -2622.8 0 32.1327 11653.4\n15.84 -2694.22 0 32.1883 11653.4\n15.85 -2759.93 0 32.2635 11653.4\n15.86 -2813.62 0 32.3449 11653.4\n15.87 -2849.37 0 32.4179 11653.4\n15.88 -2861.88 0 32.4695 11653.4\n15.89 -2846.73 0 32.4906 11653.4\n15.9 -2800.58 0 32.4777 11653.4\n15.91 -2721.36 0 32.433 11653.4\n15.92 -2608.34 0 32.3645 11653.4\n15.93 -2462.19 0 32.2843 11653.4\n15.94 -2284.97 0 32.2067 11653.4\n15.95 -2080.07 0 32.1457 11653.4\n15.96 -1852.03 0 32.1123 11653.4\n15.97 -1606.41 0 32.1124 11653.4\n15.98 -1349.53 0 32.1461 11653.4\n15.99 -1088.2 0 32.2072 11653.4\n16 -829.481 0 32.2845 11653.4\n16.01 -580.31 0 32.3643 11653.4\n16.02 -347.268 0 32.4322 11653.4\n16.03 -136.273 0 32.4762 11653.4\n16.04 47.667 0 32.4887 11653.4\n16.05 200.671 0 32.4674 11653.4\n16.06 320.146 0 32.4162 11653.4\n16.07 404.904 0 32.3441 11653.4\n16.08 455.205 0 32.2639 11653.4\n16.09 472.747 0 32.19 11653.4\n16.1 460.592 0 32.1357 11653.4\n16.11 423.026 0 32.1108 11653.4\n16.12 365.378 0 32.1197 11653.4\n16.13 293.778 0 32.1609 11653.4\n16.14 214.892 0 32.2267 11653.4\n16.15 135.631 0 32.3053 11653.4\n16.16 62.8403 0 32.3826 11653.4\n16.17 3.00694 0 32.4449 11653.4\n16.18 -38.0321 0 32.4811 11653.4\n16.19 -55.3447 0 32.4848 11653.4\n16.2 -45.1216 0 32.4555 11653.4\n16.21 -4.84439 0 32.3983 11653.4\n16.22 66.6027 0 32.3234 11653.4\n16.23 168.884 0 32.2442 11653.4\n16.24 300.226 0 32.1747 11653.4\n16.25 457.498 0 32.1275 11653.4\n16.26 636.351 0 32.1112 11653.4\n16.27 831.409 0 32.1287 11653.4\n16.28 1036.51 0 32.1767 11653.4\n16.29 1245 0 32.2465 11653.4\n16.3 1449.98 0 32.3257 11653.4\n16.31 1644.7 0 32.3998 11653.4\n16.32 1822.78 0 32.4559 11653.4\n16.33 1978.56 0 32.484 11653.4\n16.34 2107.35 0 32.4792 11653.4\n16.35 2205.64 0 32.4423 11653.4\n16.36 2271.25 0 32.38 11653.4\n16.37 2303.49 0 32.3031 11653.4\n16.38 2303.17 0 32.2255 11653.4\n16.39 2272.6 0 32.161 11653.4\n16.4 2215.48 0 32.1213 11653.4\n16.41 2136.77 0 32.1135 11653.4\n16.42 2042.47 0 32.139 11653.4\n16.43 1939.4 0 32.1931 11653.4\n16.44 1834.86 0 32.2661 11653.4\n16.45 1736.34 0 32.3448 11653.4\n16.46 1651.21 0 32.4152 11653.4\n16.47 1586.37 0 32.4647 11653.4\n16.48 1547.94 0 32.4847 11653.4\n16.49 1541 0 32.4717 11653.4\n16.5 1569.36 0 32.4279 11653.4\n16.51 1635.36 0 32.3612 11653.4\n16.52 1739.75 0 32.2834 11653.4\n16.53 1881.67 0 32.2084 11653.4\n16.54 2058.64 0 32.1495 11653.4\n16.55 2266.62 0 32.1175 11653.4\n16.56 2500.24 0 32.1181 11653.4\n16.57 2752.92 0 32.1511 11653.4\n16.58 3017.19 0 32.2106 11653.4\n16.59 3285 0 32.2857 11653.4\n16.6 3548.01 0 32.363 11653.4\n16.61 3797.95 0 32.4287 11653.4\n16.62 4026.97 0 32.4711 11653.4\n16.63 4227.98 0 32.4829 11653.4\n16.64 4394.91 0 32.462 11653.4\n16.65 4522.99 0 32.4121 11653.4\n16.66 4608.95 0 32.342 11653.4\n16.67 4651.17 0 32.2642 11653.4\n16.68 4649.71 0 32.1926 11653.4\n16.69 4606.35 0 32.14 11653.4\n16.7 4524.51 0 32.116 11653.4\n16.71 4409.1 0 32.1248 11653.4\n16.72 4266.32 0 32.1649 11653.4\n16.73 4103.42 0 32.2289 11653.4\n16.74 3928.35 0 32.3052 11653.4\n16.75 3749.51 0 32.3802 11653.4\n16.76 3575.32 0 32.4405 11653.4\n16.77 3413.93 0 32.4755 11653.4\n16.78 3272.86 0 32.4791 11653.4\n16.79 3158.69 0 32.4505 11653.4\n16.8 3076.8 0 32.395 11653.4\n16.81 3031.18 0 32.3223 11653.4\n16.82 3024.21 0 32.2454 11653.4\n16.83 3056.66 0 32.178 11653.4\n16.84 3127.59 0 32.1323 11653.4\n16.85 3234.49 0 32.1165 11653.4\n16.86 3373.33 0 32.1334 11653.4\n16.87 3538.79 0 32.1799 11653.4\n16.88 3724.52 0 32.2476 11653.4\n16.89 3923.38 0 32.3243 11653.4\n16.9 4127.8 0 32.3962 11653.4\n16.91 4330.1 0 32.4506 11653.4\n16.92 4522.83 0 32.4779 11653.4\n16.93 4699.11 0 32.4733 11653.4\n16.94 4852.94 0 32.4376 11653.4\n16.95 4979.41 0 32.3772 11653.4\n16.96 5074.99 0 32.3027 11653.4\n16.97 5137.62 0 32.2275 11653.4\n16.98 5166.82 0 32.165 11653.4\n16.99 5163.7 0 32.1265 11653.4\n17 5130.92 0 32.1189 11653.4\n17.01 5072.51 0 32.1435 11653.4\n17.02 4993.77 0 32.1959 11653.4\n17.03 4900.94 0 32.2666 11653.4\n17.04 4800.96 0 32.3428 11653.4\n17.05 4701.17 0 32.4109 11653.4\n17.06 4608.91 0 32.4589 11653.4\n17.07 4531.26 0 32.4783 11653.4\n17.08 4474.64 0 32.4657 11653.4\n17.09 4444.59 0 32.4234 11653.4\n17.1 4445.46 0 32.3589 11653.4\n17.11 4480.21 0 32.2836 11653.4\n17.12 4550.3 0 32.2109 11653.4\n17.13 4655.56 0 32.1539 11653.4\n17.14 4794.25 0 32.1229 11653.4\n17.15 4963.06 0 32.1234 11653.4\n17.16 5157.31 0 32.1553 11653.4\n17.17 5371.1 0 32.2128 11653.4\n17.18 5597.56 0 32.2855 11653.4\n17.19 5829.21 0 32.3604 11653.4\n17.2 6058.21 0 32.424 11653.4\n17.21 6276.74 0 32.4652 11653.4\n17.22 6477.37 0 32.4767 11653.4\n17.23 6653.33 0 32.4564 11653.4\n17.24 6798.86 0 32.4081 11653.4\n17.25 6909.46 0 32.3403 11653.4\n17.26 6982.07 0 32.265 11653.4\n17.27 7015.24 0 32.1957 11653.4\n17.28 7009.22 0 32.1448 11653.4\n17.29 6965.88 0 32.1215 11653.4\n17.3 6888.73 0 32.1299 11653.4\n17.31 6782.71 0 32.1686 11653.4\n17.32 6654.01 0 32.2305 11653.4\n17.33 6509.79 0 32.3044 11653.4\n17.34 6357.86 0 32.3771 11653.4\n17.35 6206.37 0 32.4355 11653.4\n17.36 6063.4 0 32.4695 11653.4\n17.37 5936.64 0 32.4731 11653.4\n17.38 5833.03 0 32.4455 11653.4\n17.39 5758.45 0 32.3918 11653.4\n17.4 5717.45 0 32.3215 11653.4\n17.41 5713.02 0 32.2471 11653.4\n17.42 5746.44 0 32.1818 11653.4\n17.43 5817.25 0 32.1375 11653.4\n17.44 5923.2 0 32.1221 11653.4\n17.45 6060.34 0 32.1384 11653.4\n17.46 6223.18 0 32.1834 11653.4\n17.47 6404.92 0 32.2489 11653.4\n17.48 6597.72 0 32.3231 11653.4\n17.49 6793 0 32.3928 11653.4\n17.5 6981.85 0 32.4456 11653.4\n17.51 7155.4 0 32.4721 11653.4\n17.52 7305.13 0 32.4678 11653.4\n17.53 7423.35 0 32.4333 11653.4\n17.54 7503.45 0 32.3749 11653.4\n17.55 7540.2 0 32.3029 11653.4\n17.56 7530.04 0 32.2301 11653.4\n17.57 7471.15 0 32.1696 11653.4\n17.58 7363.65 0 32.1322 11653.4\n17.59 7209.5 0 32.1246 11653.4\n17.6 7012.5 0 32.1483 11653.4\n17.61 6778.14 0 32.1989 11653.4\n17.62 6513.31 0 32.2672 11653.4\n17.63 6226.12 0 32.341 11653.4\n17.64 5925.47 0 32.407 11653.4\n17.65 5620.74 0 32.4536 11653.4\n17.66 5321.38 0 32.4726 11653.4\n17.67 5036.49 0 32.4606 11653.4\n17.68 4774.49 0 32.4199 11653.4\n17.69 4542.73 0 32.3576 11653.4\n17.7 4347.18 0 32.2848 11653.4\n17.71 4192.2 0 32.2145 11653.4\n17.72 4080.32 0 32.1593 11653.4\n17.73 4012.21 0 32.1291 11653.4\n17.74 3986.57 0 32.1294 11653.4\n17.75 4000.26 0 32.1601 11653.4\n17.76 4048.38 0 32.2155 11653.4\n17.77 4124.56 0 32.2857 11653.4\n17.78 4221.17 0 32.358 11653.4\n17.79 4329.7 0 32.4195 11653.4\n17.8 4441.1 0 32.4594 11653.4\n17.81 4546.23 0 32.4706 11653.4\n17.82 4636.2 0 32.4513 11653.4\n17.83 4702.82 0 32.4048 11653.4\n17.84 4738.91 0 32.3394 11653.4\n17.85 4738.67 0 32.2667 11653.4\n17.86 4697.91 0 32.1998 11653.4\n17.87 4614.25 0 32.1506 11653.4\n17.88 4487.23 0 32.128 11653.4\n17.89 4318.34 0 32.1361 11653.4\n17.9 4110.96 0 32.1734 11653.4\n17.91 3870.24 0 32.2331 11653.4\n17.92 3602.85 0 32.3043 11653.4\n17.93 3316.7 0 32.3744 11653.4\n17.94 3020.63 0 32.4309 11653.4\n17.95 2723.97 0 32.4637 11653.4\n17.96 2436.18 0 32.4671 11653.4\n17.97 2166.41 0 32.4406 11653.4\n17.98 1923.05 0 32.3888 11653.4\n17.99 1713.45 0 32.321 11653.4\n18 1543.49 0 32.2492 11653.4\n18.01 1417.33 0 32.1863 11653.4\n18.02 1337.24 0 32.1436 11653.4\n18.03 1303.42 0 32.1288 11653.4\n18.04 1314.04 0 32.1445 11653.4\n18.05 1365.2 0 32.188 11653.4\n18.06 1451.16 0 32.2512 11653.4\n18.07 1564.51 0 32.3229 11653.4\n18.08 1696.51 0 32.3901 11653.4\n18.09 1837.41 0 32.4409 11653.4\n18.1 1976.88 0 32.4665 11653.4\n18.11 2104.46 0 32.4622 11653.4\n18.12 2209.97 0 32.4288 11653.4\n18.13 2284.02 0 32.3724 11653.4\n18.14 2318.33 0 32.3028 11653.4\n18.15 2306.2 0 32.2326 11653.4\n18.16 2242.75 0 32.1742 11653.4\n18.17 2125.18 0 32.1382 11653.4\n18.18 1952.94 0 32.1311 11653.4\n18.19 1727.77 0 32.1542 11653.4\n18.2 1453.66 0 32.2032 11653.4\n18.21 1136.76 0 32.2692 11653.4\n18.22 785.087 0 32.3405 11653.4\n18.23 408.306 0 32.4042 11653.4\n18.24 17.3 0 32.4491 11653.4\n18.25 -376.231 0 32.4673 11653.4\n18.26 -760.244 0 32.4555 11653.4\n18.27 -1122.84 0 32.4159 11653.4\n18.28 -1452.72 0 32.3556 11653.4\n18.29 -1739.72 0 32.2851 11653.4\n18.3 -1975.13 0 32.2172 11653.4\n18.31 -2152.17 0 32.1639 11653.4\n18.32 -2266.2 0 32.1349 11653.4\n18.33 -2314.98 0 32.1354 11653.4\n18.34 -2298.75 0 32.1652 11653.4\n18.35 -2220.3 0 32.219 11653.4\n18.36 -2084.82 0 32.287 11653.4\n18.37 -1899.76 0 32.3571 11653.4\n18.38 -1674.56 0 32.4166 11653.4\n18.39 -1420.26 0 32.4552 11653.4\n18.4 -1149.12 0 32.4659 11653.4\n18.41 -874.14 0 32.447 11653.4\n18.42 -608.556 0 32.4017 11653.4\n18.43 -365.325 0 32.3382 11653.4\n18.44 -156.631 0 32.2677 11653.4\n18.45 6.5947 0 32.2027 11653.4\n18.46 115.092 0 32.155 11653.4\n18.47 161.637 0 32.1331 11653.4\n18.48 141.321 0 32.141 11653.4\n18.49 51.7431 0 32.1772 11653.4\n18.5 -106.9 0 32.2351 11653.4\n18.51 -331.821 0 32.3043 11653.4\n18.52 -617.751 0 32.3723 11653.4\n18.53 -957.147 0 32.4272 11653.4\n18.54 -1340.49 0 32.4592 11653.4\n18.55 -1756.63 0 32.4626 11653.4\n18.56 -2193.27 0 32.437 11653.4\n18.57 -2637.39 0 32.3869 11653.4\n18.58 -3075.76 0 32.3212 11653.4\n18.59 -3495.46 0 32.2515 11653.4\n18.6 -3884.37 0 32.1903 11653.4\n18.61 -4231.6 0 32.1487 11653.4\n18.62 -4527.93 0 32.134 11653.4\n18.63 -4766.13 0 32.149 11653.4\n18.64 -4941.21 0 32.1908 11653.4\n18.65 -5050.61 0 32.2518 11653.4\n18.66 -5094.26 0 32.3211 11653.4\n18.67 -5074.55 0 32.3862 11653.4\n18.68 -4996.22 0 32.4357 11653.4\n18.69 -4866.15 0 32.4606 11653.4\n18.7 -4693.06 0 32.4567 11653.4\n18.71 -4487.17 0 32.4248 11653.4\n18.72 -4259.77 0 32.3704 11653.4\n18.73 -4022.79 0 32.3033 11653.4\n18.74 -3788.29 0 32.2355 11653.4\n18.75 -3568.06 0 32.1789 11653.4\n18.76 -3373.12 0 32.144 11653.4\n18.77 -3213.32 0 32.1369 11653.4\n18.78 -3097.01 0 32.1588 11653.4\n18.79 -3030.69 0 32.2058 11653.4\n18.8 -3018.83 0 32.2694 11653.4\n18.81 -3063.72 0 32.3381 11653.4\n18.82 -3165.45 0 32.3996 11653.4\n18.83 -3321.89 0 32.443 11653.4\n18.84 -3528.87 0 32.4607 11653.4\n18.85 -3780.35 0 32.4496 11653.4\n18.86 -4068.7 0 32.4116 11653.4\n18.87 -4385.04 0 32.3535 11653.4\n18.88 -4719.58 0 32.2857 11653.4\n18.89 -5062.05 0 32.2202 11653.4\n18.9 -5402.09 0 32.1688 11653.4\n18.91 -5729.65 0 32.1408 11653.4\n18.92 -6035.4 0 32.1412 11653.4\n18.93 -6311.02 0 32.1698 11653.4\n18.94 -6549.56 0 32.2215 11653.4\n18.95 -6745.62 0 32.2869 11653.4\n18.96 -6895.57 0 32.3543 11653.4\n18.97 -6997.59 0 32.4115 11653.4\n18.98 -7051.75 0 32.4486 11653.4\n18.99 -7059.89 0 32.459 11653.4\n19 -7025.57 0 32.4408 11653.4\n19.01 -6953.81 0 32.3973 11653.4\n19.02 -6850.9 0 32.3362 11653.4\n19.03 -6724.11 0 32.2685 11653.4\n19.04 -6581.35 0 32.2062 11653.4\n19.05 -6430.86 0 32.1605 11653.4\n19.06 -6280.88 0 32.1397 11653.4\n19.07 -6139.3 0 32.1474 11653.4\n19.08 -6013.41 0 32.1823 11653.4\n19.09 -5909.57 0 32.238 11653.4\n19.1 -5833.05 0 32.3045 11653.4\n19.11 -5787.81 0 32.3698 11653.4\n19.12 -5776.44 0 32.4223 11653.4\n19.13 -5800.06 0 32.4527 11653.4\n19.14 -5858.34 0 32.4556 11653.4\n19.15 -5949.59 0 32.4306 11653.4\n19.16 -6070.85 0 32.3822 11653.4\n19.17 -6218.05 0 32.3188 11653.4\n19.18 -6386.23 0 32.2518 11653.4\n19.19 -6569.75 0 32.1932 11653.4\n19.2 -6762.56 0 32.1536 11653.4\n19.21 -6958.4 0 32.14 11653.4\n19.22 -7151.1 0 32.155 11653.4\n19.23 -7334.79 0 32.1957 11653.4\n19.24 -7504.11 0 32.2548 11653.4\n19.25 -7654.38 0 32.3217 11653.4\n19.26 -7781.76 0 32.3843 11653.4\n19.27 -7883.34 0 32.4316 11653.4\n19.28 -7957.17 0 32.4551 11653.4\n19.29 -8002.34 0 32.4508 11653.4\n19.3 -8018.88 0 32.4194 11653.4\n19.31 -8007.73 0 32.3666 11653.4\n19.32 -7970.65 0 32.3016 11653.4\n19.33 -7910.05 0 32.2361 11653.4\n19.34 -7828.9 0 32.1818 11653.4\n19.35 -7730.54 0 32.1485 11653.4\n19.36 -7618.5 0 32.1423 11653.4\n19.37 -7496.39 0 32.1641 11653.4\n19.38 -7367.73 0 32.21 11653.4\n19.39 -7235.81 0 32.2718 11653.4\n19.4 -7103.58 0 32.3383 11653.4\n19.41 -6973.61 0 32.3976 11653.4\n19.42 -6847.96 0 32.4392 11653.4\n19.43 -6728.22 0 32.4557 11653.4\n19.44 -6615.48 0 32.4444 11653.4\n19.45 -6510.36 0 32.407 11653.4\n19.46 -6413.05 0 32.3505 11653.4\n19.47 -6323.38 0 32.2846 11653.4\n19.48 -6240.9 0 32.2213 11653.4\n19.49 -6164.97 0 32.1719 11653.4\n19.5 -6094.82 0 32.1452 11653.4\n19.51 -6029.64 0 32.1461 11653.4\n19.52 -5968.68 0 32.1745 11653.4\n19.53 -5911.26 0 32.225 11653.4\n19.54 -5856.84 0 32.2887 11653.4\n19.55 -5805.05 0 32.3541 11653.4\n19.56 -5755.67 0 32.4095 11653.4\n19.57 -5708.63 0 32.4451 11653.4\n19.58 -5663.99 0 32.4547 11653.4\n19.59 -5621.85 0 32.4365 11653.4\n19.6 -5582.34 0 32.3939 11653.4\n19.61 -5545.55 0 32.3343 11653.4\n19.62 -5511.44 0 32.2684 11653.4\n19.63 -5479.79 0 32.2079 11653.4\n19.64 -5450.16 0 32.1637 11653.4\n19.65 -5421.84 0 32.1438 11653.4\n19.66 -5393.8 0 32.1517 11653.4\n19.67 -5364.75 0 32.186 11653.4\n19.68 -5333.07 0 32.2404 11653.4\n19.69 -5296.92 0 32.3052 11653.4\n19.7 -5254.27 0 32.3687 11653.4\n19.71 -5202.97 0 32.4196 11653.4\n19.72 -5140.85 0 32.4489 11653.4\n19.73 -5065.84 0 32.4515 11653.4\n19.74 -4976.03 0 32.427 11653.4\n19.75 -4869.85 0 32.3796 11653.4\n19.76 -4746.15 0 32.3179 11653.4\n19.77 -4604.26 0 32.2528 11653.4\n19.78 -4444.13 0 32.1959 11653.4\n19.79 -4266.32 0 32.1575 11653.4\n19.8 -4072.09 0 32.1446 11653.4\n19.81 -3863.38 0 32.1593 11653.4\n19.82 -3642.76 0 32.1991 11653.4\n19.83 -3413.38 0 32.2566 11653.4\n19.84 -3178.89 0 32.3216 11653.4\n19.85 -2943.31 0 32.3824 11653.4\n19.86 -2710.89 0 32.4282 11653.4\n19.87 -2485.95 0 32.4509 11653.4\n19.88 -2272.7 0 32.4465 11653.4\n19.89 -2075.1 0 32.4158 11653.4\n19.9 -1896.62 0 32.3643 11653.4\n19.91 -1740.17 0 32.3011 11653.4\n19.92 -1607.88 0 32.2375 11653.4\n19.93 -1501.07 0 32.1849 11653.4\n19.94 -1420.09 0 32.1527 11653.4\n19.95 -1364.33 0 32.1469 11653.4\n19.96 -1332.23 0 32.1683 11653.4\n19.97 -1321.27 0 32.2131 11653.4\n19.98 -1328.11 0 32.2732 11653.4\n19.99 -1348.67 0 32.3378 11653.4\n##### Results\nextraction_type='extract'\n### ModelCluster\npeak_funcs=[0]\nModelEvaluator=AIC\nslice=slice(None, 43, None)\n# BaselineObject\nowner=0\npars=[]\nfree=[]\nremovable=False\nstatic_owner=False\n\n## ModelPeaks\n# ModelPeak\nowner=1\npars=[1.4409645574666863, -1.2021756542216779, 35834.779473125469]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[2.438834586729778, -0.96289415777140697, 76731.43020027288]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[2.8449631419404557, -1.377022811246666, 20948.656697077673]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[3.6144870375166058, -0.96713516256064158, 74286.823948562524]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[4.1107321734767162, -0.98410710936823842, 56269.955304768802]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[4.5494140399501193, -0.9756431127837496, 81698.18210463904]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[4.8398410449548992, -1.4491665751304479, 21235.583150621042]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[5.4143786805580305, -1.1127424167906164, 63603.398981811821]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[5.9241758314319366, 1.5695897461410588, 195215.74804049844]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n# ModelPeak\nowner=1\npars=[6.7383992196340667, 0.05697362691040269, 168818.12286746191]\nfree=[True, True, True]\nremovable=True\nstatic_owner=False\n\n### start data\n#L r y dy\n1 -19502.9 11653.4\n1.14749 -22788.9 11653.4\n1.29499 1852.19 11653.4\n1.44248 116074 11653.4\n1.58997 -10291.9 11653.4\n1.73746 -27861.6 11653.4\n1.88496 -18215.1 11653.4\n2.03245 -28714 11653.4\n2.17994 -26150.2 11653.4\n2.32743 34592.3 11653.4\n2.47493 94708.1 11653.4\n2.62242 -34046.8 11653.4\n2.76991 -6095.59 11653.4\n2.9174 -9022.01 11653.4\n3.0649 -47692.9 11653.4\n3.21239 -39823.5 11653.4\n3.35988 -45615.1 11653.4\n3.50737 13411.8 11653.4\n3.65487 42196.6 11653.4\n3.80236 -28611.3 11653.4\n3.94985 -21093.7 11653.4\n4.09735 22420.5 11653.4\n4.24484 -12021.5 11653.4\n4.39233 -17934.3 11653.4\n4.53982 45713.7 11653.4\n4.68732 -9106.12 11653.4\n4.83481 459.793 11653.4\n4.9823 -30024.4 11653.4\n5.12979 -6029.52 11653.4\n5.27729 -3788.41 11653.4\n5.42478 38601.6 11653.4\n5.57227 5401.92 11653.4\n5.71976 12241.1 11653.4\n5.86726 6715.96 11653.4\n6.01475 11253.1 11653.4\n6.16224 26161.1 11653.4\n6.30973 -15451.2 11653.4\n6.45723 -45.4651 11653.4\n6.60472 29243.8 11653.4\n6.75221 20789.5 11653.4\n6.8997 3686.4 11653.4\n7.0472 6321.19 11653.4\n7.19469 -14234.2 11653.4\n\n" p1340 a. diff --git a/doc/examples/parameter_summary.py b/docs/examples/parameter_summary.py similarity index 99% rename from doc/examples/parameter_summary.py rename to docs/examples/parameter_summary.py index 1d4095c..b135d82 100644 --- a/doc/examples/parameter_summary.py +++ b/docs/examples/parameter_summary.py @@ -25,7 +25,8 @@ nyquist (whether to use Nyquist sampling) supersample (minimum amount to oversample during initial stages) cres (clustering resolution) -initial_peaks (peaks already assumed to exist during extraction)""" +initial_peaks (peaks already assumed to exist during extraction) +""" import matplotlib.pyplot as plt diff --git a/doc/examples/query_results.py b/docs/examples/query_results.py similarity index 99% rename from doc/examples/query_results.py rename to docs/examples/query_results.py index 8b90d4b..1659047 100644 --- a/doc/examples/query_results.py +++ b/docs/examples/query_results.py @@ -10,7 +10,8 @@ # See LICENSE.txt for license information. # ############################################################################## -"""Example of extracting multiple peaks and accessing results programmatically. +"""Example of extracting multiple peaks and accessing results +programmatically. This example shows how to extract a range of peaks from a simple crystalline PDF using a crystalline baseline obtained from an existing trial. It shows diff --git a/doc/make.bat b/docs/make.bat similarity index 100% rename from doc/make.bat rename to docs/make.bat diff --git a/doc/source/_static/.placeholder b/docs/source/_static/.placeholder similarity index 100% rename from doc/source/_static/.placeholder rename to docs/source/_static/.placeholder diff --git a/doc/source/api/diffpy.srmise.applications.rst b/docs/source/api/diffpy.srmise.applications.rst similarity index 100% rename from doc/source/api/diffpy.srmise.applications.rst rename to docs/source/api/diffpy.srmise.applications.rst diff --git a/doc/source/api/diffpy.srmise.baselines.rst b/docs/source/api/diffpy.srmise.baselines.rst similarity index 100% rename from doc/source/api/diffpy.srmise.baselines.rst rename to docs/source/api/diffpy.srmise.baselines.rst diff --git a/doc/source/api/diffpy.srmise.modelevaluators.rst b/docs/source/api/diffpy.srmise.modelevaluators.rst similarity index 100% rename from doc/source/api/diffpy.srmise.modelevaluators.rst rename to docs/source/api/diffpy.srmise.modelevaluators.rst diff --git a/doc/source/api/diffpy.srmise.peaks.rst b/docs/source/api/diffpy.srmise.peaks.rst similarity index 100% rename from doc/source/api/diffpy.srmise.peaks.rst rename to docs/source/api/diffpy.srmise.peaks.rst diff --git a/doc/source/api/diffpy.srmise.rst b/docs/source/api/diffpy.srmise.rst similarity index 97% rename from doc/source/api/diffpy.srmise.rst rename to docs/source/api/diffpy.srmise.rst index 98ea790..aa7f200 100644 --- a/doc/source/api/diffpy.srmise.rst +++ b/docs/source/api/diffpy.srmise.rst @@ -1,7 +1,9 @@ :tocdepth: -1 -diffpy.srmise package -===================== +|title| +======= + +.. |title| replace:: diffpy.srmise package .. automodule:: diffpy.srmise :members: diff --git a/doc/source/conf.py b/docs/source/conf.py similarity index 90% rename from doc/source/conf.py rename to docs/source/conf.py index 65d3685..f60b475 100644 --- a/doc/source/conf.py +++ b/docs/source/conf.py @@ -18,6 +18,12 @@ from importlib.metadata import version from pathlib import Path +# Attempt to import the version dynamically from GitHub tag. +try: + fullversion = version("diffpy.srmise") +except Exception: + fullversion = "No version found. The correct version will appear in the released version." + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use Path().resolve() to make it absolute, like shown here. @@ -26,7 +32,7 @@ sys.path.insert(0, str(Path("../../src").resolve())) # abbreviations -ab_authors = "Billinge Group members and community contributors" +ab_authors = "Simon Billinge, Billinge Group members" # -- General configuration ------------------------------------------------ @@ -43,6 +49,7 @@ "sphinx.ext.viewcode", "sphinx.ext.intersphinx", "sphinx_rtd_theme", + "sphinx_copybutton", "m2r", ] @@ -68,7 +75,6 @@ # |version| and |release|, also used in various other places throughout the # built documents. -fullversion = version(project) # The short X.Y version. version = "".join(fullversion.split(".post")[:1]) # The full version, including alpha/beta/rc tags. @@ -88,6 +94,11 @@ # substitute YEAR in the copyright string copyright = copyright.replace("%Y", year) +# For sphinx_copybutton extension. +# Do not copy "$" for shell commands in code-blocks. +copybutton_prompt_text = r"^\$ " +copybutton_prompt_is_regexp = True + # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. exclude_patterns = ["build"] @@ -123,6 +134,14 @@ # html_theme = "sphinx_rtd_theme" +html_context = { + "display_github": True, + "github_user": "diffpy", + "github_repo": "diffpy.srmise", + "github_version": "main", + "conf_py_path": "/docs/source/", +} + # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. @@ -221,7 +240,13 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ("index", "diffpy.srmise.tex", "diffpy.srmise Documentation", ab_authors, "manual"), + ( + "index", + "diffpy.srmise.tex", + "diffpy.srmise Documentation", + ab_authors, + "manual", + ), ] # The name of an image file (relative to this directory) to place at the top of @@ -249,7 +274,15 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [("index", "diffpy.srmise", "diffpy.srmise Documentation", ab_authors, 1)] +man_pages = [ + ( + "index", + "diffpy.srmise", + "diffpy.srmise Documentation", + ab_authors, + 1, + ) +] # If true, show URL addresses after external links. # man_show_urls = False diff --git a/doc/source/extending.rst b/docs/source/extending.rst similarity index 100% rename from doc/source/extending.rst rename to docs/source/extending.rst diff --git a/docs/source/img/.placeholder b/docs/source/img/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/docs/source/index.rst b/docs/source/index.rst new file mode 100644 index 0000000..2e91dbe --- /dev/null +++ b/docs/source/index.rst @@ -0,0 +1,58 @@ +####### +|title| +####### + +.. |title| replace:: diffpy.srmise documentation + +``diffpy.srmise`` - Peak extraction and peak fitting tool for atomic pair distribution functions + +| Software version |release| +| Last updated |today|. + +=============== +Getting started +=============== + +Welcome to the ``diffpy.srmise`` documentation! + +To get started, please visit the :ref:`Getting started ` page. + +======= +Authors +======= + +``diffpy.srmise`` is developed by Simon Billinge, Billinge Group members. The maintainer for this project is Simon Billinge. For a detailed list of contributors see +https://github.com/diffpy/diffpy.srmise/graphs/contributors. + +============ +Installation +============ + +See the `README `_ +file included with the distribution. + +================ +Acknowledgements +================ + +``diffpy.srmise`` is built and maintained with `scikit-package `_. + +================= +Table of contents +================= +.. toctree:: + :maxdepth: 1 + :titlesonly: + + tutorial/index + extending + Package API + release + license + +======= +Indices +======= + +* :ref:`genindex` +* :ref:`search` diff --git a/doc/source/license.rst b/docs/source/license.rst similarity index 97% rename from doc/source/license.rst rename to docs/source/license.rst index 75f0bdd..65646b0 100644 --- a/doc/source/license.rst +++ b/docs/source/license.rst @@ -11,7 +11,7 @@ BSD 3-Clause License Copyright 2014-2015, Board of Trustees of Michigan State University -Copyright 2016-2024, The Trustees of Columbia University in the City of New York. +Copyright 2016-2025, The Trustees of Columbia University in the City of New York. All rights reserved. diff --git a/doc/source/release.rst b/docs/source/release.rst similarity index 100% rename from doc/source/release.rst rename to docs/source/release.rst diff --git a/docs/source/snippets/.placeholder b/docs/source/snippets/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/doc/source/tutorial/abbreviations.txt b/docs/source/tutorial/abbreviations.txt similarity index 96% rename from doc/source/tutorial/abbreviations.txt rename to docs/source/tutorial/abbreviations.txt index 032313e..89c9401 100644 --- a/doc/source/tutorial/abbreviations.txt +++ b/docs/source/tutorial/abbreviations.txt @@ -1,6 +1,6 @@ .. Abbreviations and definitions for SrMise tutorial. -.. The README file in the doc/examples directory of the SrMise source +.. The README file in the docs/examples directory of the SrMise source distribution should be readable without generating the full Sphinx docs. To do this, the amount of markup is kept to a bare minimum, and the markup that does appear shouldn't get in the way of understanding. diff --git a/doc/source/tutorial/extract_single_peak.rst b/docs/source/tutorial/extract_single_peak.rst similarity index 100% rename from doc/source/tutorial/extract_single_peak.rst rename to docs/source/tutorial/extract_single_peak.rst diff --git a/doc/source/tutorial/fit_initial.rst b/docs/source/tutorial/fit_initial.rst similarity index 100% rename from doc/source/tutorial/fit_initial.rst rename to docs/source/tutorial/fit_initial.rst diff --git a/doc/source/tutorial/index.rst b/docs/source/tutorial/index.rst similarity index 100% rename from doc/source/tutorial/index.rst rename to docs/source/tutorial/index.rst diff --git a/doc/source/tutorial/multimodel_known_uncertainties.rst b/docs/source/tutorial/multimodel_known_uncertainties.rst similarity index 100% rename from doc/source/tutorial/multimodel_known_uncertainties.rst rename to docs/source/tutorial/multimodel_known_uncertainties.rst diff --git a/doc/source/tutorial/multimodel_unknown_uncertainties.rst b/docs/source/tutorial/multimodel_unknown_uncertainties.rst similarity index 100% rename from doc/source/tutorial/multimodel_unknown_uncertainties.rst rename to docs/source/tutorial/multimodel_unknown_uncertainties.rst diff --git a/doc/source/tutorial/parameter_summary.rst b/docs/source/tutorial/parameter_summary.rst similarity index 100% rename from doc/source/tutorial/parameter_summary.rst rename to docs/source/tutorial/parameter_summary.rst diff --git a/doc/source/tutorial/query_results.rst b/docs/source/tutorial/query_results.rst similarity index 100% rename from doc/source/tutorial/query_results.rst rename to docs/source/tutorial/query_results.rst diff --git a/doc/source/tutorial/sample_links.txt b/docs/source/tutorial/sample_links.txt similarity index 100% rename from doc/source/tutorial/sample_links.txt rename to docs/source/tutorial/sample_links.txt diff --git a/environment.yml b/environment.yml deleted file mode 100644 index b467ca2..0000000 --- a/environment.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: diffpy.srmise -channels: - - conda-forge -dependencies: - - python=3 - - pip diff --git a/pyproject.toml b/pyproject.toml index ce2f2b1..cc5fa75 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,14 +6,14 @@ build-backend = "setuptools.build_meta" name = "diffpy.srmise" dynamic=['version', 'dependencies'] authors = [ - { name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" }, + { name="Simon J.L. Billinge group", email="sb2896@columbia.edu" }, {name="Luke Granlund", email="granlund@pa.msu.edu"}, ] maintainers = [ - { name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" }, + { name="Simon Billinge", email="sb2896@columbia.edu" }, ] description = "Peak extraction and peak fitting tool for atomic pair distribution functions." -keywords = ['peak extraction fitting PDF AIC multimodeling'] +keywords = ['peak extraction', 'fitting', 'PDF', 'AIC', 'multimodeling'] readme = "README.rst" requires-python = ">=3.11, <3.14" classifiers = [ @@ -33,6 +33,7 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Physics', 'Topic :: Scientific/Engineering :: Chemistry', 'Topic :: Software Development :: Libraries', + ] [project.urls] @@ -62,6 +63,14 @@ exclude-file = ".codespell/ignore_lines.txt" ignore-words = ".codespell/ignore_words.txt" skip = "*.cif,*.dat" +[tool.docformatter] +recursive = true +wrap-summaries = 72 +wrap-descriptions = 72 +exclude = [ + "src/diffpy/srmise/baselines/arbitrary.py" +] + [tool.black] line-length = 115 include = '\.pyi?$' diff --git a/requirements/build.txt b/requirements/build.txt deleted file mode 100644 index f72d870..0000000 --- a/requirements/build.txt +++ /dev/null @@ -1,2 +0,0 @@ -python -setuptools diff --git a/requirements/docs.txt b/requirements/docs.txt index ab17b1c..5f34c6e 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,5 @@ sphinx sphinx_rtd_theme +sphinx-copybutton doctr m2r diff --git a/requirements/test.txt b/requirements/tests.txt similarity index 100% rename from requirements/test.txt rename to requirements/tests.txt diff --git a/src/diffpy/__init__.py b/src/diffpy/__init__.py index 377a0f9..0163760 100644 --- a/src/diffpy/__init__.py +++ b/src/diffpy/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ############################################################################## # -# (c) 2024 The Trustees of Columbia University in the City of New York. +# (c) 2025 The Trustees of Columbia University in the City of New York. # All rights reserved. # # File coded by: Billinge Group members and community contributors. @@ -12,7 +12,6 @@ # See LICENSE.rst for license information. # ############################################################################## - """Blank namespace package for module diffpy.""" diff --git a/src/diffpy/srmise/__init__.py b/src/diffpy/srmise/__init__.py index 65eb42b..a4e8b2b 100644 --- a/src/diffpy/srmise/__init__.py +++ b/src/diffpy/srmise/__init__.py @@ -1,10 +1,10 @@ #!/usr/bin/env python ############################################################################## # -# (c) 2024 The Trustees of Columbia University in the City of New York. +# (c) 2025 The Trustees of Columbia University in the City of New York. # All rights reserved. # -# File coded by: Billinge Group members and community contributors. +# File coded by: Simon Billinge, Billinge Group members. # # See GitHub contributions for a more detailed list of contributors. # https://github.com/diffpy/diffpy.srmise/graphs/contributors @@ -12,8 +12,9 @@ # See LICENSE.rst for license information. # ############################################################################## +"""Peak extraction and peak fitting tool for atomic pair distribution +functions.""" -"""Peak extraction and peak fitting tool for atomic pair distribution functions.""" # package version from diffpy.srmise.version import __version__ diff --git a/src/diffpy/srmise/applications/plot.py b/src/diffpy/srmise/applications/plot.py index 0399565..788b7d0 100755 --- a/src/diffpy/srmise/applications/plot.py +++ b/src/diffpy/srmise/applications/plot.py @@ -11,7 +11,7 @@ # See LICENSE.txt for license information. # ############################################################################## -"""plot extracted peaks and comparison to ideal distances (if given)""" +"""Plot extracted peaks and comparison to ideal distances (if given)""" import optparse import sys @@ -175,7 +175,7 @@ def labelallsubplots(): def makeplot(ppe_or_stability, ip=None, **kwds): - """Plot stuff""" + """Plot stuff.""" if isinstance(ppe_or_stability, PeakStability): stability = ppe_or_stability ppe = stability.ppe @@ -530,7 +530,8 @@ def on_draw(event): def readcompare(filename): - """Returns a list of distances read from filename, otherwise None.""" + """Returns a list of distances read from filename, otherwise + None.""" # TODO: Make this safer try: diff --git a/src/diffpy/srmise/basefunction.py b/src/diffpy/srmise/basefunction.py index 7a955f0..1876788 100644 --- a/src/diffpy/srmise/basefunction.py +++ b/src/diffpy/srmise/basefunction.py @@ -11,7 +11,8 @@ # See LICENSE.txt for license information. # ############################################################################## -"""Defines BaseFunction, the base class for mathematical functions in srmise.""" +"""Defines BaseFunction, the base class for mathematical functions in +srmise.""" import logging import re @@ -25,7 +26,8 @@ class BaseFunction(object): - """Base class for mathematical functions which model numeric sequences. + """Base class for mathematical functions which model numeric + sequences. Attributes ------------- @@ -76,7 +78,7 @@ def __init__( base=None, Cache=None, ): - """Set parameterdict defined by subclass + """Set parameterdict defined by subclass. Parameters ---------- @@ -159,32 +161,50 @@ def __init__( # "Virtual" class methods #### def actualize(self, *args, **kwds): - """Create ModelPart instance of self with given parameters. ("Virtual" method)""" + """Create ModelPart instance of self with given parameters. + + ("Virtual" method) + """ emsg = "actualize() must be implemented in a BaseFunction subclass." raise NotImplementedError(emsg) def estimate_parameters(self, *args, **kwds): - """Estimate BaseFunction parameters from supplied data. ("Virtual" method)""" + """Estimate BaseFunction parameters from supplied data. + + ("Virtual" method) + """ emsg = "estimate_parameters() must be implemented in a BaseFunction subclass." raise NotImplementedError(emsg) def _jacobianraw(self, *args, **kwds): - """Calculate the jacobian. ("Virtual" method)""" + """Calculate the jacobian. + + ("Virtual" method) + """ emsg = "_jacobianraw() must be implemented in a BaseFunction subclass." raise NotImplementedError(emsg) def _transform_derivativesraw(self, *args, **kwds): - """Convert BaseFunction parameters to another form. ("Virtual" method)""" + """Convert BaseFunction parameters to another form. + + ("Virtual" method) + """ emsg = "transform_parameters() must be implemented in a BaseFunction subclass." raise NotImplementedError(emsg) def _transform_parametersraw(self, *args, **kwds): - """Convert BaseFunction parameters to another form. ("Virtual" method)""" + """Convert BaseFunction parameters to another form. + + ("Virtual" method) + """ emsg = "transform_parameters() must be implemented in a BaseFunction subclass." raise NotImplementedError(emsg) def _valueraw(self, *args, **kwds): - """Calculate value of function. ("Virtual" method)""" + """Calculate value of function. + + ("Virtual" method) + """ emsg = "_valueraw must() be implemented in a BaseFunction subclass." raise NotImplementedError(emsg) @@ -225,7 +245,8 @@ def jacobian(self, p, r, rng=None): return self._jacobianraw(p.pars, r, p.free) def transform_derivatives(self, pars, in_format=None, out_format=None): - """Return gradient matrix for pars converted from in_format to out_format. + """Return gradient matrix for pars converted from in_format to + out_format. Parameters ---------- @@ -266,7 +287,8 @@ def transform_derivatives(self, pars, in_format=None, out_format=None): return self._transform_derivativesraw(pars, in_format=in_format, out_format=out_format) def transform_parameters(self, pars, in_format=None, out_format=None): - """Return new sequence with pars converted from in_format to out_format. + """Return new sequence with pars converted from in_format to + out_format. Also restores parameters to a preferred range if it permits multiple values that correspond to the same physical result. @@ -310,7 +332,8 @@ def transform_parameters(self, pars, in_format=None, out_format=None): return self._transform_parametersraw(pars, in_format=in_format, out_format=out_format) def value(self, p, r, rng=None): - """Calculate value of ModelPart over r, possibly restricted by range. + """Calculate value of ModelPart over r, possibly restricted by + range. Parameters ---------- @@ -345,7 +368,8 @@ def value(self, p, r, rng=None): return self._valueraw(p.pars, r) def pgradient(self, p, format): - """Return gradient matrix of parameterization in specified format wrt "internal" format at p. + """Return gradient matrix of parameterization in specified + format wrt "internal" format at p. Consider the "internal" parameterization given by (i0, i1, ..., in). Each parameter in a different format, say (o0, o1, ..., om), is a @@ -373,7 +397,7 @@ def pgradient(self, p, format): return def getmodule(self): - """Return 'diffpy.srmise.basefunction'""" + """Return 'diffpy.srmise.basefunction'.""" return "diffpy.srmise.basefunction" def writestr(self, baselist): @@ -473,14 +497,16 @@ def factory(functionstr, baselist): @staticmethod def safefunctionlist(fs): - """Return list of BaseFunction instances where any dependencies occur earlier in list. + """Return list of BaseFunction instances where any dependencies + occur earlier in list. Any functions with hidden dependent functions (i.e. those not in fs) are included in the returned list. This list provides an order that is guaranteed to be safe for saving/reinstantiating peak functions. Parameters - fs: List of BaseFunction instances.""" + fs: List of BaseFunction instances. + """ fsafe = [] for f in fs: BaseFunction.safefunction(f, fsafe) @@ -488,7 +514,8 @@ def safefunctionlist(fs): @staticmethod def safefunction(f, fsafe): - """Append BaseFunction instance f to fsafe, but adding dependent functions first. + """Append BaseFunction instance f to fsafe, but adding dependent + functions first. Does not handle circular dependencies. diff --git a/src/diffpy/srmise/baselines/arbitrary.py b/src/diffpy/srmise/baselines/arbitrary.py index 80c1055..6101bbb 100644 --- a/src/diffpy/srmise/baselines/arbitrary.py +++ b/src/diffpy/srmise/baselines/arbitrary.py @@ -26,17 +26,17 @@ class Arbitrary(BaselineFunction): """Methods for evaluating a baseline from an arbitrary function. - Supports baseline calculations with arbitrary functions. These functions, - if implemented, must have the following signatures and return values: - valuef(pars, x) ==> numpy.array of length x if x is a sequence - ==> number if x is a number - jacobianf(pars, x, free) ==> list, each element a numpy.array of length x if - x is a sequence or None if value of free for - that parameter is False. - ==> list, each element a number if x is a number - or None if value of free for that parameter is - False - estimatef(x, y) ==> numpy.array of length npars + Supports baseline calculations with arbitrary functions. These + functions, if implemented, must have the following signatures and + return values: valuef(pars, x) ==> numpy.array of length x + if x is a sequence ==> number if x is a + number jacobianf(pars, x, free) ==> list, each element a numpy.array + of length x if x is a sequence or None + if value of free for that parameter is + False. ==> list, each element a number if x + is a number or None if value of free for + that parameter is False estimatef(x, y) + ==> numpy.array of length npars """ def __init__(self, npars, valuef, jacobianf=None, estimatef=None, Cache=None): @@ -117,7 +117,8 @@ def estimate_parameters(self, r, y): The numpy array of parameters in the default internal format. we raise NotImplementedError if no estimation routine is defined, and - SrMiseEstimationError if parameters cannot be estimated for any other.""" + SrMiseEstimationError if parameters cannot be estimated for any other. + """ if self.estimatef is None: emsg = "No estimation routine provided to Arbitrary." raise NotImplementedError(emsg) @@ -211,7 +212,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return temp def _valueraw(self, pars, r): - """Compute the value of the polynomial given a set of parameters and evaluation points. + """Compute the value of the polynomial given a set of parameters + and evaluation points. This method ensures that the input parameters conform to the expected count and then delegates the computation to an internal method `valuef`. diff --git a/src/diffpy/srmise/baselines/base.py b/src/diffpy/srmise/baselines/base.py index c1ecf0e..bad8244 100644 --- a/src/diffpy/srmise/baselines/base.py +++ b/src/diffpy/srmise/baselines/base.py @@ -24,7 +24,8 @@ class BaselineFunction(BaseFunction): - """Base class for functions which represent some data's baseline term. + """Base class for functions which represent some data's baseline + term. Class members ------------- @@ -71,7 +72,7 @@ def __init__( base=None, Cache=None, ): - """Set parameterdict defined by subclass + """Set parameterdict defined by subclass. parameterdict : dict The dictionary mapping string keys to their index in a @@ -91,7 +92,8 @@ def __init__( additional functionality. Cache : class The class (not instance) which implements caching of BaseFunction - evaluations.""" + evaluations. + """ BaseFunction.__init__(self, parameterdict, parformats, default_formats, metadict, base, Cache) # "Virtual" class methods #### @@ -117,10 +119,12 @@ def getmodule(self): class Baseline(ModelPart): - """Represents a baseline associated with a BaselineFunction subclass.""" + """Represents a baseline associated with a BaselineFunction + subclass.""" def __init__(self, owner, pars, free=None, removable=False, static_owner=False): - """Initialize the BaselineComponent instance with specified configurations. + """Initialize the BaselineComponent instance with specified + configurations. Parameters ---------- diff --git a/src/diffpy/srmise/baselines/fromsequence.py b/src/diffpy/srmise/baselines/fromsequence.py index 1866441..347c14d 100644 --- a/src/diffpy/srmise/baselines/fromsequence.py +++ b/src/diffpy/srmise/baselines/fromsequence.py @@ -23,14 +23,18 @@ class FromSequence(BaselineFunction): - """Methods for evaluation of a baseline from discrete data via interpolation. + """Methods for evaluation of a baseline from discrete data via + interpolation. - FromSequence uses cubic spline interpolation (no smoothing) on discrete - points to approximate the baseline at arbitrary points within the - interpolation domain. This baseline function permits no free parameters.""" + FromSequence uses cubic spline interpolation (no smoothing) on + discrete points to approximate the baseline at arbitrary points + within the interpolation domain. This baseline function permits no + free parameters. + """ def __init__(self, *args, **kwds): - """Initialize a baseline object based on input sequences `x` and `y`. + """Initialize a baseline object based on input sequences `x` and + `y`. This class provides two ways to initialize: by directly providing the sequences or by specifying a file that contains the sequences. @@ -181,7 +185,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return temp def _valueraw(self, pars, r): - """Return value of polynomial for the given parameters and r values. + """Return value of polynomial for the given parameters and r + values. Parameters ---------- @@ -233,7 +238,7 @@ def xyrepr(self, var): return "[%s]" % ", ".join([repr(v) for v in var]) def readxy(self, filename): - """ """ + """""" from diffpy.srmise.srmiseerrors import SrMiseDataFormatError # TODO: Make this safer diff --git a/src/diffpy/srmise/baselines/nanospherical.py b/src/diffpy/srmise/baselines/nanospherical.py index a76719f..1c199c2 100644 --- a/src/diffpy/srmise/baselines/nanospherical.py +++ b/src/diffpy/srmise/baselines/nanospherical.py @@ -22,7 +22,8 @@ class NanoSpherical(BaselineFunction): - """Methods for evaluation of baseline of spherical nanoparticle of uniform density. + """Methods for evaluation of baseline of spherical nanoparticle of + uniform density. Allowed formats are internal: [scale, radius] @@ -212,7 +213,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return temp def _valueraw(self, pars, r): - """Return value of spherical baseline for the given parameters and r values. + """Return value of spherical baseline for the given parameters + and r values. Outside the interval [0, radius] the baseline is 0. @@ -245,7 +247,8 @@ def _valueraw(self, pars, r): return out def _valueraw2(self, pars, r): - """Return value of spherical baseline without bounds checking for given parameters and r values. + """Return value of spherical baseline without bounds checking + for given parameters and r values. Parameters ---------- @@ -267,7 +270,7 @@ def _valueraw2(self, pars, r): return -s * r * (1 - (3.0 / 4.0) * rdivR + (1.0 / 16.0) * rdivR**3) def _getdomain(self, pars, r): - """Return slice object for which r > 0 and r < twice the radius + """Return slice object for which r > 0 and r < twice the radius. Parameters ---------- diff --git a/src/diffpy/srmise/baselines/polynomial.py b/src/diffpy/srmise/baselines/polynomial.py index 6ec155e..9d61574 100644 --- a/src/diffpy/srmise/baselines/polynomial.py +++ b/src/diffpy/srmise/baselines/polynomial.py @@ -23,7 +23,8 @@ class Polynomial(BaselineFunction): - """Methods for evaluation and parameter estimation of a polynomial baseline.""" + """Methods for evaluation and parameter estimation of a polynomial + baseline.""" def __init__(self, degree, Cache=None): """Initialize a polynomial function of degree d. @@ -186,7 +187,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return temp def _valueraw(self, pars, r): - """Return value of polynomial for the given parameters and r values. + """Return value of polynomial for the given parameters and r + values. Parameters ---------- diff --git a/src/diffpy/srmise/dataclusters.py b/src/diffpy/srmise/dataclusters.py index 4a057c3..5cac3b1 100644 --- a/src/diffpy/srmise/dataclusters.py +++ b/src/diffpy/srmise/dataclusters.py @@ -11,7 +11,8 @@ # See LICENSE.txt for license information. # ############################################################################## -"""Defines class to partition sequences representing the x and y axis into peak-like clusters.""" +"""Defines class to partition sequences representing the x and y axis +into peak-like clusters.""" import logging @@ -53,7 +54,7 @@ class DataClusters: """ def __init__(self, x, y, res): - """Constructor + """Constructor. Parameters ---------- @@ -102,8 +103,8 @@ def __eq__(self, other): ) def _clear(self): - """ - Clear all data and reset the cluster object to a transient initial state. + """Clear all data and reset the cluster object to a transient + initial state. The purpose of this method is to provide a clean state before creating new clustering operations. The object is updated in-place and no new instance is returned. @@ -176,7 +177,8 @@ def __next__(self): """Cluster point with largest y-coordinate left, returning self. next() always adds at least one additional point to the existing - cluster, or raises an exception if all points have been clustered. + cluster, or raises an exception if all points have been + clustered. """ if self.status == self.INIT: raise Exception("Cannot cluster next point while status is INIT.") @@ -257,7 +259,8 @@ def find_nearest_cluster2(self, x): return self.find_nearest_cluster(idx - 1) def find_nearest_cluster(self, idx): - """Return [cluster index, distance] for cluster nearest to x[idx]. + """Return [cluster index, distance] for cluster nearest to + x[idx]. The distance is positive/negative if the point is right/left of the nearest cluster. If the point is within an existing cluster then @@ -332,7 +335,8 @@ def cluster_is_full(self, cluster_idx): return self.clusters[cluster_idx, 0] == low and self.clusters[cluster_idx, 1] == high def combine_clusters(self, combine): - """Combine clusters specified by each subarray of cluster indices. + """Combine clusters specified by each subarray of cluster + indices. Clusters to combine must be contiguous, increasing, and have no unclustered points between them. @@ -386,7 +390,8 @@ def combine_clusters(self, combine): self.clusters = np.delete(self.clusters, todelete, 0) def find_adjacent_clusters(self): - """Return all cluster indices with no unclustered points between them. + """Return all cluster indices with no unclustered points between + them. Return array([[leftmost_idx1,...,rightmost_idx1],...]) such that there are no unclustered points between each element in subarray of clusters @@ -465,7 +470,10 @@ def plot(self, *args, **kwds): return def animate(self): - """Animate clustering. Restores state when complete.""" + """Animate clustering. + + Restores state when complete. + """ clusters = self.clusters current_idx = self.current_idx lastcluster_idx = self.lastcluster_idx diff --git a/src/diffpy/srmise/modelcluster.py b/src/diffpy/srmise/modelcluster.py index 1525ddc..0d92f30 100644 --- a/src/diffpy/srmise/modelcluster.py +++ b/src/diffpy/srmise/modelcluster.py @@ -40,7 +40,8 @@ class ModelCovariance(object): - """Helper class preserves uncertainty info (full covariance matrix) for a fit model. + """Helper class preserves uncertainty info (full covariance matrix) + for a fit model. This object preserves a light-weight "frozen" version of a model which can be used to interrogate the model about the uncertainties of its parameters. @@ -137,7 +138,8 @@ def setcovariance(self, model, cov): rawi += 1 def transform(self, in_format, out_format, **kwds): - """Transform parameters and covariance matrix under specified change of variables. + """Transform parameters and covariance matrix under specified + change of variables. By default this change applies to all parameters of the model. If the specified transformation is invalid for a given ModelPart the original parameterization is maintained for that part. @@ -226,7 +228,8 @@ def transform(self, in_format, out_format, **kwds): return def getcorrelation(self, i, j): - """Return the correlation between variables i and j, Corr_ij=Cov_ij/(sigma_i sigma_j) + """Return the correlation between variables i and j, + Corr_ij=Cov_ij/(sigma_i sigma_j) The variables may be specified as integers, or as a two-component tuple of integers (l, m) which indicate the mth parameter in peak l. @@ -262,8 +265,9 @@ def getcorrelation(self, i, j): def getvalue(self, i): """Return value of parameter i. - The variable may be specified as an integer, or as a two-component tuple of integers (l, m) - which indicate the mth parameter of modelpart l. + The variable may be specified as an integer, or as a two- + component tuple of integers (l, m) which indicate the mth + parameter of modelpart l. """ (l, m) = i if i in self.pmap else self.ipmap[i] return self.model[l][m] @@ -334,7 +338,8 @@ def get(self, i): return (self.getvalue(i), self.getuncertainty(i)) def correlationwarning(self, threshold=0.8): - """Report distinct variables with magnitude of correlation greater than threshold. + """Report distinct variables with magnitude of correlation + greater than threshold. Returns a list of tuples (i, j, c), where i and j are tuples indicating the modelpart and parameter indices of the correlated variables, and @@ -363,7 +368,8 @@ def correlationwarning(self, threshold=0.8): return correlated def __str__(self): - """Return string of value (uncertainty) pairs for all parameters.""" + """Return string of value (uncertainty) pairs for all + parameters.""" if self.model is None or self.cov is None: return "Model and/or Covariance matrix undefined." lines = [] @@ -426,7 +432,6 @@ class ModelCluster(object): value: Return value of the model plus baseline valuebl: Return value of the baseline writestr: Return string representation of self. - """ def __init__(self, model, *args, **kwds): @@ -501,7 +506,8 @@ def __init__(self, model, *args, **kwds): def copy(self): """Return copy of this ModelCluster. - Equivalent to ModelCluster(self)""" + Equivalent to ModelCluster(self) + """ return ModelCluster(self) def addexternalpeaks(self, peaks): @@ -964,7 +970,8 @@ def deletepeak(self, idx): self.replacepeaks([], slice(idx, idx + 1)) def estimatepeak(self): - """Attempt to add single peak to empty cluster. Return True if successful. + """Attempt to add single peak to empty cluster. Return True if + successful. Returns ------- @@ -1126,7 +1133,8 @@ def fit( return new_qual def contingent_fit(self, minpoints, growth_threshold): - """Fit cluster if it has grown sufficiently large since its last fit. + """Fit cluster if it has grown sufficiently large since its last + fit. Parameters ---------- @@ -1149,7 +1157,10 @@ def contingent_fit(self, minpoints, growth_threshold): return None def cleanfit(self): - """Remove poor-quality peaks in the fit. Return number removed.""" + """Remove poor-quality peaks in the fit. + + Return number removed. + """ # Find peaks located outside the cluster pos = np.array([p["position"] for p in self.model]) left_idx = pos.searchsorted(self.r_cluster[0]) @@ -1219,7 +1230,8 @@ def reduce_to(self, x, y): Returns ------- ModelEvaluator or None - Return ModelEvaluator instance if fit changed, otherwise None.""" + Return ModelEvaluator instance if fit changed, otherwise None. + """ # No reduction necessary if self.model.value(x) < y: logger.debug("reduce_to: No reduction necessary.") @@ -1295,7 +1307,8 @@ def residual(self): return self.y_cluster - self.value() def quality(self, evaluator=None, **kwds): - """Return ModelEvaluator instance containing calculated quality of the model. + """Return ModelEvaluator instance containing calculated quality + of the model. ModelEvaluator objects may be compared as though they were numerical quantities. Its raw value is given by the 'stat' member. For more @@ -1323,7 +1336,8 @@ def quality(self, evaluator=None, **kwds): return evaluator_inst def plottable(self, joined=False): - """Return sequence suitable for plotting cluster model+baseline with matplotlib. + """Return sequence suitable for plotting cluster model+baseline + with matplotlib. Parameters ---------- @@ -1346,7 +1360,8 @@ def plottable(self, joined=False): return toreturn def plottable_residual(self): - """Return sequence suitable for plotting cluster residual with matplotlib. + """Return sequence suitable for plotting cluster residual with + matplotlib. Returns ------- @@ -1356,7 +1371,8 @@ def plottable_residual(self): return [self.r_cluster, self.residual()] def augment(self, source): - """Add peaks from another ModelCluster that improve this one's quality. + """Add peaks from another ModelCluster that improve this one's + quality. Parameters ---------- @@ -1427,14 +1443,15 @@ def __str__(self): def prune(self): """Remove peaks until model quality no longer improves. - Peaks are removed in a greedy fashion, and the best possible model is - by no means guaranteed. + Peaks are removed in a greedy fashion, and the best possible + model is by no means guaranteed. - Due to the somewhat exploratory nature of prune many non-convergent - fits will generally be performed, but it severely restricts the number - of function evaluations permitted during fitting, and so fits that do - not converge rapidly are abandoned. Nevertheless, occasionally this - method will take an unusually long time to complete. + Due to the somewhat exploratory nature of prune many non- + convergent fits will generally be performed, but it severely + restricts the number of function evaluations permitted during + fitting, and so fits that do not converge rapidly are abandoned. + Nevertheless, occasionally this method will take an unusually + long time to complete. """ if len(self.model) == 0: return diff --git a/src/diffpy/srmise/modelevaluators/aic.py b/src/diffpy/srmise/modelevaluators/aic.py index 1a1973b..24b4ef5 100644 --- a/src/diffpy/srmise/modelevaluators/aic.py +++ b/src/diffpy/srmise/modelevaluators/aic.py @@ -46,12 +46,13 @@ class AIC(ModelEvaluator): """ def __init__(self): - """ """ + """""" ModelEvaluator.__init__(self, "AIC", False) return def evaluate(self, fit, count_fixed=False, kshift=0): - """Return quality of fit for given ModelCluster using AIC (Akaike's Information Criterion). + """Return quality of fit for given ModelCluster using AIC + (Akaike's Information Criterion). Parameters ---------- @@ -66,7 +67,8 @@ def evaluate(self, fit, count_fixed=False, kshift=0): Returns ------- quality : float - The quality of fit for given ModelCluster.""" + The quality of fit for given ModelCluster. + """ # Number of parameters. By default, fixed parameters are ignored. k = fit.model.npars(count_fixed=count_fixed) + kshift if k < 0: @@ -88,7 +90,8 @@ def evaluate(self, fit, count_fixed=False, kshift=0): return self.stat def minpoints(self, npars): - """Calculates the minimum number of points required to make an estimate of a model's quality. + """Calculates the minimum number of points required to make an + estimate of a model's quality. Parameters ---------- @@ -104,7 +107,8 @@ def minpoints(self, npars): return 1 def parpenalty(self, k): - """Returns the cost for adding k parameters to the current model cluster. + """Returns the cost for adding k parameters to the current model + cluster. Parameters ---------- @@ -124,8 +128,9 @@ def parpenalty(self, k): return (2 * k) * fudgefactor def growth_justified(self, fit, k_prime): - """Returns whether adding k_prime parameters to the given model (ModelCluster) is justified - given the current quality of the fit. + """Returns whether adding k_prime parameters to the given model + (ModelCluster) is justified given the current quality of the + fit. The assumption is that adding k_prime parameters will result in "effectively 0" chiSquared cost, and so adding it is justified if the cost of adding @@ -170,7 +175,7 @@ def growth_justified(self, fit, k_prime): @staticmethod def akaikeweights(aics): - """Return sequence of Akaike weights for sequence of AICs + """Return sequence of Akaike weights for sequence of AICs. Parameters ---------- @@ -189,7 +194,7 @@ def akaikeweights(aics): @staticmethod def akaikeprobs(aics): - """Return sequence of Akaike probabilities for sequence of AICs + """Return sequence of Akaike probabilities for sequence of AICs. Parameters ---------- @@ -199,7 +204,8 @@ def akaikeprobs(aics): Returns ------- array-like - The sequence of Akaike probabilities""" + The sequence of Akaike probabilities + """ aic_weights = AIC.akaikeweights(aics) return aic_weights / np.sum(aic_weights) diff --git a/src/diffpy/srmise/modelevaluators/aicc.py b/src/diffpy/srmise/modelevaluators/aicc.py index b2a9286..66d49fc 100644 --- a/src/diffpy/srmise/modelevaluators/aicc.py +++ b/src/diffpy/srmise/modelevaluators/aicc.py @@ -45,13 +45,14 @@ class AICc(ModelEvaluator): """ def __init__(self): - """ """ + """""" ModelEvaluator.__init__(self, "AICc", False) return def evaluate(self, fit, count_fixed=False, kshift=0): - """Return quality of fit for given ModelCluster using AICc (Akaike's Information Criterion - with 2nd order correction for small sample size). + """Return quality of fit for given ModelCluster using AICc + (Akaike's Information Criterion with 2nd order correction for + small sample size). Parameters fit: A ModelCluster @@ -65,7 +66,8 @@ def evaluate(self, fit, count_fixed=False, kshift=0): Returns ------- float - Quality of AICc""" + Quality of AICc + """ # Number of parameters. By default, fixed parameters are ignored. k = fit.model.npars(count_fixed=count_fixed) + kshift if k < 0: @@ -87,7 +89,8 @@ def evaluate(self, fit, count_fixed=False, kshift=0): return self.stat def minpoints(self, npars): - """Calculates the minimum number of points required to make an estimate of a model's quality. + """Calculates the minimum number of points required to make an + estimate of a model's quality. Parameters ---------- @@ -105,7 +108,8 @@ def minpoints(self, npars): return npars + 2 def parpenalty(self, k, n): - """Returns the cost for adding k parameters to the current model cluster. + """Returns the cost for adding k parameters to the current model + cluster. Parameters ---------- @@ -128,7 +132,8 @@ def parpenalty(self, k, n): return (2 * k + float(2 * k * (k + 1)) / (n - k - 1)) * fudgefactor def growth_justified(self, fit, k_prime): - """Is adding k_prime parameters to ModelCluster justified given the current quality of the fit. + """Is adding k_prime parameters to ModelCluster justified given + the current quality of the fit. The assumption is that adding k_prime parameters will result in "effectively 0" chiSquared cost, and so adding it is justified if the cost of adding these parameters is less than the current @@ -171,7 +176,7 @@ def growth_justified(self, fit, k_prime): @staticmethod def akaikeweights(aics): - """Return sequence of Akaike weights for sequence of AICs + """Return sequence of Akaike weights for sequence of AICs. Parameters ---------- @@ -190,7 +195,7 @@ def akaikeweights(aics): @staticmethod def akaikeprobs(aics): - """Return sequence of Akaike probabilities for sequence of AICs + """Return sequence of Akaike probabilities for sequence of AICs. Parameters ---------- @@ -200,7 +205,8 @@ def akaikeprobs(aics): Returns ------- array-like - The sequence of Akaike probabilities""" + The sequence of Akaike probabilities + """ aic_weights = AICc.akaikeweights(aics) return aic_weights / np.sum(aic_weights) diff --git a/src/diffpy/srmise/modelevaluators/base.py b/src/diffpy/srmise/modelevaluators/base.py index 179e082..f190e27 100644 --- a/src/diffpy/srmise/modelevaluators/base.py +++ b/src/diffpy/srmise/modelevaluators/base.py @@ -48,12 +48,14 @@ class ModelEvaluator: - """Class for evaluating the quality of a fit. Comparison between different - models of the same type is defined so that better models are 'greater than' - worse models.""" + """Class for evaluating the quality of a fit. + + Comparison between different models of the same type is defined so + that better models are 'greater than' worse models. + """ def __init__(self, method, higher_is_better): - """Constructor of ModelEvaluator + """Constructor of ModelEvaluator. Parameters ---------- @@ -69,7 +71,7 @@ def __init__(self, method, higher_is_better): return def __lt__(self, other): - """ """ + """""" assert self.method == other.method # Comparison between same types required assert self.stat is not None and other.stat is not None # The statistic must already be calculated @@ -80,7 +82,7 @@ def __lt__(self, other): return other.stat < self.stat def __le__(self, other): - """ """ + """""" assert self.method == other.method # Comparison between same types required assert self.stat is not None and other.stat is not None # The statistic must already be calculated @@ -91,7 +93,7 @@ def __le__(self, other): return other.stat <= self.stat def __eq__(self, other): - """ """ + """""" assert self.method == other.method # Comparison between same types required assert self.stat is not None and other.stat is not None # The statistic must already be calculated @@ -99,7 +101,7 @@ def __eq__(self, other): return self.stat == other.stat def __ne__(self, other): - """ """ + """""" assert self.method == other.method # Comparison between same types required assert self.stat is not None and other.stat is not None # The statistic must already be calculated @@ -107,7 +109,7 @@ def __ne__(self, other): return self.stat != other.stat def __gt__(self, other): - """ """ + """""" assert self.method == other.method # Comparison between same types required assert self.stat is not None and other.stat is not None # The statistic must already be calculated @@ -118,7 +120,7 @@ def __gt__(self, other): return other.stat > self.stat def __ge__(self, other): - """ """ + """""" assert self.method == other.method # Comparison between same types required assert self.stat is not None and other.stat is not None # The statistic must already be calculated @@ -138,7 +140,8 @@ def chi_squared(self, expected, observed, error): observed : float The observed value. error : float - The error statistic.""" + The error statistic. + """ self.chisq = np.sum((expected - observed) ** 2 / error**2) return self.chisq diff --git a/src/diffpy/srmise/modelparts.py b/src/diffpy/srmise/modelparts.py index 43a2141..8c591e1 100644 --- a/src/diffpy/srmise/modelparts.py +++ b/src/diffpy/srmise/modelparts.py @@ -569,7 +569,8 @@ def compress(self): Returns ------- pars : array-like - The compressed parameters of the model part.""" + The compressed parameters of the model part. + """ return self.pars[self.free] def jacobian(self, r, range=None): @@ -591,12 +592,14 @@ def jacobian(self, r, range=None): return self._owner.jacobian(self, r, range) def owner(self): - """Return the BaseFunction subclass instance which owns this part. + """Return the BaseFunction subclass instance which owns this + part. Returns ------- BaseFunction subclass - The BaseFunction subclass which owns this part.""" + The BaseFunction subclass which owns this part. + """ return self._owner def update(self, freepars): @@ -727,7 +730,8 @@ def npars(self, count_fixed=True): Returns ------- int - The number of parameters in all parts.""" + The number of parameters in all parts. + """ if count_fixed: return self._owner.npars else: @@ -738,7 +742,7 @@ def __str__(self): return str(self._owner.transform_parameters(self.pars, in_format="internal", out_format="default_output")) def __eq__(self, other): - """ """ + """""" if hasattr(other, "_owner"): return ( (self._owner is other._owner) @@ -750,7 +754,7 @@ def __eq__(self, other): return False def __ne__(self, other): - """ """ + """""" return not self == other def writestr(self, ownerlist): diff --git a/src/diffpy/srmise/multimodelselection.py b/src/diffpy/srmise/multimodelselection.py index c4c7b74..4bb85d1 100644 --- a/src/diffpy/srmise/multimodelselection.py +++ b/src/diffpy/srmise/multimodelselection.py @@ -33,10 +33,11 @@ def eatkwds(*args, **kwds): class MultimodelSelection(PeakStability): - """Quick and dirty multimodel selection using AIC and its offspring.""" + """Quick and dirty multimodel selection using AIC and its + offspring.""" def __init__(self): - """ """ + """""" self.dgs = np.array([]) self.dgs_idx = {} @@ -187,7 +188,8 @@ def makeaicprobs(self): self.aicprobs[dg] = em.akaikeprobs(self.aics[dg]) def makesortedprobs(self): - """Make probabilities for the sequence of AICs in a sorted order.""" + """Make probabilities for the sequence of AICs in a sorted + order.""" self.sortedprobs = {} for dg in self.dgs: @@ -203,7 +205,8 @@ def animate_probs(self, step=False, duration=0.0, **kwds): duration : float Minimum time in seconds to complete animation. Default is 0. - Keywords passed to pyplot.plot()""" + Keywords passed to pyplot.plot() + """ if duration > 0: import time @@ -248,7 +251,8 @@ def animate_classprobs(self, step=False, duration=0.0, **kwds): duration : float Minimum time in seconds to complete animation. Default is 0. - Keywords passed to pyplot.plot()""" + Keywords passed to pyplot.plot() + """ if duration > 0: import time @@ -461,7 +465,8 @@ def dg_key(self, dg_in): Returns ------- float - The dg value usable as a key nearest to dg_in.""" + The dg value usable as a key nearest to dg_in. + """ idx = (np.abs(self.dgs - dg_in)).argmin() return self.dgs[idx] @@ -476,7 +481,8 @@ def bestclasses(self, dgs=None): Returns ------- array-like - The best classes for all models.""" + The best classes for all models. + """ if dgs is None: dgs = self.dgs best = [] @@ -518,7 +524,8 @@ def classbestdgs(self, cls, dgs=None): Returns ------- array-like - Sequence of best uncertainties for the models.""" + Sequence of best uncertainties for the models. + """ if dgs is None: dgs = self.dgs bestdgs = [] @@ -528,7 +535,8 @@ def classbestdgs(self, cls, dgs=None): return bestdgs def modelbestdgs(self, model, dgs=None): - """Return uncertainties where given model has greatest Akaike probability. + """Return uncertainties where given model has greatest Akaike + probability. Parameters ---------- @@ -587,7 +595,8 @@ def plot3dclassprobs(self, **kwds): "fig" - The figure "axis" - The image axis "cbaxis" - The colorbar axis, if it exists. - "cb" - The colorbar, if it exists.""" + "cb" - The colorbar, if it exists. + """ from matplotlib import cm, colorbar, colors from matplotlib.collections import PolyCollection @@ -780,7 +789,8 @@ def get_class(self, dG, **kwds): return self.sortedclassprobs[dG][-1 - corder] # index of corderth best class def get_prob(self, dG, **kwds): - """Return Akaike probability of best model of best class at given dG. + """Return Akaike probability of best model of best class at + given dG. Parameters ---------- @@ -807,7 +817,8 @@ def get_prob(self, dG, **kwds): return self.classprobs[dG][cls_idx] def get_nfree(self, dG, **kwds): - """Return number of free parameters of best model of best class at given dG. + """Return number of free parameters of best model of best class + at given dG. Parameters ---------- @@ -832,7 +843,8 @@ def get_nfree(self, dG, **kwds): return model.npars(count_fixed=False) + baseline.npars(count_fixed=False) def get_aic(self, dG, **kwds): - """Return number of free parameters of best model of best class at given dG. + """Return number of free parameters of best model of best class + at given dG. Parameters ---------- @@ -855,7 +867,8 @@ def get_aic(self, dG, **kwds): return self.aics[dG][idx].stat def get(self, dG, *args, **kwds): - """Return tuple of values corresponding to string arguments for best model of best class at given dG. + """Return tuple of values corresponding to string arguments for + best model of best class at given dG. Parameters ---------- @@ -891,7 +904,8 @@ def get(self, dG, *args, **kwds): return tuple(values) def maxprobdG_byclass(self, model): - """Return the post-hoc dG for which the given model's Akaike probability is maximized. + """Return the post-hoc dG for which the given model's Akaike + probability is maximized. Each model is mapped to its class' best member. @@ -911,8 +925,8 @@ def maxprobdG_byclass(self, model): return self.dgs[prob_idx] def maxprobdG_bymodel(self, model): - """Return the post-hoc dG for which the given model's Akaike probability is maximized. - Classes are not considered. + """Return the post-hoc dG for which the given model's Akaike + probability is maximized. Classes are not considered. Parameters ---------- @@ -941,7 +955,8 @@ def maxprobmodel_byclass(self, dG): Returns ------- float - The model mapped by class which maximizes probability at given dG.""" + The model mapped by class which maximizes probability at given dG. + """ cls = self.sortedclassprobs[dG][-1] m = self.sortedclasses[dG][cls][-1] return m @@ -958,6 +973,7 @@ def maxprobmodel_bymodel(self, dG): Returns ------- model : array-like - The model which maximizes probability at given dG.""" + The model which maximizes probability at given dG. + """ # Note that if there are identical models this returns the one of greatest dg. return self.sortedprobs[dG][-1] diff --git a/src/diffpy/srmise/pdfdataset.py b/src/diffpy/srmise/pdfdataset.py index 6f41d30..56c473a 100644 --- a/src/diffpy/srmise/pdfdataset.py +++ b/src/diffpy/srmise/pdfdataset.py @@ -14,10 +14,7 @@ # LICENSE_PDFgui.txt for the full PDFgui license. # ############################################################################## - - -"""class PDFDataSet for experimental PDF data. -""" +"""Class PDFDataSet for experimental PDF data.""" import os.path @@ -32,7 +29,7 @@ class PDFComponent(object): """Common base class.""" def __init__(self, name): - """initialize the object + """Initialize the object. Parameter --------- @@ -42,7 +39,7 @@ def __init__(self, name): self.name = name def close(self, force=False): - """close myself + """Close myself. Parameter --------- @@ -122,9 +119,11 @@ def __init__(self, name): return def clear(self): - """reset all data members to initial empty values + """Reset all data members to initial empty values. - The purpose of this method is to set the PDF dataset to initial empty values.""" + The purpose of this method is to set the PDF dataset to initial + empty values. + """ self.robs = [] self.Gobs = [] self.drobs = [] @@ -144,7 +143,8 @@ def clear(self): def setvar(self, var, value): """Assign a data member using PdfFit-style variable notation. - This method is typically utilized by the `applyParameters()` function. + This method is typically utilized by the `applyParameters()` + function. Parameters ---------- @@ -169,8 +169,8 @@ def setvar(self, var, value): return def getvar(self, var): - """Obtain value corresponding to PdfFit dataset variable. - Used by findParameters(). + """Obtain value corresponding to PdfFit dataset variable. Used + by findParameters(). Parameters ---------- @@ -192,7 +192,7 @@ def getvar(self, var): return value def read(self, filename): - """load data from PDFGetX2 or PDFGetN gr file + """Load data from PDFGetX2 or PDFGetN gr file. filename : str file to read from @@ -217,7 +217,7 @@ def read(self, filename): return self def readStr(self, datastring): - """read experimental PDF data from a string + """Read experimental PDF data from a string. Parameter --------- @@ -364,7 +364,6 @@ def write(self, filename): def writeStr(self): """String representation of experimental PDF data. - Returns ------- str @@ -411,7 +410,7 @@ def writeStr(self): return datastring def copy(self, other=None): - """copy self to other. if other is None, create new instance + """Copy self to other. if other is None, create new instance. Parameters ---------- diff --git a/src/diffpy/srmise/pdfpeakextraction.py b/src/diffpy/srmise/pdfpeakextraction.py index 6142e68..af52fb4 100644 --- a/src/diffpy/srmise/pdfpeakextraction.py +++ b/src/diffpy/srmise/pdfpeakextraction.py @@ -36,8 +36,8 @@ class PDFPeakExtraction(PeakExtraction): - """PDFPeakExtraction extends the PeakExtraction class to specialize in extracting - peaks from PDF (Probability Density Function) data. + """PDFPeakExtraction extends the PeakExtraction class to specialize + in extracting peaks from PDF (Probability Density Function) data. Parameters ---------- @@ -77,7 +77,6 @@ def loadpdf(self, pdf): ---------- pdf: PDFDataSet instance or str The PDFDataSet instance or a PDF file name. - """ self.clear() if isinstance(pdf, PDFDataSet): @@ -98,7 +97,8 @@ def setdata(self, x, y, dx=None, dy=None): x : array-like The x-coordinates of the data. y : array-like - The y-coordinates of the data.""" + The y-coordinates of the data. + """ PeakExtraction.setdata(self, x, y, dx, dy) try: self.qmax_fromdata = find_qmax(self.x, self.y)[0] @@ -108,7 +108,9 @@ def setdata(self, x, y, dx=None, dy=None): def clear(self): """Clear all members. - The purpose of the method is to ensure the object is in a clean state.""" + The purpose of the method is to ensure the object is in a clean + state. + """ # TODO: Clear additional members self.filename = None self.nyquist = None @@ -190,7 +192,8 @@ def defaultvars(self, *args): Parameters ---------- *args : argparse.Namespace - Arguments passed to PeakExtraction.setdata().""" + Arguments passed to PeakExtraction.setdata(). + """ nargs = list(args) # qmax preference: reported, then fromdata, then 0. @@ -250,7 +253,8 @@ def defaultvars(self, *args): PeakExtraction.defaultvars(self, *nargs) def resampledata(self, dr, **kwds): - """Return (x, y, error in x, effective error in y) resampled by interval dr. + """Return (x, y, error in x, effective error in y) resampled by + interval dr. Uses values of self.x, self.y, self.dx, self.effective_dy. The range is constrained by self.rng. @@ -276,7 +280,8 @@ def resampledata(self, dr, **kwds): Returns ------- tuple of ndarray - A tuple containing the resampled (x, y, error in x, effective error in y).""" + A tuple containing the resampled (x, y, error in x, effective error in y). + """ self.defaultvars() # Find correct range if necessary. eps = kwds.get("eps", 10**-6) @@ -318,7 +323,8 @@ def errorscale(self, dr): Returns ------- float - The uncertainties scaled.""" + The uncertainties scaled. + """ if self.qmax > 0 and self.nyquist and self.scale: dr_nyquist = np.pi / self.qmax return np.max([np.sqrt(dr_nyquist / dr), 1.0]) @@ -326,7 +332,8 @@ def errorscale(self, dr): return 1.0 def extract(self, **kwds): - """Extract peaks from the PDF. Returns ModelCovariance instance summarizing results. + """Extract peaks from the PDF. Returns ModelCovariance instance + summarizing results. Parameters ---------- @@ -540,7 +547,8 @@ def extract(self, **kwds): return cov def fit(self, **kwds): - """Fit peaks in the PDF. Returns ModelCovariance instance summarizing results. + """Fit peaks in the PDF. Returns ModelCovariance instance + summarizing results. Parameters ---------- @@ -726,7 +734,8 @@ def writepwa(self, filename, comments="n/a"): return def writepwastr(self, comments): - """Return string of extracted peaks (position, width, area) in PDF. + """Return string of extracted peaks (position, width, area) in + PDF. There is not enough information to recreate the extracted peaks from this file. @@ -1033,7 +1042,8 @@ def find_qmax(r, y, showgraphs=False): def stdratio(data): - """Calculate ratio of standard deviation for runs of equal length in data. + """Calculate ratio of standard deviation for runs of equal length in + data. Uses a numerically-stable online algorithm for calculating the standard deviation. @@ -1047,7 +1057,8 @@ def stdratio(data): ------- array-like an array of length floor(len(data)/2)-1. The ith element is - equivalent to std(data[:i+2])/std(data[i+2:2i+4]).""" + equivalent to std(data[:i+2])/std(data[i+2:2i+4]). + """ limit = int(np.floor(len(data) / 2)) std_left = np.zeros(limit) diff --git a/src/diffpy/srmise/peakextraction.py b/src/diffpy/srmise/peakextraction.py index dd0b0cd..3bcb084 100644 --- a/src/diffpy/srmise/peakextraction.py +++ b/src/diffpy/srmise/peakextraction.py @@ -70,7 +70,8 @@ def __init__(self, newvars=[]): Parameters newvars : array-like - Sequence of strings that represent additional extraction parameters.""" + Sequence of strings that represent additional extraction parameters. + """ self.clear() self.extractvars = dict.fromkeys( ( @@ -94,7 +95,9 @@ def __init__(self, newvars=[]): def clear(self): """Clear all members. - The purpose of the method is to ensure the object is in initialized state.""" + The purpose of the method is to ensure the object is in + initialized state. + """ self.x = None self.y = None self.dx = None @@ -263,7 +266,8 @@ def __str__(self): return "\n".join(out) + "\n" def plot(self, **kwds): - """Convenience function to plot data and extracted peaks with matplotlib. + """Convenience function to plot data and extracted peaks with + matplotlib. Uses initial peaks instead if no peaks have been extracted. @@ -299,7 +303,7 @@ def plot(self, **kwds): plt.plot(*mcluster.plottable(kwds)) def read(self, filename): - """load PeakExtraction object from file + """Load PeakExtraction object from file. Parameters ---------- @@ -539,7 +543,8 @@ def readstr(self, datastring): self.extracted = ModelCluster.factory(mc, pfbaselist=safepf, blfbaselist=safebf) def write(self, filename): - """Write string representation of PeakExtraction instance to file. + """Write string representation of PeakExtraction instance to + file. Parameters ---------- @@ -712,7 +717,8 @@ def writesummary(self): pass def getrangeslice(self): - """Convert the ranges in terms of x-coordinates to a slice object.""" + """Convert the ranges in terms of x-coordinates to a slice + object.""" low_idx = 0 while self.x[low_idx] < max(self.x[0], self.rng[0]): low_idx += 1 @@ -785,7 +791,8 @@ def estimate_peak(self, x, add=True): return None def add_peaks(self, peaks): - """Add peaks to extracted peaks, or initial_peaks if no extracted peaks exist. + """Add peaks to extracted peaks, or initial_peaks if no + extracted peaks exist. Parameters ---------- @@ -801,14 +808,16 @@ def add_peaks(self, peaks): self.initial_peaks.sort(key="position") def extract_single(self, recursion_depth=1): - """Find ModelCluster with peaks extracted from data. Return ModelCovariance instance at top level. + """Find ModelCluster with peaks extracted from data. Return + ModelCovariance instance at top level. Every extracted peak is one of the peak functions supplied. All comparisons of different peak models are performed with the class specified by error_method. Parameters - recursion_depth: (1) Tracks recursion with extract_single.""" + recursion_depth: (1) Tracks recursion with extract_single. + """ self.clearcalc() tracer = srmiselog.tracer tracer.pushc() @@ -1319,8 +1328,10 @@ def extract_single(self, recursion_depth=1): return cov def fit_single(self): - """Fit peaks in initial_peaks with baseline. Return ModelCovariance - instance summarizing results.""" + """Fit peaks in initial_peaks with baseline. + + Return ModelCovariance instance summarizing results. + """ self.clearcalc() diff --git a/src/diffpy/srmise/peaks/base.py b/src/diffpy/srmise/peaks/base.py index 44c7963..a13a312 100644 --- a/src/diffpy/srmise/peaks/base.py +++ b/src/diffpy/srmise/peaks/base.py @@ -70,7 +70,7 @@ def __init__( base=None, Cache=None, ): - """Set parameterdict defined by subclass + """Set parameterdict defined by subclass. parameterdict: A dictionary mapping string keys to their index in a sequence of parameters for this PeakFunction subclass. @@ -85,7 +85,8 @@ def __init__( base: A basefunction subclass instance which this one decorates with additional functionality. Cache: A class (not instance) which implements caching of BaseFunction - evaluations.""" + evaluations. + """ if "position" not in parameterdict: emsg = "Argument parameterdict missing required key 'position'." raise ValueError(emsg) @@ -125,7 +126,8 @@ def __init__(self, *args, **kwds): ModelParts.__init__(self, *args, **kwds) def argsort(self, key="position"): - """Return sequence of indices which sort peaks in order specified by key.""" + """Return sequence of indices which sort peaks in order + specified by key.""" keypars = np.array([p[key] for p in self]) # In normal use the peaks will already be sorted, so check for it. sorted = True @@ -139,7 +141,8 @@ def argsort(self, key="position"): return range(len(keypars)) def match_at(self, x, y): - """Alter peaks so their sum at x is y, preserving each peak's maximum. + """Alter peaks so their sum at x is y, preserving each peak's + maximum. Each peak is scaled equally. Peaks with fixed parameters, a maximum very close to x, or other issues may prevent optimal results. If the @@ -201,7 +204,8 @@ def sort(self, reverse=False, key="position"): class Peak(ModelPart): - """Represents a single peak associated with a PeakFunction subclass.""" + """Represents a single peak associated with a PeakFunction + subclass.""" def __init__(self, owner, pars, free=None, removable=True, static_owner=False): """Set instance members. diff --git a/src/diffpy/srmise/peaks/gaussian.py b/src/diffpy/srmise/peaks/gaussian.py index c23358e..51a8513 100644 --- a/src/diffpy/srmise/peaks/gaussian.py +++ b/src/diffpy/srmise/peaks/gaussian.py @@ -23,7 +23,8 @@ class Gaussian(PeakFunction): - """Methods for evaluation and parameter estimation of width-limited Gaussian. + """Methods for evaluation and parameter estimation of width-limited + Gaussian. Allowed formats are internal: [position, parameterized width-squared, area] @@ -44,7 +45,7 @@ class Gaussian(PeakFunction): # which the function is considered 0. By default this distance is # equivalent to 3 standard deviations. def __init__(self, maxwidth, Cache=None): - """maxwidth defined as full width at half maximum for the + """Maxwidth defined as full width at half maximum for the corresponding Gaussian, which is physically relevant.""" parameterdict = {"position": 0, "width": 1, "area": 2} formats = ["internal", "pwa", "mu_sigma_area"] @@ -172,7 +173,8 @@ def scale_at(self, pars, x, scale): Returns ------- tuple - mu, area, and sigma that are scaled.""" + mu, area, and sigma that are scaled. + """ if scale <= 0: emsg = "".join(["Cannot scale by ", str(scale), "."]) raise SrMiseScalingError(emsg) @@ -346,7 +348,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return temp def _valueraw(self, pars, r): - """Compute the value of a width-limited Gaussian for the specified parameters at given radial distances. + """Compute the value of a width-limited Gaussian for the + specified parameters at given radial distances. This function calculates the value of a Gaussian distribution, where its effective width is constrained and related to the maxwidth. As `pars[1]` approaches infinity, @@ -383,6 +386,7 @@ def getmodule(self): def max(self, pars): """Return position and height of the peak maximum. + Parameters ---------- pars : array_like @@ -391,7 +395,8 @@ def max(self, pars): Returns ------- array_like - The position and height of the peak maximum.""" + The position and height of the peak maximum. + """ # TODO: Reconsider this behavior if len(pars) == 0: return None diff --git a/src/diffpy/srmise/peaks/gaussianoverr.py b/src/diffpy/srmise/peaks/gaussianoverr.py index 6e108e6..8e5d4cf 100644 --- a/src/diffpy/srmise/peaks/gaussianoverr.py +++ b/src/diffpy/srmise/peaks/gaussianoverr.py @@ -23,7 +23,8 @@ class GaussianOverR(PeakFunction): - """Methods for evaluation and parameter estimation of width-limited Gaussian/r. + """Methods for evaluation and parameter estimation of width-limited + Gaussian/r. Allowed formats are internal: [position, parameterized width-squared, area] @@ -44,7 +45,7 @@ class GaussianOverR(PeakFunction): # which the function is considered 0. By default this distance is # equivalent to 3 standard deviations. def __init__(self, maxwidth, Cache=None): - """maxwidth defined as full width at half maximum for the + """Maxwidth defined as full width at half maximum for the corresponding Gaussian, which is physically relevant.""" parameterdict = {"position": 0, "width": 1, "area": 2} formats = ["internal", "pwa", "mu_sigma_area"] @@ -221,8 +222,7 @@ def scale_at(self, pars, x, scale): return tpars def _jacobianraw(self, pars, r, free): - """ - Compute the Jacobian of a width-limited Gaussian/r function. + """Compute the Jacobian of a width-limited Gaussian/r function. This method calculates the partial derivatives of a Gaussian/r function with respect to its parameters, considering a limiting width. The Gaussian/r's @@ -285,7 +285,8 @@ def _jacobianraw(self, pars, r, free): return jacobian def _transform_derivativesraw(self, pars, in_format, out_format): - """Return gradient matrix for the pars converted from in_format to out_format. + """Return gradient matrix for the pars converted from in_format + to out_format. Parameters pars: Sequence of parameters @@ -412,7 +413,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return temp def _valueraw(self, pars, r): - """Compute the value of a width-limited Gaussian/r for the specified parameters at given radial distances. + """Compute the value of a width-limited Gaussian/r for the + specified parameters at given radial distances. This function calculates the value of a Gaussian/r distribution, where its effective width is constrained and related to the maxwidth. As `pars[1]` approaches infinity, @@ -456,7 +458,8 @@ def max(self, pars): Returns ------- array-like - The sequence of position and height of the peak maximum.""" + The sequence of position and height of the peak maximum. + """ # TODO: Reconsider this behavior if len(pars) == 0: return None diff --git a/src/diffpy/srmise/peaks/terminationripples.py b/src/diffpy/srmise/peaks/terminationripples.py index c516c96..e135083 100644 --- a/src/diffpy/srmise/peaks/terminationripples.py +++ b/src/diffpy/srmise/peaks/terminationripples.py @@ -23,10 +23,12 @@ class TerminationRipples(PeakFunction): - """Methods for evaluation and parameter estimation of a peak function with termination ripples.""" + """Methods for evaluation and parameter estimation of a peak + function with termination ripples.""" def __init__(self, base, qmax, extension=4.0, supersample=5.0, Cache=None): - """Peak function constructor which adds termination ripples to existing function. + """Peak function constructor which adds termination ripples to + existing function. Unlike other peak functions, TerminationRipples can only be evaluated over a uniform grid, or at a single value using an ad hoc uniform grid @@ -46,7 +48,8 @@ def __init__(self, base, qmax, extension=4.0, supersample=5.0, Cache=None): cannot be determined while extending calculations. Default is 5.0. Cache : class The class (not instance) which implements caching of PeakFunction - evaluations.""" + evaluations. + """ parameterdict = base.parameterdict formats = base.parformats default_formats = base.default_formats @@ -89,7 +92,8 @@ def estimate_parameters(self, r, y): # TODO: Can this be implemented sanely for termination ripples? def scale_at(self, pars, x, scale): - """Change parameters so value(x)->scale*value(x) for the base function. + """Change parameters so value(x)->scale*value(x) for the base + function. Does not change position or height of peak's maxima. Raises SrMiseScalingError if the parameters cannot be scaled. @@ -131,7 +135,8 @@ def _jacobianraw(self, pars, r, free): return self.base._jacobianraw(pars, r, free) def _transform_derivativesraw(self, pars, in_format, out_format): - """Return gradient matrix for the pars converted from in_format to out_format. + """Return gradient matrix for the pars converted from in_format + to out_format. Parameters ---------- @@ -169,7 +174,8 @@ def _transform_parametersraw(self, pars, in_format, out_format): return self.base._transform_parametersraw(pars, in_format, out_format) def _valueraw(self, pars, r): - """Return value of base peak function for the given parameters and r values. + """Return value of base peak function for the given parameters + and r values. pars : array-like The sequence of parameters for a single peak @@ -179,7 +185,8 @@ def _valueraw(self, pars, r): Returns ------- float - The value of base peak function for the given parameters and r.""" + The value of base peak function for the given parameters and r. + """ return self.base._valueraw(pars, r) # Overridden PeakFunction functions #### @@ -205,7 +212,8 @@ def jacobian(self, peak, r, rng=None): Returns ------- jac : array-like - The Jacobian of base function with termination ripples.""" + The Jacobian of base function with termination ripples. + """ if self is not peak._owner: raise ValueError( "Argument 'peak' must be evaluated by the " @@ -244,7 +252,8 @@ def jacobian(self, peak, r, rng=None): return jac def value(self, peak, r, rng=None): - """Calculate (rippled) value of peak, possibly restricted by range. + """Calculate (rippled) value of peak, possibly restricted by + range. This function overrides its counterpart in PeakFunction in order to minimize the impact of edge-effects from introducing termination @@ -361,7 +370,8 @@ def extend_grid(self, r, dr): Returns ------- tuple - The extended r, slice giving original range.""" + The extended r, slice giving original range. + """ ext = self.extension * 2 * np.pi / self.qmax left_ext = np.arange(r[0] - dr, max(0.0, r[0] - ext - dr), -dr)[::-1] right_ext = np.arange(r[-1] + dr, r[-1] + ext + dr, dr) diff --git a/src/diffpy/srmise/peakstability.py b/src/diffpy/srmise/peakstability.py index 28c9517..f95774b 100644 --- a/src/diffpy/srmise/peakstability.py +++ b/src/diffpy/srmise/peakstability.py @@ -29,7 +29,8 @@ class PeakStability: """Utility to test robustness of peaks. results: [error scalar, model, bl, dr] - ppe: a PDFPeakExtraction instance""" + ppe: a PDFPeakExtraction instance + """ def __init__(self): self.results = [] @@ -106,7 +107,10 @@ def plotseries(self, style="o", **kwds): plt.draw() def plot(self, **kwds): - """Plot the current model. Keywords passed to pyplot.plot()""" + """Plot the current model. + + Keywords passed to pyplot.plot() + """ plt.clf() plt.plot(*self.ppe.extracted.plottable(), **kwds) q = self.ppe.extracted.quality() @@ -187,7 +191,8 @@ def run(self, err, savecovs=False): The sequence of uncertainties to run at. savecovs : bool boolean to determine to save covariance matrix. Default is False. - If savecovs is True, return the covariance matrix for each final fit.""" + If savecovs is True, return the covariance matrix for each final fit. + """ self.results = [] covs = [] diff --git a/src/diffpy/srmise/srmiseerrors.py b/src/diffpy/srmise/srmiseerrors.py index 62953d5..22e8948 100644 --- a/src/diffpy/srmise/srmiseerrors.py +++ b/src/diffpy/srmise/srmiseerrors.py @@ -13,20 +13,20 @@ ############################################################################## """Defines all custom exceptions used by diffpy.srmise. - Classes - ------- - SrMiseError: Subclass of Exception, and superclass of all diffpy.srmise exceptions. - SrMiseDataFormatError: Error in format of diffpy.srmise data. - SrMiseEstimationError: Parameter estimation error. - SrMiseFileError: Error while reading/writing files. - SrMiseFitError: Error while fitting. - SrMiseLogError: Error while logging. - SrMiseModelEvaluatorError: Error while computing or comparing model quality. - SrMisePDFKeyError: Error in key referencing component of PDF dataset. - SrMiseQmaxError: Error in value of Qmax. - SrMiseScalingError: Error while scaling a peak function. - SrMiseStaticOwnerError: Error when changing ModelPart instance owner. - """ +Classes +------- +SrMiseError: Subclass of Exception, and superclass of all diffpy.srmise exceptions. +SrMiseDataFormatError: Error in format of diffpy.srmise data. +SrMiseEstimationError: Parameter estimation error. +SrMiseFileError: Error while reading/writing files. +SrMiseFitError: Error while fitting. +SrMiseLogError: Error while logging. +SrMiseModelEvaluatorError: Error while computing or comparing model quality. +SrMisePDFKeyError: Error in key referencing component of PDF dataset. +SrMiseQmaxError: Error in value of Qmax. +SrMiseScalingError: Error while scaling a peak function. +SrMiseStaticOwnerError: Error when changing ModelPart instance owner. +""" # Superclass class for diffpy.srmise.mise @@ -34,9 +34,10 @@ class SrMiseError(Exception): """Superclass of all diffpy.srmise exceptions.""" def __init__(self, info): - """initialize + """initialize. - info: description string""" + info: description string + """ Exception.__init__(self) self.info = info @@ -48,120 +49,168 @@ def __str__(self): class SrMiseDataFormatError(SrMiseError): - """diffpy.srmise exception class. Error in formatted data.""" + """diffpy.srmise exception class. + + Error in formatted data. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseEstimationError(SrMiseError): - """diffpy.srmise.modelevaluator exception class. Parameter estimation error.""" + """diffpy.srmise.modelevaluator exception class. + + Parameter estimation error. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseFileError(SrMiseError): - """diffpy.srmise exception class. Error while reading/writing files.""" + """diffpy.srmise exception class. + + Error while reading/writing files. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseFitError(SrMiseError): - """diffpy.srmise exception class. Error occurred during fitting.""" + """diffpy.srmise exception class. + + Error occurred during fitting. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseLogError(SrMiseError): - """diffpy.srmise exception class. Error while handling logging capabilities.""" + """diffpy.srmise exception class. + + Error while handling logging capabilities. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseModelEvaluatorError(SrMiseError): - """diffpy.srmise.modelevaluator exception class. Error when comparing models.""" + """diffpy.srmise.modelevaluator exception class. + + Error when comparing models. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseQmaxError(SrMiseError): - """diffpy.srmise.modelevaluator exception class. Error when setting qmax.""" + """diffpy.srmise.modelevaluator exception class. + + Error when setting qmax. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseScalingError(SrMiseError): - """diffpy.srmise.peaks exception class. Error when scaling a peak function.""" + """diffpy.srmise.peaks exception class. + + Error when scaling a peak function. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseStaticOwnerError(SrMiseError): - """diffpy.srmise exception class. Attempt to change owner of static model part.""" + """diffpy.srmise exception class. + + Attempt to change owner of static model part. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseTransformationError(SrMiseError): - """diffpy.srmise exception class. Error transforming model/covariance parameters.""" + """diffpy.srmise exception class. + + Error transforming model/covariance parameters. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMiseUndefinedCovarianceError(SrMiseError): - """diffpy.srmise exception class. Attempted to perform on undefined covariance.""" + """diffpy.srmise exception class. + + Attempted to perform on undefined covariance. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) class SrMisePDFKeyError(SrMiseError): - """diffpy.srmise exception class. Requested PDF key can't be found.""" + """diffpy.srmise exception class. + + Requested PDF key can't be found. + """ def __init__(self, info): - """initialize + """initialize. - info -- description string""" + info -- description string + """ SrMiseError.__init__(self, info) diff --git a/src/diffpy/srmise/srmiselog.py b/src/diffpy/srmise/srmiselog.py index e4311a0..5393475 100644 --- a/src/diffpy/srmise/srmiselog.py +++ b/src/diffpy/srmise/srmiselog.py @@ -95,7 +95,8 @@ def setfilelevel(level): """Set level of file logger. Parameters - level: The logging level.""" + level: The logging level. + """ global fh if fh is not None: level = LEVELS.get(level, level) @@ -111,7 +112,8 @@ def setlevel(level): """Set level of default (stdout) logger. Parameters - level: The logging level.""" + level: The logging level. + """ global ch level = LEVELS.get(level, level) ch.setLevel(level) @@ -127,7 +129,8 @@ def liveplotting(lp, w=False): Parameters lp: Use live plotting (True) or not (False). - w: (False) Whether to wait for user after plotting.""" + w: (False) Whether to wait for user after plotting. + """ global liveplots global wait if lp is True or lp is False: @@ -172,8 +175,8 @@ def __init__(self, **kwds): def emit(self, *args, **kwds): """Write current trace to file. - Parameters - Any number of ModelCluster instances""" + Parameters Any number of ModelCluster instances + """ if not eval(self.filter): return else: @@ -236,7 +239,8 @@ def read(self, filename): "clusters" - List of cluster regions [[r0,r1],[r2,r3],...] "counter" - The count when object was created "mc" - A ModelCluster instance - "recursion" - The recursion level of mc""" + "recursion" - The recursion level of mc + """ try: return self.readstr(open(filename, "rb").read()) except SrMiseDataFormatError as err: @@ -258,7 +262,8 @@ def readstr(self, datastring): "clusters" - List of cluster regions [[r0,r1],[r2,r3],...] "counter" - The count when object was created "mc" - A ModelCluster instance - "recursion" - The recursion level of mc""" + "recursion" - The recursion level of mc + """ # find where the ModelCluster section starts res = re.search(r"^#+ ModelCluster\s*(?:#.*\s+)*", datastring, re.M) diff --git a/src/diffpy/srmise/version.py b/src/diffpy/srmise/version.py index 304027c..1b97580 100644 --- a/src/diffpy/srmise/version.py +++ b/src/diffpy/srmise/version.py @@ -1,10 +1,10 @@ #!/usr/bin/env python ############################################################################## # -# (c) 2024 The Trustees of Columbia University in the City of New York. +# (c) 2025 The Trustees of Columbia University in the City of New York. # All rights reserved. # -# File coded by: Billinge Group members and community contributors. +# File coded by: Simon Billinge, Billinge Group members. # # See GitHub contributions for a more detailed list of contributors. # https://github.com/diffpy/diffpy.srmise/graphs/contributors @@ -12,7 +12,6 @@ # See LICENSE.rst for license information. # ############################################################################## - """Definition of __version__.""" # We do not use the other three variables, but can be added back if needed. diff --git a/tests/test_version.py b/tests/test_version.py index 1bc10c2..3ac5816 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -1,10 +1,10 @@ -"""Unit tests for __version__.py -""" +"""Unit tests for __version__.py.""" import diffpy.srmise def test_package_version(): - """Ensure the package version is defined and not set to the initial placeholder.""" + """Ensure the package version is defined and not set to the initial + placeholder.""" assert hasattr(diffpy.srmise, "__version__") assert diffpy.srmise.__version__ != "0.0.0"