Commit 7e40d0c2 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

tolerance updates in add_pix_to_sqt

parent 1eafc85c

examples/match_test2

+4 −0
Original line number Diff line number Diff line
@@ -32,3 +32,7 @@ match show 
! match tau 2 run 10875 => tau 3 run 10903 (bgr)

match run 10875 tau 2 to 10903 tau2 3 ! 11A bgr to 8A sample

match show



! test fitting/collection

fit all

collect

sources/data_types.f90

+4 −2
Original line number Diff line number Diff line
@@ -1049,13 +1049,15 @@ CONTAINS 
        !return

     endif         

     

     if( abs(ps_reference%lambda_1 - ps_sample%lambda_1)/ps_reference%lambda_1 > matching_tolerance%J0_rel) then

     !if( abs(ps_reference%lambda_1 - ps_sample%lambda_1)/ps_reference%lambda_1 > matching_tolerance%J0_rel) then

     if( abs(ps_reference%lambda_1 - ps_sample%lambda_1) > matching_tolerance%lambda_min) then

        call msg_warning('add_pix_to_sqt', "Reference and Sample lambda1 are too different !")

        !write(6,*)"add_pix_to_sqt: Reference and Sample lambda1 are too different !"

        !return

     endif      

  

     if( abs(ps_reference%lambda_2 - ps_sample%lambda_2)/ps_reference%lambda_2 > matching_tolerance%J0_rel) then

     !if( abs(ps_reference%lambda_2 - ps_sample%lambda_2)/ps_reference%lambda_2 > matching_tolerance%J0_rel) then

     if( abs(ps_reference%lambda_2 - ps_sample%lambda_2) > matching_tolerance%lambda_max) then

        call msg_warning('add_pix_to_sqt', "Reference and Sample lambda2 are too different !")

        !write(6,*)"add_pix_to_sqt: Reference and Sample lambda2 are too different !"

        !return