Changeset 4712
 Timestamp:
 Jan 4, 2021 2:46:25 PM (11 months ago)
 Location:
 trunk
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIimgGUI.py
r4709 r4712 1762 1762 dsp0 = wave/(2.0*sind(LUtth[0]/2.0)) 1763 1763 dsp1 = wave/(2.0*sind(LUtth[1]/2.0)) 1764 x0 = G2img.GetDetectorXY (dsp0,0.0,Controls)[0]1765 x1 = G2img.GetDetectorXY (dsp1,0.0,Controls)[0]1764 x0 = G2img.GetDetectorXY2(dsp0,0.0,Controls)[0] 1765 x1 = G2img.GetDetectorXY2(dsp1,0.0,Controls)[0] 1766 1766 if not np.any(x0) or not np.any(x1): 1767 1767 raise Exception … … 1797 1797 dsp0 = wave/(2.0*sind(LUtth[0]/2.0)) 1798 1798 dsp1 = wave/(2.0*sind(LUtth[1]/2.0)) 1799 x0 = G2img.GetDetectorXY (dsp0,0.0,Controls)[0]1800 x1 = G2img.GetDetectorXY (dsp1,0.0,Controls)[0]1799 x0 = G2img.GetDetectorXY2(dsp0,0.0,Controls)[0] 1800 x1 = G2img.GetDetectorXY2(dsp1,0.0,Controls)[0] 1801 1801 if not np.any(x0) or not np.any(x1): 1802 1802 raise Exception 
trunk/GSASIIplot.py
r4687 r4712 6955 6955 Azm = np.linspace(*aR) 6956 6956 for azm in Azm: 6957 XY = G2img.GetDetectorXY (Dsp(np.squeeze(angI),wave),azm,Data)6957 XY = G2img.GetDetectorXY2(Dsp(np.squeeze(angI),wave),azm,Data) 6958 6958 if np.any(XY): 6959 6959 xy1.append(XY) #what about hyperbola 6960 XY = G2img.GetDetectorXY (Dsp(np.squeeze(angO),wave),azm,Data)6960 XY = G2img.GetDetectorXY2(Dsp(np.squeeze(angO),wave),azm,Data) 6961 6961 if np.any(XY): 6962 6962 xy2.append(XY) #what about hyperbola … … 7240 7240 xyI = [] 7241 7241 for azm in Azm: 7242 xy = G2img.GetDetectorXY (dspI,azm,Data)7242 xy = G2img.GetDetectorXY2(dspI,azm,Data) 7243 7243 if np.any(xy): 7244 7244 xyI.append(xy) … … 7249 7249 xyO = [] 7250 7250 for azm in Azm: 7251 xy = G2img.GetDetectorXY (dspO,azm,Data)7251 xy = G2img.GetDetectorXY2(dspO,azm,Data) 7252 7252 if np.any(xy): 7253 7253 xyO.append(xy) … … 7720 7720 G2frame.itemPicked = None 7721 7721 7722 7722 #### PlotImage execution starts here 7723 7723 if not len(G2frame.ImageZ): 7724 7724 return … … 7844 7844 xyI = [] 7845 7845 for azm in Azm: 7846 xy = G2img.GetDetectorXY (dspI,azm,Data)7846 xy = G2img.GetDetectorXY2(dspI,azm,Data) 7847 7847 if np.any(xy): 7848 7848 xyI.append(xy) … … 7855 7855 arcxO = [] 7856 7856 for azm in Azm: 7857 xy = G2img.GetDetectorXY (dspO,azm,Data)7857 xy = G2img.GetDetectorXY2(dspO,azm,Data) 7858 7858 if np.any(xy): 7859 7859 xyO.append(xy)
Note: See TracChangeset
for help on using the changeset viewer.