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

minor updates in msg formatting

parent 32cf8dbb

Makefile.version

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


export VERSION_MAJOR=1

export VERSION_MINOR=4

export VERSION_RELEASE=rc1

export VERSION_RELEASE=0.rc2



export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)

sources/data_types.f90

+4 −3
Original line number Diff line number Diff line
@@ -898,9 +898,10 @@ CONTAINS 
    integer, intent(in), optional :: phase_point

    ! 

    cres = ''

    if (present(run  )) write(cres,'(a,",",i0)') trim(cres), run

    if (present(tau  )) write(cres,'(a,",",i0)') trim(cres), tau

    if (present(phase_point)) write(cres,'(a,",",i0)') trim(cres), phase_point

    if (present(run  )) write(cres,'(a,i0,",")') trim(cres), run

    if (present(tau  )) write(cres,'(a,i0,",")') trim(cres), tau

    if (present(phase_point)) write(cres,'(a,i0,",")') trim(cres), phase_point

    if (len_trim(cres)>1) cres= cres(1:len_trim(cres)-1) ! remove trailing comma

  end function cpoint_format2



  !

sources/fit_data.f90

+2 −2
Original line number Diff line number Diff line
@@ -246,10 +246,10 @@ contains 
    if (apply_offset) then

        if (present(offset) ) djoffset = offset

        call msg_info('get_echo_param',point=cpoint(run=scan_point%id, tau=scan_point%point), &

                        msg=trim(msg_fmt("(1x,'applying phase offset: ',f12.3,' deg')", &

                        msg=trim(msg_fmt("(1x,'applying phase offset: ',g10.3,' deg')", &

                        rad2deg(get_precession_phase(djoffset,scan_point%physics%lambda))))//&

                        trim(msg_fmt("(1x,'(',g12.5,' uTm)')", djoffset/UTESLA))//&

                        trim(msg_fmt("(1x,'to scan[',i0,'/',i0,']:')", [scan_point%id, scan_point%point])))

                        trim(msg_fmt("(1x,'to scan[',i0,',',i0,']')", [scan_point%id, scan_point%point])))

        !!mm>> new to save offset info for reporting (experimental)

        if(count_dj_offset < MAX_TOTAL_POINTS)  count_dj_offset = count_dj_offset + 1

        runno_point_stat(1,count_dj_offset) = scan_point%id