Commit 9528ecfa authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

"constant" names made more consistent 

- mptr                      => MAX_NO_OF_MATCHES
- MAX_NUMBER_OF_POINTS      => MAX_NO_OF_POINTS
- MAX_NUMBER_OF_COLLECTIONS => MAX_NO_OF_COLLECTIONS

- removed MAX_NO_OF_EXPERIMENTS (unused)
parent 5b6c2555

sources/data_types.f90

+8 −7
Original line number Diff line number Diff line
@@ -13,9 +13,10 @@ module data_types 
  use logger

  implicit none



! >>new>> mm

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

! <<new<<

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

  ! (PAZ) Moved to drspine_parameters.F90 and renamed as MAX_NO_OF_MATCHES

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

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



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

  !> Structure containing the sample description (minimum sample id)
@@ -227,9 +228,9 @@ module data_types 
     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

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

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

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

! <<new<<



     type(spectrum_struct), dimension(0:MAX_NO_MONITORS)    :: spectrum  !0: detector, 1.. monitors
@@ -774,7 +775,7 @@ CONTAINS 
    this%id   = 0

    this%mode  = MODE_UNDEFINED

    this%role  = ROLE_UNDEFINED

    this%number_of_points = min(MAX_NUMBER_OF_POINTS, npoints)

    this%number_of_points = min(MAX_NO_OF_POINTS, npoints)

    call init_value(this%time_and_date)

    call init_sample_struct(this%sample)

    if(allocated(this%scan_point)) deallocate(this%scan_point)

sources/drspine_parameters.f90

+4 −5
Original line number Diff line number Diff line
@@ -13,18 +13,17 @@ module drspine_parameters 
  integer, parameter :: SGL = kind(1.0)                 ! ensures future compatibility with real

  integer, parameter :: DBL = kind(1.0d0)               ! and double precision defs in used subroutines



  !integer, parameter      :: MAX_NUMBER_OF_FILES        = 20 (unused)

  integer, parameter      :: DEFAULT_FILE_ALLOCATION    = 64  ! defauld max number of files read

  integer, parameter      :: MAX_NUMBER_OF_POINTS       = 30  ! a.k.a. max number of "taus"

  integer, parameter      :: MAX_NO_OF_POINTS           = 32  ! a.k.a. max number of "taus"

  integer, parameter      :: MAX_NO_LAMBDA_BINS         = 99

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

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

  ! the rest can be safely left alone

  integer, parameter      :: MAX_NO_PIX                 = 32

  !integer, parameter      :: MAX_NO_PHASES              = 30 (dynamic allocation)

  integer, parameter      :: MAX_GROUP_SIZE             = 64

  integer, parameter      :: MAX_NUMBER_OF_COLLECTIONS  = 2

  integer, parameter      :: MAX_NUMBER_OF_EXPERIMENTS  = 5

  !integer, parameter     :: MAX_NO_OF_EXPERIMENTS      =  5

  integer, parameter      :: MAX_NO_OF_COLLECTIONS      =  4

  integer, parameter      :: MAX_NO_OF_MATCHES          = 10



  integer, parameter      :: MAX_NO_CURRENTS            = 40

  integer, parameter      :: MAX_NO_MOTORS              = 20

sources/read_data.f90

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ contains 
    point_to_down    = 0

    point_to_up      = 0

    scan_dim         = 0

    scan_length      = MAX_NUMBER_OF_POINTS

    scan_length      = MAX_NO_OF_POINTS

    !q_set    = 0.0_DBL

    !tau_set  = 0.0_DBL

    !lambda   = 0.0_DBL
@@ -164,9 +164,9 @@ contains 
    !! !!!!  TAU SECTION !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

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

    scan_point_do: do

       if ( nscan >= MAX_NUMBER_OF_POINTS ) then

       if ( nscan >= MAX_NO_OF_POINTS ) then

            call msg_warning('read_data', &

                msg_fmt('("number of scan point exceeds max=",i0)', MAX_NUMBER_OF_POINTS))

                msg_fmt('("number of scan point exceeds max=",i0)', MAX_NO_OF_POINTS))

            exit scan_point_do

       end if

       if ( scan_length > 0 .and. nscan >= scan_length ) exit scan_point_do ! normal exit