Merge pull request #25 from slaclab/fix_import_statements

BUG: Fix library import statements in some suite_scripts
slaclab · Feb 21, 2024 · 444f234 · 444f234
2 parents faf6086 + 7aaff19
commit 444f234
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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):