Import candidate for v1.6.2

CHANGELOG

@@ -1,3 +1,8 @@
+v1.6.2 2023-06-06
+      * Work again with latest numpy by removing usage of deprecated numpy.float
+        and numpy.int aliases (Thanks Milan Klausz and Jose Robledo, see also
+        github issue #72).
+
 v1.6.1 2022-12-08
       * Fixed mcplexample_pyread so it is able to work without the user setting
         PYTHONPATH (this is still not very robust as it for now assumes that the

CMakeLists.txt

@@ -74,7 +74,7 @@ endif()
 
 cmake_policy( SET CMP0048 NEW )#Not sure if this is really needed
 
-project( MCPL VERSION 1.6.1 ${_project_metadata} )
+project( MCPL VERSION 1.6.2 ${_project_metadata} )
 
 unset( _project_metadata )
 

VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

src/mcpl/mcpl.h

@@ -21,9 +21,9 @@
 
 #define MCPL_VERSION_MAJOR 1
 #define MCPL_VERSION_MINOR 6
-#define MCPL_VERSION_PATCH 1
-#define MCPL_VERSION   10601 /* (10000*MAJOR+100*MINOR+PATCH)   */
-#define MCPL_VERSION_STR "1.6.1"
+#define MCPL_VERSION_PATCH 2
+#define MCPL_VERSION   10602 /* (10000*MAJOR+100*MINOR+PATCH)   */
+#define MCPL_VERSION_STR "1.6.2"
 #define MCPL_FORMATVERSION 3 /* Format version of written files */
 
 #ifdef __cplusplus

src/python/mcpl.py

@@ -36,7 +36,7 @@
 
 __license__ = _str('CC0 1.0 Universal')
 __copyright__ = _str('Copyright 2017-2022')
-__version__ = _str('1.6.1')
+__version__ = _str('1.6.2')
 __status__ = _str('Production')
 __author__ = _str('Thomas Kittelmann')
 __maintainer__ = _str('Thomas Kittelmann')
@@ -848,7 +848,7 @@ def _loadhdr(self):
         (nparticles,(ncomments,nblobs,opt_userflags,opt_polarisation,opt_singleprec),
          opt_universalpdgcode,(particlesize,_tmp)) = y[0]
         #convert all int types to python 'int' (which is 64bit), to avoid
-        #conversions like int+np.uint64->np.float64, and flags to bool:
+        #conversions like int+np.uint64->float, and flags to bool:
         nparticles = int(nparticles)
         self._np = nparticles#needs frequent access
         particlesize = int(particlesize)
@@ -1268,7 +1268,7 @@ def _pdg_database(pdgcode):
 def _unique_count(a,weights=None):
     """returns (unique,count) where unique is an array of sorted unique values in a, and count is the corresponding frequency counts"""
     unique, inverse = np_unique(a, return_inverse=True)
-    count = np.zeros(len(unique), np.int if weights is None else np_dtype(type(weights[0])))
+    count = np.zeros(len(unique), int if weights is None else np_dtype(type(weights[0])))
     _np_add_at(count, inverse, 1 if weights is None else weights)
     return (unique, count)
 
@@ -1411,7 +1411,7 @@ def collect_stats(mcplfile,stats=_str('all'),bin_data=True):
             ranges[s] = (ranges[s][0]-1.0,ranges[s][1]+1.0)
 
     hists={}
-    freq_uc=dict((s,(np.asarray([],dtype=np.int),np.asarray([],dtype=np.float))) for s in freq_stats)
+    freq_uc=dict((s,(np.asarray([],dtype=int),np.asarray([],dtype=float))) for s in freq_stats)
     if (std_stats and bin_data) or freq_stats:
         #pass through and collect data:
         if weight_sum is None:

src_fat/mcpl2phits_app_fat.c

@@ -117,9 +117,9 @@
 
 #define MCPL_VERSION_MAJOR 1
 #define MCPL_VERSION_MINOR 6
-#define MCPL_VERSION_PATCH 1
-#define MCPL_VERSION   10601 /* (10000*MAJOR+100*MINOR+PATCH)   */
-#define MCPL_VERSION_STR "1.6.1"
+#define MCPL_VERSION_PATCH 2
+#define MCPL_VERSION   10602 /* (10000*MAJOR+100*MINOR+PATCH)   */
+#define MCPL_VERSION_STR "1.6.2"
 #define MCPL_FORMATVERSION 3 /* Format version of written files */
 
 #ifdef __cplusplus

src_fat/mcpl2ssw_app_fat.c

@@ -117,9 +117,9 @@
 
 #define MCPL_VERSION_MAJOR 1
 #define MCPL_VERSION_MINOR 6
-#define MCPL_VERSION_PATCH 1
-#define MCPL_VERSION   10601 /* (10000*MAJOR+100*MINOR+PATCH)   */
-#define MCPL_VERSION_STR "1.6.1"
+#define MCPL_VERSION_PATCH 2
+#define MCPL_VERSION   10602 /* (10000*MAJOR+100*MINOR+PATCH)   */
+#define MCPL_VERSION_STR "1.6.2"
 #define MCPL_FORMATVERSION 3 /* Format version of written files */
 
 #ifdef __cplusplus

src_fat/mcpltool_app_fat.c

@@ -203,9 +203,9 @@
 
 #define MCPL_VERSION_MAJOR 1
 #define MCPL_VERSION_MINOR 6
-#define MCPL_VERSION_PATCH 1
-#define MCPL_VERSION   10601 /* (10000*MAJOR+100*MINOR+PATCH)   */
-#define MCPL_VERSION_STR "1.6.1"
+#define MCPL_VERSION_PATCH 2
+#define MCPL_VERSION   10602 /* (10000*MAJOR+100*MINOR+PATCH)   */
+#define MCPL_VERSION_STR "1.6.2"
 #define MCPL_FORMATVERSION 3 /* Format version of written files */
 
 #ifdef __cplusplus

src_fat/phits2mcpl_app_fat.c

@@ -117,9 +117,9 @@
 
 #define MCPL_VERSION_MAJOR 1
 #define MCPL_VERSION_MINOR 6
-#define MCPL_VERSION_PATCH 1
-#define MCPL_VERSION   10601 /* (10000*MAJOR+100*MINOR+PATCH)   */
-#define MCPL_VERSION_STR "1.6.1"
+#define MCPL_VERSION_PATCH 2
+#define MCPL_VERSION   10602 /* (10000*MAJOR+100*MINOR+PATCH)   */
+#define MCPL_VERSION_STR "1.6.2"
 #define MCPL_FORMATVERSION 3 /* Format version of written files */
 
 #ifdef __cplusplus

src_fat/pymcpltool

@@ -36,7 +36,7 @@ except SyntaxError:
 
 __license__ = _str('CC0 1.0 Universal')
 __copyright__ = _str('Copyright 2017-2022')
-__version__ = _str('1.6.1')
+__version__ = _str('1.6.2')
 __status__ = _str('Production')
 __author__ = _str('Thomas Kittelmann')
 __maintainer__ = _str('Thomas Kittelmann')
@@ -848,7 +848,7 @@ class MCPLFile:
         (nparticles,(ncomments,nblobs,opt_userflags,opt_polarisation,opt_singleprec),
          opt_universalpdgcode,(particlesize,_tmp)) = y[0]
         #convert all int types to python 'int' (which is 64bit), to avoid
-        #conversions like int+np.uint64->np.float64, and flags to bool:
+        #conversions like int+np.uint64->float, and flags to bool:
         nparticles = int(nparticles)
         self._np = nparticles#needs frequent access
         particlesize = int(particlesize)
@@ -1268,7 +1268,7 @@ def _pdg_database(pdgcode):
 def _unique_count(a,weights=None):
     """returns (unique,count) where unique is an array of sorted unique values in a, and count is the corresponding frequency counts"""
     unique, inverse = np_unique(a, return_inverse=True)
-    count = np.zeros(len(unique), np.int if weights is None else np_dtype(type(weights[0])))
+    count = np.zeros(len(unique), int if weights is None else np_dtype(type(weights[0])))
     _np_add_at(count, inverse, 1 if weights is None else weights)
     return (unique, count)
 
@@ -1411,7 +1411,7 @@ def collect_stats(mcplfile,stats=_str('all'),bin_data=True):
             ranges[s] = (ranges[s][0]-1.0,ranges[s][1]+1.0)
 
     hists={}
-    freq_uc=dict((s,(np.asarray([],dtype=np.int),np.asarray([],dtype=np.float))) for s in freq_stats)
+    freq_uc=dict((s,(np.asarray([],dtype=int),np.asarray([],dtype=float))) for s in freq_stats)
     if (std_stats and bin_data) or freq_stats:
         #pass through and collect data:
         if weight_sum is None:

src_fat/ssw2mcpl_app_fat.c

@@ -117,9 +117,9 @@
 
 #define MCPL_VERSION_MAJOR 1
 #define MCPL_VERSION_MINOR 6
-#define MCPL_VERSION_PATCH 1
-#define MCPL_VERSION   10601 /* (10000*MAJOR+100*MINOR+PATCH)   */
-#define MCPL_VERSION_STR "1.6.1"
+#define MCPL_VERSION_PATCH 2
+#define MCPL_VERSION   10602 /* (10000*MAJOR+100*MINOR+PATCH)   */
+#define MCPL_VERSION_STR "1.6.2"
 #define MCPL_FORMATVERSION 3 /* Format version of written files */
 
 #ifdef __cplusplus