diff --git a/modules/util/util.py b/modules/util/util.py index 0143f4a57c9fbad29b6bfb493a417a16f50d5425..44a034e22ec15a47b2d23b316e65655f24c57945 100644 --- a/modules/util/util.py +++ b/modules/util/util.py @@ -435,13 +435,14 @@ def make_histogram(values, edges): return h -def normalize(data, param, mean_std_dict, add_noise=False, noise_scale=0.01, seed=None, copy=True): - if copy: - data = data.copy() +def normalize(data, param, mean_std_dict, copy=True): if mean_std_dict.get(param) is None: return data + if copy: + data = data.copy() + shape = data.shape data = data.flatten() @@ -449,12 +450,6 @@ def normalize(data, param, mean_std_dict, add_noise=False, noise_scale=0.01, see data -= mean data /= std - if add_noise: - if seed is not None: - np.random.seed(seed) - rnd = np.random.normal(loc=0, scale=noise_scale, size=data.size) - data += rnd - not_valid = np.isnan(data) data[not_valid] = 0 @@ -463,6 +458,23 @@ def normalize(data, param, mean_std_dict, add_noise=False, noise_scale=0.01, see return data +def add_noise(data, noise_scale=0.01, seed=None, copy=True): + if copy: + data = data.copy() + + shape = data.shape + data = data.flatten() + + if seed is not None: + np.random.seed(seed) + rnd = np.random.normal(loc=0, scale=noise_scale, size=data.size) + data += rnd + + data = np.reshape(data, shape) + + return data + + def denormalize(data, param, mean_std_dict, copy=True): if copy: data = data.copy()