Commit 1d9f556a authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

changes to fqt_maxsigma and max. goto label length

- reduction parameter r.fqt_maxsigma means now absolute (not relative)
  $\sigma_{F(Q,t)}$. Default is 1.0

- allowed for goto labels longer than 8 characters
parent ac1c2a76
Loading
Loading
Loading
Loading
+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=7
export VERSION_RELEASE=8

git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)
ifeq "$(git_rev)" ""
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ type(reduction_pars_struct) :: reduction_parameters

\hline
{\tt r.fqt\_maxsigma}   & % {\tt fqt\_max\_sigma} &
                        1.0         & maximum $\sigma_{F(Q,t)}/F(Q,t)$ \\
                        1.0         & maximum value of $\sigma_{F(Q,t)}$ \\
\hline
{\tt r.phase\_tol}      & %{\tt symmetry\_phase\_tolerance} &
                        $10^{-10}$  & echo phase fitting tolerance \\
+3 −3
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ contains
                if(refpix%status .ne. PIXEL_OK ) cycle dtypd
                if(all ( [ refpix%average%value    > reduction_parameters%average_min_value,&
                           refpix%fqt%value        > reduction_parameters%fqt_min_value,&
                           sqrt(refpix%fqt%sigma2)/refpix%fqt%value < reduction_parameters%fqt_max_sigma] )) then
                           sqrt(refpix%fqt%sigma2) < reduction_parameters%fqt_max_sigma] )) then

                   eshape_lams%nbin = [datpix%tbin_1, datpix%tbin_2]
                   call linextract(eshape, datpix, eshape_lams, datpix%delta_J_symm%value+dj, ssq)
+2 −1
Original line number Diff line number Diff line
@@ -1182,7 +1182,8 @@ CONTAINS
          endif
          rewind(kanal(ktop))
88881     continue
          read(kanal(ktop),'(a8)',end=88883)xlab
          !read(kanal(ktop),'(a8)',end=88883)xlab
          read(kanal(ktop),'(a)',end=88883)xlab ! (paz) allow labels longer than 8-chars
          if(glabel.eq.xlab) goto 8888
          goto 88881
       else