Commit eae6dfe7 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

command help cleanup/update

parent 0e2af95a

Makefile.version

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR) 


export VERSION_MAJOR=1

export VERSION_MINOR=0

export VERSION_RELEASE=0

export VERSION_RELEASE=1



git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)

ifeq "$(git_rev)" ""

sources/Makefile.depend

+2 −2
Original line number Diff line number Diff line 
# Makefile.depend Wed Sep 25 19:57:23 EDT 2019

# Makefile.depend Thu Oct 24 11:36:08 EDT 2019

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
@@ -35,7 +35,7 @@ instrument_config.o : instrument_config.f90 echo_shapes.o binning.o geometry_typ 
module_gen_makro.o : module_gen_makro.f90 strings_module.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 plot_utils.o module_gen_makro.o getopt_m.o texology.o os_utils.o file_utils.o write_utils.o reduce_data.o dump_data.o fit_data.o read_data.o instrument_config.o data_manager.o echo_shapes.o geometry_types.o data_types.o minimization.o matching.o binning.o constants_module.o drspine_version.o drspine_parameters.o new_com.o 

drspine.o : drspine.f90 plot_utils.o module_gen_makro.o getopt_m.o texology.o file_utils.o write_utils.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

extract_figures.o : extract_figures.f90 

plain_figures.o : plain_figures.f90 

mxx.o : mxx.f90

sources/drspine.f90

+31 −52
Original line number Diff line number Diff line
@@ -9,13 +9,10 @@ program drspine 
  use drspine_parameters

  use drspine_version

  use constants_module

  use binning

  use matching

  use minimization



  use data_types

  use geometry_types

  use echo_shapes

  use data_manager

  use instrument_config
@@ -26,7 +23,6 @@ program drspine 


  use write_utils

  use file_utils

  use os_utils

  use texology



  use getopt_m
