diff --git a/analysator/pyVlsv/vlsvvtkinterface.py b/analysator/pyVlsv/vlsvvtkinterface.py index 8663e692..78d0ff5d 100644 --- a/analysator/pyVlsv/vlsvvtkinterface.py +++ b/analysator/pyVlsv/vlsvvtkinterface.py @@ -28,7 +28,6 @@ import pickle from operator import itemgetter import numbers - import analysator as pt try: import vtk @@ -643,7 +642,7 @@ def SetFileName(self, filename): def GetFileName(self): return self.__FileName - def buildDescriptor(self): + def buildDescriptorPython(self): f = self.__reader f._VlsvReader__read_fileindex_for_cellid() fileindex_for_cellid = f._VlsvReader__fileindex_for_cellid @@ -716,6 +715,20 @@ def children(cid, level): return descr.getvalue(), idxToFileIndex + def buildDescriptor(self): + import cpphelpers + f = self.__reader + f._VlsvReader__read_fileindex_for_cellid() + fileindex_for_cellid = f._VlsvReader__fileindex_for_cellid + xc= f._VlsvReader__xcells + yc= f._VlsvReader__ycells + zc= f._VlsvReader__zcells + max_ref_level = f.get_max_refinement_level() + + ret=cpphelpers.buildDescriptor(fileindex_for_cellid,xc,yc,zc,max_ref_level) + #returns descriptor as first value and second is the idxToFileIndex + return ret[0],ret[1] + def getDescriptor(self, reinit=False): diff --git a/pyproject.toml b/pyproject.toml index 705e5e83..898e2b98 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ authors = [ { name = "Markku Alho", email = "markku.alho@helsinki.fi"}, { name = "Et al"}, ] -maintainters = [ +maintainers = [ { name = "Markku Alho", email = "markku.alho@helsinki.fi"}, ] description = "Tools for reading and analysing Vlasiator .vlsv output files."