Commit 35a7cf47 authored by Michael Monkenbusch(AB)'s avatar Michael Monkenbusch(AB)
Browse files

reporting shows kind of bgr subtraction in headers, still tbd datreat-files... 

reporting shows kind of bgr subtraction in headers, still tbd datreat-files etc, volfrac and transmission factors
parent 0f4b0cd3

sources/data_types.f90

+7 −2
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ module data_types 


    type(transmission_struct)                                   :: sam_transmission !> transmission characteristics of sample

    type(transmission_struct)                                   :: bgr_transmission !> transmission characteristics of bgr

    integer                                                     :: direct_bgr_subtracted



 end type collection
@@ -973,6 +974,7 @@ CONTAINS 
    enddo

    this%update_counter          = 0

    this%out_of_range_counter    = 0

    this%direct_bgr_subtracted   = 0



    !! tau..., q... ??

!!!>>mm1216 added private structure for display purposes
@@ -1112,6 +1114,8 @@ CONTAINS 
     else

       w = 1.0_DBL

     endif





! -- the combine the results for this item  

!    (Check whether udratioRes is present or must be computed !:.)

     sqt%tq_bin(it,iq)%fqt          = (1.0_DBL-w)    *sqt%tq_bin(it,iq)%fqt          + w    * ps_sample%fqtRes%value
@@ -1197,6 +1201,7 @@ CONTAINS 
     sqt%update_counter  =  sqt%update_counter + 1

     sqt%tq_bin(it, iq)%update_counter = sqt%tq_bin(it, iq)%update_counter + 1



     if(ps_sample%background_subtracted) sqt%direct_bgr_subtracted = sqt%direct_bgr_subtracted + 1

!!!>> mm1216 >>

     call add_to_sqtinfo(sqtinfo, iq, it, qabs, tau, delta2)

                                           !!?? proper weight must still be considered !!

sources/drspine.f90

+12 −2
Original line number Diff line number Diff line
@@ -3434,11 +3434,21 @@ se: if(found('close') .or. found('end')) then 




    call tex("\newpage")

    if(nint(bgr_flag) > 0) then

  

    if(coll_data%direct_bgr_subtracted > 0 ) then

      call tex_colored_box(1d0,1d0,"cyan", &

      "\bf \large "//trim(comment)//"\\ "// &

      " With direct background subtraction"//&  !: transmission factor= "//tex_scientific_number_fmt(tfac,4)//&

      "   volfrac=TBD!! "&                      !!mm  //tex_scientific_number_fmt(volfrac,4) &

        //"("//tex_integer_number_fmt(coll_data%direct_bgr_subtracted ,4)//"," &

        //tex_integer_number_fmt(coll_data%update_counter ,4)//")" &

       )

    elseif(nint(bgr_flag) > 0) then

      call tex_colored_box(1d0,1d0,"cyan", &

      "\bf \large "//trim(comment)//"\\ "// &

      ! (paz) there's not always a single transmission factor

      ! (paz) e.g. for multi-wavelength measurements at SNS 

      ! (mm) detegrmine min/max or varage and variance or list -  ...

      " With background subtraction"//& !: transmission factor= "//tex_scientific_number_fmt(tfac,4)//&

      "   volfrac= "//tex_scientific_number_fmt(volfrac,4) &

       )