restoring old new_com as old_com (a49139a8) · Commits · Zolnierczuk, Piotr / DrSPINE

sources/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ PROGSRC=\
		FSOURCES1=\
		drspine_version.F90 \
		os_utils.F90 \
		new_com.F90
		old_com.F90

		FSOURCES2=\
		drspine_parameters.f90 \

sources/Makefile.depend

+4 −4

Original line number	Diff line number	Diff line
		# Makefile.depend Fri Sep 6 15:36:51 EDT 2019
		# Makefile.depend Wed Sep 18 22:48:10 EDT 2019
		drspine_version.o : drspine_version.F90
		os_utils.o : os_utils.F90 strings_module.o drspine_parameters.o
		new_com.o : new_com.F90 os_utils.o
		old_com.o : old_com.F90 os_utils.o
		drspine_parameters.o : drspine_parameters.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 old_com.o
		getopt_m.o : getopt_m.f90
		mathutil.o : mathutil.f90 drspine_parameters.o
		statutil.o : statutil.f90
		@@ -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 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 old_com.o
		extract_figures.o : extract_figures.f90
		plain_figures.o : plain_figures.f90
		mxx.o : mxx.f90

sources/drspine.f90

+34 −14

Original line number	Diff line number	Diff line
		@@ -860,18 +860,18 @@ program drspine
		!-------------------------------------------------------------
		!> finally check for makro files
		call makro(mycommand)
		call unused( 2, 1, 1, ier)
		call unused( 1, 1, 1, ier)


		!!>>>>
		!!mmnc
		call unused( icmdus=2, ivnuse=2, irpuse=2, iretus=iunused)
		if(iunused .ne. 0) then
		call errsig(9901,"ERROR: unknown option in last command ! $")
		endif
		!call unused( icmdus=2, ivnuse=2, irpuse=2, iretus=iunused)
		!if(iunused .ne. 0) then
		! call errsig(9901,"ERROR: unknown option in last command ! $")
		!endif

		if(ierrs > 0) call close_all_macros()
		ierrs = 0
		!if(ierrs > 0) call close_all_macros()
		!ierrs = 0
		!!mmnc


		@@ -1643,12 +1643,14 @@ CONTAINS
		implicit none
		integer :: i
		integer :: fit_flag
		integer :: fit_run
		logical :: fit_resolution, fit_sample, fit_background
		character(len=MAX_LINE_LENGTH) :: cflag
		character(len=MAX_LINE_LENGTH) :: cwhat
		real(kind=DBL) :: phase_offset

		fit_flag = -1
		fit_run = -1
		fit_resolution = .true.
		fit_sample = .true.
		fit_background = .true.
		@@ -1659,7 +1661,7 @@ CONTAINS
		! now parse "what"
		cwhat = trim(chrnxt('fit', ier)) ! weird way of getting next parameter
		if (ier>0) then
		if (trim(cwhat)=='all'.or.trim(cwhat)=='flag') then
		if (trim(cwhat)=='all'.or.trim(cwhat)=='flag'.or.trim(cwhat)=='run') then
		continue
		else
		fit_resolution = .false.
		@@ -1680,6 +1682,14 @@ CONTAINS
		end select
		end if
		end if
		if ( found('run') ) then
		fit_run = get_named_value('run ', fit_run, ier)
		if (ier>0) then
		fit_resolution = .false.
		fit_sample = .false.
		fit_background = .false.
		end if
		end if

		if ( found('flag') ) then
		cflag = get_named_value('flag ',cflag,ier)
		@@ -1690,24 +1700,21 @@ CONTAINS
		return
		else
		fit_flag = parse_fit_flag(cflag)
		print *, fit_flag
		end if
		else
		fit_flag = get_named_value('flag ',fit_flag, ier)
		fit_flag = get_named_value('flag ',fit_flag, ier) ! FIXME: never gets executed ier>0
		end if
		!if (ier<=0) then
		!end if
		end if
		phase_offset = get_named_value('phase_offset',phase_offset, ier)


		if( fit_resolution ) &
		call msg_info('cmd_fit', "fitting data with role RESOLUTION using flag="//trim(cformat_fit_flag(fit_flag)))
		if( fit_sample ) &
		call msg_info('cmd_fit', "fitting data with role SAMPLE using flag="//trim(cformat_fit_flag(fit_flag)))
		if( fit_background ) &
		call msg_info('cmd_fit', "fitting data with role BACKGROUND using flag="//trim(cformat_fit_flag(fit_flag)))

		if( fit_run>0) &
		call msg_info('cmd_fit', "fitting "//trim(msg_fmt("('run =',i0)", fit_run))//" flag="//trim(cformat_fit_flag(fit_flag)))

		!fit_loop: do i=1, data_size
		! if (.not. is_valid_scan(data_scan(i))) cycle fit_loop
		@@ -1762,6 +1769,19 @@ CONTAINS
		end do
		end if

		if ( fit_run > 0 ) then
		call msg_info('fit', '===> fitting run')
		do i=1, data_manager_size()
		if ( data_scan(i)%id /= fit_run ) cycle
		if ( fit_flag == -1 ) then
		call fit_echo_data(data_scan(i), PHASE_FIT_DEFAULT, phase_offset=phase_offset) ! FIXME: is this a right default
		else
		call fit_echo_data(data_scan(i), fit_flag, phase_offset=phase_offset)
		end if
		end do
		end if


		call unused( 1, 1, 1, ier)

		end subroutine cmd_fit

sources/new_com.F90

+4 −3

Original line number	Diff line number	Diff line
		@@ -1615,8 +1615,7 @@ CONTAINS
		do i=1,iitems
		if(iot.gt.0) &
		write(6,*)'item: ',i,cmd_item(i)(1:lclen(vname(i),80)+1)
		if(.not.item_used(i)) then
		!mmnc item_used(i) = .true.
		if(iot.gt.0.and..not.item_used(i)) then
		if(ivnuse.gt.0 .or. irpuse.gt.0) then
		call errsig(max(ivnuse-1,irpuse-1),'item not used:'// &
		cmd_item(i)(1:lclen(vname(i),80)+1)//'$')
		@@ -1629,7 +1628,7 @@ CONTAINS
		do i=1,inames
		if(iot.gt.0) &
		write(6,*)'vname: ',i,vname(i)(1:lclen(vname(i),80)+1)
		if(.not.vused(i)) then
		if(iot.gt.0.and..not.vused(i)) then
		!mmnc vused(i) = .true.
		if(ivnuse.gt.0) then
		call errsig(ivnuse-1,'name not used:'// &
		@@ -3517,9 +3516,11 @@ CONTAINS
		search: do i=1,inames
		if(compar(vname(i),pname//' ')) then
		vused(i) = .true.
		item_used(i) = .true.
		if ( len_trim(vname(i+1)) > 0 ) then
		chrval = vname(i+1)
		vused(i+1) = .true.
		item_used(i+1) = .true.
		inew = i
		else
		inew = -i ! argument not found

sources/new_com.i90

deleted100644 → 0

+0 −3691

File deleted.

Preview size limit exceeded, changes collapsed.