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

positions where matching needs attention flagge with comment >>new>>

parent eae6dfe7

sources/data_types.f90

+16 −1
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ module data_types 
  use logger

  implicit none



! >>new>> mm

  integer, parameter :: mptr = 10  ! size matching pointer arrays

! <<new<<



  !--------------------------------------------------------------------------------------------

  !> Structure containing the sample description (minimum sample id)

  !! possibly transmission information (not yet entered) etc.
@@ -193,7 +197,12 @@ module data_types 
     integer :: no_magnetic_sensors

  end type environment_parameters_struct





  !> array pointer type (new mm)

! >>new>>

  type scan_data_struct_pointer

    type(scan_data_struct), pointer                     :: ptr => null()

  end type scan_data_struct_pointer

! <<new<<



  !--------------------------------------------------------------------------------------------

  !> Structure for the core of counting data with associated parameters
@@ -215,6 +224,12 @@ module data_types 
     type(scan_data_struct), pointer                     :: matching_bgr => null()  ! matching bac

     type(scan_data_struct), pointer                     :: matching_cal => null()  ! matching calibration



! >>new>>

     type(scan_data_struct_pointer), dimension(mptr)     :: matching_ref_arr    ! new replaces single ptr

     type(scan_data_struct_pointer), dimension(mptr)     :: matching_bgr_arr    ! nullify at clear or 

     type(scan_data_struct_pointer), dimension(mptr)     :: matching_cal_arr    ! beginning of matching

! <<new<<



     type(spectrum_struct), dimension(0:MAX_NO_MONITORS)    :: spectrum  !0: detector, 1.. monitors

     type(technical_parameters_struct)                      :: technical !PAZ

     type(physical_parameters_struct)                       :: physics

sources/drspine.f90

+2 −0
Original line number Diff line number Diff line
@@ -1609,6 +1609,8 @@ CONTAINS 
    !       background  -> resolution

    !       sample      -> background



!! here: cleare the match pointer arrays !! HERE >>new>> mm TBD



    call match_scans(data_scan, data_manager_size(), match_role)

    call unused( 1, 1, 1, ier)

sources/matching.f90

+3 −3
Original line number Diff line number Diff line
@@ -184,12 +184,12 @@ contains 
    source_loop: do i=1, source_data%number_of_points

       target_loop: do j=1, target_data%number_of_points

          if (taupoint_match(source_data%scan_point(i), target_data%scan_point(j))) then

             ! FIXME: implicit assumption that role is either ROLE_REFERENCE or ROLE_BACKGROUND

             ! FIXME: implicit assumption that role is either ROLE_REFERENCE or ROLE_BACKGROUND  HERE

             if(has_role(target_data%role, ROLE_REFERENCE)) then

                source_data%scan_point(i)%matching_ref => target_data%scan_point(j)

                source_data%scan_point(i)%matching_ref => target_data%scan_point(j)            ! >>new>> mm HERE

                cmsg = 'res'

             else if(has_role(target_data%role, ROLE_BACKGROUND)) then

                source_data%scan_point(i)%matching_bgr => target_data%scan_point(j)

                source_data%scan_point(i)%matching_bgr => target_data%scan_point(j)            ! >>new>> mm HERE

                cmsg = 'bgr'

             else

                cycle target_loop

sources/mxx.f90

+8 −0
Original line number Diff line number Diff line
@@ -133,6 +133,14 @@ character(len=llen) :: dmatch = " " 
!! program body

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!



inquire(file=trim(mdir),exist=da)

if(.not. da) then

   write(*,*) "File: ",trim(mdir)," NOT FOUND!"

   mdir = "/Users/monk"//mdir

   write(*,*) ".... try: ",trim(mdir)

endif





inquire(file=trim(mdir),exist=da)

if(.not. da) then

  write(*,*)"Could not find file: "