From fe0e20d3c255d0be5a8f46c80201548171b1b827 Mon Sep 17 00:00:00 2001 From: "Antonello, Dr. Massimiliano" <massimiliano.antonello@uni-hamburg.de> Date: Mon, 21 Oct 2024 17:48:53 +0200 Subject: [PATCH] First commit to create Sumlab branch --- AdditionalPDFs.py | 2 +- Model.py | 3 --- PeakOTron.py | 6 +++--- requirements.txt | 16 ++++++++-------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/AdditionalPDFs.py b/AdditionalPDFs.py index 2934d4c..ba373ef 100644 --- a/AdditionalPDFs.py +++ b/AdditionalPDFs.py @@ -5,7 +5,7 @@ import matplotlib.pyplot as plt from scipy.stats._distn_infrastructure import ( - rv_discrete, _ncx2_pdf, _ncx2_cdf, get_distribution_names) + rv_discrete, get_distribution_names) class gpd_gen(rv_discrete): diff --git a/Model.py b/Model.py index 15bf6c4..d1b5205 100644 --- a/Model.py +++ b/Model.py @@ -1,13 +1,10 @@ from scipy.signal import fftconvolve as convolve from itertools import product, combinations -from scipy.interpolate import interp1d from scipy.stats import poisson, norm, binom from AdditionalPDFs import gpoisson, borel -from scipy.integrate import simps from numba import njit import numpy as np from functools import lru_cache -import matplotlib.pyplot as plt #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ######################################################################################################## diff --git a/PeakOTron.py b/PeakOTron.py index 95b1d45..2495f97 100644 --- a/PeakOTron.py +++ b/PeakOTron.py @@ -2,15 +2,15 @@ from HelperFunctions import GP_gain, GP_lbda, GP_mu, HistMean, HistStd, HistSkew from HelperFunctions import LatexFormat, Linear from AdditionalPDFs import gpoisson from LossFunctions import * -from Model import DRM, sigmak, Beta, Beta_Inf +from Model import DRM, Beta, Beta_Inf from iminuit import Minuit from scipy.interpolate import interp1d, UnivariateSpline, InterpolatedUnivariateSpline -from scipy.stats import poisson, norm +from scipy.stats import norm from astropy.stats import knuth_bin_width, freedman_bin_width, scott_bin_width from matplotlib import cm import matplotlib.pyplot as plt import matplotlib.gridspec as gridspec -from matplotlib.ticker import MaxNLocator, ScalarFormatter +from matplotlib.ticker import ScalarFormatter from itertools import chain from copy import deepcopy import time diff --git a/requirements.txt b/requirements.txt index 0b369a4..41c18c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -astropy==3.0.2 -iminuit==2.17.0 -joblib==0.13.2 -matplotlib==3.1.3 -numba==0.45.1 -numpy==1.17.2 -pandas==1.1.3 -scipy==1.3.1 +astropy +iminuit +joblib +matplotlib +numba +numpy +pandas +scipy \ No newline at end of file -- GitLab