Changeset 4538

Timestamp:

Aug 6, 2020 9:59:46 AM (3 years ago)

Author:

vondreele

Message:

fix integer divide issue in ComputeArc? in G2plot
remove Spotmask is None message (Spotmask is missing was removed earlier)
in SaveIntegration? get polarization from dataPolaVal? instead of from Comments

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIplot.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -885 +885 @@
         Sample['Phi'] = data['GonioAngles'][2]
         Sample['Azimuth'] = (azm+dazm)%360.    #put here as bin center 
-        polariz = 0.99    #set default polarization for synchrotron radiation!
+        polariz = data['PolaVal'][0]
         for item in Comments:
-            if 'polariz' in item:
-                try:
-                    polariz = float(item.split('=')[1])
-                except:
-                    polariz = 0.99
+            # if 'polariz' in item:
+            #     try:
+            #         polariz = float(item.split('=')[1])
+            #     except:
+            #         polariz = 0.99
             for key in ('Temperature','Pressure','Time','FreePrm1','FreePrm2','FreePrm3','Omega',
                 'Chi','Phi'):

trunk/GSASIIplot.py

@@ -6794 +6794 @@
     xy2 = []
     aR = [azm0,azm1,max(3,int(0.5+azm1-azm0))] # number of points should be at least 3
-    if azm1-azm0 > 180: aR[2] /= 2  # for more than 180 degrees, steps can be 2 deg.
+    if azm1-azm0 > 180: aR[2] //= 2  # for more than 180 degrees, steps can be 2 deg.
     Azm = np.linspace(*aR)
     for azm in Azm:
@@ -7641 +7641 @@
                 MaskA = ma.getmaskarray(MA)
             except TypeError: # needed if spotMasks set to initial value (None)
-                if GSASIIpath.GetConfigValue('debug'): print('spotMask is None')
+#                if GSASIIpath.GetConfigValue('debug'): print('spotMask is None')
                 MaskA = ma.getmaskarray(MA)
             for xline in Masks.get('Xlines',[]):