SRL release version

SHAPE_Package/!Read_me.txt

@@ -2,7 +2,7 @@ Welcome to the Seismic HAzard Parameters Evaluation (SHAPE) Toolbox!
 
 Find the two versions in the corresponding directories
 
-SHAPE_ver1 -  is a Interactive Standalone version (inputs are set interactively, step by step)
+SHAPE_ver1 -  is an Interactive Standalone version (inputs are set interactively, step by step)
                     REQUIREMENTS: Matlab R2017b or later, with installed Toolboxes:
                   - 'Statistics and Machine Learning'
                   - 'Image Processing'
@@ -13,13 +13,13 @@ SHAPE_ver2 -  is a Wrapper version (inputs are set in the wrapper script and onc
                   - 'Statistics and Machine Learning'
 
 >> Please refer to the "READ_ME_SHAPE_ver*.pdf" file in each directory for further instructions on  
-   step-by-step implementation of the applications as well as for data requirements & general tips.
+   step-by-step implementation of SHAPE as well as for data format specifications and general tips.
 
 >> Your feedback is welcome! contact Dr K. Leptokaropoulos for questions, suggestions or comments: 
    - kleptoka@igf.edu.pl
 
 >> Please acknowledge any use of SHAPE in your work, by citing: 
-   - Leptokaropoulos & Lasocki (2020), SHAPE: A MATLAB Software Package for Time-dependent Seismic
+   - Leptokaropoulos, K. and S. Lasocki (2020), SHAPE: A MATLAB Software Package for Time-dependent 
-     Hazard Analysis, Seismol. Res. Lett., doi: 
+     Seismic Hazard Analysis, Seismol. Res. Lett., doi: 10.1785/0220190319 
 
 ENJOY! 

SHAPE_Package/SHAPE_ver1.0/CATALOGS/ST2_SEIS_Fields.txt

@@ -1 +1 @@
-Time   ML    Long    Lat   Depth  
+Time   ML    Lat    Long   Depth  

SHAPE_Package/SHAPE_ver1.0/SHAPE_ver1.m

@@ -1,11 +1,11 @@
 % PROGRAM     :  SHAPE [Seismic HAzard Parameters Evaluation] 
 % VERSION     :  V_1.2 [Interactive Standalone Version] 
-% LAST UPDATED:  March 2020 
+% LAST UPDATED:  April 2020 
 % COMPATIBLE  :  Matlab version 2017b or later
 % REQUIREMENTS:  "Statistics and Machine Learning" and "Image Processing" Matlab Toolbox installed
 % TOOLBOX     :  "Hazard Analysis Toolbox" developed within SERA Project
 % USER GUIDE  :  "READ_ME_SHAPE_ver1.pdf"
-% CITE AS     :  Leptokaropoulos K. and S. Lasocki (2020), Seismol. Res. Lett., doi:
+% CITE AS     :  Leptokaropoulos K. and S. Lasocki (2020), Seismol. Res. Lett., doi: 10.1785/0220190319
 % CONTACT     :  kleptoka@igf.edu.pl (Dr. Kostas Leptokaropoulos)
 % --------------------------------------------------------------------------------------------------------------------
 % Time-and-Technology Dependent Seismic Hazard Assessment (SHA)  
@@ -16,18 +16,17 @@
 % >   File with the parameters of seismic data [mandatory]
 % >   File with the parameters of production data [optional]
 % >   File specifying time windows for SHA analysis [optional]
-% >   Files(s) with the fields description of the corresponding parameters in the seismic data file
+% >   File with the fields description of the corresponding parameters in the seismic data file
-% >   Files(s) with the fields description of the corresponding parameters in the production data files
+% >   File with the fields description of the corresponding parameters in the production data files
 % FOR DETAILS on data requirements please refer to the document:
 %                            "READ_ME_SHAPE_ver1.pdf"
 % --------------------------------------------------------------------------------------------------------------------
-% OVERVIEW:THE PROGRAM takes as input a Seismic and optionally, a Production data parameters files to provides Seismic 
+% OVERVIEW: THE PROGRAM takes as input a Seismic and optionally, a Production data parameter file to provide Seismic 
 % Hazard Assessment for specified time-windows after filtering appropriately the data following User's specifications. 
 % --------------------------------------------------------------------------------------------------------------------
 % AUTHORS: K. Leptokaropoulos and S. Lasocki
-% Based on magnitude distribution and stationary hazard parameters estimation functions originally developed by S. Lasocki
+% Based on magnitude distribution/stationary hazard parameters estimation functions originally developed by S. Lasocki
-% Last Updated: 03/2020, within SERA PROJECT, EU Horizon 2020 R&I 
+% Last Updated: 04/2020, within SERA PROJECT, EU Horizon 2020 R&I programme under grant agreement No.730900
-% programme under grant agreement No.730900
 % CURRENT VERSION: v1.2        ****    [INTERACTIVE STANDALONE VERSION!!]
 %% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % PLEASE refer to the accompanying document:
@@ -113,7 +112,7 @@
 % Lasocki S, Urban P (2011), Acta Geophys. 59:659–673
 % Lasocki S, Orlecka-Sikora B (2008), Tectonophysics 456:28–37
 % Leptokaropoulos K, Staszek M, Cielesta S, Urban P, Olszewska D, Lizurek G (2017), Acta Geophys. 65:493-505 
-% Leptokaropoulos K, Lasocki S (2020), Seismol. Res. Lett., doi: .
+% Leptokaropoulos K, Lasocki S (2020), Seismol. Res. Lett., doi: 10.1785/0220190319.
 % ---------------------------------------------------------------------------------------------------------------------
 % LICENSE 
 %     This is free software: you can redistribute it and/or modify it under the terms of the 

SHAPE_Package/SHAPE_ver2.0/CATALOGS/ST2_SEIS_Fields.txt

@@ -1 +1 @@
-Time   ML    Long    Lat   Depth  
+Time   ML    Lat    Long   Depth  

SHAPE_Package/SHAPE_ver2.0/SHAPE_ver2.m

@@ -1,32 +1,32 @@
 % PROGRAM     :  SHAPE [Seismic HAzard Parameters Evaluation]  
 % VERSION     :  V_2.2 [Wrapper (fast) Standalone Version] 
-% LAST UPDATED:  March 2020
+% LAST UPDATED:  April 2020
 % COMPATIBLE  :  Matlab version 2017b or later
 % REQUIREMENTS:  "Statistics and Machine Learning" Matlab Toolbox installed
 % TOOLBOX     :  "Hazard Analysis Toolbox" developed within SERA Project
-% USER GUIDE  :  "READ_ME_SHAPE_ver2.docx"
+% USER GUIDE  :  "READ_ME_SHAPE_ver2.pdf"
-% CITE AS     :  Leptokaropoulos K. and S. Lasocki (2020), Seismol. Res. Lett., doi: 
+% CITE AS     :  Leptokaropoulos K. and S. Lasocki (2020), Seismol. Res. Lett., doi: 10.1785/0220190319 
 % CONTACT     :  kleptoka@igf.edu.pl (Dr. Kostas Leptokaropoulos)
 % --------------------------------------------------------------------------------------------------------------------
 % Time-and-Technology Dependent Seismic Hazard Assessment (SHA)  
 % --------------------------------------------------------------------------------------------------------------------
+% INPUT:
 % !!! ----------------------------  INPUT DATA REQUIREMENTS ----------------------------- !!!
 % the program works with ASCII input data files (e.g. *.txt). The files needed are:
 % >   File with the parameters of seismic data [mandatory]
 % >   File with the parameters of production data [optional]
 % >   File specifying time windows for SHA analysis [optional]
-% >   Files(s) with the fields description of the corresponding parameters in the seismic data file
+% >   File with the fields description of the corresponding parameters in the seismic data file
-% >   Files(s) with the fields description of the corresponding parameters in the production data files
+% >   File with the fields description of the corresponding parameters in the production data files
 % FOR DETAILS on data requirements please refer to the document:
 %                            "READ_ME_SHAPE_ver2.pdf"
 % --------------------------------------------------------------------------------------------------------------------
-% OVERVIEW:THE PROGRAM takes as input a Seismic and optionally, a Production data parameters files to provides Seismic 
+% OVERVIEW: THE PROGRAM takes as input a Seismic and optionally, a Production data parameter file to provide Seismic 
 % Hazard Assessment for specified time-windows, following User's specifications. 
 % --------------------------------------------------------------------------------------------------------------------
 % AUTHORS: K. Leptokaropoulos and S. Lasocki
-% Based on magnitude distribution and stationary hazard parameters estimation functions originally developed by S. Lasocki
+% Based on magnitude distribution/stationary hazard parameters estimation functions originally developed by S. Lasocki
-% Last Updated: 03/2020, within SERA PROJECT, EU Horizon 2020 R&I 
+% Last Updated: 04/2020, within SERA PROJECT, EU Horizon 2020 R&I programme under grant agreement No.730900
-% programme under grant agreement No.730900
 % CURRENT VERSION: v2.2        ****    [WRAPPER (fast) STANDALONE VERSION!!]
 %% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % PLEASE refer to the accompanying document:
@@ -45,7 +45,7 @@
 % upon User’s particular specifications. 4 different magnitude distribution models can 
 % be chosen. The input files must be in ASCII format (e.g. *.txt). A brief description 
 % of the preparation process is given here:
-% !!! THE USER SETS THE PARAMETERS IN LINES 115-130 !!! then the following steps are executed
+% !!! THE USER SETS THE PARAMETERS IN LINES 117-134 !!! then the following steps are executed
 % (please see in the script for more comments and details for each STEP)
 % STEP_1. Upload Data
 % STEP_2. Select Magnidue Scale
@@ -98,7 +98,7 @@
 % Lasocki S, Urban P (2011), Acta Geophys. 59:659–673
 % Lasocki S, Orlecka-Sikora B (2008), Tectonophysics 456:28–37
 % Leptokaropoulos K, Staszek M, Cielesta S, Urban P, Olszewska D, Lizurek G (2017), Acta Geophys. 65:493-505 
-% Leptokaropoulos K, Lasocki S (2020), Seismol. Res. Lett., doi: .
+% Leptokaropoulos K, Lasocki S (2020), Seismol. Res. Lett., doi: 10.1785/0220190319.
 % ---------------------------------------------------------------------------------------------------------------------
 % LICENSE 
 %     This is free software: you can redistribute it and/or modify it under the terms of the