NSFopen 2.4.0__tar.gz → 2.5.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {nsfopen-2.4.0 → nsfopen-2.5.0}/CHANGELOG.md +195 -141
- {nsfopen-2.4.0 → nsfopen-2.5.0}/MANIFEST.in +1 -0
- nsfopen-2.5.0/NSFopen/_version.py +1 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Force_Spectroscopy/Contact_Models.py +1 -1
- nsfopen-2.5.0/NSFopen/example/Force_Spectroscopy/spectroscopy_results.csv +101 -0
- nsfopen-2.5.0/NSFopen/process/contact.py +719 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/measure.py +168 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/ops.py +15 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/process.py +10 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/spectroscopy.py +231 -29
- nsfopen-2.5.0/NSFopen/process/terraces.py +338 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/read/read.py +1 -1
- {nsfopen-2.4.0 → nsfopen-2.5.0/NSFopen.egg-info}/PKG-INFO +11 -1
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen.egg-info/SOURCES.txt +3 -6
- {nsfopen-2.4.0/NSFopen.egg-info → nsfopen-2.5.0}/PKG-INFO +11 -1
- {nsfopen-2.4.0 → nsfopen-2.5.0}/README.md +185 -175
- nsfopen-2.4.0/NSFopen/_version.py +0 -1
- nsfopen-2.4.0/NSFopen/example/Calculate_Roughness/__pycache__/Calculate_Roughness.cpython-310.pyc +0 -0
- nsfopen-2.4.0/NSFopen/example/Spring_Constant/__pycache__/Spring_Constant.cpython-310.pyc +0 -0
- nsfopen-2.4.0/NSFopen/example/Spring_Constant/__pycache__/__init__.cpython-310.pyc +0 -0
- nsfopen-2.4.0/NSFopen/process/contact.py +0 -387
- nsfopen-2.4.0/tests/test_examples.py +0 -26
- nsfopen-2.4.0/tests/test_nsfopen.py +0 -711
- {nsfopen-2.4.0 → nsfopen-2.5.0}/LICENSE +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/__init__.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Calculate_Roughness/Calculate_Roughness.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Calculate_Roughness/Calculate_Roughness.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Calculate_Roughness/Calculate_Roughness.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Calculate_Roughness/sapphire.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Force_Spectroscopy/Force_Spectroscopy.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Force_Spectroscopy/Force_Spectroscopy.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Force_Spectroscopy/Force_Spectroscopy.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Force_Spectroscopy/spectroscopy.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Grain_Analysis/Grain_Analysis.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Grain_Analysis/Grain_Analysis.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Grain_Analysis/Grain_Analysis.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Lateral_Force/Lateral_Force_Processing.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Lateral_Force/Lateral_Force_Processing.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Lateral_Force/Lateral_Force_Processing.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Lateral_Force/SBS-PMMA.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/Plane_Removal.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/Plane_Removal.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/Plane_Removal.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/circles.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/circles_holes.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/grid.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plane_Removal/squares_holes.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plotting_Data/MoS2.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plotting_Data/Plotting_Data.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plotting_Data/Plotting_Data.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Plotting_Data/Plotting_Data.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Sharpen_Image/Sharpen_Image.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Sharpen_Image/Sharpen_Image.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Sharpen_Image/Sharpen_Image.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Sharpen_Image/grid.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Spring_Constant/Spring_Constant.html +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Spring_Constant/Spring_Constant.ipynb +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Spring_Constant/Spring_Constant.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Spring_Constant/sader.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Spring_Constant/thermal.nid +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/example/Spring_Constant/thermal.png +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/__init__.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/colormaps.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/combine.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/fitting.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/grains.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/iv.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/profile_iso.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/psdfit.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/process/surface3d.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/read/__init__.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/read/nhf.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen/read/nhf_spec.py +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen.egg-info/dependency_links.txt +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen.egg-info/entry_points.txt +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen.egg-info/not-zip-safe +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen.egg-info/requires.txt +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/NSFopen.egg-info/top_level.txt +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/pyproject.toml +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/setup.cfg +0 -0
- {nsfopen-2.4.0 → nsfopen-2.5.0}/setup.py +0 -0
|
@@ -1,141 +1,195 @@
|
|
|
1
|
-
# Change log
|
|
2
|
-
|
|
3
|
-
## 2.
|
|
4
|
-
|
|
5
|
-
Compared to **2.
|
|
6
|
-
|
|
7
|
-
###
|
|
8
|
-
Added, in `NSFopen.process` (the calculations of
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
and
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
-
|
|
25
|
-
|
|
26
|
-
`
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
-
|
|
64
|
-
|
|
65
|
-
-
|
|
66
|
-
|
|
67
|
-
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
- `
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
- `
|
|
101
|
-
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
-
|
|
105
|
-
-
|
|
106
|
-
|
|
107
|
-
###
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
- `
|
|
129
|
-
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
1
|
+
# Change log
|
|
2
|
+
|
|
3
|
+
## 2.5.0 (November 8, 2026)
|
|
4
|
+
|
|
5
|
+
Compared to **2.4.1**.
|
|
6
|
+
|
|
7
|
+
### Terraces and curvature
|
|
8
|
+
Added, in `NSFopen.process` (the calculations of NSSA's *Curvature* and *Terrace analysis* tools):
|
|
9
|
+
- `terraces.terraces(state, TerraceSettings(...))` and `process.terraces()`: a stepped surface divided into terraces at
|
|
10
|
+
the steps (found from the local slopes, or given as the mask), a polynomial background fitted together with one height
|
|
11
|
+
per terrace, and the common step height of which the terrace heights are integer multiples (or a given one), with its
|
|
12
|
+
standard error. `TerraceResult` has the terraces (height, level, area, roughness), the labels of every pixel, the
|
|
13
|
+
background, `leveled()`, `summary()` and `rows()`. Only numpy and scipy are used.
|
|
14
|
+
- Operation `level.terraces` (`process.level_terraces()`): subtracts that background, so the terraces become flat and the
|
|
15
|
+
steps stay.
|
|
16
|
+
- `measure.curvature(state, region)` and `process.curvature()`: principal radii of curvature, their directions, the center
|
|
17
|
+
and the bow from a quadratic fit; `Curvature.summary()`, `rows()`, `profile()`. `center=(x, y)` fixes the vertex of
|
|
18
|
+
the fit at a given point instead of finding it.
|
|
19
|
+
- `measure.extreme_point(state, region, which)`: the highest or lowest point of the region (smoothed), e.g. as the center
|
|
20
|
+
of the curvature.
|
|
21
|
+
- Tests: `tests/test_terraces_curvature.py` (synthetic staircases, spheres, an elliptic dome, a cylinder).
|
|
22
|
+
|
|
23
|
+
### Contact models
|
|
24
|
+
- `contact.fit_maugis()`, model `maugis` (Maugis-Dugdale, sphere, retract curve): E*, the work of adhesion W and the
|
|
25
|
+
Maugis parameter λ, with the Tabor parameter μ = 1.157 λ and the adhesive stress σ0 in the values;
|
|
26
|
+
`maugis_reduced()`, `maugis_force()`.
|
|
27
|
+
- Bottom-effect correction of thin samples on a hard substrate for Hertz, Sneddon and DMT: `Tip(thickness=, bonded=)`,
|
|
28
|
+
`contact.bottom_factor()`; sphere after Dimitriadis et al. 2002 (bonded or not, any ν), cone, pyramid and cylinder
|
|
29
|
+
punch after Garcia and Garcia 2018 (bonded). `ForceSettings.thickness_mode` (`off`, `fixed`, `map`), `thickness`,
|
|
30
|
+
`substrate`, `bonded`: in `map` the thickness of a curve is its height (contact) above the substrate height;
|
|
31
|
+
`spectroscopy.substrate_height()` takes that from curves on the substrate. The fit values get `sample thickness`,
|
|
32
|
+
`bottom χ`, `bottom factor`.
|
|
33
|
+
- Faster: `ForceAnalysis.run(workers=None)` fits in several processes when the first curves show the rest would take
|
|
34
|
+
more than 3 s (`workers=1`: one process; programs frozen with PyInstaller need `multiprocessing.freeze_support()`).
|
|
35
|
+
The processes get the curves of their part with the work (`SpecFile.subset()`), not the file, and use one numpy
|
|
36
|
+
thread each;
|
|
37
|
+
the contact point grid of Hertz, Sneddon and DMT is computed at once (about 2 times faster, the same results).
|
|
38
|
+
- JKR: the force from the exact closed form (no table), the start grid computed at once and the refinement with the
|
|
39
|
+
exact derivatives: about 20 % faster, and on curves where W and E* trade off it now finds the better fit.
|
|
40
|
+
- `spectroscopy.complete_model()`: model settings saved before 2.5.0 get the defaults of the new fields.
|
|
41
|
+
- Tests: `tests/test_contact_models.py`.
|
|
42
|
+
|
|
43
|
+
### Changed
|
|
44
|
+
- Spectroscopy results: `adhesion force` is now `adhesion (minimum retract)`, so it is not taken for the adhesion of
|
|
45
|
+
a fit (`adhesion (fit)`).
|
|
46
|
+
- Spectroscopy results: the column `fit region` is now `model region` (`spectroscopy.REGION`), to match NSSA's
|
|
47
|
+
*Model regions*.
|
|
48
|
+
|
|
49
|
+
## 2.4.1 (November 4, 2026)
|
|
50
|
+
|
|
51
|
+
### Fixed
|
|
52
|
+
- Reading a NID file gave a pandas warning (`Series.dropna(inplace=True)` is deprecated from pandas 3.1). The data is
|
|
53
|
+
the same.
|
|
54
|
+
|
|
55
|
+
## 2.4.0 (November 4, 2026)
|
|
56
|
+
|
|
57
|
+
Compared to **2.3.0**.
|
|
58
|
+
|
|
59
|
+
### Force spectroscopy analysis
|
|
60
|
+
Added, in `NSFopen.process` (the calculations of the Spectroscopy page of NSSA, the NSF Surface and Spectroscopy
|
|
61
|
+
Analyzer, so a script and the program give the same numbers):
|
|
62
|
+
- `contact`: elastic contact of a tip pressed into a flat sample. Models Hertz, Sneddon (exact), DMT, JKR and
|
|
63
|
+
Oliver-Pharr; tip shapes sphere, cone, four-sided pyramid, flat cylinder punch and hyperboloid. `fit_elastic`,
|
|
64
|
+
`fit_jkr`, `fit_oliver_pharr` give the Young's modulus, reduced modulus, contact point, adhesion and the fit quality.
|
|
65
|
+
- `spectroscopy`: `SpecFile` opens the force curves and force maps of NID and NHF files. `ForceSettings` and
|
|
66
|
+
`ForceAnalysis` process them: smoothing, baseline (offset, tilt, or an interference sine with its period found),
|
|
67
|
+
contact point, indentation, adhesion, pull-off, adhesion and dissipated energy, and the model fit. `Results` has
|
|
68
|
+
statistics, maps, masks, fits of different models on different regions, a quality filter (leave out fits below an R²)
|
|
69
|
+
and CSV export. Maps can be analyzed partly (every n-th line and column, or a region).
|
|
70
|
+
- `iv`: I-V curves with dI/dV, normalized conductance, zero-bias conductance and resistance, gap and rectification.
|
|
71
|
+
|
|
72
|
+
### Color maps
|
|
73
|
+
- 12 maps are defined in `colormaps.py` (`NANOSURF`): Sky (the default for heights), Warm, Flare, Caribbean, Strata,
|
|
74
|
+
Gold, Digitalis, Neon, Plum, Cold, Spectrum and Maple, plus BlueBlackRed. `register()` adds them and their reversed
|
|
75
|
+
versions (`Sky_r`) to matplotlib; `colormap(name)` returns any of them or a matplotlib map.
|
|
76
|
+
- The 59 Gwyddion gradient files that 2.3.0 included are removed: they are GPL, NSFopen is MIT. An installed Gwyddion's
|
|
77
|
+
gradients are found on Windows, macOS and Linux (`gwyddion_dirs`, `gwyddion_gradients`, `register(gwyddion=True)`), and
|
|
78
|
+
`colors(name)` uses them when the name is not one of the 12.
|
|
79
|
+
|
|
80
|
+
### Changes that can affect existing scripts
|
|
81
|
+
| What | 2.3.0 | 2.4.0 |
|
|
82
|
+
|---|---|---|
|
|
83
|
+
| `colors(name)` with a Gwyddion name | 59 gradient files in the package | 12 maps defined in the code; `Pm3d`, `Blend2`, `Code-V` open as `Flare`, `Strata`, `Spectrum`; the others only with an installed Gwyddion or `gwy_dir=` |
|
|
84
|
+
| `colormaps.GRADIENTS` | The gradient folder | Removed |
|
|
85
|
+
|
|
86
|
+
### Examples
|
|
87
|
+
- New `Force_Spectroscopy/Contact_Models.py`: a force map fitted with `process.spectroscopy`, with statistics, the
|
|
88
|
+
quality filter, maps of the modulus and adhesion, and the stiffest curve with its fit.
|
|
89
|
+
|
|
90
|
+
### Packaging
|
|
91
|
+
- Credentials (`tokens.json`, `.env`, `*.token`) in the example folders are never packaged.
|
|
92
|
+
|
|
93
|
+
## 2.3.0 (November 2, 2026, yanked on PyPI)
|
|
94
|
+
|
|
95
|
+
Yanked because the package included the GPL-licensed Gwyddion gradient files; use 2.4.0.
|
|
96
|
+
|
|
97
|
+
Compared to **2.2.4**, the latest version on PyPI (August 2024).
|
|
98
|
+
|
|
99
|
+
### Highlights
|
|
100
|
+
- `pip install NSFopen` now works by itself: the `nanosurf` and `scikit-learn` packages are no longer needed.
|
|
101
|
+
- NID files are read about 5 times faster, and line flattening is about twice as fast.
|
|
102
|
+
- NHF spectroscopy files of any size open immediately, and their curves are read when asked for.
|
|
103
|
+
- WaveMode NMA files are read, with a curve for every pixel and maps of any quantity.
|
|
104
|
+
- `process` has many new image analysis functions, brought over from the Nanosurf Surface Analyzer (now NSSA).
|
|
105
|
+
- Figures take their units and labels from the file, can be placed in subplots, and there is a new 3D plot.
|
|
106
|
+
|
|
107
|
+
### Reading files
|
|
108
|
+
Added:
|
|
109
|
+
- New NHF reader that needs only h5py, for file versions 1.1 and 2.0 to 2.6. Images are identical to those of Nanosurf's
|
|
110
|
+
reader on versions 1.1, 2.0, 2.3, 2.4 and 2.6.
|
|
111
|
+
- Spectroscopy (`afm.spec`): segments, grid position, other units through the file's calibration, force curves.
|
|
112
|
+
- WaveMode NMA (`afm.nma`): `curve()` gives Z, interaction and force of a pixel; `map()` builds per-pixel maps.
|
|
113
|
+
- `afm.units` holds the unit of every channel. `afm.close()` releases an NHF file; `read` also works in a `with` block.
|
|
114
|
+
- `read(..., measurement=)` picks a measurement of an NHF file.
|
|
115
|
+
|
|
116
|
+
Fixed:
|
|
117
|
+
- 2.2.4 needed `nanosurf` to be imported but did not declare it, and failed on NHF files with `nanosurf` 2.0.7.
|
|
118
|
+
- NID headers were read as Latin-1, so units and sizes came out as `°` and `3µm`.
|
|
119
|
+
- Duplicate `Wait` segments of older NHF files overwrote each other: the second is now `Wait 2`.
|
|
120
|
+
- A third NID channel of the same name overwrote the second: they are now `Amplitude`, `Amplitude2`, `Amplitude3`.
|
|
121
|
+
- A truncated NID file now says so.
|
|
122
|
+
|
|
123
|
+
### Processing images
|
|
124
|
+
Added:
|
|
125
|
+
- Leveling: `level_flatten`, `level_poly2d`, `level_lines`, `level_align_rows`, `level_facet`, `level_three_point`,
|
|
126
|
+
`level_median`, `level_rolling_ball`, `level_shift`.
|
|
127
|
+
- Filters: `filter_basic`, `filter_median`, `filter_gaussian`, `filter_fft`, `filter_notch`.
|
|
128
|
+
- Glitches: `glitch_spikes`, `glitch_lines`, `glitch_auto_lines`, `glitch_scars`, `glitch_step_lines`, `glitch_fill_mask`.
|
|
129
|
+
- Masks, kept per channel: `set_mask` and `mask_threshold`, `mask_otsu`, `mask_watershed`, `mask_outliers`, `mask_scars`,
|
|
130
|
+
`mask_shape`, `mask_floodfill`, `mask_grow`, `mask_shrink`, `mask_invert`, `mask_clear`, `mask_remove_small`,
|
|
131
|
+
`mask_fill_holes`. Leveling, filters and statistics can use the mask.
|
|
132
|
+
- Geometry and scale: `geometry_crop`, `geometry_flip`, `geometry_rotate`, `geometry_resample`, `geometry_square_pixels`,
|
|
133
|
+
`rescale_scale`, `rescale_z_to_reference`, `rescale_xy`.
|
|
134
|
+
- Statistics after ISO 25178: `statistics`, `bearing_curve`, `histogram_fit`, `slope_distributions`.
|
|
135
|
+
- Lines: `line_profile`, `step_heights`, `critical_dimension`, `masked_step_height`, and `profile_roughness` after
|
|
136
|
+
ISO 21920.
|
|
137
|
+
- Spectra and texture: `psd`, `psd_fit`, `spectrum`, `acf`, `line_functions`, `rms_by_scale`, `lattice`.
|
|
138
|
+
- Grain analysis: `grains`.
|
|
139
|
+
- Two channels: `combine`, `find_shift`.
|
|
140
|
+
- Access: `channels`, `array`, `set_channel`, `size`, `unit`, `origin`, and `apply` and `operations`.
|
|
141
|
+
|
|
142
|
+
Fixed:
|
|
143
|
+
- `NSFopen.process` could not be imported, because `colormaps.py` imported itself.
|
|
144
|
+
- `flatten(inplace=False)` and similar calls changed the data as well as returning the result.
|
|
145
|
+
- `plane_level` was wrong on non-square images.
|
|
146
|
+
- The physical sizes of non-square NHF images were swapped.
|
|
147
|
+
|
|
148
|
+
### Figures
|
|
149
|
+
Added:
|
|
150
|
+
- `plot3d`, a 3D view after the Surface Analyzer's, with materials, lighting and overlays of another channel. It needs no
|
|
151
|
+
graphics card.
|
|
152
|
+
- `plot_profile`, `plot_psd`, `plot_histogram_fit`, `plot_bearing`, `plot_acf`.
|
|
153
|
+
- `ax=` to draw into subplots, and `figsize`, `dpi`, `theme` and `color_range` on the plots.
|
|
154
|
+
- `image(profile=)` shows where a line cut lies.
|
|
155
|
+
- Color maps by name, including the Gwyddion gradients now included with the package: `cmap='Gold'`.
|
|
156
|
+
|
|
157
|
+
Fixed:
|
|
158
|
+
- The default scale bar had zero length on scans of about 2.5 µm or less, and non-integer lengths were labelled wrongly.
|
|
159
|
+
- `hist(color=)` raised an error.
|
|
160
|
+
|
|
161
|
+
### Changes that can affect existing scripts
|
|
162
|
+
| What | 2.2.4 | 2.3.0 |
|
|
163
|
+
|---|---|---|
|
|
164
|
+
| NHF force curves `[row, col]` | Position in the file | True grid position, row 0 at the bottom |
|
|
165
|
+
| NHF force curves | Arrays | Read on access; `np.asarray(curves)` gives the array |
|
|
166
|
+
| `image` and `hist`, `scale` | `1e9` for every channel | A readable unit from the channel; `scale=1e9` still forces it |
|
|
167
|
+
| `hist`, `xlabel` | `Z-Axis [nm]` for every channel | The channel and its unit |
|
|
168
|
+
| `image`, color bar | Only with `cbar=` | Always; `colorbar=False` turns it off |
|
|
169
|
+
| `image`, pixels | matplotlib's default | `interpolation='nearest'`; can be overridden |
|
|
170
|
+
| `remove_outliers` | Nearest neighbors with scikit-learn | Interpolation from the pixels around; the numbers differ, and `neighbors` is gone |
|
|
171
|
+
| Unknown channel | pandas `KeyError` | `ValueError` that lists the channels |
|
|
172
|
+
| Default channel | `Z-Axis` only | Falls back to `Topography` in files that have no `Z-Axis` |
|
|
173
|
+
| `NSFopen.read.checkFileType` | Present | Removed |
|
|
174
|
+
|
|
175
|
+
`stats()` keeps its results, including `Sku` as excess kurtosis (0 for a Gaussian surface). The new `statistics()` gives
|
|
176
|
+
the ISO value of `Sku` (3 for a Gaussian surface).
|
|
177
|
+
|
|
178
|
+
### Examples
|
|
179
|
+
- All are rewritten around `process`, and there is a new `Grain_Analysis`.
|
|
180
|
+
- **`Spring_Constant`: the result changes from 14.5 to 24.0 N/m.** The old fit used a power formula on amplitude data and
|
|
181
|
+
found Q = 253; the file records Nanosurf's own Q of 442, and the corrected fit finds 417.
|
|
182
|
+
- `Plotting_Data`: the image was drawn upside down.
|
|
183
|
+
- `Force_Spectroscopy`: the map axes were labelled µm but showed pixels.
|
|
184
|
+
- `Sharpen_Image`: it no longer passes the data through an 8-bit JPEG, and needs neither OpenCV nor PIL.
|
|
185
|
+
- `Plane_Removal`: it crashed on non-square images, and its clipping changed the data.
|
|
186
|
+
- `Lateral_Force`: the offset between the scans is measured instead of set by hand.
|
|
187
|
+
- Renamed without spaces: `Plotting_Data.py`, `Lateral_Force_Processing.py`, `Sharpen_Image.py`.
|
|
188
|
+
|
|
189
|
+
### Requirements
|
|
190
|
+
- matplotlib 3.6 or newer; the other requirements are unchanged (numpy, scipy, pandas, h5py, Python 3.9 or newer).
|
|
191
|
+
- Removed: `nanosurf` and `scikit-learn`, which 2.2.4 used without declaring them.
|
|
192
|
+
|
|
193
|
+
## Earlier versions
|
|
194
|
+
The earlier releases have no change notes. Their list and dates are on
|
|
195
|
+
[PyPI](https://pypi.org/project/NSFopen/#history).
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "2.5.0"
|
|
@@ -27,7 +27,7 @@ results.write_csv("spectroscopy_results.csv")
|
|
|
27
27
|
|
|
28
28
|
# Maps of the modulus and the adhesion (NaN: left out or not fitted)
|
|
29
29
|
fig, axes = plt.subplots(1, 2, figsize=(10, 4))
|
|
30
|
-
for ax, name in zip(axes, ("E", "adhesion
|
|
30
|
+
for ax, name in zip(axes, ("E", "adhesion (minimum retract)")):
|
|
31
31
|
values = results.map(name)
|
|
32
32
|
image = ax.imshow(values, origin="lower", cmap="viridis")
|
|
33
33
|
ax.set_title(f"{name} [{results.units[name]}]")
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
curve,x [m],y [m],left out (R² < 0.95),max force [N],contact point (piezo) [m],height (contact) [m],max indentation [m],snap-in force [N],slope (top half) [N/m],adhesion (minimum retract) [N],pull-off distance [m],adhesion energy [J],dissipated energy [J],E [Pa],E* [Pa],contact point [m],adhesion (fit) [N],work of adhesion [J/m²],fit rms [N],R²,error
|
|
2
|
+
1,-2.25e-06,-2.25e-06,1,2.73822e-07,-1.29925e-06,1.29925e-06,5.16155e-09,4.32292e-09,2.54102,1.06264e-08,-5.54123e-10,2.51412e-16,7.0583e-16,5.64395e+09,6.43185e+09,-1.29537e-06,1.06264e-08,0.169124,3.47435e-08,0.832335,
|
|
3
|
+
2,-1.75e-06,-2.25e-06,0,2.72462e-07,-1.28705e-06,1.28705e-06,5.62308e-09,3.96697e-09,2.55628,1.25085e-08,8.20637e-10,1.80321e-16,3.44883e-16,5.18072e+09,5.90396e+09,-1.28284e-06,1.25085e-08,0.199079,1.48448e-08,0.969635,
|
|
4
|
+
3,-1.25e-06,-2.25e-06,0,2.72149e-07,-1.29476e-06,1.29476e-06,6.60555e-09,5.66769e-09,2.51618,1.1704e-08,1.68999e-09,1.83841e-16,5.33655e-16,3.79135e+09,4.32062e+09,-1.29171e-06,1.1704e-08,0.186275,1.32859e-08,0.975685,
|
|
5
|
+
4,-7.5e-07,-2.25e-06,0,2.73328e-07,-1.28912e-06,1.28912e-06,6.9144e-09,1.76962e-09,2.52686,1.22076e-08,-2.73427e-09,2.04878e-16,7.86556e-16,3.44533e+09,3.92631e+09,-1.28032e-06,1.22076e-08,0.194291,1.00068e-08,0.986402,
|
|
6
|
+
5,-2.5e-07,-2.25e-06,0,2.72567e-07,-1.28287e-06,1.28287e-06,5.6057e-09,2.58212e-09,2.52757,1.0785e-08,-1.67554e-09,1.18496e-16,7.43573e-16,4.77241e+09,5.43865e+09,-1.27705e-06,1.0785e-08,0.171649,9.64164e-09,0.987027,
|
|
7
|
+
6,2.5e-07,-2.25e-06,0,2.71624e-07,-1.27915e-06,1.27915e-06,6.65575e-09,4.55675e-09,2.48612,8.90666e-09,8.83099e-10,1.55559e-16,6.36104e-16,3.72139e+09,4.2409e+09,-1.2754e-06,8.90666e-09,0.141754,1.24179e-08,0.978534,
|
|
8
|
+
7,7.5e-07,-2.25e-06,1,2.71728e-07,-1.27434e-06,1.27434e-06,5.70472e-09,3.81748e-09,2.53988,9.94509e-09,-4.36468e-10,1.29222e-16,6.02435e-16,4.89084e+09,5.57361e+09,-1.27016e-06,9.94509e-09,0.158281,2.18808e-08,0.93333,
|
|
9
|
+
8,1.25e-06,-2.25e-06,0,2.72616e-07,-1.26778e-06,1.26778e-06,6.29246e-09,3.57529e-09,2.43419,1.09332e-08,-5.91099e-10,1.2839e-16,8.97101e-16,4.11989e+09,4.69503e+09,-1.26275e-06,1.09332e-08,0.174007,1.30072e-08,0.976636,
|
|
10
|
+
9,1.75e-06,-2.25e-06,1,2.73268e-07,-1.27451e-06,1.27451e-06,4.80078e-09,3.76794e-09,2.54514,8.75325e-09,-2.03907e-09,1.22388e-16,6.15377e-16,6.20092e+09,7.06658e+09,-1.26764e-06,8.75325e-09,0.139312,2.04778e-08,0.941934,
|
|
11
|
+
10,2.25e-06,-2.25e-06,0,2.73009e-07,-1.2597e-06,1.2597e-06,6.7768e-09,3.83284e-09,2.55292,7.48101e-09,9.30893e-10,1.03451e-16,3.88134e-16,3.40363e+09,3.87878e+09,-1.25522e-06,7.48101e-09,0.119064,1.03523e-08,0.985086,
|
|
12
|
+
11,2.25e-06,-1.75e-06,1,2.71996e-07,-1.25282e-06,1.25282e-06,4.73685e-09,2.81257e-09,2.54697,7.08963e-09,-2.17845e-10,7.67942e-17,5.19487e-16,6.34859e+09,7.23487e+09,-1.24806e-06,7.08963e-09,0.112835,2.25417e-08,0.929842,
|
|
13
|
+
12,1.75e-06,-1.75e-06,0,2.72412e-07,-1.25605e-06,1.25605e-06,5.66129e-09,2.75737e-09,2.53769,8.95314e-09,-2.07095e-10,1.12989e-16,6.64998e-16,4.51337e+09,5.14344e+09,-1.25192e-06,8.95314e-09,0.142494,1.57552e-08,0.965391,
|
|
14
|
+
13,1.25e-06,-1.75e-06,0,2.71859e-07,-1.26151e-06,1.26151e-06,6.14906e-09,1.00126e-09,2.59066,8.02688e-09,-1.09376e-09,6.75103e-17,2.3654e-16,4.19651e+09,4.78235e+09,-1.25719e-06,8.02688e-09,0.127752,1.72719e-08,0.958027,
|
|
15
|
+
14,7.5e-07,-1.75e-06,0,2.71867e-07,-1.26492e-06,1.26492e-06,6.20769e-09,3.56944e-09,2.53294,9.27403e-09,-3.4442e-10,1.23012e-16,4.17538e-16,4.5435e+09,5.17778e+09,-1.26026e-06,9.27403e-09,0.147601,1.88153e-08,0.951096,
|
|
16
|
+
15,2.5e-07,-1.75e-06,1,2.7395e-07,-1.27646e-06,1.27646e-06,5.67983e-09,2.4258e-09,2.5654,7.12706e-09,-1.42175e-09,7.72651e-17,4.01055e-16,4.46442e+09,5.08766e+09,-1.27283e-06,7.12706e-09,0.113431,2.47073e-08,0.912282,
|
|
17
|
+
16,-2.5e-07,-1.75e-06,1,2.72198e-07,-1.27644e-06,1.27644e-06,4.81942e-09,1.21315e-09,2.61783,8.25998e-09,3.14497e-10,9.61936e-17,5.54171e-16,5.42442e+09,6.18167e+09,-1.27193e-06,8.25998e-09,0.131462,2.54657e-08,0.90991,
|
|
18
|
+
17,-7.5e-07,-1.75e-06,0,2.73979e-07,-1.28066e-06,1.28066e-06,5.96947e-09,1.3274e-09,2.56951,9.78691e-09,-9.26096e-10,1.11762e-16,4.09476e-16,4.36031e+09,4.96901e+09,-1.27618e-06,9.78691e-09,0.155764,8.59868e-09,0.989588,
|
|
19
|
+
18,-1.25e-06,-1.75e-06,0,2.72781e-07,-1.2807e-06,1.2807e-06,5.35899e-09,2.8145e-09,2.59505,8.28404e-09,1.39254e-09,7.19284e-17,2.10463e-16,5.24644e+09,5.97885e+09,-1.27853e-06,8.28404e-09,0.131845,1.17113e-08,0.980633,
|
|
20
|
+
19,-1.75e-06,-1.75e-06,1,2.73615e-07,-1.29295e-06,1.29295e-06,5.61528e-09,2.94815e-09,2.54736,9.03819e-09,-1.98596e-10,1.44934e-16,5.12594e-16,4.85887e+09,5.53717e+09,-1.28854e-06,9.03819e-09,0.143847,2.17869e-08,0.933903,
|
|
21
|
+
20,-2.25e-06,-1.75e-06,0,2.72591e-07,-1.29467e-06,1.29467e-06,5.51691e-09,1.66575e-09,2.58489,8.96433e-09,-1.66515e-09,1.67377e-16,3.28416e-16,4.86819e+09,5.54779e+09,-1.28878e-06,8.96433e-09,0.142672,1.48073e-08,0.969282,
|
|
22
|
+
21,-2.25e-06,-1.25e-06,1,2.74025e-07,-1.28699e-06,1.28699e-06,5.55496e-09,1.46175e-09,2.57015,9.69408e-09,-1.60758e-09,1.11556e-16,4.12795e-16,5.15861e+09,5.87876e+09,-1.2822e-06,9.69408e-09,0.154286,2.7302e-08,0.896658,
|
|
23
|
+
22,-1.75e-06,-1.25e-06,0,2.7316e-07,-1.27812e-06,1.27812e-06,6.80035e-09,3.07473e-09,2.54829,7.60384e-09,1.83324e-09,6.97739e-17,3.41253e-16,3.36527e+09,3.83507e+09,-1.27537e-06,7.60384e-09,0.121019,6.45314e-09,0.994154,
|
|
24
|
+
23,-1.25e-06,-1.25e-06,0,2.73559e-07,-1.27591e-06,1.27591e-06,7.01387e-09,3.61167e-09,2.53868,8.63196e-09,2.47154e-09,1.12614e-16,4.32227e-16,3.37061e+09,3.84115e+09,-1.27119e-06,8.63196e-09,0.137382,1.06757e-08,0.984474,
|
|
25
|
+
24,-7.5e-07,-1.25e-06,0,2.72036e-07,-1.27413e-06,1.27413e-06,5.98688e-09,3.07348e-09,2.54617,6.91031e-09,-5.82436e-10,5.87245e-17,4.68709e-16,4.36929e+09,4.97925e+09,-1.2697e-06,6.91031e-09,0.109981,1.15549e-08,0.981049,
|
|
26
|
+
25,-2.5e-07,-1.25e-06,1,2.73832e-07,-1.26483e-06,1.26483e-06,5.66821e-09,3.84228e-09,2.4489,1.10389e-08,5.06384e-10,1.1587e-16,7.79607e-16,4.9761e+09,5.67077e+09,-1.26082e-06,1.10389e-08,0.17569,2.4058e-08,0.921023,
|
|
27
|
+
26,2.5e-07,-1.25e-06,1,2.72331e-07,-1.26141e-06,1.26141e-06,5.54441e-09,3.60012e-09,2.5419,1.05188e-08,2.29681e-10,1.10113e-16,5.12422e-16,5.4132e+09,6.16888e+09,-1.25756e-06,1.05188e-08,0.167412,2.35169e-08,0.923426,
|
|
28
|
+
27,7.5e-07,-1.25e-06,0,2.72414e-07,-1.25789e-06,1.25789e-06,5.71015e-09,2.63661e-09,2.5015,8.93991e-09,-3.49228e-09,1.19218e-16,6.55317e-16,4.62157e+09,5.26675e+09,-1.24967e-06,8.93991e-09,0.142283,1.70894e-08,0.959503,
|
|
29
|
+
28,1.25e-06,-1.25e-06,0,2.73531e-07,-1.25348e-06,1.25348e-06,6.11174e-09,4.21764e-09,2.47336,1.1331e-08,1.54869e-09,1.14989e-16,5.84097e-16,4.49227e+09,5.1194e+09,-1.24978e-06,1.1331e-08,0.180339,1.80103e-08,0.955838,
|
|
30
|
+
29,1.75e-06,-1.25e-06,1,2.72162e-07,-1.24652e-06,1.24652e-06,6.12883e-09,3.59268e-09,2.47704,9.17063e-09,-8.65926e-10,1.19818e-16,6.39169e-16,4.54249e+09,5.17662e+09,-1.24205e-06,9.17063e-09,0.145955,3.73518e-08,0.807772,
|
|
31
|
+
30,2.25e-06,-1.25e-06,0,2.7311e-07,-1.24742e-06,1.24742e-06,6.46419e-09,1.94927e-09,2.51566,9.62942e-09,5.02402e-10,1.53386e-16,7.22005e-16,3.85588e+09,4.39417e+09,-1.24294e-06,9.62942e-09,0.153257,9.01422e-09,0.988636,
|
|
32
|
+
31,2.25e-06,-7.5e-07,1,2.7197e-07,-1.22801e-06,1.22801e-06,6.19374e-09,3.39572e-09,2.55281,9.38626e-09,1.06964e-09,1.16555e-16,4.20035e-16,3.87915e+09,4.42069e+09,-1.22547e-06,9.38626e-09,0.149387,3.07472e-08,0.867556,
|
|
33
|
+
32,1.75e-06,-7.5e-07,1,2.71949e-07,-1.23183e-06,1.23183e-06,6.79427e-09,4.03183e-09,2.57153,7.43748e-09,2.08983e-09,8.17351e-17,1.99589e-16,3.64632e+09,4.15535e+09,-1.23054e-06,7.43748e-09,0.118371,2.33617e-08,0.92307,
|
|
34
|
+
33,1.25e-06,-7.5e-07,1,2.71806e-07,-1.24147e-06,1.24147e-06,4.30866e-09,2.5874e-09,2.578,9.78976e-09,-1.02316e-09,1.59951e-16,5.68642e-16,7.61577e+09,8.67894e+09,-1.23597e-06,9.78976e-09,0.155809,2.11558e-08,0.93773,
|
|
35
|
+
34,7.5e-07,-7.5e-07,0,2.71626e-07,-1.25064e-06,1.25064e-06,6.43156e-09,1.4814e-09,2.49056,9.98382e-09,-8.48577e-10,2.21993e-16,9.00786e-16,3.83074e+09,4.36552e+09,-1.24169e-06,9.98382e-09,0.158897,1.28725e-08,0.977808,
|
|
36
|
+
35,2.5e-07,-7.5e-07,1,2.73862e-07,-1.25012e-06,1.25012e-06,5.58855e-09,2.57349e-09,2.53599,9.53933e-09,-3.2557e-10,1.36233e-16,5.85567e-16,5.32447e+09,6.06777e+09,-1.24555e-06,9.53933e-09,0.151823,2.55168e-08,0.908819,
|
|
37
|
+
36,-2.5e-07,-7.5e-07,0,2.71502e-07,-1.25983e-06,1.25983e-06,6.07175e-09,3.1773e-09,2.55903,9.01418e-09,-1.79876e-09,1.81522e-16,5.60117e-16,4.31622e+09,4.91876e+09,-1.25397e-06,9.01418e-09,0.143465,1.50062e-08,0.968424,
|
|
38
|
+
37,-7.5e-07,-7.5e-07,0,2.73227e-07,-1.25986e-06,1.25986e-06,6.53512e-09,4.13721e-09,2.544,9.82531e-09,5.14847e-10,2.11195e-16,4.97675e-16,3.94998e+09,4.5014e+09,-1.25605e-06,9.82531e-09,0.156375,1.31571e-08,0.975987,
|
|
39
|
+
38,-1.25e-06,-7.5e-07,0,2.73421e-07,-1.26479e-06,1.26479e-06,7.32699e-09,3.6264e-09,2.5461,9.04453e-09,2.30174e-09,1.70809e-16,1.8282e-16,3.29482e+09,3.75478e+09,-1.26317e-06,9.04453e-09,0.143948,1.0619e-08,0.984282,
|
|
40
|
+
39,-1.75e-06,-7.5e-07,0,2.72036e-07,-1.27011e-06,1.27011e-06,6.4789e-09,5.39705e-09,2.499,1.05032e-08,3.66445e-09,1.93465e-16,6.59417e-16,4.02499e+09,4.58689e+09,-1.26675e-06,1.05032e-08,0.167163,1.58662e-08,0.966132,
|
|
41
|
+
40,-2.25e-06,-7.5e-07,0,2.7421e-07,-1.28294e-06,1.28294e-06,5.98518e-09,2.2644e-09,2.50099,1.10505e-08,-3.30519e-09,1.07511e-16,6.73324e-16,4.33365e+09,4.93863e+09,-1.27508e-06,1.10505e-08,0.175874,1.8395e-08,0.953325,
|
|
42
|
+
41,-2.25e-06,-2.5e-07,1,2.73585e-07,-1.26605e-06,1.26605e-06,3.95981e-09,3.62333e-09,2.59636,9.74802e-09,-8.51416e-10,2.10167e-16,4.36552e-16,8.52771e+09,9.71818e+09,-1.26063e-06,9.74802e-09,0.155145,2.94324e-08,0.880916,
|
|
43
|
+
42,-1.75e-06,-2.5e-07,0,2.73024e-07,-1.26482e-06,1.26482e-06,6.42597e-09,4.83499e-09,2.52122,1.15851e-08,5.80955e-10,2.30885e-16,6.77515e-16,3.82621e+09,4.36035e+09,-1.25842e-06,1.15851e-08,0.184383,8.71796e-09,0.989769,
|
|
44
|
+
43,-1.25e-06,-2.5e-07,0,2.72132e-07,-1.25902e-06,1.25902e-06,6.35818e-09,2.28565e-09,2.52557,9.39304e-09,-6.46603e-10,1.46555e-16,5.00934e-16,4.00894e+09,4.56859e+09,-1.25368e-06,9.39304e-09,0.149495,1.08162e-08,0.983737,
|
|
45
|
+
44,-7.5e-07,-2.5e-07,0,2.72482e-07,-1.25569e-06,1.25569e-06,5.55332e-09,4.02974e-09,2.55411,1.13722e-08,4.2839e-11,2.31488e-16,5.82071e-16,5.15212e+09,5.87136e+09,-1.25084e-06,1.13722e-08,0.180995,1.64473e-08,0.962906,
|
|
46
|
+
45,-2.5e-07,-2.5e-07,1,2.7207e-07,-1.24803e-06,1.24803e-06,5.66857e-09,3.4796e-09,2.54164,8.14396e-09,-1.54336e-09,1.55835e-16,5.27341e-16,4.7806e+09,5.44797e+09,-1.24345e-06,8.14396e-09,0.129615,1.95414e-08,0.945207,
|
|
47
|
+
46,2.5e-07,-2.5e-07,0,2.73355e-07,-1.24349e-06,1.24349e-06,5.23739e-09,3.82273e-09,2.52532,1.22482e-08,-2.73984e-09,1.60669e-16,8.55795e-16,5.33908e+09,6.08442e+09,-1.23458e-06,1.22482e-08,0.194937,1.75281e-08,0.958647,
|
|
48
|
+
47,7.5e-07,-2.5e-07,0,2.73345e-07,-1.2432e-06,1.2432e-06,5.35615e-09,2.04392e-09,2.49567,9.0945e-09,-5.39909e-09,9.15176e-17,6.75418e-16,5.40738e+09,6.16225e+09,-1.23417e-06,9.0945e-09,0.144743,1.73735e-08,0.957684,
|
|
49
|
+
48,1.25e-06,-2.5e-07,0,2.73927e-07,-1.23706e-06,1.23706e-06,6.1431e-09,3.12456e-09,2.49887,9.53986e-09,-6.11265e-10,1.12071e-16,6.89351e-16,4.34783e+09,4.95479e+09,-1.23196e-06,9.53986e-09,0.151832,1.14766e-08,0.981719,
|
|
50
|
+
49,1.75e-06,-2.5e-07,0,2.71725e-07,-1.23075e-06,1.23075e-06,6.41795e-09,1.64935e-09,2.54206,8.0071e-09,-1.59257e-09,7.76994e-17,3.62108e-16,3.93255e+09,4.48154e+09,-1.22624e-06,8.0071e-09,0.127437,1.23812e-08,0.978238,
|
|
51
|
+
50,2.25e-06,-2.5e-07,0,2.72807e-07,-1.22501e-06,1.22501e-06,6.97178e-09,1.70752e-09,2.57909,5.77911e-09,3.5595e-10,5.37893e-17,1.40038e-16,3.41683e+09,3.89382e+09,-1.22167e-06,5.77911e-09,0.0919774,1.21485e-08,0.978851,
|
|
52
|
+
51,2.25e-06,2.5e-07,0,2.72091e-07,-1.21425e-06,1.21425e-06,6.19727e-09,2.66719e-09,2.59017,5.87584e-09,-1.42926e-09,4.91527e-17,1.60551e-16,4.19179e+09,4.77697e+09,-1.21039e-06,5.87584e-09,0.0935169,1.62991e-08,0.961939,
|
|
53
|
+
52,1.75e-06,2.5e-07,1,2.71789e-07,-1.21722e-06,1.21722e-06,5.22233e-09,3.22094e-09,2.55548,6.06614e-09,1.14881e-09,1.04157e-16,4.86115e-16,6.03896e+09,6.88201e+09,-1.21286e-06,6.06614e-09,0.0965456,2.53965e-08,0.911858,
|
|
54
|
+
53,1.25e-06,2.5e-07,1,2.72072e-07,-1.22059e-06,1.22059e-06,5.57885e-09,2.45001e-09,2.49152,1.09882e-08,1.5642e-10,1.46112e-16,7.31352e-16,5.27709e+09,6.01377e+09,-1.21638e-06,1.09882e-08,0.174882,2.42811e-08,0.918941,
|
|
55
|
+
54,7.5e-07,2.5e-07,1,2.7321e-07,-1.22882e-06,1.22882e-06,5.56066e-09,2.65051e-09,2.52714,9.32028e-09,-2.43092e-09,1.22687e-16,5.12758e-16,5.14087e+09,5.85855e+09,-1.22205e-06,9.32028e-09,0.148337,2.24665e-08,0.929286,
|
|
56
|
+
55,2.5e-07,2.5e-07,0,2.71781e-07,-1.23059e-06,1.23059e-06,5.78811e-09,2.27725e-09,2.57499,8.43062e-09,-1.25082e-09,9.18035e-17,4.94422e-16,4.56264e+09,5.19959e+09,-1.22618e-06,8.43062e-09,0.134178,1.48795e-08,0.968631,
|
|
57
|
+
56,-2.5e-07,2.5e-07,1,2.72648e-07,-1.23961e-06,1.23961e-06,6.22285e-09,3.03044e-09,2.51218,8.27728e-09,-7.42435e-10,1.00255e-16,5.58944e-16,4.2327e+09,4.82359e+09,-1.23567e-06,8.27728e-09,0.131737,1.95093e-08,0.946843,
|
|
58
|
+
57,-7.5e-07,2.5e-07,0,2.73472e-07,-1.23947e-06,1.23947e-06,4.90382e-09,3.11072e-09,2.4884,1.31671e-08,2.53744e-10,1.37503e-16,7.77e-16,6.25172e+09,7.12447e+09,-1.23424e-06,1.31671e-08,0.209561,1.52186e-08,0.968463,
|
|
59
|
+
58,-1.25e-06,2.5e-07,0,2.72936e-07,-1.25283e-06,1.25283e-06,5.75993e-09,3.98917e-09,2.47661,1.12161e-08,-1.68007e-09,1.25732e-16,7.10597e-16,4.7022e+09,5.35863e+09,-1.24618e-06,1.12161e-08,0.17851,1.71219e-08,0.959739,
|
|
60
|
+
59,-1.75e-06,2.5e-07,0,2.73175e-07,-1.25338e-06,1.25338e-06,5.88152e-09,2.61518e-09,2.54537,8.61864e-09,-1.44017e-11,7.95361e-17,4.06083e-16,4.83363e+09,5.50841e+09,-1.24932e-06,8.61864e-09,0.13717,1.61504e-08,0.963171,
|
|
61
|
+
60,-2.25e-06,2.5e-07,0,2.73456e-07,-1.2577e-06,1.2577e-06,5.86112e-09,3.6791e-09,2.52274,1.0814e-08,1.55894e-09,1.57317e-16,5.59253e-16,4.84224e+09,5.51823e+09,-1.25363e-06,1.0814e-08,0.17211,1.87118e-08,0.951833,
|
|
62
|
+
61,-2.25e-06,7.5e-07,1,2.72779e-07,-1.26952e-06,1.26952e-06,7.55332e-09,6.68846e-10,2.51942,5.87164e-09,-2.75449e-09,3.80042e-17,2.33641e-16,3.21138e+09,3.65969e+09,-1.26587e-06,5.87164e-09,0.09345,2.21098e-08,0.928994,
|
|
63
|
+
62,-1.75e-06,7.5e-07,0,2.7243e-07,-1.24627e-06,1.24627e-06,6.0123e-09,3.87179e-09,2.52556,1.0299e-08,-6.28941e-10,1.15477e-16,6.28544e-16,4.51552e+09,5.1459e+09,-1.2412e-06,1.0299e-08,0.163914,1.28711e-08,0.977242,
|
|
64
|
+
63,-1.25e-06,7.5e-07,0,2.72221e-07,-1.23679e-06,1.23679e-06,8.93733e-09,4.33237e-09,2.39073,1.12377e-08,1.2179e-09,1.24698e-16,6.70334e-16,2.41928e+09,2.75702e+09,-1.23436e-06,1.12377e-08,0.178853,1.64127e-08,0.962715,
|
|
65
|
+
64,-7.5e-07,7.5e-07,0,2.74244e-07,-1.23751e-06,1.23751e-06,6.34307e-09,2.37034e-09,2.47882,9.1936e-09,-3.60899e-09,9.83272e-17,6.66272e-16,4.06057e+09,4.62743e+09,-1.2295e-06,9.1936e-09,0.146321,1.49712e-08,0.969136,
|
|
66
|
+
65,-2.5e-07,7.5e-07,0,2.72778e-07,-1.22945e-06,1.22945e-06,5.68387e-09,3.74048e-09,2.57151,1.07832e-08,1.05826e-09,1.09249e-16,3.92306e-16,4.88942e+09,5.57199e+09,-1.22549e-06,1.07832e-08,0.17162,1.82831e-08,0.954341,
|
|
67
|
+
66,2.5e-07,7.5e-07,1,2.72505e-07,-1.21731e-06,1.21731e-06,5.49075e-09,4.8355e-09,2.55554,1.11068e-08,2.55544e-09,1.53474e-16,4.54259e-16,5.14681e+09,5.86531e+09,-1.21425e-06,1.11068e-08,0.17677,3.29839e-08,0.852828,
|
|
68
|
+
67,7.5e-07,7.5e-07,0,2.72753e-07,-1.21742e-06,1.21742e-06,5.86421e-09,2.26514e-09,2.54638,1.01063e-08,-1.64078e-09,1.0517e-16,4.36039e-16,4.59058e+09,5.23143e+09,-1.21083e-06,1.01063e-08,0.160846,1.39852e-08,0.973078,
|
|
69
|
+
68,1.25e-06,7.5e-07,1,2.73329e-07,-1.21664e-06,1.21664e-06,5.69541e-09,2.16043e-09,2.4867,9.82785e-09,6.08312e-10,1.63421e-16,5.03221e-16,5.27425e+09,6.01054e+09,-1.2128e-06,9.82785e-09,0.156415,2.26731e-08,0.929089,
|
|
70
|
+
69,1.75e-06,7.5e-07,0,2.73928e-07,-1.20505e-06,1.20505e-06,4.15873e-09,5.79126e-09,2.57915,1.24194e-08,2.50382e-09,2.12985e-16,6.61436e-16,7.60521e+09,8.66691e+09,-1.20087e-06,1.24194e-08,0.19766,1.61554e-08,0.964725,
|
|
71
|
+
70,2.25e-06,7.5e-07,1,2.71789e-07,-1.20502e-06,1.20502e-06,4.75467e-09,2.56472e-09,2.47048,1.03164e-08,6.8401e-10,1.87394e-16,6.62007e-16,6.8022e+09,7.7518e+09,-1.2008e-06,1.03164e-08,0.164191,2.58679e-08,0.908756,
|
|
72
|
+
71,2.25e-06,1.25e-06,1,2.72745e-07,-1.19998e-06,1.19998e-06,4.74995e-09,2.08726e-09,2.56221,1.07671e-08,-1.65818e-09,1.40931e-16,6.55932e-16,6.6979e+09,7.63293e+09,-1.19292e-06,1.07671e-08,0.171364,2.4961e-08,0.914905,
|
|
73
|
+
72,1.75e-06,1.25e-06,0,2.71754e-07,-1.20314e-06,1.20314e-06,4.9929e-09,3.7084e-09,2.52525,1.05964e-08,4.37436e-10,1.42697e-16,4.97846e-16,6.24779e+09,7.11999e+09,-1.1988e-06,1.05964e-08,0.168647,1.70871e-08,0.959664,
|
|
74
|
+
73,1.25e-06,1.25e-06,1,2.73727e-07,-1.20665e-06,1.20665e-06,5.12208e-09,3.64433e-09,2.5394,7.55862e-09,8.30184e-10,8.79633e-17,5.59504e-16,5.52489e+09,6.29617e+09,-1.20223e-06,7.55862e-09,0.120299,1.94249e-08,0.947566,
|
|
75
|
+
74,7.5e-07,1.25e-06,0,2.72091e-07,-1.21345e-06,1.21345e-06,9.86978e-09,5.31775e-09,2.41207,1.27304e-08,1.52014e-09,1.46903e-16,8.31596e-16,1.97241e+09,2.24776e+09,-1.20947e-06,1.27304e-08,0.20261,1.26812e-08,0.97797,
|
|
76
|
+
75,2.5e-07,1.25e-06,1,2.72528e-07,-1.21475e-06,1.21475e-06,6.24495e-09,3.76623e-09,2.50263,1.18326e-08,-1.25151e-09,2.21721e-16,7.49774e-16,4.35765e+09,4.96598e+09,-1.20881e-06,1.18326e-08,0.188322,2.12693e-08,0.937902,
|
|
77
|
+
76,-2.5e-07,1.25e-06,0,2.72113e-07,-1.22168e-06,1.22168e-06,5.58124e-09,2.8753e-09,2.53548,8.79247e-09,1.39237e-09,2.09589e-16,5.52022e-16,5.01885e+09,5.71949e+09,-1.21755e-06,8.79247e-09,0.139936,1.79536e-08,0.956035,
|
|
78
|
+
77,-7.5e-07,1.25e-06,0,2.71579e-07,-1.21848e-06,1.21848e-06,6.7476e-09,3.2202e-09,2.44111,1.17086e-08,-3.58427e-10,2.17434e-16,8.96758e-16,3.43743e+09,3.9173e+09,-1.21225e-06,1.17086e-08,0.186349,6.86335e-09,0.993568,
|
|
79
|
+
78,-1.25e-06,1.25e-06,1,2.72907e-07,-1.23398e-06,1.23398e-06,5.31418e-09,3.09301e-09,2.564,6.34616e-09,-1.14133e-09,1.81926e-16,5.33453e-16,5.08656e+09,5.79665e+09,-1.22909e-06,6.34616e-09,0.101002,2.09318e-08,0.938025,
|
|
80
|
+
79,-1.75e-06,1.25e-06,1,2.7345e-07,-1.23782e-06,1.23782e-06,4.83225e-09,3.19414e-09,2.57217,8.32455e-09,-2.72628e-09,1.81838e-16,8.38801e-16,5.87466e+09,6.69477e+09,-1.23097e-06,8.32455e-09,0.132489,2.27288e-08,0.926748,
|
|
81
|
+
80,-2.25e-06,1.25e-06,0,2.74133e-07,-1.23875e-06,1.23875e-06,5.30195e-09,2.74726e-09,2.55134,8.31507e-09,-2.46105e-10,1.67944e-16,5.80875e-16,5.28724e+09,6.02535e+09,-1.23401e-06,8.31507e-09,0.132338,1.39088e-08,0.973044,
|
|
82
|
+
81,-2.25e-06,1.75e-06,1,2.73089e-07,-1.22513e-06,1.22513e-06,6.0515e-09,2.70828e-09,2.54268,6.14695e-09,-1.47642e-09,1.51514e-16,4.22565e-16,4.53618e+09,5.16944e+09,-1.21971e-06,6.14695e-09,0.0978318,2.5234e-08,0.911209,
|
|
83
|
+
82,-1.75e-06,1.75e-06,1,2.73878e-07,-1.22021e-06,1.22021e-06,7.75174e-09,4.27378e-09,2.3656,1.13067e-08,-7.97e-10,1.92095e-16,6.11114e-16,2.65515e+09,3.02581e+09,-1.21656e-06,1.13067e-08,0.179952,5.43969e-08,0.588721,
|
|
84
|
+
83,-1.25e-06,1.75e-06,1,2.71491e-07,-1.21708e-06,1.21708e-06,5.98724e-09,3.19188e-09,2.54701,8.1165e-09,-1.15728e-09,1.33728e-16,3.63531e-16,4.60351e+09,5.24616e+09,-1.21361e-06,8.1165e-09,0.129178,2.70017e-08,0.896474,
|
|
85
|
+
84,-7.5e-07,1.75e-06,0,2.73044e-07,-1.20921e-06,1.20921e-06,6.20397e-09,3.83225e-09,2.57556,9.17688e-09,1.23324e-09,1.3039e-16,2.29691e-16,4.15318e+09,4.73297e+09,-1.20706e-06,9.17688e-09,0.146055,1.24205e-08,0.978164,
|
|
86
|
+
85,-2.5e-07,1.75e-06,0,2.7206e-07,-1.20541e-06,1.20541e-06,5.81119e-09,4.7175e-09,2.4919,1.10668e-08,6.60501e-10,2.1878e-16,5.02141e-16,5.01419e+09,5.71417e+09,-1.20179e-06,1.10668e-08,0.176133,1.84582e-08,0.952653,
|
|
87
|
+
86,2.5e-07,1.75e-06,0,2.73378e-07,-1.20741e-06,1.20741e-06,6.51445e-09,4.65141e-09,2.49416,1.00983e-08,6.71086e-10,1.40827e-16,6.88449e-16,3.77884e+09,4.30637e+09,-1.20296e-06,1.00983e-08,0.160719,1.3677e-08,0.973912,
|
|
88
|
+
87,7.5e-07,1.75e-06,1,2.71982e-07,-1.20213e-06,1.20213e-06,6.44488e-09,4.08711e-09,2.55721,7.88743e-09,1.54185e-09,9.50298e-17,4.485e-16,4.16633e+09,4.74796e+09,-1.19898e-06,7.88743e-09,0.125532,2.31534e-08,0.924933,
|
|
89
|
+
88,1.25e-06,1.75e-06,1,2.7345e-07,-1.19585e-06,1.19585e-06,4.58245e-09,3.1512e-09,2.56213,9.4432e-09,-1.50791e-09,1.02428e-16,6.27103e-16,6.62143e+09,7.54579e+09,-1.19107e-06,9.4432e-09,0.150293,1.88643e-08,0.949534,
|
|
90
|
+
89,1.75e-06,1.75e-06,1,2.73645e-07,-1.19514e-06,1.19514e-06,5.20924e-09,3.66748e-09,2.60397,8.08653e-09,-3.83809e-11,7.86769e-17,4.80355e-16,5.03764e+09,5.7409e+09,-1.19148e-06,8.08653e-09,0.128701,2.58264e-08,0.905901,
|
|
91
|
+
90,2.25e-06,1.75e-06,1,2.74074e-07,-1.19124e-06,1.19124e-06,5.46865e-09,2.94818e-09,2.5475,6.55471e-09,3.95023e-10,8.12905e-17,7.08994e-16,4.89134e+09,5.57417e+09,-1.18643e-06,6.55471e-09,0.104322,2.74221e-08,0.896683,
|
|
92
|
+
91,2.25e-06,2.25e-06,1,2.73307e-07,-1.18417e-06,1.18417e-06,6.3225e-09,3.04167e-09,2.5415,1.16453e-08,-3.35599e-09,1.36274e-16,5.27429e-16,4.08835e+09,4.65908e+09,-1.17635e-06,1.16453e-08,0.18534,2.04485e-08,0.942412,
|
|
93
|
+
92,1.75e-06,2.25e-06,1,2.72255e-07,-1.18716e-06,1.18716e-06,5.46529e-09,3.37304e-09,2.48573,1.16725e-08,-1.64092e-09,1.27173e-16,7.09013e-16,4.94272e+09,5.63272e+09,-1.18144e-06,1.16725e-08,0.185774,2.06707e-08,0.939804,
|
|
94
|
+
93,1.25e-06,2.25e-06,0,2.72534e-07,-1.18561e-06,1.18561e-06,5.08559e-09,3.96684e-09,2.56025,1.03771e-08,2.19572e-10,1.34612e-16,5.19884e-16,5.65279e+09,6.44192e+09,-1.18053e-06,1.03771e-08,0.165157,1.27746e-08,0.97723,
|
|
95
|
+
94,7.5e-07,2.25e-06,1,2.73283e-07,-1.19991e-06,1.19991e-06,5.79356e-09,1.15563e-09,2.56109,6.15357e-09,-4.80418e-09,6.28314e-17,3.62099e-16,4.9787e+09,5.67373e+09,-1.19178e-06,6.15357e-09,0.0979372,2.49794e-08,0.912318,
|
|
96
|
+
95,2.5e-07,2.25e-06,1,2.72933e-07,-1.19757e-06,1.19757e-06,5.06171e-09,2.79731e-09,2.54848,9.63728e-09,-3.81313e-10,1.4225e-16,5.41885e-16,5.9825e+09,6.81766e+09,-1.1926e-06,9.63728e-09,0.153382,2.13906e-08,0.937274,
|
|
97
|
+
96,-2.5e-07,2.25e-06,1,2.72821e-07,-1.19981e-06,1.19981e-06,5.1927e-09,9.09991e-10,2.47027,9.25982e-09,6.38251e-10,1.26043e-16,7.62604e-16,5.94943e+09,6.77997e+09,-1.19506e-06,9.25982e-09,0.147375,2.27544e-08,0.929439,
|
|
98
|
+
97,-7.5e-07,2.25e-06,1,2.73883e-07,-1.20566e-06,1.20566e-06,5.30736e-09,2.48843e-09,2.56291,7.37717e-09,-1.43664e-09,8.82855e-17,5.74873e-16,5.30921e+09,6.05038e+09,-1.20111e-06,7.37717e-09,0.117411,2.13005e-08,0.936208,
|
|
99
|
+
98,-1.25e-06,2.25e-06,0,2.7401e-07,-1.20187e-06,1.20187e-06,5.06907e-09,2.32608e-09,2.55028,6.7176e-09,1.02407e-09,8.12442e-17,3.80944e-16,5.97789e+09,6.81241e+09,-1.19912e-06,6.7176e-09,0.106914,1.81047e-08,0.953365,
|
|
100
|
+
99,-1.75e-06,2.25e-06,1,2.74186e-07,-1.21489e-06,1.21489e-06,4.40214e-09,1.09931e-09,2.52542,9.46162e-09,-4.51642e-09,1.05014e-16,6.61984e-16,7.83232e+09,8.92572e+09,-1.2069e-06,9.46162e-09,0.150586,2.20095e-08,0.931173,
|
|
101
|
+
100,-2.25e-06,2.25e-06,1,2.73415e-07,-1.21662e-06,1.21662e-06,6.3157e-09,1.6159e-09,2.56567,5.98496e-09,-1.57034e-09,7.05869e-17,3.55925e-16,4.08749e+09,4.6581e+09,-1.21237e-06,5.98496e-09,0.0952536,2.83917e-08,0.886442,
|