Changeset 265 for trunk/GSASIIimage.py

Timestamp:

Apr 19, 2011 3:12:37 PM (12 years ago)

Author:

vondreele

Message:

further progress on implementing pdf calculations
optionally put legends on the pdf plots
attempt implementation of a rotation of the azimuth ranges for multiazimuth integrations -not fully successful

File:

• trunk/GSASIIimage.py (modified) (5 diffs)

trunk/GSASIIimage.py

@@ -291 +291 @@
     tilt = data['tilt']
     phi = data['rotation']
+    LRazim = data['LRazimuth']
     azmthoff = data['azmthOff']
+    azmRot = data['azmthRotate']
+    Full = data['fullIntegrate']
     dx = np.array(x-cent[0],dtype=np.float32)
     dy = np.array(y-cent[1],dtype=np.float32)
@@ -299 +302 @@
     tth = npatand(np.sqrt(dx**2+dy**2-Z**2)/(dist-Z))
     dsp = wave/(2.*npsind(tth/2.))
-    azm = npatan2d(dx,-dy)+azmthoff
+    azm = (npatan2d(dx,-dy)+azmthoff+720.)%360.
+    if Full:
+        azm = (azm+azmRot+720.)%360.
+    else:
+        azm = np.where(azm<LRazim[0],azm+360.,azm)
     return tth,azm,dsp
     
@@ -325 +332 @@
     return abs(avg-curr)/avg < .02
 
-        
 def ImageCalibrate(self,data):
     import copy
@@ -554 +560 @@
     LUtth = data['IOtth']
     if data['fullIntegrate']:
-        LRazm = [-180,180]
+        LRazm = [0,360]
     else:
         LRazm = data['LRazimuth']
     numAzms = data['outAzimuths']
     numChans = data['outChannels']
+    azmRot = data['azmthRotate']
+    Full = data['fullIntegrate']
     Dtth = (LUtth[1]-LUtth[0])/numChans
     Dazm = (LRazm[1]-LRazm[0])/numAzms
@@ -602 +610 @@
             H2 = LUtth
         if Dazm:        
-            H1 = [azm for azm in np.linspace(LRazm[0],LRazm[1],numAzms+1)]
+            H1 = np.array([azm for azm in np.linspace(LRazm[0],LRazm[1],numAzms+1)])
+            if Full:
+                H1 = H1+azmRot
         else:
             H1 = LRazm