Commit 16e0250b authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

updated default parameters

parent e5788442

Makefile.version

+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=1

export VERSION_RELEASE=0

export VERSION_RELEASE=1



git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)

ifeq "$(git_rev)" ""

sources/drspine_parameters.f90

+15 −14
Original line number Diff line number Diff line
@@ -150,27 +150,28 @@ module drspine_parameters 
     !> max magnetic field variation in a scan

     real(kind=DBL) :: max_bfield_variation

  end type reduction_pars_struct

  ! the default parameters are "very open" (as per MM email)

  ! since the reducrion algorithm takes care of the data "cleaning"

  type(reduction_pars_struct) :: reduction_parameters = reduction_pars_struct(&

       100.0_DBL, & ! min_counts_per_pixel

       0.03_DBL,  & ! min_sigma_relative

       1.0_DBL,    & ! min_counts_per_pixel

       0.01_DBL,   & ! min_sigma_relative

       !

       0.00_DBL,   & ! average min. value

       0.25_DBL,  & ! average max. deviation

       1.50_DBL,   & ! average max. deviation

       !

       0.10_DBL,  & ! min. F(Qt) value

       1.00_DBL,  & ! max. F(Qt) sigma

       0.01_DBL,   & ! min. F(Qt) value

       100.0_DBL,  & ! max. F(Qt) sigma

       !

       1e-10_DBL,       & ! symmetry phase tolerance

       1.0D-05  ,       & ! symmetry phase min. shift

       ASIN(1.0_DBL),   & ! symmetry phase max. deviation

       0.1D-8  ,    & ! symmetry phase tolerance

       0.1D-4  ,    & ! symmetry phase min. shift

       1.27_DBL,    & ! symmetry phase max. deviation

       ASIN(1.0_DBL)*4, & ! symmetry phase corr step

       !

       300.0_DBL, & ! max_chisquare (chi2/ndf)

       1D3    ,   & ! max_chisquare (chi2/ndf)

       4      ,   & ! "central" detector area size (pixel x pixels)

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

       0.00_DBL,  & ! pz, 0 should be the default (off) catch band for post collecting q-values

       1.0D-06    & ! max magnetic field variation

       !0.002e10_DBL & ! catch band for post collecting q-values

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

       1D-6       & ! max magnetic field variation

       )

  !

CONTAINS

sources/instrument_config.f90

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ contains 
                                    pixel2d(0, 0, SNS_DET_SIZE, SNS_DET_SIZE),&

                                    SNS_L1, SNS_L2, SNS_MON_DIST)

            instrument_parameters%norm_counter = SNS_NORM_DEFAULT

            reduction_parameters%post_collection_qcatch = 0 ! switch off for SNS-NSE

        case (INST_JNSE)

            if (present(tbins)) call create_bin_struct(tbins, 1, 1)

            call eshape_select(E_TG_ESHAPE)
@@ -68,6 +69,7 @@ contains 
                                    pixel2d(0, 0, JNSE_DET_SIZE, JNSE_DET_SIZE),&

                                    JNSE_L1, JNSE_L2, JNSE_MON_DIST)

            instrument_parameters%norm_counter = JNSE_NORM_DEFAULT

            reduction_parameters%post_collection_qcatch = 0.005_DBL/ANGSTROEM

        case default

            return

        end select