@@ -341,7 +337,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: run

     !! clear

     !-------------------------------------------------------------

     if(command('run ', &

          ' run commandline'//LF//&
@@ -355,7 +350,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: clear

     !! clear

     !-------------------------------------------------------------

     if(command('clear ', &

          ' clear'//LF//&
@@ -380,7 +374,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: bins

     !! bins

     !-------------------------------------------------------------

     if(command('bins ', &

          ' bins pix nbins <n> '//LF//&
@@ -396,7 +389,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: histo

     !! histo

     !-------------------------------------------------------------

     if(command('histo ', &

          ' histo [tau|q] nbins <n> [min <min>] [max <max>] [log]'//LF//&
@@ -418,7 +410,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: eshape

     !! eshape

     !-------------------------------------------------------------

     if(command('eshape ', &

          ' eshape [basic|gaussian|flux_weighted|triangular] '//LF//&
@@ -436,16 +427,12 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: read

     !! read                          -   read filenames givent at startup

     !! read [options]  <filename(s)> - read <filename>

     !! options:

     !!     as [ref|sig|bak|bgr|auto] - assign file type (default it auto)

     !-------------------------------------------------------------

     if(command('read  ', &

          " read <filename(s)> [as (ref|sample|background|auto)] [tfac <val>]"//LF//&

          " read <filename(s)> [as (ref|sample|background|auto)] [tfac <val>] [phase_offset <val>]"//LF//&

          "   - read filename(s) and assign a role to them (default auto)"//LF//&

          "     and optionally set the relative transmission factor to <val>"//LF//&

          "     tfac <val>          - set the relative transmission factor to <val>"//LF//&

          "                           <val> = transmission(sample)/transmission(bgr)"//LF//&

          "     phase_offset <val>  - set the initial phase offset"//LF//&

          " read "//LF//&

          "   - read filenames given at the OS command line"//LF//&

          ""//LF//&
@@ -458,9 +445,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: role

     !! role [options] <numor>     - assign new role to data

     !! options:

     !!     as [ref|sig|bak|bgr|auto] - assign new role (default it auto)

     !-------------------------------------------------------------

     if(command('role  ', &

          " role <numor(s)> [as (ref|sample|background|auto)]"//LF//&
@@ -471,8 +455,7 @@ program drspine 




     !-------------------------------------------------------------

     !> COMMAND:

     !! moni <value>  - set normalization monitor index

     !> COMMAND: moni

     !-------------------------------------------------------------

     if(command('moni ', &

          " moni <ival> "//LF//&
@@ -485,7 +468,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: group

     !! group <name> [<numor>] - assign new group to data

     !-------------------------------------------------------------

     !if(command('group  ', &

     !     " group <name> [numor]"//LF//&
@@ -497,8 +479,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: mask

     !! mask [options]      - mask pixel

     !! options:

     !-------------------------------------------------------------

     if(command('mask  ', &

          " mask set [val v]"//LF//&
@@ -516,7 +496,6 @@ program drspine 


     !-------------------------------------------------------------

     !> COMMAND: dump

     !! dump [dir] outdir

     !-------------------------------------------------------------

     if(command('dump  ', &

          ' dump [file <filename> ] [verbose] [clean]'//LF//&
@@ -560,7 +539,7 @@ program drspine 
          '   - matches data sets to each other'//LF//&

          '   resolution|res - matches resolution data to sample and background data'//LF//&

          '   background|bgr - matches background data to sample data'//LF//&

          '   all            - same as "resolution" and "background" $' )) then

          '   all            - same as resolution and background $' )) then

        !               ===============

        call cmd_match()

        cycle commandloop
@@ -570,17 +549,19 @@ program drspine 
     !> COMMAND: fit

     !-------------------------------------------------------------

     if(command('fit  ', &

          ' fit (all|resolution|sample|background) [flag (<flag>|show)] [phase_offset <value>]'//LF//&

          ' fit (all|resolution|sample|background|run <runn>) [flag <flag>] [phase_offset <value>]'//LF//&

          '     - performs the echo fit'//LF//&

          '         resolution|res          - fits resolution data'//LF//&

          '         sample|sam              - fits sample data'//LF//&

          '         background|bgr          - fits background data'//LF//&

          '         all                     - fits all data (same as res sam and bgr) '//LF//&

          '         run <runn>              - fits run <runn> only'//LF//&

          '         flag <flag>             - sets fitting flag'//LF//&

          '        <flag>    - where "<flag> is a numerical value (see "fit flag show" below)'//LF//&

          '   flag show      - shows available flags'//LF//&

          '   phase_offset <value> - initial phase offset in degrees (sample,bgr)'//LF//&

          '                 - only makes sense  for "flag offset"'//LF//&

          '                                   where "<flag> is a numerical value (see "fit flag show" below)'//LF//&

          '         phase_offset <value>    - initial phase offset in degrees (for sample,background)'//LF//&

          '                                   only makes sense  for "flag offset"'//LF//&

          ' '//LF//&

          ' fit flag show   - shows available fit flags'//LF//&

          ' NOTES:'//LF//&

          '   typically requires data being "read" and "match"ed before fitting$')) then

!         '                 '//trim(cformat_fit_flag(int(z'FFFFFFF'),hide_numeric=.true.))//LF//& !<- this causes weird problems
@@ -601,10 +582,9 @@ program drspine 
          '                         if 1 perform standard background subtraction'//LF//&

          '         tfac <val>    - use transmission factor (default 1)'//LF//&              ! use tfac while reading data (pz)

          '                         <val> = transmission(sample)/transmission(bgr)'//LF//&



          '         volfrac <val> - use volume fraction factor (default 1)'//LF//&

          '         use_mean      - use arithmetic mean for wavelength calculations'//LF//&

          '                   default us flux weighted wavelength'//LF//&

          '                         default is flux weighted wavelength'//LF//&

          '         resolution    - produce R(Q,t) file for resolution data'//LF//&

          '         debug         - dump S(Q,t) debug info files (developer option)'//LF//&

          ' NOTES:'//LF//&
@@ -859,20 +839,19 @@ program drspine 
     endif



     !-------------------------------------------------------------

     !> COMMAND: check for the possibility that mycommad is a makro

     !> COMMAND: check for the possibility that mycommand is a makro

     !-------------------------------------------------------------

     !> finally check for makro files

     call makro(mycommand)

     call unused( 1, 1, 1, ier)





  enddo commandloop



  !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

  ! ------ THE LOOP ENDS HERE--------------------------------!!

  !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!



  CALL MSG_INFO('DRSPINE', '===> DONE')

  call msg_info('drspine', '===> DONE')





  !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!