Changeset 265 for trunk/GSASIIimage.py
 Timestamp:
 Apr 19, 2011 3:12:37 PM (12 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIimage.py
r264 r265 291 291 tilt = data['tilt'] 292 292 phi = data['rotation'] 293 LRazim = data['LRazimuth'] 293 294 azmthoff = data['azmthOff'] 295 azmRot = data['azmthRotate'] 296 Full = data['fullIntegrate'] 294 297 dx = np.array(xcent[0],dtype=np.float32) 295 298 dy = np.array(ycent[1],dtype=np.float32) … … 299 302 tth = npatand(np.sqrt(dx**2+dy**2Z**2)/(distZ)) 300 303 dsp = wave/(2.*npsind(tth/2.)) 301 azm = npatan2d(dx,dy)+azmthoff 304 azm = (npatan2d(dx,dy)+azmthoff+720.)%360. 305 if Full: 306 azm = (azm+azmRot+720.)%360. 307 else: 308 azm = np.where(azm<LRazim[0],azm+360.,azm) 302 309 return tth,azm,dsp 303 310 … … 325 332 return abs(avgcurr)/avg < .02 326 333 327 328 334 def ImageCalibrate(self,data): 329 335 import copy … … 554 560 LUtth = data['IOtth'] 555 561 if data['fullIntegrate']: 556 LRazm = [ 180,180]562 LRazm = [0,360] 557 563 else: 558 564 LRazm = data['LRazimuth'] 559 565 numAzms = data['outAzimuths'] 560 566 numChans = data['outChannels'] 567 azmRot = data['azmthRotate'] 568 Full = data['fullIntegrate'] 561 569 Dtth = (LUtth[1]LUtth[0])/numChans 562 570 Dazm = (LRazm[1]LRazm[0])/numAzms … … 602 610 H2 = LUtth 603 611 if Dazm: 604 H1 = [azm for azm in np.linspace(LRazm[0],LRazm[1],numAzms+1)] 612 H1 = np.array([azm for azm in np.linspace(LRazm[0],LRazm[1],numAzms+1)]) 613 if Full: 614 H1 = H1+azmRot 605 615 else: 606 616 H1 = LRazm
Note: See TracChangeset
for help on using the changeset viewer.