Commit e13a50fe authored by Viktor Reshniak's avatar Viktor Reshniak
Browse files

remove skewness and linear background

parent c273a483

peak_integration.py

+6 −6
Original line number Diff line number Diff line
@@ -1063,9 +1063,9 @@ class Histogram(object): 


			###################################

			# initialization and bounds for the background intensity

			bkgr_init = [ np.sqrt(0.9*data_mean)] + [0]*self.ndims

			bkgr_lbnd = [-np.sqrt(1.1*data_mean)] + [0]*self.ndims

			bkgr_ubnd = [ np.sqrt(1.1*data_mean)] + [0]*self.ndims

			bkgr_init = [ np.sqrt(0.9*data_mean)] #+ [0]*self.ndims

			bkgr_lbnd = [-np.sqrt(1.1*data_mean)] #+ [0]*self.ndims

			bkgr_ubnd = [ np.sqrt(1.1*data_mean)] #+ [0]*self.ndims



			###################################

			# initialization and bounds for the max peak intensity
@@ -1117,9 +1117,9 @@ class Histogram(object): 
		###################################

		# initialization and bounds for all parameters

		# params_init = params_init1

		if params_init is None: params_init = bkgr_init + intst_init + cnt_init + prec_init + skew_init

		if params_lbnd is None: params_lbnd = bkgr_lbnd + intst_lbnd + cnt_lbnd + prec_lbnd + skew_lbnd

		if params_ubnd is None: params_ubnd = bkgr_ubnd + intst_ubnd + cnt_ubnd + prec_ubnd + skew_ubnd

		if params_init is None: params_init = bkgr_init + intst_init + cnt_init + prec_init #+ skew_init

		if params_lbnd is None: params_lbnd = bkgr_lbnd + intst_lbnd + cnt_lbnd + prec_lbnd #+ skew_lbnd

		if params_ubnd is None: params_ubnd = bkgr_ubnd + intst_ubnd + cnt_ubnd + prec_ubnd #+ skew_ubnd



		# params_lbnd = [p-1.e-8 for p in params_init]

		# params_ubnd = [p+1.e-8 for p in params_init]