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

updated default parameters 

- changed default max_field variation from 1e-6 to 1e-5
	too many false positived
- annotated matching tolerance defaults
parent 34a6fd8c

sources/drspine_parameters.f90

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ module drspine_parameters 
       4      ,   & ! "central" detector area size (pixel x pixels)

       2      ,   & ! symmetry phase patch size (for smoothing)

       0.5D8  ,   & ! catch band for post collecting q-values (actual values are set in instrument config)

       1D-6       & ! max magnetic field variation

       1D-5       & ! max magnetic field variation

       )

  !

CONTAINS

sources/matching.f90

+16 −16
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ module matching 
  end type matching_tolerance_struct



  type(matching_tolerance_struct) :: matching_tolerance = matching_tolerance_struct( &

                            30D-05, & !0.00001_DBL*30, & ! J0 abs tolerance (Tm)

                             3D-02, & !0.003_DBL  *10, & ! J0 relative tolerance

                              0.15*DEGREE,  &

                            180.00*DEGREE,  &

                            0.1*ANGSTROEM,  &

                            0.1*ANGSTROEM   &

                            300*UTESLA   ,  & ! J0 abs tolerance 300 uTm

                              0.03_DBL   ,  & ! J0 relative tolerance, default 3%

                              0.15*DEGREE,  & ! scattering angle tolerance

                            180.00*DEGREE,  & ! sample angle tolerance, default is disabled (?)

                            0.1*ANGSTROEM,  & ! min. neutron wavelength tolerance, default 0.1 A

                            0.1*ANGSTROEM   & ! max. neutron wavelength tolerance, default 0.1 A

                            )



  public  :: taupoint_match, taupoint_mismatch, cformat_match_accuracy
@@ -270,10 +270,10 @@ contains 
                cycle target_loop

             end if

             call msg_debug('tau_match_data','match found: '//&

                  'source/'//trim(cformat_role(source_data%role))//' '//&

                  trim(msg_fmt("(i0,':',i0)",[source_data%id, i]))//' => '//&

                  'target/'//trim(cformat_role(target_data%role))//' '//&

                  trim(msg_fmt("(i0,':',i0)",[target_data%id, j]))//' '//&

                  trim(cformat_role(source_data%role, short=.true.))//' '//&

                  trim(msg_fmt("(i0,':',i0.2)",[source_data%id, i]))//' => '//&

                  trim(cformat_role(target_data%role, short=.true.))//' '//&

                  trim(msg_fmt("(i0,':',i0.2)",[target_data%id, j]))//' '//&

                  trim(cformat_match_accuracy(source_data%scan_point(i), target_data%scan_point(j))))

             cycle source_loop ! found match for this source point

          end if
@@ -323,18 +323,18 @@ contains 
            src => scan_data(i)%scan_point(j)

            write(output_unit,'(1x,a)', advance='no') trim(cformat_role(scan_data(i)%role, short=.true.))//':'

            write(output_unit,'(1x,a)', advance='no') trim(msg_fmt("(i0,':',i0.2)",[src%id, src%point]))

            if(associated( src%matching_ref)) then

                tgt => src%matching_ref

                write(output_unit,'(a)', advance='no') ' => ref: '

                write(output_unit,'(a)', advance='no') trim(msg_fmt("(i0,':',i0.2)",[tgt%id,tgt%point]))//' ['

                write(output_unit,'(a)', advance='no') trim(list_matching_ids(src%matching_ref_arr,.true.))//']'

            end if

            if(associated( src%matching_bgr)) then

                tgt => src%matching_bgr

                write(output_unit,'(a)', advance='no') ' => bgr: '

                write(output_unit,'(a)', advance='no') trim(msg_fmt("(i0,':',i0.2)",[tgt%id,tgt%point]))//' ['

                write(output_unit,'(a)', advance='no') trim(list_matching_ids(src%matching_bgr_arr,.true.))//']'

            end if

            if(associated( src%matching_ref)) then

                tgt => src%matching_ref

                write(output_unit,'(a)', advance='no') ' => ref: '

                write(output_unit,'(a)', advance='no') trim(msg_fmt("(i0,':',i0.2)",[tgt%id,tgt%point]))//' ['

                write(output_unit,'(a)', advance='no') trim(list_matching_ids(src%matching_ref_arr,.true.))//']'

            end if

            write(output_unit,*)

        end do tau_loop

    end do source_loop