diff --git a/calibrationSuite/basicSuiteScript.py b/calibrationSuite/basicSuiteScript.py index bce0bf5..4d09325 100755 --- a/calibrationSuite/basicSuiteScript.py +++ b/calibrationSuite/basicSuiteScript.py @@ -7,8 +7,8 @@ ##from mfxRixSuiteConfig import * import h5py from scipy.optimize import curve_fit ## here? -import calibrationSuite.fitFunctions -import calibrationSuite.ancillaryMethods +from calibrationSuite.fitFunctions import * +from calibrationSuite.ancillaryMethods import * def sortArrayByList(a, data): return [x for _,x in sorted(zip(a, data), key=lambda pair:pair[0])] diff --git a/suite_scripts/AnalyzeH5.py b/suite_scripts/AnalyzeH5.py index f818c1c..93360a4 100644 --- a/suite_scripts/AnalyzeH5.py +++ b/suite_scripts/AnalyzeH5.py @@ -1,6 +1,7 @@ import h5py import numpy as np -import calibrationSuite.fitFunctions, calibrationSuite.ancillaryMethods +from calibrationSuite.fitFunctions import * +from calibrationSuite.ancillaryMethods import * ##import seaborn as sns import matplotlib.pyplot as plt from matplotlib.ticker import AutoMinorLocator diff --git a/suite_scripts/CalcNoise.py b/suite_scripts/CalcNoise.py index 00d13e3..f00b681 100755 --- a/suite_scripts/CalcNoise.py +++ b/suite_scripts/CalcNoise.py @@ -1,5 +1,5 @@ from calibrationSuite.basicSuiteScript import * -import calibrationSuite.Stats +from calibrationSuite.Stats import * class CalcNoise(BasicSuiteScript): def __init__(self): diff --git a/suite_scripts/CalcNoiseAndMean.py b/suite_scripts/CalcNoiseAndMean.py index 3d3f7f4..d7a19a6 100755 --- a/suite_scripts/CalcNoiseAndMean.py +++ b/suite_scripts/CalcNoiseAndMean.py @@ -1,5 +1,5 @@ from calibrationSuite.basicSuiteScript import * -import calibrationSuite.Stats +from calibrationSuite.Stats import * class CalcNoise(BasicSuiteScript): def __init__(self): diff --git a/suite_scripts/analyze_npy.py b/suite_scripts/analyze_npy.py index 80784da..c8eb173 100644 --- a/suite_scripts/analyze_npy.py +++ b/suite_scripts/analyze_npy.py @@ -1,6 +1,7 @@ import matplotlib.pyplot as plt import numpy as np -import calibrationSuite.fitFunctions, calibrationSuite.ancillaryMethods +from calibrationSuite.fitFunctions import * +from calibrationSuite.ancillaryMethods import * import sys class AnalyzeLinearity(object):