GIT: Merge branch 'development'

Author: laborleben

pixel_clusterizer/clusterizer.py

@@ -255,12 +255,14 @@ def set_end_of_cluster_function(self, function):
         ''' Adding function to module.
         This is maybe the only way to make the clusterizer to work with multiprocessing.
         '''
+        self.cluster_functions._end_of_cluster_function = self._jitted(function)
         self._end_of_cluster_function = function
 
     def set_end_of_event_function(self, function):
         ''' Adding function to module.
         This is maybe the only way to make the clusterizer to work with multiprocessing.
         '''
+        self.cluster_functions._end_of_event_function = self._jitted(function)
         self._end_of_event_function = function
 
     def set_min_hit_charge(self, value):
@@ -304,10 +306,8 @@ def cluster_hits(self, hits, noisy_pixels=None, disabled_pixels=None):
         The noisy_pixels parameter allows for removing clusters that consist of a single noisy pixels. Clusters with 2 or more noisy pixels are not removed.
         The disabled_pixels parameter allows for ignoring pixels.
         '''
-        # For multiprocessing make sure that the function are jitted after pickling.
-        # In some cases, where the pixel_clusterizer module is installed into the
-        # the site-packages folder, overriding the of cluster funtions immediately invokes
-        # the JIT compiler and converts the function objects to a Numba ojects.
+        # Jitting a second time to workaround different bahavior of the installation methods on different platforms (pip install vs. python setup.py).
+        # In some circumstances, the Numba compiler can't compile functions that were pickled previously.
         self.cluster_functions._end_of_cluster_function = self._jitted(self._end_of_cluster_function)
         self.cluster_functions._end_of_event_function = self._jitted(self._end_of_event_function)
 

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages  # This setup relies on setuptools since distutils is insufficient and badly hacked code
 
-version = '3.1.3'
+version = '3.1.4'
 author = 'David-Leon Pohl, Jens Janssen'
 author_email = '[email protected], [email protected]'