diff --git a/python/findxtal.py b/python/findxtal.py index 6aa2fd0..e07dcf6 100755 --- a/python/findxtal.py +++ b/python/findxtal.py @@ -175,7 +175,7 @@ def ShowImage(img,title=None,cmap='gray',vmin=None, vmax=None): def imgEqualize(img,num_bins=256): # get image histogram - hist, bins = np.histogram(image.flatten(), num_bins, normed=True) + hist, bins = np.histogram(img.flatten(), num_bins, normed=True) cdf = hist.cumsum() # cumulative distribution function cdf = 255 * cdf / cdf[-1] # normalize @@ -466,8 +466,8 @@ if __name__ == '__main__': basePath='/home/zamofing_t/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX/python/images/' #testfftLoop() - testFindGrid() - #testFindObj() + #testFindGrid() + testFindObj() #testPhaseEnhance() exit(0) diff --git a/qt/ESB_MX_exp.ui b/qt/ESB_MX_exp.ui index 45ce74f..8a72a79 100644 --- a/qt/ESB_MX_exp.ui +++ b/qt/ESB_MX_exp.ui @@ -69,11 +69,11 @@ P=$(P),M=MOT_WEDGEA; P=$(P),M=MOT_WEDGEB; P=$(P),M=MOT_BLGT; P=$(P),M=MOT_CRYO; -P=$(P),M=MOT_GIRDER1; -P=$(P),M=MOT_GIRDER2; -P=$(P),M=MOT_GIRDER3; -P=$(P),M=MOT_GIRDER4; -P=$(P),M=MOT_GIRDER5 +P=$(P),M=MOT_GIR_X; +P=$(P),M=MOT_GIR_Y; +P=$(P),M=MOT_GIR_U; +P=$(P),M=MOT_GIR_V; +P=$(P),M=MOT_GIR_W ESB_MX_motor.ui @@ -358,7 +358,7 @@ P=$(P),M=MOT_GIRDER5 ESB_MX_5cam.ui - NAME=$(P), NAME1=$(P) + P=$(P) caRowColMenu::Menu