Commit ac06d3ea authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

extract/show max_field_var

parent b561fc23

sources/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ install: 
depend:

	@echo "# Makefile.depend" `date`  >  Makefile.depend

ifdef MAKEDEPF90

	@$(MAKEDEPF90) -W     ${FSOURCES1} ${FSOURCES2} ${PROGSRC} >> Makefile.depend

	@$(MAKEDEPF90)        ${FSOURCES1} ${FSOURCES2} ${PROGSRC} >> Makefile.depend

endif

ifdef MAKEDEPEND

	@$(MAKEDEPEND) -Y -f- ${CSOURCES}  >> Makefile.depend 2> /dev/null

sources/drspine.f90

+3 −1
Original line number Diff line number Diff line
@@ -4380,8 +4380,8 @@ ntl2: do i=0, nt 
    call setudf("r.max_chisq "     , reduction_parameters%max_chisquare, ier)

    call setudf("r.center_size "   , reduction_parameters%central_detector_area_size, ier)

    !

    !

    call setudf("r.postcoll_qcat ", reduction_parameters%post_collection_qcatch, ier)

    call setudf("r.max_field_var ", reduction_parameters%max_bfield_variation, ier)



    ! instrument config

    call set_instrument_vars()
@@ -4412,6 +4412,7 @@ ntl2: do i=0, nt 
    call extract("r.center_size "   , reduction_parameters%central_detector_area_size, ier)



    call extract("r.postcoll_qcat ", reduction_parameters%post_collection_qcatch, ier)

    call extract("r.max_field_var ", reduction_parameters%max_bfield_variation, ier)



    ! instrument config

    call get_instrument_vars()
@@ -4438,6 +4439,7 @@ ntl2: do i=0, nt 


    call msg_debug('get_progvar', msg_fmt("('r.center_size   = ', i0)", reduction_parameters%central_detector_area_size))

    call msg_debug('get_progvar', msg_fmt("('r.postcoll_qcat = ',g12.5)", reduction_parameters%post_collection_qcatch))

    call msg_debug('get_progvar', msg_fmt("('r.max_field_var = ',g12.5)", reduction_parameters%max_bfield_variation))



    ! program config

    call msg_debug('get_progvar', msg_fmt("('c.last_run      = ', i0)", program_param%last_run))

sources/drspine_version.F90

+11 −7
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ module drspine_version 
  character(len=*), parameter :: VERSION_RELEASE = _VERSION_RELEASE_

  character(len=*), parameter :: BUILD_DATE = __DATE__

  character(len=*), parameter :: BUILD_TIME = __TIME__

! Intel puts way too much info

#if defined(__INTEL_COMPILER)

  character(len=*), parameter :: COMPILER = "Intel(R) Fortran"

!#elif   defined(__GFORTRAN__)

!  character(len=*), parameter :: COMPILER = "GCC Fortran"

#else

  character(len=*), parameter :: COMPILER = compiler_version()

#endif



contains
@@ -32,13 +40,9 @@ contains 
        if ( short_version ) return

    end if

    cresult = trim(cresult)//"-"//trim(VERSION_RELEASE)//" "//&

         "(build on "//trim(BUILD_DATE)//" "//trim(BUILD_TIME)//" "//&

! Intel puts way too much info

#if defined(__INTEL_COMPILER)

         "with Intel(R) Fortran)"

#else

         "with "//trim(compiler_version())//")"

#endif

         "(build on "//trim(BUILD_DATE)//" "//trim(BUILD_TIME)//&

         " with "//trim(COMPILER)//")"



  end function drspine_libversion



end module drspine_version