kCSD fit

Author: wsredniawa

kcsd/sKCSD.py

@@ -633,7 +633,13 @@ def parameters(self, **kwargs):
         self.dist_table_density = kwargs.pop('dist_table_density', 20)
         self.dim = 'skCSD'
         self.tolerance = kwargs.pop('tolerance', 2e-06)
+<<<<<<< HEAD
         self.exact = kwargs.pop('exact', False)
+=======
+        self.skmonaco_available = kwargs.pop('skmonaco_available',skmonaco_available)
+        self.est_xyz = np.array([])
+        self.est_xyz_auto =  False
+>>>>>>> kCSD fit
         if kwargs:
             raise TypeError('Invalid keyword arguments:', kwargs.keys())