Commit 45a3d42f authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

Merge branch 'pztest' into dev/hdf5

parents 442da87e c40c97eb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ export MKDIR_P=mkdir -p
-include ./Makefile.def
-include ./Makefile.version

SUBDIRS=doc python sources scripts tests examples
SUBDIRS=python sources scripts tests examples doc


all:
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ export PROJECT=drspine

export VERSION_MAJOR=2
export VERSION_MINOR=0
export VERSION_RELEASE=a3
export VERSION_RELEASE=a4

export PROJLIB=lib$(PROJECT).a
export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)
+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ endif

FSOURCES2=\
	drspine_parameters.f90 \
	error_codes.f90  \
	constants_module.f90   \
	strings_module.f90  \
	regex_module.f90  \
+9 −8
Original line number Diff line number Diff line
# Makefile.depend Mon Jul 3 12:14:43 EDT 2023
# Makefile.depend Wed Jul 3 13:38:50 EDT 2024
drspine_version.o : drspine_version.F90 drspine_parameters.o 
os_utils.o : os_utils.F90 strings_module.o drspine_parameters.o 
new_com.o : new_com.F90 os_utils.o 
new_com.o : new_com.F90 os_utils.o error_codes.o 
drspine_parameters.o : drspine_parameters.f90 
error_codes.o : error_codes.f90 
constants_module.o : constants_module.f90 drspine_parameters.o 
strings_module.o : strings_module.f90 
regex_module.o : regex_module.f90 
logger.o : logger.f90 new_com.o 
logger.o : logger.f90 
getopt_m.o : getopt_m.f90 
mathutil.o : mathutil.f90 drspine_parameters.o 
statutil.o : statutil.f90 
@@ -17,24 +18,24 @@ polynom.o : polynom.f90
binning.o : binning.f90 logger.o mathutil.o drspine_parameters.o 
base_types.o : base_types.f90 logger.o strings_module.o drspine_parameters.o 
geometry_types.o : geometry_types.f90 base_types.o drspine_parameters.o 
data_types.o : data_types.f90 logger.o binning.o geometry_types.o base_types.o constants_module.o drspine_parameters.o 
data_types.o : data_types.f90 logger.o binning.o geometry_types.o base_types.o constants_module.o error_codes.o drspine_parameters.o 
results_types.o : results_types.f90 data_types.o 
matching.o : matching.f90 geometry_types.o base_types.o data_types.o constants_module.o drspine_parameters.o 
data_manager.o : data_manager.f90 logger.o data_types.o 
echo_shapes.o : echo_shapes.f90 logger.o mathutil.o minimization.o data_types.o constants_module.o drspine_parameters.o 
file_utils.o : file_utils.f90 strings_module.o drspine_parameters.o 
read_utils.o : read_utils.f90 base_types.o logger.o strings_module.o drspine_parameters.o 
read_utils.o : read_utils.f90 base_types.o error_codes.o logger.o strings_module.o drspine_parameters.o 
texology.o : texology.f90 os_utils.o read_utils.o 
dump_data.o : dump_data.f90 file_utils.o logger.o echo_shapes.o geometry_types.o data_types.o constants_module.o drspine_version.o drspine_parameters.o 
dump_data.o : dump_data.f90 os_utils.o file_utils.o logger.o echo_shapes.o geometry_types.o data_types.o constants_module.o drspine_version.o drspine_parameters.o 
write_utils.o : write_utils.f90 strings_module.o constants_module.o data_types.o drspine_parameters.o 
fit_utils.o : fit_utils.f90 echo_shapes.o polynom.o logger.o data_types.o drspine_parameters.o 
read_data.o : read_data.f90 binning.o logger.o file_utils.o read_utils.o instrument_config.o geometry_types.o data_types.o base_types.o constants_module.o 
fit_data.o : fit_data.f90 logger.o mathutil.o fit_utils.o dump_data.o echo_shapes.o data_types.o constants_module.o 
reduce_data.o : reduce_data.f90 instrument_config.o dump_data.o data_types.o constants_module.o 
reduce_xyz.o : reduce_xyz.f90 dump_data.o data_types.o 
instrument_config.o : instrument_config.f90 echo_shapes.o binning.o geometry_types.o strings_module.o drspine_parameters.o 
instrument_config.o : instrument_config.f90 new_com.o echo_shapes.o binning.o geometry_types.o strings_module.o drspine_parameters.o 
module_gen_makro.o : module_gen_makro.f90 strings_module.o 
drspine_utils.o : drspine_utils.f90 logger.o new_com.o strings_module.o drspine_parameters.o 
drspine_utils.o : drspine_utils.f90 logger.o new_com.o strings_module.o error_codes.o drspine_parameters.o 
gr_interface.o : gr_interface.f90 drspine_parameters.o 
plot_utils.o : plot_utils.f90 texology.o dump_data.o data_types.o gr_interface.o 
drspine.o : drspine.f90 drspine_utils.o plot_utils.o module_gen_makro.o getopt_m.o texology.o file_utils.o write_utils.o reduce_xyz.o reduce_data.o dump_data.o fit_data.o read_data.o instrument_config.o data_manager.o data_types.o minimization.o matching.o constants_module.o drspine_version.o drspine_parameters.o new_com.o 
+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
module data_types
  !use, intrinsic :: ieee_arithmetic
  use drspine_parameters
  use error_codes
  use constants_module
  use base_types
  use geometry_types
@@ -511,7 +512,7 @@ module data_types
    integer                                                     :: update_counter
    integer                                                     :: out_of_range_counter

    character(len=cmd_len)                                      :: comment     !> representative comment for the collection
    character(len=MAX_LINE_LENGTH)                              :: comment     !> representative comment for the collection
    character(len=8)                                            :: short_id    !> short name of sample
    integer                                                     :: numor_sam   !> representative run number for sample      
    integer                                                     :: numor_ref   !> representative run number for reference      
Loading