Commit 69910a44 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

fixed numerical issue in calculating var_tau

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

export VERSION_MAJOR=1
export VERSION_MINOR=3
export VERSION_RELEASE=2
export VERSION_RELEASE=3

export PROJLIB=lib$(PROJECT).a
export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)
+8 −5
Original line number Diff line number Diff line
@@ -1552,18 +1552,21 @@ dotau: do it=it1,it2
                  dvar = sqrt(dvar)
               end if

               dtau_var = ci%fqt_tau_var-ci%fqt_tau**2
               if (dtau_var<0) then
                  dtau_var = 0.0_DBL
               !dtau_var = ci%fqt_tau_var-ci%fqt_tau**2
               dtau_var = ci%fqt_tau_var/ci%fqt_tau**2 ! this is numerically more stable (paz) for small diffs
               if (dtau_var>1) then
                  dtau_var = ci%fqt_tau*sqrt(dtau_var-1)
               else
                  dtau_var = sqrt(dtau_var)
                  dtau_var = 0.0_DBL
               end if

              write(iok, '(5e15.7,i10,e15.7)') &
                   ci%fqt_tau/NS, ci%fqt, sqrt(ci%fqt_err2), dvar, dtau_var/NS, ci%update_counter, ci%fqt_Q*ANGSTROEM
              write(cmsg,'(7e15.7,i10,e15.7)') ci%fqt_tau/NS, ci%fqt, ci%fqt_err2, ci%fqt_var, ci%fqt**2, &
              write(cmsg,'(7e15.7,i10,e15.7)') &
                   ci%fqt_tau/NS, ci%fqt, ci%fqt_err2, ci%fqt_var, ci%fqt**2, &
                   ci%fqt_tau_var, ci%fqt_tau**2, ci%update_counter, ci%fqt_Q*ANGSTROEM
              call msg_trace('print_collection_item/fqt',trim(cmsg))

            endif
         endif

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ set r.phase_minoff 1.00E-5
set r.max_chisq        300.00
set r.center_size      4.00
set r.postcoll_qcat    0.00
set r.max_field_var    1.00E-6
set r.max_field_var    2.50E-5

echo test_init_file done

+522 −0

File added.

Preview size limit exceeded, changes collapsed.

+9165 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading