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

modified mask q command 

it modified so that it applies to all sample data by default
unless a run number (numor) is specified explicitely
parent a4ed0d8d

sources/drspine.f90

+17 −5
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ CONTAINS 
    !

    ival    = 0

    itau    = 0

    irun    = int(program_param%last_run)

    irun    = 0

    xmask   = 0

    qmask   = 0

    dqmask  = HUGE(1d0)
@@ -1595,7 +1595,7 @@ CONTAINS 
            call msg_warning("drspine/mask", 'mask - set and clear are mutually exclusive')

            exit case_what

        end if

        irun = get_named_value('run', irun, inew)

        irun = get_named_value('run', int(program_param%last_run), inew)



        if (do_set) then

            itau = get_named_value('set', itau, inew)
@@ -1642,19 +1642,31 @@ CONTAINS 
            dqmask(3) = get_named_value('dqz', dqmask(3), inew)

            do i=1, data_manager_size()

                if ( .not. is_valid_scan(data_scan(i)) ) cycle

                if ( irun>0) then ! run specified, check if it is the one

                    if ( data_scan(i)%id /= irun ) cycle

                else ! run not specified, apply to all SAMPLE data

                    if (.not. has_role(data_scan(i)%role, ROLE_SAMPLE)) cycle

                end if

                call mask_qvec_set(data_scan(i), qmask, dqmask)

            enddo

        else if (do_clear) then

            do i=1, data_manager_size()

                if ( .not. is_valid_scan(data_scan(i)) ) cycle

                if ( irun>0) then ! run specified, check if it is the one

                    if ( data_scan(i)%id /= irun ) cycle

                else ! run not specified, apply to all SAMPLE data

                    if (.not. has_role(data_scan(i)%role, ROLE_SAMPLE)) cycle

                end if

                call mask_qvec_clear(data_scan(i))

            enddo

        else

            do i=1, data_manager_size()

                if ( .not. is_valid_scan(data_scan(i)) ) cycle

                if ( irun>0) then ! run specified, check if it is the one

                    if ( data_scan(i)%id /= irun ) cycle

                else ! run not specified, apply to all SAMPLE data

                    if (.not. has_role(data_scan(i)%role, ROLE_SAMPLE)) cycle

                end if

                call mask_qvec_list(data_scan(i))

            enddo

        end if

sources/reduce_data.f90

+2 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ bgr_pixel_bin(l) 
    !

    iunit   = output_unit

    if (present(outunit)) iunit = outunit

    write(iunit, '(1x,a,2i3)') 'detector pixels:   ', this%no_xpix, this%no_ypix

    write(iunit, '(1x,a,1x,i0,"[",i0,"]",2x,"(",i0,1x,i0,")")') 'q-mask: ', this%id, it, this%no_xpix, this%no_ypix

    write(iunit,'(5x)', advance='no')

    do i=1, this%no_xpix

       write(iunit,'(i2)', advance='no') i
@@ -740,10 +740,10 @@ bgr_pixel_bin(l) 
    type(scan_struct), intent(inout) :: data_scan

    !

    integer :: iscan, it

    ! print only the first tau (others will look alike)

    do iscan=1, min(data_scan%number_of_points,1)

       associate(scan_point => data_scan%scan_point(iscan))

       do it=1, scan_point%no_lam

        write (*,*) data_scan%id, iscan, it

        call print_detector_qmask(scan_point, it)

       end do

       end associate