Commit 0f4b0cd3 authored by Michael Monkenbusch(AB)'s avatar Michael Monkenbusch(AB)
Browse files

up-down issue fixed (consider moving up and down from ave to fit ...)

parent d098ebff

sources/fit_data.f90

+5 −2
Original line number Diff line number Diff line
@@ -412,8 +412,11 @@ contains 
    !

    ave = phase_scan%average%value

    sig = sqrt(phase_scan%average%sigma2)

    up  = max(phase_scan%up%value, phase_scan%down%value)

    dn  = min(phase_scan%up%value, phase_scan%down%value)

!!???!!    up  = max(phase_scan%up%value, phase_scan%down%value)

!!???!!    dn  = min(phase_scan%up%value, phase_scan%down%value)



    up  = phase_scan%up%value

    dn  = phase_scan%down%value



    ! check counting statistics

    if ( phase_scan%average_raw%value.lt.reduction_parameters%min_counts_per_pixel) then

sources/reduce_data.f90

+32 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ if(ix==4 .and. iy==4) write(*,'(a,i4,i9,2(i3,2f18.9))') "Tcombine_runs i amp fqt 
    !

    real(kind=DBL), parameter             :: dj_tolerance = 4*Pi*1d-7*40*0.001d0 

    integer :: i, j, l, it, ix, iy

    integer :: nphase

    integer :: nphase, ntot, n_dn, n_up



    type(value_struct), dimension(:), allocatable :: bgr_pixel_bin
@@ -254,6 +254,15 @@ if(ix==4 .and. iy==4) write(*,'(a,i4,i9,2(i3,2f18.9))') "Tcombine_runs i amp fqt 
       

!!! >>cp>> we may put this section(>>cp>) into a subroutine sub_pix(pixel, ..) contained in this sbr TBD

        nphase = sample_data%scan_point(i)%centerbin%max_phase  !! ????? or check if equal to previous np. !!

        ntot   = sample_data%scan_point(i)%centerbin%n_all 

        n_dn   = sample_data%scan_point(i)%centerbin%n_down

        n_up   = sample_data%scan_point(i)%centerbin%n_up

write(*,*)"Tp nphase: ", nphase, sample_data%scan_point(i)%centerbin%n_all, sample_data%scan_point(i)%pixelbin(0,4,4)%n_all, &

 !!TEST!! 

sample_data%scan_point(i)%centerbin%n_up, sample_data%scan_point(i)%centerbin%n_down  



write(*,*)"Tpud nphase: ", nphase, sample_data%scan_point(i)%centerbin%up,  sample_data%scan_point(i)%centerbin%down

 !!TEST!!  



                 do l=1, nphase

                   call init_value(bgr_pixel_bin(l))
@@ -324,6 +333,16 @@ bgr_pixel_bin(l) 


           enddo

    

!! here we fix the average up down values: TBD  should be done in teh fittimng sqt(sqt steps) ...

           sample_data%scan_point(i)%centerbin%average = &

                ave_value(sample_data%scan_point(i)%centerbin%counts_pixel_bin(1:n_dn)%value)

           sample_data%scan_point(i)%centerbin%amplitude%state = VAL_UNDEFINED

           sample_data%scan_point(i)%centerbin%down = &

                ave_value(sample_data%scan_point(i)%centerbin%counts_pixel_bin(n_dn+1:n_up))

           sample_data%scan_point(i)%centerbin%up   = &

                ave_value(sample_data%scan_point(i)%centerbin%counts_pixel_bin(n_up+1:ntot))



    

           sample_data%scan_point(i)%centerbin%background_subtracted = .true.

           sample_data%scan_point(i)%centerbin%transmission_factor = &

                               value_struct(VAL_NO_ERROR, transmission, 0.0_DBL)
@@ -398,6 +417,17 @@ write(*,'(a,3i5,i10,2(2x,i2,2f18.11))')"TP4b bgrsub pixp: ",i,j,l, & 
sample_data%scan_point(i)%id,sample_data%scan_point(i)%pixelbin(it,ix,iy)%counts_pixel_bin(l) ,& !!TEST!!

bgr_pixel_bin(l)                    

                 enddo



!! here we fix the average up down values: TBD  should be done in teh fittimng sqt(sqt steps) ...

                 sample_data%scan_point(i)%pixelbin(it,ix,iy)%average = &

                    ave_value(sample_data%scan_point(i)%pixelbin(it,ix,iy)%counts_pixel_bin(1:n_dn)%value)

                 sample_data%scan_point(i)%pixelbin(it,ix,iy)%amplitude%state = VAL_UNDEFINED

                 sample_data%scan_point(i)%pixelbin(it,ix,iy)%down = &

                    ave_value(sample_data%scan_point(i)%pixelbin(it,ix,iy)%counts_pixel_bin(n_dn+1:n_up))

                 sample_data%scan_point(i)%pixelbin(it,ix,iy)%up =  &

                    ave_value(sample_data%scan_point(i)%pixelbin(it,ix,iy)%counts_pixel_bin(n_up+1:ntot))





                 sample_data%scan_point(i)%pixelbin(it,ix,iy)%background_subtracted = .true.

                 sample_data%scan_point(i)%pixelbin(it,ix,iy)%transmission_factor = &

                               value_struct(VAL_NO_ERROR, transmission, 0.0_DBL)