diff --git a/grain_size_tools/GrainSizeTools_script.py b/grain_size_tools/GrainSizeTools_script.py index ffbeead..12fd46a 100644 --- a/grain_size_tools/GrainSizeTools_script.py +++ b/grain_size_tools/GrainSizeTools_script.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # # # -# Version 2024.02.xx # +# Version 3.1.0 # # For details see: http://marcoalopez.github.io/GrainSizeTools/ # # download at https://github.com/marcoalopez/GrainSizeTools/releases # # # diff --git a/grain_size_tools/averages.py b/grain_size_tools/averages.py index 22f2e43..f85a7ac 100644 --- a/grain_size_tools/averages.py +++ b/grain_size_tools/averages.py @@ -18,7 +18,7 @@ # See the License for the specific language governing permissions and # # limitations under the "License". # # # -# Version 2024.02.xx # +# Version 3.1.0 # # For details see: http://marcoalopez.github.io/GrainSizeTools/ # # download at https://github.com/marcoalopez/GrainSizeTools/releases # # # diff --git a/grain_size_tools/get.py b/grain_size_tools/get.py index 179656d..3c14e2f 100644 --- a/grain_size_tools/get.py +++ b/grain_size_tools/get.py @@ -5,7 +5,7 @@ A free open-source cross-platform script to visualize and characterize grain size population and estimate differential stress via paleopizometers. -Version: 2024.03.RC +Version: 3.1.0 Documentation: https://github.com/marcoalopez/GrainSizeTools/wiki Type get.functions_list() to get a list of the main methods @@ -25,14 +25,13 @@ plot.normalized -> visualize a normalized distribution of grain sizes stereology.Saltykov -> approximate the actual grain size distribution via the Saltykov method -stereology.calc_shape -> approximate the lognormal shape of the actual distribution +stereology.two_step -> approximate the lognormal distribution to the actual distribution ====================================================================================== You can get more information about the methods using the following ways: (1) Typing ? or ?? after the function name, e.g. summarize? (2) Typing help plus the name of the function, e.g. help(summarize) - (3) In JupyterLab by enabling the "Show contextual help", the info - will pop up as soon as you write the name of the function. + (3) In JupyterLab by enabling the "Show contextual help" """ diff --git a/grain_size_tools/new_piezometers.py b/grain_size_tools/new_piezometers.py index 6a0c32d..e0f5b20 100644 --- a/grain_size_tools/new_piezometers.py +++ b/grain_size_tools/new_piezometers.py @@ -1,3 +1,28 @@ +# ============================================================================ # +# # +# This is part of the "GrainSizeTools Script" # +# A Python script for characterizing grain size from thin sections # +# # +# Copyright (c) 2014-present Marco A. Lopez-Sanchez # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +# # +# Version 3.2.0 # +# For details see: http://marcoalopez.github.io/GrainSizeTools/ # +# download at https://github.com/marcoalopez/GrainSizeTools/releases # +# # +# ============================================================================ # + from dataclasses import dataclass from typing import Dict, ClassVar, Any import yaml diff --git a/grain_size_tools/piezometers.py b/grain_size_tools/piezometers.py index dbafc08..1c9ebcc 100644 --- a/grain_size_tools/piezometers.py +++ b/grain_size_tools/piezometers.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # # # -# Version 2024.02.xx # +# Version 3.1.0 # # For details see: http://marcoalopez.github.io/GrainSizeTools/ # # download at https://github.com/marcoalopez/GrainSizeTools/releases # # # diff --git a/grain_size_tools/plot.py b/grain_size_tools/plot.py index 856ad26..9956333 100644 --- a/grain_size_tools/plot.py +++ b/grain_size_tools/plot.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # # # -# Version 2024.02.xx # +# Version 3.1.0 # # For details see: http://marcoalopez.github.io/GrainSizeTools/ # # download at https://github.com/marcoalopez/GrainSizeTools/releases # # # diff --git a/grain_size_tools/stereology.py b/grain_size_tools/stereology.py index 216b0fb..1d20c68 100644 --- a/grain_size_tools/stereology.py +++ b/grain_size_tools/stereology.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # # # -# Version 2024.05.17 # +# Version 3.1.0 # # For details see: http://marcoalopez.github.io/GrainSizeTools/ # # download at https://github.com/marcoalopez/GrainSizeTools/releases # # # diff --git a/grain_size_tools/template.py b/grain_size_tools/template.py index a159e90..f8824df 100644 --- a/grain_size_tools/template.py +++ b/grain_size_tools/template.py @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # # # -# Version 2024.02.xx # +# Version 3.1.0 # # For details see: http://marcoalopez.github.io/GrainSizeTools/ # # download at https://github.com/marcoalopez/GrainSizeTools/releases # # #