Changeset 5470

Timestamp:

Jan 10, 2023 10:02:59 PM (11 months ago)

Author:

toby

Message:

fix for deprecated names in numpy 1.23

Location:

trunk/NIST_profile

Files:

• atan_windowed_FP_profile.py (modified) (2 diffs)
• profile_functions_class.py (modified) (7 diffs)

trunk/NIST_profile/atan_windowed_FP_profile.py

@@ -41 +41 @@
                 key[k]=tuple(v.tolist())
     
-        flag, emiss = self.get_conv(me, key, numpy.complex)
+        flag, emiss = self.get_conv(me, key, complex)
         if flag: return emiss #already up to date
         
@@ -107 +107 @@
                 key[k]=tuple(v.tolist()) #tuples are better keys
     
-        flag, emiss = self.get_conv(me, key, numpy.complex)
+        flag, emiss = self.get_conv(me, key, complex)
         if flag: return emiss #already up to date
         

trunk/NIST_profile/profile_functions_class.py

@@ -221 +221 @@
         self._rb3=b(numpy.zeros(nn,float))
         ## a complex-format scratch buffer
-        self._cb1=b(numpy.zeros(nn,numpy.complex))
+        self._cb1=b(numpy.zeros(nn,complex))
         ## a scratch buffer used by the axial helper
         self._f0buf=b(numpy.zeros(self.oversampling*twotheta_output_points, float))
@@ -731 +731 @@
             del kwargs["equatorial_divergence_deg"] #not used
         
-        flag, axfn = self.get_conv(me, kwargs, numpy.complex)
+        flag, axfn = self.get_conv(me, kwargs, complex)
         if flag: return axfn #already up to date if first return is True
         
@@ -765 +765 @@
         #we also need the diffractometer radius from the global space
         kwargs["diffractometer_radius"]=self.param_dicts["conv_global"]["diffractometer_radius"]
-        flag, tailfn = self.get_conv(me, kwargs, numpy.complex)
+        flag, tailfn = self.get_conv(me, kwargs, complex)
         if flag: return tailfn #already up to date
         
@@ -886 +886 @@
                 key[k]=v.tolist()
     
-        flag, emiss = self.get_conv(me, key, numpy.complex)
+        flag, emiss = self.get_conv(me, key, complex)
         if flag: return emiss #already up to date
         
@@ -932 +932 @@
         twotheta0=self.param_dicts["conv_global"]["twotheta0"]
         key=(twotheta0, equatorial_divergence_deg)
-        flag, conv = self.get_conv(me, key, numpy.complex)
+        flag, conv = self.get_conv(me, key, complex)
         if flag: return conv #already up to date
         
@@ -964 +964 @@
         kwargs["diffractometer_radius"]=self.param_dicts["conv_global"]["diffractometer_radius"]
 
-        flag, conv = self.get_conv(me, kwargs, numpy.complex)
+        flag, conv = self.get_conv(me, kwargs, complex)
         if flag: return conv #already up to date
         xx=type("data", (), kwargs) #make it dot-notation accessible
@@ -1005 +1005 @@
             (twotheta0, diffractometer_radius,
             specimen_displacement, zero_error_deg),
-            numpy.complex)
+            complex)
         if flag: return conv#already up to date