diff --git a/.travis.yml b/.travis.yml index 9408491..4480ef7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: - "2.7" - "3.4" env: - - ROOT=v5-34-18 + - ROOT=5.34.18 - ROOT=master COVERAGE=1 install: source ci/install.sh script: bash ci/test.sh diff --git a/README.rst b/README.rst index 01e6187..a647dbd 100644 --- a/README.rst +++ b/README.rst @@ -46,10 +46,10 @@ At the core of root_numpy are powerful and flexible functions for converting or `structured arrays `_ as well as converting NumPy arrays back into ROOT TTrees. root_numpy can convert branches of strings and basic types such as bool, int, float, double, -etc. as well as variable and fixed-length 1D arrays and 1D or 2D vectors of -basic types and strings. root_numpy can also create columns in the output array -that are expressions involving the TTree branches (i.e. ``'vect.Pt() / 1000'``) -similar to ``TTree::Draw()``. +etc. as well as variable-length and fixed-length multidimensional arrays and 1D +or 2D vectors of basic types and strings. root_numpy can also create columns in +the output array that are expressions involving the TTree branches (i.e. +``'vect.Pt() / 1000'``) similar to ``TTree::Draw()``. For example, get a NumPy structured or record array from a TTree (copy and paste the following examples into your Python prompt): diff --git a/ci/install.sh b/ci/install.sh index 9b18083..d7eaf93 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -17,12 +17,12 @@ sudo apt-get -qq install python-nose python-pip pip install coverage coveralls # Install the ROOT binary -build=root${ROOT}_python${TRAVIS_PYTHON_VERSION}_gcc4.8_x86_64 +ROOT_BUILD=ROOT-${ROOT}_Python-${TRAVIS_PYTHON_VERSION}_GCC-4.8_x86_64 if [ ! -z ${NOTMVA+x} ]; then # Use a build without TMVA - build+=_notmva + ROOT_BUILD+=_notmva fi -time wget --no-check-certificate https://copy.com/rtIyUdxgjt7h/ci/root_builds/${build}.tar.gz -time tar zxf ${build}.tar.gz -mv ${build} root +time wget --no-check-certificate https://copy.com/rtIyUdxgjt7h/ci/root_builds/${ROOT_BUILD}.tar.gz +time tar zxf ${ROOT_BUILD}.tar.gz +mv ${ROOT_BUILD} root source root/bin/thisroot.sh diff --git a/root_numpy/_tree.py b/root_numpy/_tree.py index 6dc2dff..ab5bdbf 100644 --- a/root_numpy/_tree.py +++ b/root_numpy/_tree.py @@ -114,11 +114,10 @@ def root2array(filenames, treename : str, optional (default=None) Name of the tree to convert (optional if each file contains exactly one tree). - branches : list of str, optional (default=None) - List of branch names to include as columns of the array. If None or - empty then include all branches than can be converted in the first - tree. If branches contains duplicate branches, only the first one is - used. + branches : list of strings or single string, optional (default=None) + List of branch names to include as columns of the array or a single + branch name to convert into a one-dimensional array. If None then + include all branches that can be converted. selection : str, optional (default=None) Only include entries fulfilling this condition. start, stop, step: int, optional (default=None) @@ -189,16 +188,27 @@ def root2array(filenames, elif not trees: raise IOError( "no trees present in {0}".format(filenames[0])) - else: - treename = trees[0] + treename = trees[0] + + if isinstance(branches, string_types): + # single branch selected + branches = [branches] + flatten = True + else: + flatten = False - return _librootnumpy.root2array_fromFname( + arr = _librootnumpy.root2array_fromFname( filenames, treename, branches, selection, start, stop, step, include_weight, weight_name) + if flatten: + # select single column + return arr[branches[0]] + return arr + def root2rec(filenames, treename=None, @@ -245,11 +255,10 @@ def tree2array(tree, ---------- tree : ROOT TTree instance The ROOT TTree to convert into an array. - branches : list of str, optional (default=None) - List of branch names to include as columns of the array. If None or - empty then include all branches than can be converted in the first - tree. If branches contains duplicate branches, only the first one is - used. + branches : list of strings or single string, optional (default=None) + List of branch names to include as columns of the array or a single + branch name to convert into a one-dimensional array. If None then + include all branches that can be converted. selection : str, optional (default=None) Only include entries fulfilling this condition. start, stop, step: int, optional (default=None) @@ -271,13 +280,24 @@ def tree2array(tree, import ROOT if not isinstance(tree, ROOT.TTree): raise TypeError("tree must be a ROOT.TTree") - # will need AsCapsule for Python 3 cobj = ROOT.AsCObject(tree) + + if isinstance(branches, string_types): + # single branch selected + branches = [branches] + flatten = True + else: + flatten = False + arr = _librootnumpy.root2array_fromCObj( cobj, branches, selection, start, stop, step, include_weight, weight_name) + + if flatten: + # select single column + return arr[branches[0]] return arr diff --git a/root_numpy/info.py b/root_numpy/info.py index 34122a6..213434b 100644 --- a/root_numpy/info.py +++ b/root_numpy/info.py @@ -6,5 +6,5 @@ |_| \___/ \___/ \__|___|_| |_|\__,_|_| |_| |_| .__/ \__, | {0} |_____| |_| |___/ """ -__version__ = '4.1.2.dev0' +__version__ = '4.2.0.dev0' __doc__ = __doc__.format(__version__) # pylint:disable=redefined-builtin diff --git a/root_numpy/src/Column.h b/root_numpy/src/Column.h index 33cbd18..59f063c 100644 --- a/root_numpy/src/Column.h +++ b/root_numpy/src/Column.h @@ -6,32 +6,20 @@ #include -enum ColumnType -{ - SINGLE = 1, - FIXED = 2, - VARY = 3 -}; - - class Column { public: virtual ~Column() {} virtual int GetLen() = 0; + virtual int GetCountLen() = 0; virtual int GetSize() = 0; virtual void* GetValuePointer() = 0; virtual const char* GetTypeName() = 0; - bool skipped; - // single fixed vary? - ColumnType coltype; - // column name - std::string colname; - // useful in case of fixed element - int countval; - // name of the roottype - std::string rttype; + // Column name + std::string name; + // Name of the ROOT type + std::string type; }; @@ -39,12 +27,11 @@ class FormulaColumn: public Column { public: - FormulaColumn(std::string _colname, TTreeFormula* _formula) + FormulaColumn(std::string _name, TTreeFormula* _formula) { - colname = _colname; - coltype = SINGLE; + name = _name; formula = _formula; - rttype = "Double_t"; + type = "Double_t"; value = new double[1]; } @@ -58,6 +45,11 @@ class FormulaColumn: public Column return 1; } + int GetCountLen() + { + return 1; + } + int GetSize() { return sizeof(double) * GetLen(); @@ -81,58 +73,15 @@ class FormulaColumn: public Column }; -// This describes the structure of the tree -// Converter should take this and make the appropriate data structure class BranchColumn: public Column { public: - static int find_coltype(TLeaf* leaf, - ColumnType& coltype, - int& countval) - { - // Check whether it's array if so of which type - TLeaf* len_leaf = leaf->GetLeafCounter(countval); - if (countval == 1) - { - if (len_leaf == 0) - { // single element - coltype = SINGLE; - } - else - { // variable length - coltype = VARY; - } - } - else if (countval > 0) - { - // fixed multiple array - coltype = FIXED; - } - else - { - // negative - std::string msg("Unable to understand the structure of leaf "); - msg += leaf->GetName(); - PyErr_SetString(PyExc_IOError, msg.c_str()); - return 0; - } - return 1; - } - - static BranchColumn* build(TLeaf* leaf, const std::string& colname) + BranchColumn(std::string& _name, TLeaf* _leaf) { - BranchColumn* ret = new BranchColumn(); - ret->leaf = leaf; - ret->colname = colname; - ret->skipped = false; - if (!find_coltype(leaf, ret->coltype, ret->countval)) - { - delete ret; - return NULL; - } - ret->rttype = leaf->GetTypeName(); - return ret; + name = _name; + leaf = _leaf; + type = leaf->GetTypeName(); } void SetLeaf(TLeaf* newleaf, bool check=false) @@ -140,14 +89,8 @@ class BranchColumn: public Column leaf = newleaf; if (check) { - assert(leaf->GetTypeName() == rttype); - int cv; - ColumnType ct; - if (find_coltype(leaf, ct, cv) == 0) - abort(); - if (ct != coltype) - abort(); - //if(ct==FIXED){assert(cv==countval);} + assert(leaf->GetTypeName() == type); + // TODO: compare shape } } @@ -157,6 +100,17 @@ class BranchColumn: public Column return leaf->GetLen(); } + int GetCountLen() + { + // get count leaf value + TLeaf* count_leaf = leaf->GetLeafCount(); + if (count_leaf != NULL) + { + return int(count_leaf->GetValue()); + } + return 1; + } + int GetSize() { // get size of this block in bytes diff --git a/root_numpy/src/ROOT.pxi b/root_numpy/src/ROOT.pxi index 01f244d..2edd9d3 100644 --- a/root_numpy/src/ROOT.pxi +++ b/root_numpy/src/ROOT.pxi @@ -46,16 +46,19 @@ cdef extern from "TBranch.h": cdef extern from "TLeaf.h": cdef cppclass TLeaf: + const_char* GetName() + const_char* GetTitle() const_char* GetTypeName() + TLeaf* GetLeafCount() TLeaf* GetLeafCounter(int&) - const_char* GetName() - + TBranch* GetBranch() + cdef extern from "TTree.h": cdef cppclass TTree: TTree() TTree(const_char*, const_char*) - void GetEntry(int i) - int GetEntries() + int GetEntry(long_long entry) + long_long GetEntries() void SetBranchAddress(const_char* bname, void* addr) void SetBranchStatus(const_char* bname, bool status) void Print() @@ -66,7 +69,8 @@ cdef extern from "TTree.h": int Fill() int Scan() void Delete(void*) - long SetEntries(long) + long_long SetEntries(long_long) + double GetWeight() int Write() int Write(const_char* name, int option) @@ -74,7 +78,7 @@ cdef extern from "TChain.h": cdef cppclass TChain(TTree): TChain() TChain(const_char*) - int Add(const_char*, long) + int Add(const_char*, long_long) void Print() cdef extern from "TFormula.h": diff --git a/root_numpy/src/TreeChain.h b/root_numpy/src/TreeChain.h index 3144f22..97d2122 100644 --- a/root_numpy/src/TreeChain.h +++ b/root_numpy/src/TreeChain.h @@ -1,23 +1,25 @@ #ifndef __TREE_CHAIN_H #define __TREE_CHAIN_H -#include -#include +#include +#include #include #include #include +#include #include #include -#include -#include -#include -#include -#include +#include #include #include #include #include +#include +#include +#include +#include +#include #include "Column.h" #include "util.h" @@ -56,21 +58,9 @@ class TreeChain ~TreeChain() { - if (!fChain) - { - // Copied from MakeClass - return; - } - fChain->SetNotify(notifier->oldnotify); - LeafCache::iterator it; - for(it = leafcache.begin(); it != leafcache.end(); ++it) - { - delete it->second; - } - - // TreeChain owns the formulae and so we delete them here + // Delete TTreeFormula std::vector::iterator fit; for (fit = formulae.begin(); fit != formulae.end(); ++fit) { @@ -97,10 +87,6 @@ class TreeChain long long LoadTree(long entry) { - if (!fChain) - { - return -5; - } long long load = fChain->LoadTree(entry); if (load < 0) { @@ -110,7 +96,7 @@ class TreeChain { fCurrent = fChain->GetTreeNumber(); } - if(notifier->notified) + if (notifier->notified) { Notify(); notifier->notified = false; @@ -121,10 +107,6 @@ class TreeChain void AddFormula(TTreeFormula* formula) { // The TreeChain will take ownership of the formula - if (formula == NULL) - { - return; - } formulae.push_back(formula); } @@ -201,13 +183,7 @@ class TreeChain membership, and it won't cost us anything since TTreeFormula won't reload them. */ - long load; - // Read contents of entry. - if (!fChain) - { - return 0; - } - load = LoadTree(entry); + long load = LoadTree(entry); if (load < 0) { return (int)load; @@ -251,19 +227,19 @@ class TreeChain { TBranch* branch; TLeaf* leaf; + std::string bname, lname; - // Handle all the leaves + // Update all BranchColumn leaves LeafCache::iterator it; for(it = leafcache.begin(); it != leafcache.end(); ++it) { - std::string bname = it->first.first; - std::string lname = it->first.second; + bname = it->first.first; + lname = it->first.second; branch = fChain->FindBranch(bname.c_str()); if (branch == NULL) { std::cerr << "WARNING: cannot find branch " << bname << std::endl; - it->second->skipped = true; continue; } leaf = branch->FindLeaf(lname.c_str()); @@ -271,11 +247,9 @@ class TreeChain { std::cerr << "WARNING: cannot find leaf " << lname << " for branch " << bname << std::endl; - it->second->skipped = true; continue; } it->second->SetLeaf(leaf, true); - it->second->skipped = false; } // Update all formula leaves and activate all object subbranches @@ -296,45 +270,12 @@ class TreeChain } } - long long GetEntries() - { - return fChain->GetEntries(); - } - - double GetWeight() + void AddColumn(const std::string& branch_name, + const std::string& leaf_name, + BranchColumn* column) { - return fChain->GetWeight(); - } - - Column* MakeColumn(const std::string& bname, - const std::string& lname, - const std::string& colname) - { - TBranch* branch = fChain->GetBranch(bname.c_str()); - if (branch == NULL) - { - PyErr_SetString(PyExc_IOError, - format("cannot find branch %s", bname.c_str()).c_str()); - return NULL; - } - - TLeaf* leaf = branch->FindLeaf(lname.c_str()); - if (leaf == NULL) - { - PyErr_SetString(PyExc_IOError, - format("cannot find leaf %s for branch %s", lname.c_str(), - bname.c_str()).c_str()); - return NULL; - } - - BL bl = make_pair(bname, lname); - BranchColumn* ret = BranchColumn::build(leaf, colname); - if (ret == NULL) - { - return NULL; - } - leafcache.insert(make_pair(bl, ret)); - return ret; + BL bl = make_pair(branch_name, leaf_name); + leafcache.insert(make_pair(bl, column)); } class MiniNotify: public TObject @@ -365,11 +306,11 @@ class TreeChain MiniNotify* notifier; std::vector formulae; - // Branch name to leaf name conversion + // Branch name to leaf name association typedef std::pair BL; typedef std::map LeafCache; - // Column pointer cache since the leaf inside needs to be updated + // Column pointer cache to update leaves // when new file is loaded in the chain LeafCache leafcache; }; diff --git a/root_numpy/src/Vector2Array.h b/root_numpy/src/Vector2Array.h deleted file mode 100644 index ca0d001..0000000 --- a/root_numpy/src/Vector2Array.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __VECTOR2ARRAY_H -#define __VECTOR2ARRAY_H -#include - -// Workaround cython lack of template and pointer deref -template class Vector2Array -{ - public: - inline T* convert(std::vector* v) - { - return v->size() > 0 ? &((*v)[0]) : NULL; - } -}; -#endif diff --git a/root_numpy/src/_librootnumpy.cpp b/root_numpy/src/_librootnumpy.cpp index 63f1bd6..779e34f 100644 --- a/root_numpy/src/_librootnumpy.cpp +++ b/root_numpy/src/_librootnumpy.cpp @@ -280,7 +280,6 @@ void __Pyx_call_destructor(T* x) { #include "TMatrixTBase.h" #include "2to3.h" #include "util.h" -#include "Vector2Array.h" #include #include "Column.h" #include "TreeChain.h" @@ -488,6 +487,7 @@ static const char *__pyx_filename; static const char *__pyx_f[] = { "setup.pxi", + "converters.pyx", "tree.pyx", "array.pyx", "matrix.pyx", @@ -821,7 +821,7 @@ typedef unsigned long __pyx_t_13_librootnumpy_unsigned_long; * ctypedef unsigned long unsigned_long * ctypedef long long long_long # <<<<<<<<<<<<<< * ctypedef unsigned long long unsigned_long_long - * + * ctypedef np.npy_intp SIZE_t */ #line 41 "root_numpy/src/setup.pxi" @@ -831,12 +831,23 @@ typedef PY_LONG_LONG __pyx_t_13_librootnumpy_long_long; * ctypedef unsigned long unsigned_long * ctypedef long long long_long * ctypedef unsigned long long unsigned_long_long # <<<<<<<<<<<<<< + * ctypedef np.npy_intp SIZE_t * - * include "ROOT.pxi" */ #line 42 "root_numpy/src/setup.pxi" typedef unsigned PY_LONG_LONG __pyx_t_13_librootnumpy_unsigned_long_long; + +/* "root_numpy/src/setup.pxi":43 + * ctypedef long long long_long + * ctypedef unsigned long long unsigned_long_long + * ctypedef np.npy_intp SIZE_t # <<<<<<<<<<<<<< + * + * include "ROOT.pxi" + */ + +#line 43 "root_numpy/src/setup.pxi" +typedef npy_intp __pyx_t_13_librootnumpy_SIZE_t; #if CYTHON_CCOMPLEX #ifdef __cplusplus typedef ::std::complex< float > __pyx_t_float_complex; @@ -909,7 +920,7 @@ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; typedef npy_cdouble __pyx_t_5numpy_complex_t; #line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" -struct __pyx_opt_args_13_librootnumpy_parse_tree_structure; +struct __pyx_opt_args_13_librootnumpy_create_numpyarray; #line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" struct __pyx_t_13_librootnumpy_Converter; @@ -953,6 +964,9 @@ struct __pyx_t_13_librootnumpy_VectorStringConverter; #line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" struct __pyx_t_13_librootnumpy_VectorVectorStringConverter; +#line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" +struct __pyx_opt_args_13_librootnumpy_get_tree_structure; + #line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" struct __pyx_opt_args_13_librootnumpy_handle_load; @@ -962,167 +976,188 @@ struct __pyx_t_13_librootnumpy_NP2CConverter; #line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" struct __pyx_t_13_librootnumpy_ScalarNP2CConverter; -#line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" -struct __pyx_opt_args_13_librootnumpy_find_np2c_converter; - #line 766 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" struct __pyx_opt_args_13_librootnumpy_array2tree; -/* "root_numpy/src/tree.pyx":104 +/* "root_numpy/src/converters.pyx":432 * * - * cdef parse_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< - * cdef int ibranch - * cdef TBranch* branch + * cdef enum LeafShapeType: # <<<<<<<<<<<<<< + * SINGLE_VALUE = 1 + * VARIABLE_LENGTH_ARRAY = 2 */ -#line 104 "root_numpy/src/tree.pyx" -struct __pyx_opt_args_13_librootnumpy_parse_tree_structure { +#line 432 "root_numpy/src/converters.pyx" +enum __pyx_t_13_librootnumpy_LeafShapeType { -#line 104 "root_numpy/src/tree.pyx" - int __pyx_n; +#line 432 "root_numpy/src/converters.pyx" + __pyx_e_13_librootnumpy_SINGLE_VALUE = 1, -#line 104 "root_numpy/src/tree.pyx" - PyObject *branches; +#line 432 "root_numpy/src/converters.pyx" + __pyx_e_13_librootnumpy_VARIABLE_LENGTH_ARRAY = 2, -#line 104 "root_numpy/src/tree.pyx" +#line 432 "root_numpy/src/converters.pyx" + __pyx_e_13_librootnumpy_FIXED_LENGTH_ARRAY = 3 + +#line 432 "root_numpy/src/converters.pyx" }; -struct __pyx_t_13_librootnumpy_Converter -#line 104 "root_numpy/src/tree.pyx" - { - /* "root_numpy/src/tree.pyx":185 - * - * - * cdef cppclass Converter: # <<<<<<<<<<<<<< - * __init__(): - * pass +/* "root_numpy/src/converters.pyx":53 + * # given numelement and size of each element + * # and write it to buffer + * cdef inline int create_numpyarray(void* buffer, void* src, int typecode, # <<<<<<<<<<<<<< + * unsigned long numele, int elesize, + * int ndim = 1, np.npy_intp* dims = NULL): */ -#line 185 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_Converter(void); - virtual -#line 185 "root_numpy/src/tree.pyx" - ~__pyx_t_13_librootnumpy_Converter(void); +#line 53 "root_numpy/src/converters.pyx" +struct __pyx_opt_args_13_librootnumpy_create_numpyarray { + +#line 53 "root_numpy/src/converters.pyx" + int __pyx_n; + +#line 53 "root_numpy/src/converters.pyx" + int ndim; + +#line 53 "root_numpy/src/converters.pyx" + npy_intp *dims; + +#line 53 "root_numpy/src/converters.pyx" +}; +struct __pyx_t_13_librootnumpy_Converter +#line 53 "root_numpy/src/converters.pyx" + { virtual -#line 185 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual -#line 185 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/converters.pyx" PyObject *get_nptype(void); - -#line 185 "root_numpy/src/tree.pyx" + virtual ~__pyx_t_13_librootnumpy_Converter() { } +#line 53 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_BasicConverter : public __pyx_t_13_librootnumpy_Converter -#line 185 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/converters.pyx" { - /* "root_numpy/src/tree.pyx":199 + /* "root_numpy/src/converters.pyx":123 * * * cdef cppclass BasicConverter(Converter): # <<<<<<<<<<<<<< - * # cdef string rtype * int size + * int nptypecode */ -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" int size; -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" int nptypecode; -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" std::string nptype; -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" __pyx_t_13_librootnumpy_BasicConverter(int, std::string, int); virtual -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" PyObject *get_nptype(void); virtual -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" int get_nptypecode(void); virtual ~__pyx_t_13_librootnumpy_BasicConverter() { } -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_ObjectConverterBase : public __pyx_t_13_librootnumpy_Converter -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" { virtual -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" PyObject *get_nptype(void); virtual -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" PyObject *get_nptypecode(void); virtual ~__pyx_t_13_librootnumpy_ObjectConverterBase() { } -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_VaryArrayConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 199 "root_numpy/src/tree.pyx" +#line 123 "root_numpy/src/converters.pyx" { - /* "root_numpy/src/tree.pyx":230 + /* "root_numpy/src/converters.pyx":154 * * * cdef cppclass VaryArrayConverter(ObjectConverterBase): # <<<<<<<<<<<<<< * BasicConverter* conv # converter for single element - * int typecode + * np.npy_intp* dims */ -#line 230 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/converters.pyx" __pyx_t_13_librootnumpy_BasicConverter *conv; -#line 230 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/converters.pyx" + npy_intp *dims; + +#line 154 "root_numpy/src/converters.pyx" + int ndim; + +#line 154 "root_numpy/src/converters.pyx" int typecode; -#line 230 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/converters.pyx" int elesize; -#line 230 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_VaryArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *); +#line 154 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_VaryArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *, int, npy_intp *); virtual -#line 230 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/converters.pyx" + ~__pyx_t_13_librootnumpy_VaryArrayConverter(void); + virtual +#line 154 "root_numpy/src/converters.pyx" int write(Column *, void *); - virtual ~__pyx_t_13_librootnumpy_VaryArrayConverter() { } -#line 230 "root_numpy/src/tree.pyx" + +#line 154 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_FixedArrayConverter : public __pyx_t_13_librootnumpy_Converter -#line 230 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/converters.pyx" { - /* "root_numpy/src/tree.pyx":246 + /* "root_numpy/src/converters.pyx":178 * * * cdef cppclass FixedArrayConverter(Converter): # <<<<<<<<<<<<<< * BasicConverter* conv # converter for single element - * int L # numele + * PyObject* shape */ -#line 246 "root_numpy/src/tree.pyx" +#line 178 "root_numpy/src/converters.pyx" __pyx_t_13_librootnumpy_BasicConverter *conv; -#line 246 "root_numpy/src/tree.pyx" - int L; +#line 178 "root_numpy/src/converters.pyx" + PyObject *shape; -#line 246 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_FixedArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *, int); +#line 178 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_FixedArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *, PyObject *); virtual -#line 246 "root_numpy/src/tree.pyx" +#line 178 "root_numpy/src/converters.pyx" + ~__pyx_t_13_librootnumpy_FixedArrayConverter(void); + virtual +#line 178 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual -#line 246 "root_numpy/src/tree.pyx" +#line 178 "root_numpy/src/converters.pyx" PyObject *get_nptype(void); virtual -#line 246 "root_numpy/src/tree.pyx" +#line 178 "root_numpy/src/converters.pyx" int get_nptypecode(void); - virtual ~__pyx_t_13_librootnumpy_FixedArrayConverter() { } -#line 246 "root_numpy/src/tree.pyx" + +#line 178 "root_numpy/src/converters.pyx" }; -/* "root_numpy/src/tree.pyx":267 +/* "root_numpy/src/converters.pyx":202 * * * cdef cppclass VectorConverter[T](ObjectConverterBase): # <<<<<<<<<<<<<< @@ -1130,31 +1165,31 @@ int get_nptypecode(void); * int nptypecode */ -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" template struct __pyx_t_13_librootnumpy_VectorConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" { -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" int elesize; -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" int nptypecode; -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" Vector2Array v2a; -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" __pyx_t_13_librootnumpy_VectorConverter(void); virtual -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_VectorConverter() { } -#line 267 "root_numpy/src/tree.pyx" +#line 202 "root_numpy/src/converters.pyx" }; -/* "root_numpy/src/tree.pyx":287 +/* "root_numpy/src/converters.pyx":222 * * * cdef cppclass VectorVectorConverter[T](ObjectConverterBase): # <<<<<<<<<<<<<< @@ -1162,76 +1197,76 @@ int write(Column *, void *); * int nptypecode */ -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" template struct __pyx_t_13_librootnumpy_VectorVectorConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" { -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int elesize; -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int nptypecode; -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" Vector2Array v2a; -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" __pyx_t_13_librootnumpy_VectorVectorConverter(void); virtual -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_VectorVectorConverter() { } -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_VectorBoolConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" { virtual -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_VectorBoolConverter() { } -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_VectorVectorBoolConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" { virtual -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_VectorVectorBoolConverter() { } -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_StringConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" { virtual -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_StringConverter() { } -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_VectorStringConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" { virtual -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_VectorStringConverter() { } -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" }; struct __pyx_t_13_librootnumpy_VectorVectorStringConverter : public __pyx_t_13_librootnumpy_ObjectConverterBase -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" { virtual -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" int write(Column *, void *); virtual ~__pyx_t_13_librootnumpy_VectorVectorStringConverter() { } -#line 287 "root_numpy/src/tree.pyx" +#line 222 "root_numpy/src/converters.pyx" }; -/* "root_numpy/src/tree.pyx":417 +/* "root_numpy/src/converters.pyx":352 * * cdef cpp_map[string, Converter*] CONVERTERS * ctypedef pair[string, Converter*] CONVERTERS_ITEM # <<<<<<<<<<<<<< @@ -1239,10 +1274,30 @@ int write(Column *, void *); * # basic type converters */ -#line 417 "root_numpy/src/tree.pyx" +#line 352 "root_numpy/src/converters.pyx" typedef std::pair __pyx_t_13_librootnumpy_CONVERTERS_ITEM; -/* "root_numpy/src/tree.pyx":550 +/* "root_numpy/src/tree.pyx":65 + * + * + * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< + * cdef int ibranch + * cdef TBranch* branch + */ + +#line 65 "root_numpy/src/tree.pyx" +struct __pyx_opt_args_13_librootnumpy_get_tree_structure { + +#line 65 "root_numpy/src/tree.pyx" + int __pyx_n; + +#line 65 "root_numpy/src/tree.pyx" + PyObject *branches; + +#line 65 "root_numpy/src/tree.pyx" +}; + +/* "root_numpy/src/tree.pyx":86 * * * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< @@ -1250,42 +1305,42 @@ typedef std::pair __pyx_t_13_l * return */ -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_handle_load { -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" int __pyx_n; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" bool ignore_index; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" }; struct __pyx_t_13_librootnumpy_NP2CConverter -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" { virtual -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" void fill_from(void *); virtual -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" ~__pyx_t_13_librootnumpy_NP2CConverter(void); - /* "root_numpy/src/tree.pyx":740 + /* "root_numpy/src/tree.pyx":368 * #################################### * * cdef cppclass NP2CConverter: # <<<<<<<<<<<<<< + * * void fill_from(void* source): - * pass */ -#line 740 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" }; struct __pyx_t_13_librootnumpy_ScalarNP2CConverter : public __pyx_t_13_librootnumpy_NP2CConverter -#line 740 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" { - /* "root_numpy/src/tree.pyx":747 + /* "root_numpy/src/tree.pyx":377 * * * cdef cppclass ScalarNP2CConverter(NP2CConverter): # <<<<<<<<<<<<<< @@ -1293,74 +1348,54 @@ struct __pyx_t_13_librootnumpy_ScalarNP2CConverter : public __pyx_t_13_librootnu * string roottype */ -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" int nbytes; -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" std::string roottype; -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" std::string name; -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" void *value; -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" TBranch *branch; -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" __pyx_t_13_librootnumpy_ScalarNP2CConverter(TTree *, std::string, std::string, int); virtual -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" PyObject *__del__(PyObject *); virtual -#line 747 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" void fill_from(void *); virtual ~__pyx_t_13_librootnumpy_ScalarNP2CConverter() { } -#line 747 "root_numpy/src/tree.pyx" -}; - -/* "root_numpy/src/tree.pyx":784 - * - * - * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype, peekvalue=None): # <<<<<<<<<<<<<< - * # TODO: - * # np.float16: #this needs special treatment root doesn't have 16 bit float? - */ - -#line 784 "root_numpy/src/tree.pyx" -struct __pyx_opt_args_13_librootnumpy_find_np2c_converter { - -#line 784 "root_numpy/src/tree.pyx" - int __pyx_n; - -#line 784 "root_numpy/src/tree.pyx" - PyObject *peekvalue; - -#line 784 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" }; -/* "root_numpy/src/tree.pyx":807 +/* "root_numpy/src/tree.pyx":424 * * - * cdef TTree* array2tree(np.ndarray arr, name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< - * # hmm how do I catch all python exception - * # and clean up before throwing ? + * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< + * cdef vector[NP2CConverter*] converters + * cdef vector[int] posarray */ -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_array2tree { -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" int __pyx_n; -#line 807 "root_numpy/src/tree.pyx" - PyObject *name; +#line 424 "root_numpy/src/tree.pyx" + std::string name; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" TTree *tree; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" }; #ifndef CYTHON_REFNANNY #define CYTHON_REFNANNY 0 @@ -1449,14 +1484,91 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg #define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw) #endif +static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); + +static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); +static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); + +static void __Pyx_WriteUnraisable(const char *name, int clineno, + int lineno, const char *filename, + int full_traceback); + +#define __Pyx_SetItemInt(o, i, v, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ + (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ + __Pyx_SetItemInt_Fast(o, (Py_ssize_t)i, v, is_list, wraparound, boundscheck) : \ + (is_list ? (PyErr_SetString(PyExc_IndexError, "list assignment index out of range"), -1) : \ + __Pyx_SetItemInt_Generic(o, to_py_func(i), v))) +static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v); +static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, + int is_list, int wraparound, int boundscheck); + +#define __Pyx_GetItemInt(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ + (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ + __Pyx_GetItemInt_Fast(o, (Py_ssize_t)i, is_list, wraparound, boundscheck) : \ + (is_list ? (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL) : \ + __Pyx_GetItemInt_Generic(o, to_py_func(i)))) +#define __Pyx_GetItemInt_List(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ + (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ + __Pyx_GetItemInt_List_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) : \ + (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL)) +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, + int wraparound, int boundscheck); +#define __Pyx_GetItemInt_Tuple(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ + (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ + __Pyx_GetItemInt_Tuple_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) : \ + (PyErr_SetString(PyExc_IndexError, "tuple index out of range"), (PyObject*)NULL)) +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, + int wraparound, int boundscheck); +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j); +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, + int is_list, int wraparound, int boundscheck); + #if CYTHON_COMPILING_IN_CPYTHON static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg); #endif static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg); -static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); -static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); +static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg); + +#define __Pyx_PyObject_PopIndex(L, ix, is_signed, type, to_py_func) ( \ + (PyList_CheckExact(L) && __Pyx_fits_Py_ssize_t(ix, type, is_signed)) ? \ + __Pyx__PyList_PopIndex(L, ix) : __Pyx__PyObject_PopIndex(L, to_py_func(ix))) +#define __Pyx_PyList_PopIndex(L, ix, is_signed, type, to_py_func) ( \ + __Pyx_fits_Py_ssize_t(ix, type, is_signed) ? \ + __Pyx__PyList_PopIndex(L, ix) : __Pyx__PyObject_PopIndex(L, to_py_func(ix))) +static PyObject* __Pyx__PyList_PopIndex(PyObject* L, Py_ssize_t ix); +static PyObject* __Pyx__PyObject_PopIndex(PyObject* L, PyObject* py_ix); + +static CYTHON_INLINE int __Pyx_PyList_Extend(PyObject* L, PyObject* v) { +#if CYTHON_COMPILING_IN_CPYTHON + PyObject* none = _PyList_Extend((PyListObject*)L, v); + if (unlikely(!none)) + return -1; + Py_DECREF(none); + return 0; +#else + return PyList_SetSlice(L, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, v); +#endif +} + +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE int __Pyx_ListComp_Append(PyObject* list, PyObject* x) { + PyListObject* L = (PyListObject*) list; + Py_ssize_t len = Py_SIZE(list); + if (likely(L->allocated > len)) { + Py_INCREF(x); + PyList_SET_ITEM(list, len, x); + Py_SIZE(list) = len+1; + return 0; + } + return PyList_Append(list, x); +} +#else +#define __Pyx_ListComp_Append(L,x) PyList_Append(L,x) +#endif + +static CYTHON_INLINE void __Pyx_RaiseUnboundLocalError(const char *varname); static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause); @@ -1472,8 +1584,6 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int #define __Pyx_PyString_Equals __Pyx_PyBytes_Equals #endif -static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg); - static CYTHON_INLINE PyObject* __Pyx_PyDict_Keys(PyObject* d); static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name); @@ -1502,27 +1612,6 @@ static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact, static CYTHON_INLINE PyObject* __Pyx_PyBytes_Join(PyObject* sep, PyObject* values); #endif -#define __Pyx_GetItemInt(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ - (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ - __Pyx_GetItemInt_Fast(o, (Py_ssize_t)i, is_list, wraparound, boundscheck) : \ - (is_list ? (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL) : \ - __Pyx_GetItemInt_Generic(o, to_py_func(i)))) -#define __Pyx_GetItemInt_List(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ - (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ - __Pyx_GetItemInt_List_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) : \ - (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL)) -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, - int wraparound, int boundscheck); -#define __Pyx_GetItemInt_Tuple(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ - (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ - __Pyx_GetItemInt_Tuple_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) : \ - (PyErr_SetString(PyExc_IndexError, "tuple index out of range"), (PyObject*)NULL)) -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, - int wraparound, int boundscheck); -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j); -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, - int is_list, int wraparound, int boundscheck); - #if CYTHON_COMPILING_IN_CPYTHON static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func); #else @@ -1545,20 +1634,12 @@ static CYTHON_INLINE int __Pyx_PyList_Append(PyObject* list, PyObject* x) { #define __Pyx_PyList_Append(L,x) PyList_Append(L,x) #endif -static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); +static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); -static void __Pyx_WriteUnraisable(const char *name, int clineno, - int lineno, const char *filename, - int full_traceback); +static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb); -#define __Pyx_SetItemInt(o, i, v, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \ - (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \ - __Pyx_SetItemInt_Fast(o, (Py_ssize_t)i, v, is_list, wraparound, boundscheck) : \ - (is_list ? (PyErr_SetString(PyExc_IndexError, "list assignment index out of range"), -1) : \ - __Pyx_SetItemInt_Generic(o, to_py_func(i), v))) -static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v); -static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, - int is_list, int wraparound, int boundscheck); +static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); +static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); static CYTHON_INLINE int __Pyx_PySequence_Contains(PyObject* item, PyObject* seq, int eq) { int result = PySequence_Contains(seq, item); @@ -1573,13 +1654,6 @@ static CYTHON_INLINE int __Pyx_IterFinish(void); static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected); -static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); - -static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb); - -static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); -static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); - #ifndef __PYX_FORCE_INIT_THREADS #define __PYX_FORCE_INIT_THREADS 0 #endif @@ -1595,22 +1669,6 @@ static CYTHON_INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info); #define __Pyx_BufPtrStrided2d(type, buf, i0, s0, i1, s1) (type)((char*)buf + i0 * s0 + i1 * s1) static void __Pyx_RaiseBufferFallbackError(void); -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE int __Pyx_ListComp_Append(PyObject* list, PyObject* x) { - PyListObject* L = (PyListObject*) list; - Py_ssize_t len = Py_SIZE(list); - if (likely(L->allocated > len)) { - Py_INCREF(x); - PyList_SET_ITEM(list, len, x); - Py_SIZE(list) = len+1; - return 0; - } - return PyList_Append(list, x); -} -#else -#define __Pyx_ListComp_Append(L,x) PyList_Append(L,x) -#endif - static void __Pyx_RaiseBufferIndexError(int axis); static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void); @@ -1814,18 +1872,20 @@ static void __Pyx_CppExn2PyErr() { static CYTHON_INLINE unsigned int __Pyx_PyInt_As_unsigned_int(PyObject *); -static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value); - -static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value); - static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_long(unsigned long value); static CYTHON_INLINE unsigned long __Pyx_PyInt_As_unsigned_long(PyObject *); -static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *); +static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value); + +static CYTHON_INLINE Py_intptr_t __Pyx_PyInt_As_Py_intptr_t(PyObject *); + +static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value); static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value); +static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *); + #if CYTHON_CCOMPLEX #ifdef __cplusplus #define __Pyx_CREAL(z) ((z).real()) @@ -2061,17 +2121,16 @@ static CYTHON_INLINE int __pyx_f_7cpython_5array_extend_buffer(arrayobject *, ch /* Module declarations from '_librootnumpy' */ static std::map __pyx_v_13_librootnumpy_CONVERTERS; static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const *); /*proto*/ -static PyObject *__pyx_f_13_librootnumpy_parse_branch_structure(TBranch *); /*proto*/ -static PyObject *__pyx_f_13_librootnumpy_parse_tree_structure(TTree *, struct __pyx_opt_args_13_librootnumpy_parse_tree_structure *__pyx_optional_args); /*proto*/ -static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray(void *, void *, int, unsigned long, int); /*proto*/ +static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray(void *, void *, int, unsigned long, int, struct __pyx_opt_args_13_librootnumpy_create_numpyarray *__pyx_optional_args); /*proto*/ static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(void *, std::vector *); /*proto*/ static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray_vectorstring(void *, std::vector *); /*proto*/ -static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_find_converter(Column *); /*proto*/ static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_find_converter_by_typename(std::string); /*proto*/ -static PyArrayObject *__pyx_f_13_librootnumpy_init_array(std::vector &, std::vector<__pyx_t_13_librootnumpy_Converter *> &, unsigned long, PyObject *, PyObject *); /*proto*/ +static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_get_converter(TLeaf *); /*proto*/ +static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *); /*proto*/ +static PyObject *__pyx_f_13_librootnumpy_get_tree_structure(TTree *, struct __pyx_opt_args_13_librootnumpy_get_tree_structure *__pyx_optional_args); /*proto*/ static PyObject *__pyx_f_13_librootnumpy_handle_load(int, struct __pyx_opt_args_13_librootnumpy_handle_load *__pyx_optional_args); /*proto*/ -static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *, PyObject *, PyObject *, PyObject *, PyObject *, PyObject *, PyObject *, PyObject *); /*proto*/ -static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_converter(TTree *, PyObject *, PyObject *, struct __pyx_opt_args_13_librootnumpy_find_np2c_converter *__pyx_optional_args); /*proto*/ +static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *, PyObject *, std::string, PyObject *, PyObject *, PyObject *, bool, std::string); /*proto*/ +static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_converter(TTree *, PyObject *, PyObject *); /*proto*/ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *, struct __pyx_opt_args_13_librootnumpy_array2tree *__pyx_optional_args); /*proto*/ static CYTHON_INLINE PyArrayObject *__pyx_f_13_librootnumpy_tonumpyarray(void *, int, int); /*proto*/ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *, PyObject *, PyObject *, PyObject *, PyObject *, PyObject *, int __pyx_skip_dispatch); /*proto*/ @@ -2094,22 +2153,24 @@ int __pyx_module_is_main__librootnumpy = 0; /* Implementation of '_librootnumpy' */ static PyObject *__pyx_builtin_ImportError; -static PyObject *__pyx_builtin_IOError; static PyObject *__pyx_builtin_range; +static PyObject *__pyx_builtin_IOError; static PyObject *__pyx_builtin_ValueError; static PyObject *__pyx_builtin_RuntimeError; static PyObject *__pyx_builtin_IndexError; +static PyObject *__pyx_builtin_enumerate; static PyObject *__pyx_builtin_TypeError; +static PyObject *__pyx_builtin_AssertionError; static PyObject *__pyx_builtin_xrange; static PyObject *__pyx_builtin_MemoryError; -static PyObject *__pyx_pf_13_librootnumpy_list_trees(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_2list_structures(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_4list_branches(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_6root2array_fromFname(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fnames, PyObject *__pyx_v_treename, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, PyObject *__pyx_v_include_weight, PyObject *__pyx_v_weight_name); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_tree, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, PyObject *__pyx_v_include_weight, PyObject *__pyx_v_weight_name); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_name, PyObject *__pyx_v_tree); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_12array2root(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_filename, PyObject *__pyx_v_treename, PyObject *__pyx_v_mode); /* proto */ -static PyObject *__pyx_pf_13_librootnumpy_14cleanup(CYTHON_UNUSED PyObject *__pyx_self); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_cleanup(CYTHON_UNUSED PyObject *__pyx_self); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_6list_branches(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fnames, std::string __pyx_v_treename, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, bool __pyx_v_include_weight, std::string __pyx_v_weight_name); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_tree, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, bool __pyx_v_include_weight, std::string __pyx_v_weight_name); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_name, PyObject *__pyx_v_tree); /* proto */ +static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_filename, PyObject *__pyx_v_treename, PyObject *__pyx_v_mode); /* proto */ static PyObject *__pyx_pf_13_librootnumpy_16array_d(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_root_arr); /* proto */ static PyObject *__pyx_pf_13_librootnumpy_18array_f(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_root_arr); /* proto */ static PyObject *__pyx_pf_13_librootnumpy_20array_l(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_root_arr); /* proto */ @@ -2167,7 +2228,6 @@ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_se static void __pyx_pf_7cpython_5array_5array_2__releasebuffer__(CYTHON_UNUSED arrayobject *__pyx_v_self, Py_buffer *__pyx_v_info); /* proto */ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags); /* proto */ static void __pyx_pf_5numpy_7ndarray_2__releasebuffer__(PyArrayObject *__pyx_v_self, Py_buffer *__pyx_v_info); /* proto */ -static char __pyx_k_[] = ", "; static char __pyx_k_B[] = "B"; static char __pyx_k_D[] = "D"; static char __pyx_k_F[] = "F"; @@ -2185,16 +2245,16 @@ static char __pyx_k_h[] = "h"; static char __pyx_k_i[] = "i"; static char __pyx_k_j[] = "j"; static char __pyx_k_l[] = "l"; -static char __pyx_k_n[] = "n"; static char __pyx_k_q[] = "q"; static char __pyx_k_s[] = "s"; -static char __pyx_k_t[] = "t"; static char __pyx_k_x[] = "x"; static char __pyx_k_y[] = "y"; static char __pyx_k_z[] = "z"; static char __pyx_k_Zd[] = "Zd"; static char __pyx_k_Zf[] = "Zf"; static char __pyx_k_Zg[] = "Zg"; +static char __pyx_k__6[] = "[]"; +static char __pyx_k__8[] = "]["; static char __pyx_k_f1[] = "f1"; static char __pyx_k_f2[] = "f2"; static char __pyx_k_f3[] = "f3"; @@ -2205,13 +2265,18 @@ static char __pyx_k_h2[] = "h2"; static char __pyx_k_h3[] = "h3"; static char __pyx_k_it[] = "it"; static char __pyx_k_np[] = "np"; -static char __pyx_k__19[] = "/"; +static char __pyx_k_re[] = "re"; +static char __pyx_k__10[] = ", "; +static char __pyx_k__19[] = "_"; +static char __pyx_k__24[] = ""; +static char __pyx_k__25[] = "/"; static char __pyx_k_arr[] = "arr"; static char __pyx_k_get[] = "get"; static char __pyx_k_idx[] = "idx"; static char __pyx_k_int[] = "int"; static char __pyx_k_key[] = "key"; static char __pyx_k_mat[] = "_mat"; +static char __pyx_k_pop[] = "pop"; static char __pyx_k_ret[] = "ret"; static char __pyx_k_bool[] = "bool"; static char __pyx_k_char[] = "char"; @@ -2219,7 +2284,6 @@ static char __pyx_k_data[] = "data"; static char __pyx_k_f1_2[] = "f1_"; static char __pyx_k_f2_2[] = "f2_"; static char __pyx_k_f3_2[] = "f3_"; -static char __pyx_k_file[] = "file"; static char __pyx_k_fk_d[] = "fk%d"; static char __pyx_k_func[] = "func"; static char __pyx_k_h1_2[] = "h1_"; @@ -2240,9 +2304,7 @@ static char __pyx_k_step[] = "step"; static char __pyx_k_stop[] = "stop"; static char __pyx_k_test[] = "__test__"; static char __pyx_k_tree[] = "tree"; -static char __pyx_k_vary[] = "[vary]"; static char __pyx_k_warn[] = "warn"; -static char __pyx_k_0___1[] = "{0}_{1}"; static char __pyx_k_TTree[] = "TTree"; static char __pyx_k_TYPES[] = "TYPES"; static char __pyx_k_arr_2[] = "_arr"; @@ -2251,21 +2313,28 @@ static char __pyx_k_chain[] = "chain"; static char __pyx_k_ctype[] = "ctype"; static char __pyx_k_dtype[] = "dtype"; static char __pyx_k_empty[] = "empty"; -static char __pyx_k_fixed[] = "[fixed]"; static char __pyx_k_float[] = "float"; static char __pyx_k_fname[] = "fname"; static char __pyx_k_graph[] = "graph"; +static char __pyx_k_group[] = "group"; static char __pyx_k_index[] = "index"; static char __pyx_k_int16[] = "int16"; static char __pyx_k_int32[] = "int32"; static char __pyx_k_int64[] = "int64"; static char __pyx_k_items[] = "items"; +static char __pyx_k_match[] = "match"; static char __pyx_k_names[] = "names"; +static char __pyx_k_nkeys[] = "nkeys"; static char __pyx_k_numpy[] = "numpy"; static char __pyx_k_range[] = "range"; +static char __pyx_k_rfile[] = "rfile"; static char __pyx_k_right[] = "right"; +static char __pyx_k_rtree[] = "rtree"; +static char __pyx_k_s_0_9[] = "^[^\\[]+((?:\\[[^\\s\\]]+\\])(?:\\[[0-9]+\\])*)?$"; static char __pyx_k_short[] = "short"; +static char __pyx_k_split[] = "split"; static char __pyx_k_start[] = "start"; +static char __pyx_k_strip[] = "strip"; static char __pyx_k_ttree[] = "ttree"; static char __pyx_k_uint8[] = "uint8"; static char __pyx_k_atexit[] = "atexit"; @@ -2299,6 +2368,7 @@ static char __pyx_k_array_s[] = "array_s"; static char __pyx_k_bin_idx[] = "bin_idx"; static char __pyx_k_cleanup[] = "cleanup"; static char __pyx_k_clsname[] = "clsname"; +static char __pyx_k_compile[] = "compile"; static char __pyx_k_fill_g1[] = "fill_g1"; static char __pyx_k_fill_g2[] = "fill_g2"; static char __pyx_k_fill_h1[] = "fill_h1"; @@ -2335,6 +2405,7 @@ static char __pyx_k_array_h2c[] = "array_h2c"; static char __pyx_k_array_h3c[] = "array_h3c"; static char __pyx_k_ctypename[] = "ctypename"; static char __pyx_k_dtypecode[] = "dtypecode"; +static char __pyx_k_enumerate[] = "enumerate"; static char __pyx_k_h1c_array[] = "h1c_array"; static char __pyx_k_h1d_array[] = "h1d_array"; static char __pyx_k_h1f_array[] = "h1f_array"; @@ -2361,6 +2432,7 @@ static char __pyx_k_sample_h1[] = "sample_h1"; static char __pyx_k_sample_h2[] = "sample_h2"; static char __pyx_k_sample_h3[] = "sample_h3"; static char __pyx_k_selection[] = "selection"; +static char __pyx_k_structure[] = "structure"; static char __pyx_k_ulonglong[] = "ulonglong"; static char __pyx_k_IndexError[] = "IndexError"; static char __pyx_k_ValueError[] = "ValueError"; @@ -2384,6 +2456,7 @@ static char __pyx_k_vector_bool[] = "vector"; static char __pyx_k_vector_char[] = "vector"; static char __pyx_k_vector_long[] = "vector"; static char __pyx_k_weight_name[] = "weight_name"; +static char __pyx_k_LEAF_PATTERN[] = "LEAF_PATTERN"; static char __pyx_k_RuntimeError[] = "RuntimeError"; static char __pyx_k_force_repeat[] = "force_repeat"; static char __pyx_k_librootnumpy[] = "_librootnumpy"; @@ -2397,6 +2470,7 @@ static char __pyx_k_unsigned_char[] = "unsigned char"; static char __pyx_k_unsigned_long[] = "unsigned long"; static char __pyx_k_vector_double[] = "vector"; static char __pyx_k_vector_string[] = "vector"; +static char __pyx_k_AssertionError[] = "AssertionError"; static char __pyx_k_chain_is_empty[] = "chain is empty"; static char __pyx_k_evaluate_graph[] = "evaluate_graph"; static char __pyx_k_include_weight[] = "include_weight"; @@ -2411,7 +2485,6 @@ static char __pyx_k_array2tree_toCObj[] = "array2tree_toCObj"; static char __pyx_k_vector_vector_int[] = "vector >"; static char __pyx_k_cannot_open_file_0[] = "cannot open file {0}"; static char __pyx_k_extern_ordereddict[] = "extern.ordereddict"; -static char __pyx_k_no_converter_for_0[] = "no converter for {0}"; static char __pyx_k_unsigned_long_long[] = "unsigned long long"; static char __pyx_k_vector_vector_bool[] = "vector >"; static char __pyx_k_vector_vector_char[] = "vector >"; @@ -2430,12 +2503,11 @@ static char __pyx_k_vector_unsigned_char[] = "vector"; static char __pyx_k_vector_unsigned_long[] = "vector"; static char __pyx_k_vector_vector_double[] = "vector >"; static char __pyx_k_vector_vector_string[] = "vector >"; -static char __pyx_k_tree_0_not_found_in_1[] = "tree {0} not found in {1}"; +static char __pyx_k_tree_0_not_found_in_1[] = "tree '{0}' not found in {1}"; static char __pyx_k_vector_unsigned_short[] = "vector"; -static char __pyx_k_branch_0_has_no_leaves[] = "branch {0} has no leaves"; +static char __pyx_k_branch_0_has_no_leaves[] = "branch '{0}' has no leaves"; static char __pyx_k_file_0_is_not_writable[] = "file {0} is not writable"; static char __pyx_k_multiple_trees_found_0[] = "multiple trees found: {0}"; -static char __pyx_k_tree_must_be_PyCObject[] = "tree must be PyCObject"; static char __pyx_k_unable_to_get_keys_in_0[] = "unable to get keys in {0}"; static char __pyx_k_vector_vector_long_long[] = "vector >"; static char __pyx_k_cannot_open_current_file[] = "cannot open current file"; @@ -2451,30 +2523,32 @@ static char __pyx_k_the_chain_is_not_initialized[] = "the chain is not initializ static char __pyx_k_unable_to_access_tree_0_in_1[] = "unable to access tree '{0}' in {1}"; static char __pyx_k_vector_vector_unsigned_short[] = "vector >"; static char __pyx_k_RootNumpyUnconvertibleWarning[] = "RootNumpyUnconvertibleWarning"; -static char __pyx_k_home_endw_workspace_root_numpy[] = "/home/endw/workspace/root_numpy/root_numpy/src/tree.pyx"; -static char __pyx_k_cannot_convert_leaf_0_of_branch[] = "cannot convert leaf {0} of branch {1} with type {2} (skipping)"; -static char __pyx_k_converter_for_r_not_implemented[] = "converter for %r not implemented yet (skipping)"; -static char __pyx_k_leaf_list_for_branch_0_is_empty[] = "leaf list for branch {0} is empty"; +static char __pyx_k_home_endw_workspace_root_numpy[] = "/home/endw/workspace/root_numpy/root_numpy/src/converters.pyx"; +static char __pyx_k_cannot_convert_leaf_0_of_branch[] = "cannot convert leaf '{0}' of branch '{1}' with type '{2}'"; +static char __pyx_k_could_not_find_double_converter[] = "could not find double converter for formula"; +static char __pyx_k_leaf_list_for_branch_0_is_empty[] = "leaf list for branch '{0}' is empty"; static char __pyx_k_unknown_dtype_code_in_numpy_pxd[] = "unknown dtype code in numpy.pxd (%d)"; static char __pyx_k_Format_string_allocated_too_shor[] = "Format string allocated too short, see comment in numpy.pxd"; static char __pyx_k_Non_native_byte_order_not_suppor[] = "Non-native byte order not supported"; static char __pyx_k_cannot_access_tree_in_current_fi[] = "cannot access tree in current file"; -static char __pyx_k_could_not_compile_selection_form[] = "could not compile selection formula"; -static char __pyx_k_field_0_of_type_1_is_not_compati[] = "field `{0}` of type `{1}` is not compatible with existing branch of type `{2}`"; -static char __pyx_k_home_endw_workspace_root_numpy_2[] = "/home/endw/workspace/root_numpy/root_numpy/src/array.pyx"; -static char __pyx_k_home_endw_workspace_root_numpy_3[] = "/home/endw/workspace/root_numpy/root_numpy/src/matrix.pyx"; -static char __pyx_k_home_endw_workspace_root_numpy_4[] = "/home/endw/workspace/root_numpy/root_numpy/src/sample.pyx"; -static char __pyx_k_home_endw_workspace_root_numpy_5[] = "/home/endw/workspace/root_numpy/root_numpy/src/hist.pyx"; -static char __pyx_k_home_endw_workspace_root_numpy_6[] = "/home/endw/workspace/root_numpy/root_numpy/src/graph.pyx"; -static char __pyx_k_home_endw_workspace_root_numpy_7[] = "/home/endw/workspace/root_numpy/root_numpy/src/evaluate.pyx"; +static char __pyx_k_converter_for_r_is_not_implement[] = "converter for {!r} is not implemented (skipping)"; +static char __pyx_k_could_not_compile_selection_expr[] = "could not compile selection expression '{0}'"; +static char __pyx_k_field_0_of_type_1_is_not_compati[] = "field '{0}' of type '{1}' is not compatible with existing branch of type '{2}'"; +static char __pyx_k_home_endw_workspace_root_numpy_2[] = "/home/endw/workspace/root_numpy/root_numpy/src/tree.pyx"; +static char __pyx_k_home_endw_workspace_root_numpy_3[] = "/home/endw/workspace/root_numpy/root_numpy/src/array.pyx"; +static char __pyx_k_home_endw_workspace_root_numpy_4[] = "/home/endw/workspace/root_numpy/root_numpy/src/matrix.pyx"; +static char __pyx_k_home_endw_workspace_root_numpy_5[] = "/home/endw/workspace/root_numpy/root_numpy/src/sample.pyx"; +static char __pyx_k_home_endw_workspace_root_numpy_6[] = "/home/endw/workspace/root_numpy/root_numpy/src/hist.pyx"; +static char __pyx_k_home_endw_workspace_root_numpy_7[] = "/home/endw/workspace/root_numpy/root_numpy/src/graph.pyx"; +static char __pyx_k_home_endw_workspace_root_numpy_8[] = "/home/endw/workspace/root_numpy/root_numpy/src/evaluate.pyx"; static char __pyx_k_ndarray_is_not_Fortran_contiguou[] = "ndarray is not Fortran contiguous"; -static char __pyx_k_the_branch_or_expression_0_is_no[] = "the branch or expression {0} is not present or valid"; +static char __pyx_k_the_branch_or_expression_0_is_no[] = "the branch or expression '{0}' is not present or valid"; static char __pyx_k_tree_index_in_chain_is_out_of_bo[] = "tree index in chain is out of bounds"; static char __pyx_k_unable_to_convert_any_branches_i[] = "unable to convert any branches in this tree"; static char __pyx_k_vector_vector_unsigned_long_long[] = "vector >"; +static char __pyx_k_cannot_convert_leaf_0_of_branch_2[] = "cannot convert leaf '{0}' of branch '{1}' with type '{2}' (skipping)"; static char __pyx_k_Format_string_allocated_too_shor_2[] = "Format string allocated too short."; -static PyObject *__pyx_kp_s_; -static PyObject *__pyx_kp_s_0___1; +static PyObject *__pyx_n_s_AssertionError; static PyObject *__pyx_n_s_B; static PyObject *__pyx_n_s_D; static PyObject *__pyx_n_s_F; @@ -2485,6 +2559,7 @@ static PyObject *__pyx_n_s_IOError; static PyObject *__pyx_n_s_ImportError; static PyObject *__pyx_n_s_IndexError; static PyObject *__pyx_n_s_L; +static PyObject *__pyx_n_s_LEAF_PATTERN; static PyObject *__pyx_n_s_Long64_t; static PyObject *__pyx_n_s_MemoryError; static PyObject *__pyx_kp_u_Non_native_byte_order_not_suppor; @@ -2501,7 +2576,12 @@ static PyObject *__pyx_n_s_TYPES_NUMPY2ROOT; static PyObject *__pyx_n_s_TypeError; static PyObject *__pyx_n_s_ULong64_t; static PyObject *__pyx_n_s_ValueError; -static PyObject *__pyx_kp_s__19; +static PyObject *__pyx_kp_s__10; +static PyObject *__pyx_n_b__19; +static PyObject *__pyx_kp_s__24; +static PyObject *__pyx_kp_s__25; +static PyObject *__pyx_kp_s__6; +static PyObject *__pyx_kp_s__8; static PyObject *__pyx_n_s_arr; static PyObject *__pyx_n_s_arr_2; static PyObject *__pyx_n_s_array; @@ -2525,6 +2605,7 @@ static PyObject *__pyx_n_s_branches; static PyObject *__pyx_kp_s_branches_is_an_empty_list; static PyObject *__pyx_kp_s_cannot_access_tree_in_current_fi; static PyObject *__pyx_kp_s_cannot_convert_leaf_0_of_branch; +static PyObject *__pyx_kp_s_cannot_convert_leaf_0_of_branch_2; static PyObject *__pyx_kp_s_cannot_open_current_file; static PyObject *__pyx_kp_s_cannot_open_file_0; static PyObject *__pyx_kp_s_cannot_read_0; @@ -2534,18 +2615,22 @@ static PyObject *__pyx_n_s_char; static PyObject *__pyx_n_s_cleanup; static PyObject *__pyx_n_s_clsname; static PyObject *__pyx_n_s_collections; -static PyObject *__pyx_kp_s_converter_for_r_not_implemented; -static PyObject *__pyx_kp_s_could_not_compile_selection_form; +static PyObject *__pyx_n_s_compile; +static PyObject *__pyx_kp_s_converter_for_r_is_not_implement; +static PyObject *__pyx_kp_s_could_not_compile_selection_expr; +static PyObject *__pyx_kp_s_could_not_find_double_converter; static PyObject *__pyx_n_s_count_nonzero; static PyObject *__pyx_n_s_ctype; static PyObject *__pyx_n_s_ctypename; static PyObject *__pyx_n_s_d; static PyObject *__pyx_n_s_data; +static PyObject *__pyx_n_b_double; static PyObject *__pyx_n_s_double; static PyObject *__pyx_n_s_dtype; static PyObject *__pyx_n_s_dtypecode; static PyObject *__pyx_kp_s_duplicate_branches_requested; static PyObject *__pyx_n_s_empty; +static PyObject *__pyx_n_s_enumerate; static PyObject *__pyx_n_s_evaluate_f1; static PyObject *__pyx_n_s_evaluate_f2; static PyObject *__pyx_n_s_evaluate_f3; @@ -2559,7 +2644,6 @@ static PyObject *__pyx_n_s_evaluate_h2; static PyObject *__pyx_n_s_evaluate_h3; static PyObject *__pyx_n_s_evaluate_spline; static PyObject *__pyx_n_s_extern_ordereddict; -static PyObject *__pyx_n_s_f; static PyObject *__pyx_n_s_f1; static PyObject *__pyx_n_s_f1_2; static PyObject *__pyx_n_s_f2; @@ -2568,7 +2652,6 @@ static PyObject *__pyx_n_s_f3; static PyObject *__pyx_n_s_f3_2; static PyObject *__pyx_kp_s_field_0_of_type_1_is_not_compati; static PyObject *__pyx_n_s_fields; -static PyObject *__pyx_n_s_file; static PyObject *__pyx_kp_s_file_0_is_not_writable; static PyObject *__pyx_n_s_filename; static PyObject *__pyx_n_s_fill_g1; @@ -2579,7 +2662,6 @@ static PyObject *__pyx_n_s_fill_h3; static PyObject *__pyx_n_s_fill_p1; static PyObject *__pyx_n_s_fill_p2; static PyObject *__pyx_n_s_fill_p3; -static PyObject *__pyx_kp_s_fixed; static PyObject *__pyx_n_s_fk; static PyObject *__pyx_kp_s_fk_d; static PyObject *__pyx_n_s_fk_name; @@ -2597,6 +2679,7 @@ static PyObject *__pyx_n_s_func_2; static PyObject *__pyx_n_s_get; static PyObject *__pyx_n_s_graph; static PyObject *__pyx_n_s_graph_2; +static PyObject *__pyx_n_s_group; static PyObject *__pyx_n_s_h1; static PyObject *__pyx_n_s_h1_2; static PyObject *__pyx_n_s_h1c_array; @@ -2627,6 +2710,7 @@ static PyObject *__pyx_kp_s_home_endw_workspace_root_numpy_4; static PyObject *__pyx_kp_s_home_endw_workspace_root_numpy_5; static PyObject *__pyx_kp_s_home_endw_workspace_root_numpy_6; static PyObject *__pyx_kp_s_home_endw_workspace_root_numpy_7; +static PyObject *__pyx_kp_s_home_endw_workspace_root_numpy_8; static PyObject *__pyx_n_s_i; static PyObject *__pyx_n_s_idx; static PyObject *__pyx_n_s_import; @@ -2658,30 +2742,33 @@ static PyObject *__pyx_kp_s_long_long; static PyObject *__pyx_n_s_longlong; static PyObject *__pyx_n_s_main; static PyObject *__pyx_n_s_mat; +static PyObject *__pyx_n_s_match; static PyObject *__pyx_n_s_matrix; static PyObject *__pyx_n_s_matrix_d; static PyObject *__pyx_n_s_matrix_f; static PyObject *__pyx_n_s_mode; static PyObject *__pyx_kp_s_multiple_trees_found_0; -static PyObject *__pyx_n_s_n; static PyObject *__pyx_n_s_n_samples; static PyObject *__pyx_n_s_name; static PyObject *__pyx_n_s_names; static PyObject *__pyx_kp_u_ndarray_is_not_C_contiguous; static PyObject *__pyx_kp_u_ndarray_is_not_Fortran_contiguou; -static PyObject *__pyx_kp_s_no_converter_for_0; +static PyObject *__pyx_n_s_nkeys; static PyObject *__pyx_n_s_np; static PyObject *__pyx_n_s_numpy; static PyObject *__pyx_n_s_object; static PyObject *__pyx_n_s_outtree; +static PyObject *__pyx_n_s_pop; static PyObject *__pyx_n_s_profile; static PyObject *__pyx_n_s_profile_2; static PyObject *__pyx_n_s_range; +static PyObject *__pyx_n_s_re; static PyObject *__pyx_kp_s_read_failure_in_current_tree; static PyObject *__pyx_n_s_register; static PyObject *__pyx_n_s_resize; static PyObject *__pyx_n_s_ret; static PyObject *__pyx_n_s_return_indices; +static PyObject *__pyx_n_s_rfile; static PyObject *__pyx_n_s_right; static PyObject *__pyx_n_s_root2array_fromCObj; static PyObject *__pyx_n_s_root2array_fromFname; @@ -2689,7 +2776,9 @@ static PyObject *__pyx_n_s_root_arr; static PyObject *__pyx_n_s_root_hist; static PyObject *__pyx_n_s_root_mat; static PyObject *__pyx_n_s_rpartition; +static PyObject *__pyx_n_s_rtree; static PyObject *__pyx_n_s_s; +static PyObject *__pyx_kp_s_s_0_9; static PyObject *__pyx_n_s_sample_f1; static PyObject *__pyx_n_s_sample_f2; static PyObject *__pyx_n_s_sample_f3; @@ -2701,19 +2790,21 @@ static PyObject *__pyx_n_s_short; static PyObject *__pyx_n_s_size; static PyObject *__pyx_n_s_spline; static PyObject *__pyx_n_s_spline_2; +static PyObject *__pyx_n_s_split; static PyObject *__pyx_n_s_start; static PyObject *__pyx_n_s_step; static PyObject *__pyx_n_s_stop; static PyObject *__pyx_n_b_string; -static PyObject *__pyx_n_s_t; +static PyObject *__pyx_n_s_strip; +static PyObject *__pyx_n_s_structure; static PyObject *__pyx_n_s_test; static PyObject *__pyx_kp_s_the_branch_or_expression_0_is_no; static PyObject *__pyx_kp_s_the_chain_is_not_initialized; +static PyObject *__pyx_n_b_tree; static PyObject *__pyx_n_s_tree; static PyObject *__pyx_kp_s_tree_0_not_found_in_1; static PyObject *__pyx_kp_s_tree_has_no_branches; static PyObject *__pyx_kp_s_tree_index_in_chain_is_out_of_bo; -static PyObject *__pyx_kp_s_tree_must_be_PyCObject; static PyObject *__pyx_n_s_treename; static PyObject *__pyx_n_s_ttree; static PyObject *__pyx_n_s_uint16; @@ -2732,7 +2823,6 @@ static PyObject *__pyx_kp_s_unsigned_long_long; static PyObject *__pyx_kp_s_unsigned_short; static PyObject *__pyx_n_s_update; static PyObject *__pyx_n_s_values; -static PyObject *__pyx_kp_s_vary; static PyObject *__pyx_kp_b_vector_bool; static PyObject *__pyx_kp_b_vector_char; static PyObject *__pyx_kp_b_vector_double; @@ -2776,15 +2866,15 @@ static PyObject *__pyx_int_2; static PyObject *__pyx_int_3; static PyObject *__pyx_int_4; static PyObject *__pyx_int_8; +static PyObject *__pyx_int_neg_1; +static std::string __pyx_k__27; +static PyObject *__pyx_tuple_; static PyObject *__pyx_tuple__2; static PyObject *__pyx_tuple__3; static PyObject *__pyx_tuple__4; static PyObject *__pyx_tuple__5; -static PyObject *__pyx_tuple__6; static PyObject *__pyx_tuple__7; -static PyObject *__pyx_tuple__8; static PyObject *__pyx_tuple__9; -static PyObject *__pyx_tuple__10; static PyObject *__pyx_tuple__11; static PyObject *__pyx_tuple__12; static PyObject *__pyx_tuple__13; @@ -2797,10 +2887,7 @@ static PyObject *__pyx_tuple__20; static PyObject *__pyx_tuple__21; static PyObject *__pyx_tuple__22; static PyObject *__pyx_tuple__23; -static PyObject *__pyx_tuple__24; -static PyObject *__pyx_tuple__25; static PyObject *__pyx_tuple__26; -static PyObject *__pyx_tuple__27; static PyObject *__pyx_tuple__28; static PyObject *__pyx_tuple__29; static PyObject *__pyx_tuple__30; @@ -2820,127 +2907,134 @@ static PyObject *__pyx_tuple__43; static PyObject *__pyx_tuple__44; static PyObject *__pyx_tuple__45; static PyObject *__pyx_tuple__46; +static PyObject *__pyx_tuple__47; static PyObject *__pyx_tuple__48; +static PyObject *__pyx_tuple__49; static PyObject *__pyx_tuple__50; +static PyObject *__pyx_tuple__51; static PyObject *__pyx_tuple__52; -static PyObject *__pyx_tuple__54; -static PyObject *__pyx_tuple__56; -static PyObject *__pyx_tuple__58; -static PyObject *__pyx_tuple__60; -static PyObject *__pyx_tuple__62; -static PyObject *__pyx_tuple__64; -static PyObject *__pyx_tuple__66; -static PyObject *__pyx_tuple__68; -static PyObject *__pyx_tuple__70; -static PyObject *__pyx_tuple__72; -static PyObject *__pyx_tuple__74; -static PyObject *__pyx_tuple__76; -static PyObject *__pyx_tuple__78; -static PyObject *__pyx_tuple__80; -static PyObject *__pyx_tuple__82; -static PyObject *__pyx_tuple__84; -static PyObject *__pyx_tuple__86; -static PyObject *__pyx_tuple__88; -static PyObject *__pyx_tuple__90; -static PyObject *__pyx_tuple__92; -static PyObject *__pyx_tuple__94; -static PyObject *__pyx_tuple__96; -static PyObject *__pyx_tuple__98; -static PyObject *__pyx_tuple__100; -static PyObject *__pyx_tuple__102; -static PyObject *__pyx_tuple__104; -static PyObject *__pyx_tuple__106; -static PyObject *__pyx_tuple__108; -static PyObject *__pyx_tuple__110; -static PyObject *__pyx_tuple__112; -static PyObject *__pyx_tuple__114; -static PyObject *__pyx_tuple__116; -static PyObject *__pyx_tuple__118; -static PyObject *__pyx_tuple__120; -static PyObject *__pyx_tuple__122; -static PyObject *__pyx_tuple__124; -static PyObject *__pyx_tuple__126; -static PyObject *__pyx_tuple__128; -static PyObject *__pyx_tuple__130; -static PyObject *__pyx_tuple__132; -static PyObject *__pyx_tuple__134; -static PyObject *__pyx_tuple__136; -static PyObject *__pyx_tuple__138; -static PyObject *__pyx_tuple__140; -static PyObject *__pyx_tuple__142; -static PyObject *__pyx_tuple__144; -static PyObject *__pyx_tuple__146; -static PyObject *__pyx_tuple__148; -static PyObject *__pyx_tuple__150; -static PyObject *__pyx_tuple__152; -static PyObject *__pyx_tuple__154; -static PyObject *__pyx_tuple__156; -static PyObject *__pyx_tuple__158; -static PyObject *__pyx_tuple__160; -static PyObject *__pyx_tuple__162; -static PyObject *__pyx_tuple__164; -static PyObject *__pyx_codeobj__47; -static PyObject *__pyx_codeobj__49; -static PyObject *__pyx_codeobj__51; -static PyObject *__pyx_codeobj__53; -static PyObject *__pyx_codeobj__55; -static PyObject *__pyx_codeobj__57; -static PyObject *__pyx_codeobj__59; -static PyObject *__pyx_codeobj__61; -static PyObject *__pyx_codeobj__63; -static PyObject *__pyx_codeobj__65; -static PyObject *__pyx_codeobj__67; -static PyObject *__pyx_codeobj__69; -static PyObject *__pyx_codeobj__71; -static PyObject *__pyx_codeobj__73; -static PyObject *__pyx_codeobj__75; -static PyObject *__pyx_codeobj__77; -static PyObject *__pyx_codeobj__79; -static PyObject *__pyx_codeobj__81; -static PyObject *__pyx_codeobj__83; -static PyObject *__pyx_codeobj__85; -static PyObject *__pyx_codeobj__87; -static PyObject *__pyx_codeobj__89; -static PyObject *__pyx_codeobj__91; -static PyObject *__pyx_codeobj__93; -static PyObject *__pyx_codeobj__95; -static PyObject *__pyx_codeobj__97; -static PyObject *__pyx_codeobj__99; -static PyObject *__pyx_codeobj__101; -static PyObject *__pyx_codeobj__103; -static PyObject *__pyx_codeobj__105; -static PyObject *__pyx_codeobj__107; -static PyObject *__pyx_codeobj__109; -static PyObject *__pyx_codeobj__111; -static PyObject *__pyx_codeobj__113; -static PyObject *__pyx_codeobj__115; -static PyObject *__pyx_codeobj__117; -static PyObject *__pyx_codeobj__119; -static PyObject *__pyx_codeobj__121; -static PyObject *__pyx_codeobj__123; -static PyObject *__pyx_codeobj__125; -static PyObject *__pyx_codeobj__127; -static PyObject *__pyx_codeobj__129; -static PyObject *__pyx_codeobj__131; -static PyObject *__pyx_codeobj__133; -static PyObject *__pyx_codeobj__135; -static PyObject *__pyx_codeobj__137; -static PyObject *__pyx_codeobj__139; -static PyObject *__pyx_codeobj__141; -static PyObject *__pyx_codeobj__143; -static PyObject *__pyx_codeobj__145; -static PyObject *__pyx_codeobj__147; -static PyObject *__pyx_codeobj__149; -static PyObject *__pyx_codeobj__151; -static PyObject *__pyx_codeobj__153; -static PyObject *__pyx_codeobj__155; -static PyObject *__pyx_codeobj__157; -static PyObject *__pyx_codeobj__159; -static PyObject *__pyx_codeobj__161; -static PyObject *__pyx_codeobj__163; -static PyObject *__pyx_codeobj__165; - -/* "root_numpy/src/tree.pyx":38 +static PyObject *__pyx_tuple__53; +static PyObject *__pyx_tuple__55; +static PyObject *__pyx_tuple__57; +static PyObject *__pyx_tuple__59; +static PyObject *__pyx_tuple__61; +static PyObject *__pyx_tuple__63; +static PyObject *__pyx_tuple__65; +static PyObject *__pyx_tuple__67; +static PyObject *__pyx_tuple__69; +static PyObject *__pyx_tuple__71; +static PyObject *__pyx_tuple__73; +static PyObject *__pyx_tuple__75; +static PyObject *__pyx_tuple__77; +static PyObject *__pyx_tuple__79; +static PyObject *__pyx_tuple__81; +static PyObject *__pyx_tuple__83; +static PyObject *__pyx_tuple__85; +static PyObject *__pyx_tuple__87; +static PyObject *__pyx_tuple__89; +static PyObject *__pyx_tuple__91; +static PyObject *__pyx_tuple__93; +static PyObject *__pyx_tuple__95; +static PyObject *__pyx_tuple__97; +static PyObject *__pyx_tuple__99; +static PyObject *__pyx_tuple__101; +static PyObject *__pyx_tuple__103; +static PyObject *__pyx_tuple__105; +static PyObject *__pyx_tuple__107; +static PyObject *__pyx_tuple__109; +static PyObject *__pyx_tuple__111; +static PyObject *__pyx_tuple__113; +static PyObject *__pyx_tuple__115; +static PyObject *__pyx_tuple__117; +static PyObject *__pyx_tuple__119; +static PyObject *__pyx_tuple__121; +static PyObject *__pyx_tuple__123; +static PyObject *__pyx_tuple__125; +static PyObject *__pyx_tuple__127; +static PyObject *__pyx_tuple__129; +static PyObject *__pyx_tuple__131; +static PyObject *__pyx_tuple__133; +static PyObject *__pyx_tuple__135; +static PyObject *__pyx_tuple__137; +static PyObject *__pyx_tuple__139; +static PyObject *__pyx_tuple__141; +static PyObject *__pyx_tuple__143; +static PyObject *__pyx_tuple__145; +static PyObject *__pyx_tuple__147; +static PyObject *__pyx_tuple__149; +static PyObject *__pyx_tuple__151; +static PyObject *__pyx_tuple__153; +static PyObject *__pyx_tuple__155; +static PyObject *__pyx_tuple__157; +static PyObject *__pyx_tuple__159; +static PyObject *__pyx_tuple__161; +static PyObject *__pyx_tuple__163; +static PyObject *__pyx_tuple__165; +static PyObject *__pyx_tuple__167; +static PyObject *__pyx_tuple__169; +static PyObject *__pyx_tuple__171; +static PyObject *__pyx_codeobj__54; +static PyObject *__pyx_codeobj__56; +static PyObject *__pyx_codeobj__58; +static PyObject *__pyx_codeobj__60; +static PyObject *__pyx_codeobj__62; +static PyObject *__pyx_codeobj__64; +static PyObject *__pyx_codeobj__66; +static PyObject *__pyx_codeobj__68; +static PyObject *__pyx_codeobj__70; +static PyObject *__pyx_codeobj__72; +static PyObject *__pyx_codeobj__74; +static PyObject *__pyx_codeobj__76; +static PyObject *__pyx_codeobj__78; +static PyObject *__pyx_codeobj__80; +static PyObject *__pyx_codeobj__82; +static PyObject *__pyx_codeobj__84; +static PyObject *__pyx_codeobj__86; +static PyObject *__pyx_codeobj__88; +static PyObject *__pyx_codeobj__90; +static PyObject *__pyx_codeobj__92; +static PyObject *__pyx_codeobj__94; +static PyObject *__pyx_codeobj__96; +static PyObject *__pyx_codeobj__98; +static PyObject *__pyx_codeobj__100; +static PyObject *__pyx_codeobj__102; +static PyObject *__pyx_codeobj__104; +static PyObject *__pyx_codeobj__106; +static PyObject *__pyx_codeobj__108; +static PyObject *__pyx_codeobj__110; +static PyObject *__pyx_codeobj__112; +static PyObject *__pyx_codeobj__114; +static PyObject *__pyx_codeobj__116; +static PyObject *__pyx_codeobj__118; +static PyObject *__pyx_codeobj__120; +static PyObject *__pyx_codeobj__122; +static PyObject *__pyx_codeobj__124; +static PyObject *__pyx_codeobj__126; +static PyObject *__pyx_codeobj__128; +static PyObject *__pyx_codeobj__130; +static PyObject *__pyx_codeobj__132; +static PyObject *__pyx_codeobj__134; +static PyObject *__pyx_codeobj__136; +static PyObject *__pyx_codeobj__138; +static PyObject *__pyx_codeobj__140; +static PyObject *__pyx_codeobj__142; +static PyObject *__pyx_codeobj__144; +static PyObject *__pyx_codeobj__146; +static PyObject *__pyx_codeobj__148; +static PyObject *__pyx_codeobj__150; +static PyObject *__pyx_codeobj__152; +static PyObject *__pyx_codeobj__154; +static PyObject *__pyx_codeobj__156; +static PyObject *__pyx_codeobj__158; +static PyObject *__pyx_codeobj__160; +static PyObject *__pyx_codeobj__162; +static PyObject *__pyx_codeobj__164; +static PyObject *__pyx_codeobj__166; +static PyObject *__pyx_codeobj__168; +static PyObject *__pyx_codeobj__170; +static PyObject *__pyx_codeobj__172; + +/* "root_numpy/src/converters.pyx":43 * * * cdef inline unicode resolve_type(const char* typename): # <<<<<<<<<<<<<< @@ -2948,16 +3042,16 @@ static PyObject *__pyx_codeobj__165; * resolvedtype = ResolveTypedef(typename, True).c_str() */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const *__pyx_v_typename) { PyObject *__pyx_v_resolvedtype = NULL -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" ; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -2969,10 +3063,10 @@ static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const * const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_RefNannySetupContext("resolve_type", 0); - /* "root_numpy/src/tree.pyx":40 + /* "root_numpy/src/converters.pyx":45 * cdef inline unicode resolve_type(const char* typename): * # resolve Float_t -> float, vector -> vector, ... * resolvedtype = ResolveTypedef(typename, True).c_str() # <<<<<<<<<<<<<< @@ -2980,28 +3074,28 @@ static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const * * return resolvedtype */ -#line 40 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyUnicode_FromString(TClassEdit::ResolveTypedef(__pyx_v_typename, 1).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 45 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyUnicode_FromString(TClassEdit::ResolveTypedef(__pyx_v_typename, 1).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 40 "root_numpy/src/tree.pyx" +#line 45 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 40 "root_numpy/src/tree.pyx" +#line 45 "root_numpy/src/converters.pyx" __pyx_t_2 = __pyx_t_1; -#line 40 "root_numpy/src/tree.pyx" +#line 45 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_2); -#line 40 "root_numpy/src/tree.pyx" +#line 45 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 40 "root_numpy/src/tree.pyx" +#line 45 "root_numpy/src/converters.pyx" __pyx_v_resolvedtype = ((PyObject*)__pyx_t_2); -#line 40 "root_numpy/src/tree.pyx" +#line 45 "root_numpy/src/converters.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":41 + /* "root_numpy/src/converters.pyx":46 * # resolve Float_t -> float, vector -> vector, ... * resolvedtype = ResolveTypedef(typename, True).c_str() * resolvedtype = SPECIAL_TYPEDEFS.get(resolvedtype, resolvedtype) # <<<<<<<<<<<<<< @@ -3009,118 +3103,118 @@ static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const * * */ -#line 41 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_SPECIAL_TYPEDEFS); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 46 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_SPECIAL_TYPEDEFS); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 41 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 46 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_get); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __pyx_t_1 = NULL; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __pyx_t_4 = 0; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_3); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" if (likely(__pyx_t_1)) { -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_1); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_INCREF(function); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __pyx_t_4 = 1; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" } -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" } -#line 41 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 46 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" if (__pyx_t_1) { -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); __Pyx_GIVEREF(__pyx_t_1); __pyx_t_1 = NULL; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" } -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_v_resolvedtype); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0+__pyx_t_4, __pyx_v_resolvedtype); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_v_resolvedtype); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_v_resolvedtype); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 1+__pyx_t_4, __pyx_v_resolvedtype); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_v_resolvedtype); -#line 41 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 46 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __pyx_t_3 = __pyx_t_2; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_3); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __Pyx_DECREF_SET(__pyx_v_resolvedtype, ((PyObject*)__pyx_t_3)); -#line 41 "root_numpy/src/tree.pyx" +#line 46 "root_numpy/src/converters.pyx" __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":42 + /* "root_numpy/src/converters.pyx":47 * resolvedtype = ResolveTypedef(typename, True).c_str() * resolvedtype = SPECIAL_TYPEDEFS.get(resolvedtype, resolvedtype) * return resolvedtype # <<<<<<<<<<<<<< @@ -3128,19 +3222,19 @@ static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const * * */ -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_r); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_v_resolvedtype); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/converters.pyx" __pyx_r = __pyx_v_resolvedtype; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/converters.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":38 + /* "root_numpy/src/converters.pyx":43 * * * cdef inline unicode resolve_type(const char* typename): # <<<<<<<<<<<<<< @@ -3148,8112 +3242,8489 @@ static CYTHON_INLINE PyObject *__pyx_f_13_librootnumpy_resolve_type(char const * * resolvedtype = ResolveTypedef(typename, True).c_str() */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" /* function exit code */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __pyx_L1_error:; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_AddTraceback("_librootnumpy.resolve_type", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __pyx_r = 0; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_v_resolvedtype); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" return __pyx_r; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":45 - * - * - * def list_trees(fname): # <<<<<<<<<<<<<< - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: +/* "root_numpy/src/converters.pyx":53 + * # given numelement and size of each element + * # and write it to buffer + * cdef inline int create_numpyarray(void* buffer, void* src, int typecode, # <<<<<<<<<<<<<< + * unsigned long numele, int elesize, + * int ndim = 1, np.npy_intp* dims = NULL): */ -#line 45 "root_numpy/src/tree.pyx" - - -#line 45 "root_numpy/src/tree.pyx" -/* Python wrapper */ - -#line 45 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_1list_trees(PyObject *__pyx_self, PyObject *__pyx_v_fname); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_1list_trees = -#line 45 "root_numpy/src/tree.pyx" -{"list_trees", (PyCFunction)__pyx_pw_13_librootnumpy_1list_trees, METH_O, 0}; - -#line 45 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_1list_trees(PyObject *__pyx_self, PyObject *__pyx_v_fname) { - -#line 45 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = 0; - -#line 45 "root_numpy/src/tree.pyx" - __Pyx_RefNannyDeclarations - -#line 45 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_trees (wrapper)", 0); - __pyx_r = -#line 45 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_list_trees(__pyx_self, ((PyObject *)__pyx_v_fname)); - -#line 45 "root_numpy/src/tree.pyx" - - -#line 45 "root_numpy/src/tree.pyx" - /* function exit code */ - -#line 45 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 53 "root_numpy/src/converters.pyx" -#line 45 "root_numpy/src/tree.pyx" - return __pyx_r; -#line 45 "root_numpy/src/tree.pyx" -} +#line 53 "root_numpy/src/converters.pyx" +static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray(void *__pyx_v_buffer, void *__pyx_v_src, int __pyx_v_typecode, unsigned long __pyx_v_numele, int __pyx_v_elesize, struct __pyx_opt_args_13_librootnumpy_create_numpyarray *__pyx_optional_args) { -#line 45 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/converters.pyx" + int __pyx_v_ndim = ((int)1); + /* "root_numpy/src/converters.pyx":55 + * cdef inline int create_numpyarray(void* buffer, void* src, int typecode, + * unsigned long numele, int elesize, + * int ndim = 1, np.npy_intp* dims = NULL): # <<<<<<<<<<<<<< + * cdef np.npy_intp* _dims = dims + * cdef np.npy_intp default_dims[1] + */ -#line 45 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_list_trees(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname) { - TFile *__pyx_v_f -#line 45 "root_numpy/src/tree.pyx" -; - TList *__pyx_v_keys -#line 45 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_ret = NULL -#line 45 "root_numpy/src/tree.pyx" +#line 55 "root_numpy/src/converters.pyx" + npy_intp *__pyx_v_dims = ((npy_intp *)NULL); + npy_intp *__pyx_v__dims +#line 55 "root_numpy/src/converters.pyx" ; - int __pyx_v_n -#line 45 "root_numpy/src/tree.pyx" + npy_intp __pyx_v_default_dims[1] +#line 55 "root_numpy/src/converters.pyx" ; - TKey *__pyx_v_key -#line 45 "root_numpy/src/tree.pyx" + PyArrayObject *__pyx_v_tmp = 0 +#line 55 "root_numpy/src/converters.pyx" ; - int __pyx_v_i -#line 45 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_tmpobj +#line 55 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_clsname = NULL -#line 45 "root_numpy/src/tree.pyx" + unsigned long __pyx_v_nbytes +#line 55 "root_numpy/src/converters.pyx" ; -#line 45 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; +#line 55 "root_numpy/src/converters.pyx" + int __pyx_r; __Pyx_RefNannyDeclarations - const char *__pyx_t_1; - int __pyx_t_2; - PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6 = NULL; - int __pyx_t_7; - int __pyx_t_8; - int __pyx_t_9; + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 45 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_trees", 0); +#line 55 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("create_numpyarray", 0); - /* "root_numpy/src/tree.pyx":46 - * - * def list_trees(fname): - * cdef TFile* f = Open(fname, 'read') # <<<<<<<<<<<<<< - * if f is NULL: - * raise IOError("cannot read {0}".format(fname)) - */ +#line 55 "root_numpy/src/converters.pyx" + if (__pyx_optional_args) { -#line 46 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_fname); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 55 "root_numpy/src/converters.pyx" + if (__pyx_optional_args->__pyx_n > 0) { -#line 46 "root_numpy/src/tree.pyx" - __pyx_v_f = TFile::Open(__pyx_t_1, __pyx_k_read); +#line 55 "root_numpy/src/converters.pyx" + __pyx_v_ndim = __pyx_optional_args->ndim; - /* "root_numpy/src/tree.pyx":47 - * def list_trees(fname): - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: # <<<<<<<<<<<<<< - * raise IOError("cannot read {0}".format(fname)) - * cdef TList* keys = f.GetListOfKeys() - */ +#line 55 "root_numpy/src/converters.pyx" + if (__pyx_optional_args->__pyx_n > 1) { -#line 47 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_v_f == NULL) != 0); +#line 55 "root_numpy/src/converters.pyx" + __pyx_v_dims = __pyx_optional_args->dims; -#line 47 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 55 "root_numpy/src/converters.pyx" + } - /* "root_numpy/src/tree.pyx":48 - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: - * raise IOError("cannot read {0}".format(fname)) # <<<<<<<<<<<<<< - * cdef TList* keys = f.GetListOfKeys() - * if keys is NULL: +#line 55 "root_numpy/src/converters.pyx" + } + +#line 55 "root_numpy/src/converters.pyx" + } + + /* "root_numpy/src/converters.pyx":56 + * unsigned long numele, int elesize, + * int ndim = 1, np.npy_intp* dims = NULL): + * cdef np.npy_intp* _dims = dims # <<<<<<<<<<<<<< + * cdef np.npy_intp default_dims[1] + * if dims == NULL: */ -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_read_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 56 "root_numpy/src/converters.pyx" + __pyx_v__dims = __pyx_v_dims; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":58 + * cdef np.npy_intp* _dims = dims + * cdef np.npy_intp default_dims[1] + * if dims == NULL: # <<<<<<<<<<<<<< + * _dims = default_dims + * _dims[0] = numele; + */ -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#line 58 "root_numpy/src/converters.pyx" + __pyx_t_1 = ((__pyx_v_dims == NULL) != 0); -#line 48 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { +#line 58 "root_numpy/src/converters.pyx" + if (__pyx_t_1) { -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":59 + * cdef np.npy_intp default_dims[1] + * if dims == NULL: + * _dims = default_dims # <<<<<<<<<<<<<< + * _dims[0] = numele; + * cdef np.ndarray tmp = np.PyArray_EMPTY(ndim, _dims, typecode, 0) + */ -#line 48 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +#line 59 "root_numpy/src/converters.pyx" + __pyx_v__dims = __pyx_v_default_dims; -#line 48 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); + /* "root_numpy/src/converters.pyx":60 + * if dims == NULL: + * _dims = default_dims + * _dims[0] = numele; # <<<<<<<<<<<<<< + * cdef np.ndarray tmp = np.PyArray_EMPTY(ndim, _dims, typecode, 0) + * cdef PyObject* tmpobj = tmp # borrow ref + */ -#line 48 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 60 "root_numpy/src/converters.pyx" + (__pyx_v__dims[0]) = __pyx_v_numele; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 60 "root_numpy/src/converters.pyx" + goto __pyx_L3; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 60 "root_numpy/src/converters.pyx" + } -#line 48 "root_numpy/src/tree.pyx" - } +#line 60 "root_numpy/src/converters.pyx" + __pyx_L3:; -#line 48 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":61 + * _dims = default_dims + * _dims[0] = numele; + * cdef np.ndarray tmp = np.PyArray_EMPTY(ndim, _dims, typecode, 0) # <<<<<<<<<<<<<< + * cdef PyObject* tmpobj = tmp # borrow ref + * # incref since we are placing in buffer directly + */ -#line 48 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 61 "root_numpy/src/converters.pyx" + __pyx_t_2 = PyArray_EMPTY(__pyx_v_ndim, __pyx_v__dims, __pyx_v_typecode, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 61 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 61 "root_numpy/src/converters.pyx" + if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 48 "root_numpy/src/tree.pyx" - } else { +#line 61 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((PyArrayObject *)__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 61 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); + /* "root_numpy/src/converters.pyx":62 + * _dims[0] = numele; + * cdef np.ndarray tmp = np.PyArray_EMPTY(ndim, _dims, typecode, 0) + * cdef PyObject* tmpobj = tmp # borrow ref # <<<<<<<<<<<<<< + * # incref since we are placing in buffer directly + * Py_INCREF(tmp) + */ -#line 48 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; +#line 62 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); + /* "root_numpy/src/converters.pyx":64 + * cdef PyObject* tmpobj = tmp # borrow ref + * # incref since we are placing in buffer directly + * Py_INCREF(tmp) # <<<<<<<<<<<<<< + * # copy to tmp.data + * cdef unsigned long nbytes = numele * elesize + */ -#line 48 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_fname); +#line 64 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_tmp)); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_fname); + /* "root_numpy/src/converters.pyx":66 + * Py_INCREF(tmp) + * # copy to tmp.data + * cdef unsigned long nbytes = numele * elesize # <<<<<<<<<<<<<< + * memcpy(tmp.data, src, nbytes) + * # now write PyObject* to buffer + */ -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 66 "root_numpy/src/converters.pyx" + __pyx_v_nbytes = (__pyx_v_numele * __pyx_v_elesize); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":67 + * # copy to tmp.data + * cdef unsigned long nbytes = numele * elesize + * memcpy(tmp.data, src, nbytes) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + */ -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 67 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_tmp->data, __pyx_v_src, __pyx_v_nbytes); -#line 48 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":69 + * memcpy(tmp.data, src, nbytes) + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * return sizeof(tmpobj) + * + */ -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 69 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); + + /* "root_numpy/src/converters.pyx":70 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * + */ -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 70 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 48 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); + /* "root_numpy/src/converters.pyx":53 + * # given numelement and size of each element + * # and write it to buffer + * cdef inline int create_numpyarray(void* buffer, void* src, int typecode, # <<<<<<<<<<<<<< + * unsigned long numele, int elesize, + * int ndim = 1, np.npy_intp* dims = NULL): + */ -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 53 "root_numpy/src/converters.pyx" -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 53 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 53 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); +#line 53 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 53 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 48 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 48 "root_numpy/src/tree.pyx" - } +#line 53 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_tmp); - /* "root_numpy/src/tree.pyx":49 - * if f is NULL: - * raise IOError("cannot read {0}".format(fname)) - * cdef TList* keys = f.GetListOfKeys() # <<<<<<<<<<<<<< - * if keys is NULL: - * raise IOError("unable to get keys in {0}".format(fname)) - */ +#line 53 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 49 "root_numpy/src/tree.pyx" - __pyx_v_keys = __pyx_v_f->GetListOfKeys(); +#line 53 "root_numpy/src/converters.pyx" + return __pyx_r; - /* "root_numpy/src/tree.pyx":50 - * raise IOError("cannot read {0}".format(fname)) - * cdef TList* keys = f.GetListOfKeys() - * if keys is NULL: # <<<<<<<<<<<<<< - * raise IOError("unable to get keys in {0}".format(fname)) - * ret = dict() +#line 53 "root_numpy/src/converters.pyx" +} + +/* "root_numpy/src/converters.pyx":74 + * + * # special treatment for vector + * cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): # <<<<<<<<<<<<<< + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] */ -#line 50 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_v_keys == NULL) != 0); +#line 74 "root_numpy/src/converters.pyx" -#line 50 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":51 - * cdef TList* keys = f.GetListOfKeys() - * if keys is NULL: - * raise IOError("unable to get keys in {0}".format(fname)) # <<<<<<<<<<<<<< - * ret = dict() - * cdef int n = keys.GetEntries() - */ +#line 74 "root_numpy/src/converters.pyx" +static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(void *__pyx_v_buffer, std::vector *__pyx_v_src) { + unsigned long __pyx_v_numele +#line 74 "root_numpy/src/converters.pyx" +; + npy_intp __pyx_v_dims[1] +#line 74 "root_numpy/src/converters.pyx" +; + PyArrayObject *__pyx_v_tmp = 0 +#line 74 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_tmpobj +#line 74 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_i +#line 74 "root_numpy/src/converters.pyx" +; -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_unable_to_get_keys_in_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 74 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + unsigned long __pyx_t_2; + unsigned long __pyx_t_3; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 74 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("create_numpyarray_vectorbool", 0); -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_6 = NULL; + /* "root_numpy/src/converters.pyx":75 + * # special treatment for vector + * cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): + * cdef unsigned long numele = src.size() # <<<<<<<<<<<<<< + * cdef np.npy_intp dims[1] + * dims[0] = numele; + */ -#line 51 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { +#line 75 "root_numpy/src/converters.pyx" + __pyx_v_numele = __pyx_v_src->size(); -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":77 + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] + * dims[0] = numele; # <<<<<<<<<<<<<< + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) + * cdef PyObject* tmpobj = tmp # borrow ref + */ -#line 51 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_6)) { +#line 77 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 51 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); + /* "root_numpy/src/converters.pyx":78 + * cdef np.npy_intp dims[1] + * dims[0] = numele; + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) # <<<<<<<<<<<<<< + * cdef PyObject* tmpobj = tmp # borrow ref + * # incref since we are placing in buffer directly + */ -#line 51 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_6); +#line 78 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, NPY_BOOL, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 51 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 78 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 78 "root_numpy/src/converters.pyx" + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 51 "root_numpy/src/tree.pyx" - } +#line 78 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); -#line 51 "root_numpy/src/tree.pyx" - } +#line 78 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 51 "root_numpy/src/tree.pyx" - if (!__pyx_t_6) { + /* "root_numpy/src/converters.pyx":79 + * dims[0] = numele; + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) + * cdef PyObject* tmpobj = tmp # borrow ref # <<<<<<<<<<<<<< + * # incref since we are placing in buffer directly + * Py_INCREF(tmp) + */ -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 79 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":81 + * cdef PyObject* tmpobj = tmp # borrow ref + * # incref since we are placing in buffer directly + * Py_INCREF(tmp) # <<<<<<<<<<<<<< + * # can't use memcpy here... + * cdef unsigned long i + */ -#line 51 "root_numpy/src/tree.pyx" - } else { +#line 81 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_tmp)); -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":84 + * # can't use memcpy here... + * cdef unsigned long i + * for i in range(numele): # <<<<<<<<<<<<<< + * tmp[i] = src.at(i) + * # now write PyObject* to buffer + */ -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 84 "root_numpy/src/converters.pyx" + __pyx_t_2 = __pyx_v_numele; -#line 51 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; +#line 84 "root_numpy/src/converters.pyx" + for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) { -#line 51 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); +#line 84 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_3; -#line 51 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); + /* "root_numpy/src/converters.pyx":85 + * cdef unsigned long i + * for i in range(numele): + * tmp[i] = src.at(i) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + */ -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_fname); +#line 85 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_src->at(__pyx_v_i)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 85 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 85 "root_numpy/src/converters.pyx" + if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_tmp), __pyx_v_i, __pyx_t_1, unsigned long, 0, __Pyx_PyInt_From_unsigned_long, 0, 0, 1) < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 85 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 51 "root_numpy/src/tree.pyx" - } +#line 85 "root_numpy/src/converters.pyx" + } -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + /* "root_numpy/src/converters.pyx":87 + * tmp[i] = src.at(i) + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * return sizeof(tmpobj) + * + */ -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 87 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":88 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * + */ -#line 51 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 88 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 88 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; + /* "root_numpy/src/converters.pyx":74 + * + * # special treatment for vector + * cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): # <<<<<<<<<<<<<< + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] + */ -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 74 "root_numpy/src/converters.pyx" -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 74 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 51 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); +#line 74 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 74 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 51 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 74 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorbool", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 51 "root_numpy/src/tree.pyx" - } +#line 74 "root_numpy/src/converters.pyx" + __pyx_r = 0; - /* "root_numpy/src/tree.pyx":52 - * if keys is NULL: - * raise IOError("unable to get keys in {0}".format(fname)) - * ret = dict() # <<<<<<<<<<<<<< - * cdef int n = keys.GetEntries() - * cdef TKey* key - */ +#line 74 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 52 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 74 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_tmp); -#line 52 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 74 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 52 "root_numpy/src/tree.pyx" - __pyx_v_ret = ((PyObject*)__pyx_t_3); +#line 74 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 52 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 74 "root_numpy/src/converters.pyx" +} - /* "root_numpy/src/tree.pyx":53 - * raise IOError("unable to get keys in {0}".format(fname)) - * ret = dict() - * cdef int n = keys.GetEntries() # <<<<<<<<<<<<<< - * cdef TKey* key - * for i in range(n): +/* "root_numpy/src/converters.pyx":91 + * + * + * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): # <<<<<<<<<<<<<< + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] */ -#line 53 "root_numpy/src/tree.pyx" - __pyx_v_n = __pyx_v_keys->GetEntries(); +#line 91 "root_numpy/src/converters.pyx" - /* "root_numpy/src/tree.pyx":55 - * cdef int n = keys.GetEntries() - * cdef TKey* key - * for i in range(n): # <<<<<<<<<<<<<< - * key = keys.At(i) - * clsname = str(key.GetClassName()) - */ -#line 55 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_v_n; +#line 91 "root_numpy/src/converters.pyx" +static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray_vectorstring(void *__pyx_v_buffer, std::vector *__pyx_v_src) { + unsigned long __pyx_v_numele +#line 91 "root_numpy/src/converters.pyx" +; + npy_intp __pyx_v_dims[1] +#line 91 "root_numpy/src/converters.pyx" +; + int __pyx_v_objsize +#line 91 "root_numpy/src/converters.pyx" +; + PyArrayObject *__pyx_v_tmp = 0 +#line 91 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_tmpobj +#line 91 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_tmpstrobj +#line 91 "root_numpy/src/converters.pyx" +; + char *__pyx_v_dataptr +#line 91 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_i +#line 91 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_py_bytes = NULL +#line 91 "root_numpy/src/converters.pyx" +; -#line 55 "root_numpy/src/tree.pyx" - for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { +#line 91 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + int __pyx_t_2; + unsigned long __pyx_t_3; + unsigned long __pyx_t_4; + PyObject *__pyx_t_5 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 55 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_8; +#line 91 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("create_numpyarray_vectorstring", 0); - /* "root_numpy/src/tree.pyx":56 - * cdef TKey* key - * for i in range(n): - * key = keys.At(i) # <<<<<<<<<<<<<< - * clsname = str(key.GetClassName()) - * if clsname == 'TTree' or clsname == 'TNtuple': + /* "root_numpy/src/converters.pyx":92 + * + * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): + * cdef unsigned long numele = src.size() # <<<<<<<<<<<<<< + * cdef np.npy_intp dims[1] + * dims[0] = numele; */ -#line 56 "root_numpy/src/tree.pyx" - __pyx_v_key = ((TKey *)__pyx_v_keys->At(__pyx_v_i)); +#line 92 "root_numpy/src/converters.pyx" + __pyx_v_numele = __pyx_v_src->size(); - /* "root_numpy/src/tree.pyx":57 - * for i in range(n): - * key = keys.At(i) - * clsname = str(key.GetClassName()) # <<<<<<<<<<<<<< - * if clsname == 'TTree' or clsname == 'TNtuple': - * ret[str(key.GetName())] = None + /* "root_numpy/src/converters.pyx":94 + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] + * dims[0] = numele; # <<<<<<<<<<<<<< + * cdef int objsize = np.dtype('O').itemsize + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) */ -#line 57 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyStr_FromString(__pyx_v_key->GetClassName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 94 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":95 + * cdef np.npy_intp dims[1] + * dims[0] = numele; + * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) + * cdef PyObject* tmpobj = tmp # borrow ref + */ -#line 57 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 95 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 95 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 57 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 95 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 95 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 57 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 95 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; -#line 57 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":96 + * dims[0] = numele; + * cdef int objsize = np.dtype('O').itemsize + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) # <<<<<<<<<<<<<< + * cdef PyObject* tmpobj = tmp # borrow ref + * # incref since we are placing in buffer directly + */ -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 96 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, NPY_OBJECT, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 57 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 96 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 57 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_clsname, __pyx_t_3); +#line 96 "root_numpy/src/converters.pyx" + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 57 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 96 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); - /* "root_numpy/src/tree.pyx":58 - * key = keys.At(i) - * clsname = str(key.GetClassName()) - * if clsname == 'TTree' or clsname == 'TNtuple': # <<<<<<<<<<<<<< - * ret[str(key.GetName())] = None - * return list(ret.keys()) +#line 96 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; + + /* "root_numpy/src/converters.pyx":97 + * cdef int objsize = np.dtype('O').itemsize + * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) + * cdef PyObject* tmpobj = tmp # borrow ref # <<<<<<<<<<<<<< + * # incref since we are placing in buffer directly + * Py_INCREF(tmp) */ -#line 58 "root_numpy/src/tree.pyx" - __pyx_t_9 = (__Pyx_PyString_Equals(__pyx_v_clsname, __pyx_n_s_TTree, Py_EQ)); if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 58 "root_numpy/src/tree.pyx" - if (!__pyx_t_9) { +#line 97 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); -#line 58 "root_numpy/src/tree.pyx" - } else { + /* "root_numpy/src/converters.pyx":99 + * cdef PyObject* tmpobj = tmp # borrow ref + * # incref since we are placing in buffer directly + * Py_INCREF(tmp) # <<<<<<<<<<<<<< + * cdef PyObject* tmpstrobj + * cdef char* dataptr = tmp.data + */ -#line 58 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_9; +#line 99 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_tmp)); -#line 58 "root_numpy/src/tree.pyx" - goto __pyx_L8_bool_binop_done; + /* "root_numpy/src/converters.pyx":101 + * Py_INCREF(tmp) + * cdef PyObject* tmpstrobj + * cdef char* dataptr = tmp.data # <<<<<<<<<<<<<< + * # can't use memcpy here... + * cdef unsigned long i + */ -#line 58 "root_numpy/src/tree.pyx" - } +#line 101 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_tmp->data); -#line 58 "root_numpy/src/tree.pyx" - __pyx_t_9 = (__Pyx_PyString_Equals(__pyx_v_clsname, __pyx_n_s_TNtuple, Py_EQ)); if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":104 + * # can't use memcpy here... + * cdef unsigned long i + * for i in range(numele): # <<<<<<<<<<<<<< + * py_bytes = str(src.at(i)) + * Py_INCREF(py_bytes) + */ -#line 58 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_9; +#line 104 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; -#line 58 "root_numpy/src/tree.pyx" - __pyx_L8_bool_binop_done:; +#line 104 "root_numpy/src/converters.pyx" + for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { -#line 58 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 104 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; - /* "root_numpy/src/tree.pyx":59 - * clsname = str(key.GetClassName()) - * if clsname == 'TTree' or clsname == 'TNtuple': - * ret[str(key.GetName())] = None # <<<<<<<<<<<<<< - * return list(ret.keys()) - * + /* "root_numpy/src/converters.pyx":105 + * cdef unsigned long i + * for i in range(numele): + * py_bytes = str(src.at(i)) # <<<<<<<<<<<<<< + * Py_INCREF(py_bytes) + * tmpstrobj = py_bytes */ -#line 59 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyStr_FromString(__pyx_v_key->GetName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_src->at(__pyx_v_i)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 59 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 105 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 59 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 105 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 59 "root_numpy/src/tree.pyx" - if (unlikely(PyDict_SetItem(__pyx_v_ret, __pyx_t_3, Py_None) < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 105 "root_numpy/src/converters.pyx" + __Pyx_XDECREF_SET(__pyx_v_py_bytes, __pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 59 "root_numpy/src/tree.pyx" - goto __pyx_L7; + /* "root_numpy/src/converters.pyx":106 + * for i in range(numele): + * py_bytes = str(src.at(i)) + * Py_INCREF(py_bytes) # <<<<<<<<<<<<<< + * tmpstrobj = py_bytes + * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) + */ -#line 59 "root_numpy/src/tree.pyx" - } +#line 106 "root_numpy/src/converters.pyx" + Py_INCREF(__pyx_v_py_bytes); -#line 59 "root_numpy/src/tree.pyx" - __pyx_L7:; + /* "root_numpy/src/converters.pyx":107 + * py_bytes = str(src.at(i)) + * Py_INCREF(py_bytes) + * tmpstrobj = py_bytes # <<<<<<<<<<<<<< + * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) + * # now write PyObject* to buffer + */ -#line 59 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/converters.pyx" + __pyx_v_tmpstrobj = ((PyObject *)__pyx_v_py_bytes); + + /* "root_numpy/src/converters.pyx":108 + * Py_INCREF(py_bytes) + * tmpstrobj = py_bytes + * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + */ + +#line 108 "root_numpy/src/converters.pyx" + memcpy((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&__pyx_v_tmpstrobj), (sizeof(PyObject *))); + +#line 108 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":60 - * if clsname == 'TTree' or clsname == 'TNtuple': - * ret[str(key.GetName())] = None - * return list(ret.keys()) # <<<<<<<<<<<<<< - * + /* "root_numpy/src/converters.pyx":110 + * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * return sizeof(tmpobj) * */ -#line 60 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 110 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyDict_Keys(__pyx_v_ret); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":111 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * + */ -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 111 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 111 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":91 + * + * + * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): # <<<<<<<<<<<<<< + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] + */ -#line 60 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 91 "root_numpy/src/converters.pyx" -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 91 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyList_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 91 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 60 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 60 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_3; +#line 91 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorstring", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 91 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 60 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 91 "root_numpy/src/converters.pyx" + __pyx_L0:; - /* "root_numpy/src/tree.pyx":45 - * - * - * def list_trees(fname): # <<<<<<<<<<<<<< - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: - */ +#line 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_tmp); -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_py_bytes); +#line 91 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 45 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 91 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 45 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 91 "root_numpy/src/converters.pyx" +} -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +/* "root_numpy/src/converters.pyx":116 + * cdef cppclass Converter: + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * pass + * + */ -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); +#line 116 "root_numpy/src/converters.pyx" -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); +#line 116 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_Converter::write(CYTHON_UNUSED Column *__pyx_v_col, CYTHON_UNUSED void *__pyx_v_buffer) { -#line 45 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.list_trees", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 116 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 45 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 116 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 45 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 116 "root_numpy/src/converters.pyx" -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_ret); -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_clsname); +#line 116 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 116 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 45 "root_numpy/src/tree.pyx" +#line 116 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 45 "root_numpy/src/tree.pyx" +#line 116 "root_numpy/src/converters.pyx" return __pyx_r; -#line 45 "root_numpy/src/tree.pyx" +#line 116 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":63 +/* "root_numpy/src/converters.pyx":119 + * pass * + * object get_nptype(): # <<<<<<<<<<<<<< + * pass * - * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< - * if tree is None: - * # automatically select single tree */ -#line 63 "root_numpy/src/tree.pyx" - - -#line 63 "root_numpy/src/tree.pyx" -/* Python wrapper */ - -#line 63 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_3list_structures(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_3list_structures = -#line 63 "root_numpy/src/tree.pyx" -{"list_structures", (PyCFunction)__pyx_pw_13_librootnumpy_3list_structures, METH_VARARGS|METH_KEYWORDS, 0}; +#line 119 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_3list_structures(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_fname = 0 -#line 63 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_tree = 0 -#line 63 "root_numpy/src/tree.pyx" -; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; -#line 63 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = 0; +#line 119 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_Converter::get_nptype(void) { -#line 63 "root_numpy/src/tree.pyx" +#line 119 "root_numpy/src/converters.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations -#line 63 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_structures (wrapper)", 0); +#line 119 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptype", 0); -#line 63 "root_numpy/src/tree.pyx" - { +#line 119 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" - static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; -#line 63 "root_numpy/src/tree.pyx" - PyObject* values[2] = {0,0}; +#line 119 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 63 "root_numpy/src/tree.pyx" - values[1] = ((PyObject *)Py_None); +#line 119 "root_numpy/src/converters.pyx" + __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 63 "root_numpy/src/tree.pyx" - if (unlikely(__pyx_kwds)) { +#line 119 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 63 "root_numpy/src/tree.pyx" - Py_ssize_t kw_args; +#line 119 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 63 "root_numpy/src/tree.pyx" - const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); +#line 119 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 63 "root_numpy/src/tree.pyx" - switch (pos_args) { - case 2: -#line 63 "root_numpy/src/tree.pyx" -values[1] = PyTuple_GET_ITEM(__pyx_args, 1); - case 1: -#line 63 "root_numpy/src/tree.pyx" -values[0] = PyTuple_GET_ITEM(__pyx_args, 0); +#line 119 "root_numpy/src/converters.pyx" +} -#line 63 "root_numpy/src/tree.pyx" - case 0: break; - default: -#line 63 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +/* "root_numpy/src/converters.pyx":128 + * string nptype + * + * __init__(int size, string nptype, int nptypecode): # <<<<<<<<<<<<<< + * this.size = size + * this.nptypecode = nptypecode + */ -#line 63 "root_numpy/src/tree.pyx" - } +#line 128 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" - kw_args = PyDict_Size(__pyx_kwds); -#line 63 "root_numpy/src/tree.pyx" - switch (pos_args) { +#line 128 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_BasicConverter::__pyx_t_13_librootnumpy_BasicConverter(int __pyx_v_size, std::string __pyx_v_nptype, int __pyx_v_nptypecode) { + __Pyx_RefNannyDeclarations -#line 63 "root_numpy/src/tree.pyx" - case 0: +#line 128 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 63 "root_numpy/src/tree.pyx" - if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; - else -#line 63 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; + /* "root_numpy/src/converters.pyx":129 + * + * __init__(int size, string nptype, int nptypecode): + * this.size = size # <<<<<<<<<<<<<< + * this.nptypecode = nptypecode + * this.nptype = nptype + */ -#line 63 "root_numpy/src/tree.pyx" - case 1: +#line 129 "root_numpy/src/converters.pyx" + this->size = __pyx_v_size; -#line 63 "root_numpy/src/tree.pyx" - if (kw_args > 0) { + /* "root_numpy/src/converters.pyx":130 + * __init__(int size, string nptype, int nptypecode): + * this.size = size + * this.nptypecode = nptypecode # <<<<<<<<<<<<<< + * this.nptype = nptype + * + */ -#line 63 "root_numpy/src/tree.pyx" - PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); +#line 130 "root_numpy/src/converters.pyx" + this->nptypecode = __pyx_v_nptypecode; -#line 63 "root_numpy/src/tree.pyx" - if (value) { values[1] = value; kw_args--; } + /* "root_numpy/src/converters.pyx":131 + * this.size = size + * this.nptypecode = nptypecode + * this.nptype = nptype # <<<<<<<<<<<<<< + * + * int write(Column* col, void* buffer): + */ -#line 63 "root_numpy/src/tree.pyx" - } +#line 131 "root_numpy/src/converters.pyx" + this->nptype = __pyx_v_nptype; -#line 63 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":128 + * string nptype + * + * __init__(int size, string nptype, int nptypecode): # <<<<<<<<<<<<<< + * this.size = size + * this.nptypecode = nptypecode + */ -#line 63 "root_numpy/src/tree.pyx" - if (unlikely(kw_args > 0)) { +#line 128 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "list_structures") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 63 "root_numpy/src/tree.pyx" - } +#line 128 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 63 "root_numpy/src/tree.pyx" - } else { +#line 128 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 63 "root_numpy/src/tree.pyx" - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 2: -#line 63 "root_numpy/src/tree.pyx" -values[1] = PyTuple_GET_ITEM(__pyx_args, 1); - case 1: -#line 63 "root_numpy/src/tree.pyx" -values[0] = PyTuple_GET_ITEM(__pyx_args, 0); +#line 128 "root_numpy/src/converters.pyx" +} -#line 63 "root_numpy/src/tree.pyx" - break; - default: -#line 63 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +/* "root_numpy/src/converters.pyx":133 + * this.nptype = nptype + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef void* src = col.GetValuePointer() + * memcpy(buffer, src, this.size) + */ -#line 63 "root_numpy/src/tree.pyx" - } +#line 133 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" - } -#line 63 "root_numpy/src/tree.pyx" - __pyx_v_fname = values[0]; +#line 133 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_BasicConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + void *__pyx_v_src +#line 133 "root_numpy/src/converters.pyx" +; -#line 63 "root_numpy/src/tree.pyx" - __pyx_v_tree = values[1]; +#line 133 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 63 "root_numpy/src/tree.pyx" - } +#line 133 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 63 "root_numpy/src/tree.pyx" - goto __pyx_L4_argument_unpacking_done; + /* "root_numpy/src/converters.pyx":134 + * + * int write(Column* col, void* buffer): + * cdef void* src = col.GetValuePointer() # <<<<<<<<<<<<<< + * memcpy(buffer, src, this.size) + * return this.size + */ -#line 63 "root_numpy/src/tree.pyx" - __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("list_structures", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); -#line 63 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 134 "root_numpy/src/converters.pyx" + __pyx_v_src = __pyx_v_col->GetValuePointer(); -#line 63 "root_numpy/src/tree.pyx" - __pyx_L3_error:; + /* "root_numpy/src/converters.pyx":135 + * int write(Column* col, void* buffer): + * cdef void* src = col.GetValuePointer() + * memcpy(buffer, src, this.size) # <<<<<<<<<<<<<< + * return this.size + * + */ -#line 63 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 135 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, __pyx_v_src, this->size); -#line 63 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/converters.pyx":136 + * cdef void* src = col.GetValuePointer() + * memcpy(buffer, src, this.size) + * return this.size # <<<<<<<<<<<<<< + * + * object get_nptype(): + */ -#line 63 "root_numpy/src/tree.pyx" - return NULL; +#line 136 "root_numpy/src/converters.pyx" + __pyx_r = this->size; -#line 63 "root_numpy/src/tree.pyx" - __pyx_L4_argument_unpacking_done:; - __pyx_r = -#line 63 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_2list_structures(__pyx_self, __pyx_v_fname, __pyx_v_tree); +#line 136 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 63 "root_numpy/src/tree.pyx" + /* "root_numpy/src/converters.pyx":133 + * this.nptype = nptype + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef void* src = col.GetValuePointer() + * memcpy(buffer, src, this.size) + */ +#line 133 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" + +#line 133 "root_numpy/src/converters.pyx" /* function exit code */ -#line 63 "root_numpy/src/tree.pyx" +#line 133 "root_numpy/src/converters.pyx" + __pyx_L0:; + +#line 133 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 63 "root_numpy/src/tree.pyx" +#line 133 "root_numpy/src/converters.pyx" return __pyx_r; -#line 63 "root_numpy/src/tree.pyx" +#line 133 "root_numpy/src/converters.pyx" } -#line 63 "root_numpy/src/tree.pyx" +/* "root_numpy/src/converters.pyx":138 + * return this.size + * + * object get_nptype(): # <<<<<<<<<<<<<< + * return np.dtype(this.nptype) + * + */ +#line 138 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_2list_structures(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree) { - TFile *__pyx_v_f -#line 63 "root_numpy/src/tree.pyx" -; - TTree *__pyx_v_t -#line 63 "root_numpy/src/tree.pyx" -; -#line 63 "root_numpy/src/tree.pyx" +#line 138 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_BasicConverter::get_nptype(void) { + +#line 138 "root_numpy/src/converters.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; - int __pyx_t_2; - PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6 = NULL; - Py_ssize_t __pyx_t_7; - PyObject *__pyx_t_8 = NULL; - const char *__pyx_t_9; + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 63 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_structures", 0); - -#line 63 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_tree); +#line 138 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptype", 0); - /* "root_numpy/src/tree.pyx":64 + /* "root_numpy/src/converters.pyx":139 * - * def list_structures(fname, tree=None): - * if tree is None: # <<<<<<<<<<<<<< - * # automatically select single tree - * tree = list_trees(fname) + * object get_nptype(): + * return np.dtype(this.nptype) # <<<<<<<<<<<<<< + * + * int get_nptypecode(): */ -#line 64 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_tree == Py_None); +#line 139 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_r); -#line 64 "root_numpy/src/tree.pyx" - __pyx_t_2 = (__pyx_t_1 != 0); +#line 139 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(this->nptype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 64 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 139 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":66 - * if tree is None: - * # automatically select single tree - * tree = list_trees(fname) # <<<<<<<<<<<<<< - * if len(tree) != 1: - * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) - */ +#line 139 "root_numpy/src/converters.pyx" + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_list_trees); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 139 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 66 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 139 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#line 139 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 66 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_4))) { +#line 139 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); +#line 139 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 66 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +#line 139 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 66 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +#line 139 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 66 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 139 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_t_1; -#line 66 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 139 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 66 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 139 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 66 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":138 + * return this.size + * + * object get_nptype(): # <<<<<<<<<<<<<< + * return np.dtype(this.nptype) + * + */ -#line 66 "root_numpy/src/tree.pyx" - } +#line 138 "root_numpy/src/converters.pyx" -#line 66 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 138 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 66 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 138 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 66 "root_numpy/src/tree.pyx" - } else { +#line 138 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 138 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 66 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 138 "root_numpy/src/converters.pyx" + __Pyx_AddTraceback("BasicConverter.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 66 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; +#line 138 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 66 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); +#line 138 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 66 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_fname); +#line 138 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 66 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_fname); +#line 138 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 138 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 66 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 138 "root_numpy/src/converters.pyx" +} -#line 66 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +/* "root_numpy/src/converters.pyx":141 + * return np.dtype(this.nptype) + * + * int get_nptypecode(): # <<<<<<<<<<<<<< + * return this.nptypecode + * + */ -#line 66 "root_numpy/src/tree.pyx" - } +#line 141 "root_numpy/src/converters.pyx" -#line 66 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 66 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_3); +#line 141 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_BasicConverter::get_nptypecode(void) { -#line 66 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 141 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations - /* "root_numpy/src/tree.pyx":67 - * # automatically select single tree - * tree = list_trees(fname) - * if len(tree) != 1: # <<<<<<<<<<<<<< - * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) - * else: - */ +#line 141 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptypecode", 0); -#line 67 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyObject_Length(__pyx_v_tree); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":142 + * + * int get_nptypecode(): + * return this.nptypecode # <<<<<<<<<<<<<< + * + * + */ -#line 67 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_t_7 != 1) != 0); +#line 142 "root_numpy/src/converters.pyx" + __pyx_r = this->nptypecode; -#line 67 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 142 "root_numpy/src/converters.pyx" + goto __pyx_L0; - /* "root_numpy/src/tree.pyx":68 - * tree = list_trees(fname) - * if len(tree) != 1: - * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) # <<<<<<<<<<<<<< - * else: - * tree = tree[0] + /* "root_numpy/src/converters.pyx":141 + * return np.dtype(this.nptype) + * + * int get_nptypecode(): # <<<<<<<<<<<<<< + * return this.nptypecode + * */ -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_multiple_trees_found_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 141 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_6 = __Pyx_PyString_Join(__pyx_kp_s_, __pyx_v_tree); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 141 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#line 141 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 68 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { +#line 141 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); +#line 141 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 68 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +#line 141 "root_numpy/src/converters.pyx" +} -#line 68 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +/* "root_numpy/src/converters.pyx":147 + * cdef cppclass ObjectConverterBase(Converter): + * + * object get_nptype(): # <<<<<<<<<<<<<< + * return np.object + * + */ -#line 68 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 147 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 147 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptype(void) { -#line 68 "root_numpy/src/tree.pyx" - } +#line 147 "root_numpy/src/converters.pyx" + PyObject *__pyx_r = NULL; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 68 "root_numpy/src/tree.pyx" - } +#line 147 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptype", 0); -#line 68 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { + /* "root_numpy/src/converters.pyx":148 + * + * object get_nptype(): + * return np.object # <<<<<<<<<<<<<< + * + * object get_nptypecode(): + */ -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 148 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_r); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 148 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 148 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 68 "root_numpy/src/tree.pyx" - } else { +#line 148 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_object); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 148 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 148 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 68 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; +#line 148 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_t_2; -#line 68 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_t_6); +#line 148 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_6); +#line 148 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_6 = 0; + /* "root_numpy/src/converters.pyx":147 + * cdef cppclass ObjectConverterBase(Converter): + * + * object get_nptype(): # <<<<<<<<<<<<<< + * return np.object + * + */ -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 147 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 147 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 68 "root_numpy/src/tree.pyx" - } +#line 147 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 147 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 147 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 147 "root_numpy/src/converters.pyx" + __Pyx_AddTraceback("ObjectConverterBase.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 68 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 147 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 147 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 147 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 147 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 147 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 147 "root_numpy/src/converters.pyx" +} -#line 68 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); +/* "root_numpy/src/converters.pyx":150 + * return np.object + * + * object get_nptypecode(): # <<<<<<<<<<<<<< + * return np.NPY_OBJECT + * + */ -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 150 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 68 "root_numpy/src/tree.pyx" - } +#line 150 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptypecode(void) { -#line 68 "root_numpy/src/tree.pyx" - /*else*/ { +#line 150 "root_numpy/src/converters.pyx" + PyObject *__pyx_r = NULL; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; - /* "root_numpy/src/tree.pyx":70 - * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) - * else: - * tree = tree[0] # <<<<<<<<<<<<<< - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: +#line 150 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptypecode", 0); + + /* "root_numpy/src/converters.pyx":151 + * + * object get_nptypecode(): + * return np.NPY_OBJECT # <<<<<<<<<<<<<< + * + * */ -#line 70 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_tree, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 151 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_r); -#line 70 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 151 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 70 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_3); +#line 151 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 70 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 151 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_t_1; -#line 70 "root_numpy/src/tree.pyx" - } +#line 151 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 70 "root_numpy/src/tree.pyx" - goto __pyx_L3; +#line 151 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 70 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":150 + * return np.object + * + * object get_nptypecode(): # <<<<<<<<<<<<<< + * return np.NPY_OBJECT + * + */ -#line 70 "root_numpy/src/tree.pyx" - __pyx_L3:; +#line 150 "root_numpy/src/converters.pyx" - /* "root_numpy/src/tree.pyx":71 - * else: - * tree = tree[0] - * cdef TFile* f = Open(fname, 'read') # <<<<<<<<<<<<<< - * if f is NULL: - * raise IOError("cannot read {0}".format(fname)) - */ -#line 71 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_AsString(__pyx_v_fname); if (unlikely((!__pyx_t_9) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 150 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 71 "root_numpy/src/tree.pyx" - __pyx_v_f = TFile::Open(__pyx_t_9, __pyx_k_read); +#line 150 "root_numpy/src/converters.pyx" + __pyx_L1_error:; - /* "root_numpy/src/tree.pyx":72 - * tree = tree[0] - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: # <<<<<<<<<<<<<< - * raise IOError("cannot read {0}".format(fname)) - * cdef TTree* t = f.Get(tree) - */ +#line 150 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 72 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_v_f == NULL) != 0); +#line 150 "root_numpy/src/converters.pyx" + __Pyx_AddTraceback("ObjectConverterBase.get_nptypecode", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 72 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 150 "root_numpy/src/converters.pyx" + __pyx_r = 0; - /* "root_numpy/src/tree.pyx":73 - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: - * raise IOError("cannot read {0}".format(fname)) # <<<<<<<<<<<<<< - * cdef TTree* t = f.Get(tree) - * if t is NULL: - */ +#line 150 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_read_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 150 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 150 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_8 = NULL; +#line 150 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 73 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { +#line 150 "root_numpy/src/converters.pyx" +} -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_4); +/* "root_numpy/src/converters.pyx":161 + * int elesize + * + * __init__(BasicConverter* conv, int ndim, np.npy_intp* dims): # <<<<<<<<<<<<<< + * this.conv = conv + * this.dims = dims + */ -#line 73 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_8)) { +#line 161 "root_numpy/src/converters.pyx" -#line 73 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); -#line 73 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_8); +#line 161 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_VaryArrayConverter::__pyx_t_13_librootnumpy_VaryArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *__pyx_v_conv, int __pyx_v_ndim, npy_intp *__pyx_v_dims) { + __Pyx_RefNannyDeclarations + int __pyx_t_1; -#line 73 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 161 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 73 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); + /* "root_numpy/src/converters.pyx":162 + * + * __init__(BasicConverter* conv, int ndim, np.npy_intp* dims): + * this.conv = conv # <<<<<<<<<<<<<< + * this.dims = dims + * this.ndim = ndim + */ -#line 73 "root_numpy/src/tree.pyx" - } +#line 162 "root_numpy/src/converters.pyx" + this->conv = __pyx_v_conv; -#line 73 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":163 + * __init__(BasicConverter* conv, int ndim, np.npy_intp* dims): + * this.conv = conv + * this.dims = dims # <<<<<<<<<<<<<< + * this.ndim = ndim + * this.typecode = conv.get_nptypecode() + */ -#line 73 "root_numpy/src/tree.pyx" - if (!__pyx_t_8) { +#line 163 "root_numpy/src/converters.pyx" + this->dims = __pyx_v_dims; -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":164 + * this.conv = conv + * this.dims = dims + * this.ndim = ndim # <<<<<<<<<<<<<< + * this.typecode = conv.get_nptypecode() + * this.elesize = conv.size + */ -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 164 "root_numpy/src/converters.pyx" + this->ndim = __pyx_v_ndim; -#line 73 "root_numpy/src/tree.pyx" - } else { + /* "root_numpy/src/converters.pyx":165 + * this.dims = dims + * this.ndim = ndim + * this.typecode = conv.get_nptypecode() # <<<<<<<<<<<<<< + * this.elesize = conv.size + * + */ -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 165 "root_numpy/src/converters.pyx" + this->typecode = __pyx_v_conv->get_nptypecode(); -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); + /* "root_numpy/src/converters.pyx":166 + * this.ndim = ndim + * this.typecode = conv.get_nptypecode() + * this.elesize = conv.size # <<<<<<<<<<<<<< + * + * __dealloc__(): + */ -#line 73 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8); __Pyx_GIVEREF(__pyx_t_8); __pyx_t_8 = NULL; +#line 166 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_v_conv->size; -#line 73 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); +#line 166 "root_numpy/src/converters.pyx" + this->elesize = __pyx_t_1; -#line 73 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_fname); + /* "root_numpy/src/converters.pyx":161 + * int elesize + * + * __init__(BasicConverter* conv, int ndim, np.npy_intp* dims): # <<<<<<<<<<<<<< + * this.conv = conv + * this.dims = dims + */ -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_fname); +#line 161 "root_numpy/src/converters.pyx" -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 161 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 73 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 161 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 73 "root_numpy/src/tree.pyx" - } +#line 161 "root_numpy/src/converters.pyx" +} -#line 73 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +/* "root_numpy/src/converters.pyx":168 + * this.elesize = conv.size + * + * __dealloc__(): # <<<<<<<<<<<<<< + * free(this.dims) + * + */ -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 168 "root_numpy/src/converters.pyx" -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); -#line 73 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 168 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_VaryArrayConverter::~__pyx_t_13_librootnumpy_VaryArrayConverter(void) { + __Pyx_RefNannyDeclarations -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 168 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; + /* "root_numpy/src/converters.pyx":169 + * + * __dealloc__(): + * free(this.dims) # <<<<<<<<<<<<<< + * + * int write(Column* col, void* buffer): + */ -#line 73 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 169 "root_numpy/src/converters.pyx" + free(this->dims); -#line 73 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":168 + * this.elesize = conv.size + * + * __dealloc__(): # <<<<<<<<<<<<<< + * free(this.dims) + * + */ -#line 73 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 168 "root_numpy/src/converters.pyx" -#line 73 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); -#line 73 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 168 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 73 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 168 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 73 "root_numpy/src/tree.pyx" - } +#line 168 "root_numpy/src/converters.pyx" +} - /* "root_numpy/src/tree.pyx":74 - * if f is NULL: - * raise IOError("cannot read {0}".format(fname)) - * cdef TTree* t = f.Get(tree) # <<<<<<<<<<<<<< - * if t is NULL: - * raise IOError("tree {0} not found in {1}".format(tree, fname)) +/* "root_numpy/src/converters.pyx":171 + * free(this.dims) + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * this.dims[0] = col.GetCountLen() + * return create_numpyarray(buffer, col.GetValuePointer(), */ -#line 74 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_AsString(__pyx_v_tree); if (unlikely((!__pyx_t_9) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 171 "root_numpy/src/converters.pyx" -#line 74 "root_numpy/src/tree.pyx" - __pyx_v_t = ((TTree *)__pyx_v_f->Get(__pyx_t_9)); - /* "root_numpy/src/tree.pyx":75 - * raise IOError("cannot read {0}".format(fname)) - * cdef TTree* t = f.Get(tree) - * if t is NULL: # <<<<<<<<<<<<<< - * raise IOError("tree {0} not found in {1}".format(tree, fname)) - * return parse_tree_structure(t) - */ +#line 171 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VaryArrayConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { -#line 75 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_v_t == NULL) != 0); +#line 171 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations + int __pyx_t_1; + struct __pyx_opt_args_13_librootnumpy_create_numpyarray __pyx_t_2; -#line 75 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 171 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); - /* "root_numpy/src/tree.pyx":76 - * cdef TTree* t = f.Get(tree) - * if t is NULL: - * raise IOError("tree {0} not found in {1}".format(tree, fname)) # <<<<<<<<<<<<<< - * return parse_tree_structure(t) + /* "root_numpy/src/converters.pyx":172 * + * int write(Column* col, void* buffer): + * this.dims[0] = col.GetCountLen() # <<<<<<<<<<<<<< + * return create_numpyarray(buffer, col.GetValuePointer(), + * this.typecode, col.GetLen(), this.elesize, */ -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_tree_0_not_found_in_1, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 172 "root_numpy/src/converters.pyx" + (this->dims[0]) = __pyx_v_col->GetCountLen(); -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); - -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_6 = NULL; + /* "root_numpy/src/converters.pyx":173 + * int write(Column* col, void* buffer): + * this.dims[0] = col.GetCountLen() + * return create_numpyarray(buffer, col.GetValuePointer(), # <<<<<<<<<<<<<< + * this.typecode, col.GetLen(), this.elesize, + * this.ndim, this.dims) + */ -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 173 "root_numpy/src/converters.pyx" + __pyx_t_2.__pyx_n = 2; -#line 76 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { +#line 173 "root_numpy/src/converters.pyx" + __pyx_t_2.ndim = this->ndim; -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); +#line 173 "root_numpy/src/converters.pyx" + __pyx_t_2.dims = this->dims; -#line 76 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_6)) { +#line 173 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_f_13_librootnumpy_create_numpyarray(__pyx_v_buffer, __pyx_v_col->GetValuePointer(), this->typecode, __pyx_v_col->GetLen(), this->elesize, &__pyx_t_2); -#line 76 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +#line 173 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_t_1; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_6); +#line 173 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); + /* "root_numpy/src/converters.pyx":171 + * free(this.dims) + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * this.dims[0] = col.GetCountLen() + * return create_numpyarray(buffer, col.GetValuePointer(), + */ -#line 76 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 171 "root_numpy/src/converters.pyx" -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_7 = 1; -#line 76 "root_numpy/src/tree.pyx" - } +#line 171 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 76 "root_numpy/src/tree.pyx" - } +#line 171 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 171 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 171 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 76 "root_numpy/src/tree.pyx" - if (__pyx_t_6) { +#line 171 "root_numpy/src/converters.pyx" +} -#line 76 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; +/* "root_numpy/src/converters.pyx":182 + * PyObject* shape + * + * __init__(BasicConverter* conv, PyObject* shape): # <<<<<<<<<<<<<< + * Py_INCREF( shape) + * this.conv = conv + */ -#line 76 "root_numpy/src/tree.pyx" - } +#line 182 "root_numpy/src/converters.pyx" -#line 76 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_tree); -#line 76 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0+__pyx_t_7, __pyx_v_tree); +#line 182 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_FixedArrayConverter::__pyx_t_13_librootnumpy_FixedArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *__pyx_v_conv, PyObject *__pyx_v_shape) { + __Pyx_RefNannyDeclarations -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_tree); +#line 182 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 76 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); + /* "root_numpy/src/converters.pyx":183 + * + * __init__(BasicConverter* conv, PyObject* shape): + * Py_INCREF( shape) # <<<<<<<<<<<<<< + * this.conv = conv + * this.shape = shape + */ -#line 76 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_v_fname); +#line 183 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_shape)); -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_fname); + /* "root_numpy/src/converters.pyx":184 + * __init__(BasicConverter* conv, PyObject* shape): + * Py_INCREF( shape) + * this.conv = conv # <<<<<<<<<<<<<< + * this.shape = shape + * + */ -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 184 "root_numpy/src/converters.pyx" + this->conv = __pyx_v_conv; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":185 + * Py_INCREF( shape) + * this.conv = conv + * this.shape = shape # <<<<<<<<<<<<<< + * + * __dealloc__(): + */ -#line 76 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 185 "root_numpy/src/converters.pyx" + this->shape = __pyx_v_shape; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + /* "root_numpy/src/converters.pyx":182 + * PyObject* shape + * + * __init__(BasicConverter* conv, PyObject* shape): # <<<<<<<<<<<<<< + * Py_INCREF( shape) + * this.conv = conv + */ -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 182 "root_numpy/src/converters.pyx" -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); -#line 76 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 182 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 182 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 182 "root_numpy/src/converters.pyx" +} -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +/* "root_numpy/src/converters.pyx":187 + * this.shape = shape + * + * __dealloc__(): # <<<<<<<<<<<<<< + * Py_XDECREF(this.shape) + * + */ -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 187 "root_numpy/src/converters.pyx" -#line 76 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); +#line 187 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_FixedArrayConverter::~__pyx_t_13_librootnumpy_FixedArrayConverter(void) { + __Pyx_RefNannyDeclarations -#line 76 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 187 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 76 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":188 + * + * __dealloc__(): + * Py_XDECREF(this.shape) # <<<<<<<<<<<<<< + * + * int write(Column* col, void* buffer): + */ -#line 76 "root_numpy/src/tree.pyx" - } +#line 188 "root_numpy/src/converters.pyx" + Py_XDECREF(this->shape); - /* "root_numpy/src/tree.pyx":77 - * if t is NULL: - * raise IOError("tree {0} not found in {1}".format(tree, fname)) - * return parse_tree_structure(t) # <<<<<<<<<<<<<< + /* "root_numpy/src/converters.pyx":187 + * this.shape = shape * + * __dealloc__(): # <<<<<<<<<<<<<< + * Py_XDECREF(this.shape) * */ -#line 77 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#line 77 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_f_13_librootnumpy_parse_tree_structure(__pyx_v_t, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 187 "root_numpy/src/converters.pyx" -#line 77 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); -#line 77 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_3; +#line 187 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 77 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 187 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 77 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 187 "root_numpy/src/converters.pyx" +} - /* "root_numpy/src/tree.pyx":63 - * +/* "root_numpy/src/converters.pyx":190 + * Py_XDECREF(this.shape) * - * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< - * if tree is None: - * # automatically select single tree + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef int nbytes = col.GetSize() + * memcpy(buffer, col.GetValuePointer(), nbytes) */ -#line 63 "root_numpy/src/tree.pyx" +#line 190 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 190 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_FixedArrayConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + int __pyx_v_nbytes +#line 190 "root_numpy/src/converters.pyx" +; -#line 63 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 190 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 190 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":191 + * + * int write(Column* col, void* buffer): + * cdef int nbytes = col.GetSize() # <<<<<<<<<<<<<< + * memcpy(buffer, col.GetValuePointer(), nbytes) + * return nbytes + */ -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); +#line 191 "root_numpy/src/converters.pyx" + __pyx_v_nbytes = __pyx_v_col->GetSize(); -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); + /* "root_numpy/src/converters.pyx":192 + * int write(Column* col, void* buffer): + * cdef int nbytes = col.GetSize() + * memcpy(buffer, col.GetValuePointer(), nbytes) # <<<<<<<<<<<<<< + * return nbytes + * + */ -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); +#line 192 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, __pyx_v_col->GetValuePointer(), __pyx_v_nbytes); -#line 63 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); + /* "root_numpy/src/converters.pyx":193 + * cdef int nbytes = col.GetSize() + * memcpy(buffer, col.GetValuePointer(), nbytes) + * return nbytes # <<<<<<<<<<<<<< + * + * object get_nptype(): + */ -#line 63 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 193 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_v_nbytes; -#line 63 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 193 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_tree); + /* "root_numpy/src/converters.pyx":190 + * Py_XDECREF(this.shape) + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef int nbytes = col.GetSize() + * memcpy(buffer, col.GetValuePointer(), nbytes) + */ -#line 63 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 190 "root_numpy/src/converters.pyx" + + +#line 190 "root_numpy/src/converters.pyx" + /* function exit code */ + +#line 190 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 63 "root_numpy/src/tree.pyx" +#line 190 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 63 "root_numpy/src/tree.pyx" +#line 190 "root_numpy/src/converters.pyx" return __pyx_r; -#line 63 "root_numpy/src/tree.pyx" +#line 190 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":80 - * +/* "root_numpy/src/converters.pyx":195 + * return nbytes * - * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< - * return list(list_structures(fname, tree).keys()) + * object get_nptype(): # <<<<<<<<<<<<<< + * return (np.dtype(this.conv.nptype), this.shape) * */ -#line 80 "root_numpy/src/tree.pyx" - +#line 195 "root_numpy/src/converters.pyx" -#line 80 "root_numpy/src/tree.pyx" -/* Python wrapper */ -#line 80 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_5list_branches(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_5list_branches = -#line 80 "root_numpy/src/tree.pyx" -{"list_branches", (PyCFunction)__pyx_pw_13_librootnumpy_5list_branches, METH_VARARGS|METH_KEYWORDS, 0}; +#line 195 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_FixedArrayConverter::get_nptype(void) { -#line 80 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_5list_branches(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_fname = 0 -#line 80 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_tree = 0 -#line 80 "root_numpy/src/tree.pyx" -; +#line 195 "root_numpy/src/converters.pyx" + PyObject *__pyx_r = NULL; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 80 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = 0; +#line 195 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptype", 0); -#line 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannyDeclarations + /* "root_numpy/src/converters.pyx":196 + * + * object get_nptype(): + * return (np.dtype(this.conv.nptype), this.shape) # <<<<<<<<<<<<<< + * + * int get_nptypecode(): + */ -#line 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_branches (wrapper)", 0); +#line 196 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_r); -#line 80 "root_numpy/src/tree.pyx" - { +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(this->conv->nptype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 80 "root_numpy/src/tree.pyx" - static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - PyObject* values[2] = {0,0}; +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 80 "root_numpy/src/tree.pyx" - values[1] = ((PyObject *)Py_None); +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 80 "root_numpy/src/tree.pyx" - if (unlikely(__pyx_kwds)) { +#line 196 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - Py_ssize_t kw_args; +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 80 "root_numpy/src/tree.pyx" - switch (pos_args) { - case 2: -#line 80 "root_numpy/src/tree.pyx" -values[1] = PyTuple_GET_ITEM(__pyx_args, 1); - case 1: -#line 80 "root_numpy/src/tree.pyx" -values[0] = PyTuple_GET_ITEM(__pyx_args, 0); +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 80 "root_numpy/src/tree.pyx" - case 0: break; - default: -#line 80 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - } +#line 196 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 80 "root_numpy/src/tree.pyx" - kw_args = PyDict_Size(__pyx_kwds); +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 80 "root_numpy/src/tree.pyx" - switch (pos_args) { +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 80 "root_numpy/src/tree.pyx" - case 0: +#line 196 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; - else -#line 80 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - case 1: +#line 196 "root_numpy/src/converters.pyx" + __Pyx_INCREF(((PyObject *)this->shape)); -#line 80 "root_numpy/src/tree.pyx" - if (kw_args > 0) { +#line 196 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)this->shape)); -#line 80 "root_numpy/src/tree.pyx" - PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(((PyObject *)this->shape)); -#line 80 "root_numpy/src/tree.pyx" - if (value) { values[1] = value; kw_args--; } +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 80 "root_numpy/src/tree.pyx" - } +#line 196 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_t_2; -#line 80 "root_numpy/src/tree.pyx" - } +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; -#line 80 "root_numpy/src/tree.pyx" - if (unlikely(kw_args > 0)) { +#line 196 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 80 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "list_branches") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + /* "root_numpy/src/converters.pyx":195 + * return nbytes + * + * object get_nptype(): # <<<<<<<<<<<<<< + * return (np.dtype(this.conv.nptype), this.shape) + * + */ -#line 80 "root_numpy/src/tree.pyx" - } +#line 195 "root_numpy/src/converters.pyx" -#line 80 "root_numpy/src/tree.pyx" - } else { -#line 80 "root_numpy/src/tree.pyx" - switch (PyTuple_GET_SIZE(__pyx_args)) { - case 2: -#line 80 "root_numpy/src/tree.pyx" -values[1] = PyTuple_GET_ITEM(__pyx_args, 1); - case 1: -#line 80 "root_numpy/src/tree.pyx" -values[0] = PyTuple_GET_ITEM(__pyx_args, 0); +#line 195 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 80 "root_numpy/src/tree.pyx" - break; - default: -#line 80 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +#line 195 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 80 "root_numpy/src/tree.pyx" - } +#line 195 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - } +#line 195 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 80 "root_numpy/src/tree.pyx" - __pyx_v_fname = values[0]; +#line 195 "root_numpy/src/converters.pyx" + __Pyx_AddTraceback("FixedArrayConverter.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 80 "root_numpy/src/tree.pyx" - __pyx_v_tree = values[1]; +#line 195 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 80 "root_numpy/src/tree.pyx" - } +#line 195 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 80 "root_numpy/src/tree.pyx" - goto __pyx_L4_argument_unpacking_done; +#line 195 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 80 "root_numpy/src/tree.pyx" - __pyx_L5_argtuple_error:; - __Pyx_RaiseArgtupleInvalid("list_branches", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); -#line 80 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 195 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 80 "root_numpy/src/tree.pyx" - __pyx_L3_error:; +#line 195 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 80 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 195 "root_numpy/src/converters.pyx" +} -#line 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +/* "root_numpy/src/converters.pyx":198 + * return (np.dtype(this.conv.nptype), this.shape) + * + * int get_nptypecode(): # <<<<<<<<<<<<<< + * return this.conv.nptypecode + * + */ -#line 80 "root_numpy/src/tree.pyx" - return NULL; +#line 198 "root_numpy/src/converters.pyx" -#line 80 "root_numpy/src/tree.pyx" - __pyx_L4_argument_unpacking_done:; - __pyx_r = -#line 80 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_4list_branches(__pyx_self, __pyx_v_fname, __pyx_v_tree); -#line 80 "root_numpy/src/tree.pyx" +#line 198 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_FixedArrayConverter::get_nptypecode(void) { +#line 198 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 80 "root_numpy/src/tree.pyx" +#line 198 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptypecode", 0); + + /* "root_numpy/src/converters.pyx":199 + * + * int get_nptypecode(): + * return this.conv.nptypecode # <<<<<<<<<<<<<< + * + * + */ + +#line 199 "root_numpy/src/converters.pyx" + __pyx_r = this->conv->nptypecode; + +#line 199 "root_numpy/src/converters.pyx" + goto __pyx_L0; + + /* "root_numpy/src/converters.pyx":198 + * return (np.dtype(this.conv.nptype), this.shape) + * + * int get_nptypecode(): # <<<<<<<<<<<<<< + * return this.conv.nptypecode + * + */ + +#line 198 "root_numpy/src/converters.pyx" + + +#line 198 "root_numpy/src/converters.pyx" /* function exit code */ -#line 80 "root_numpy/src/tree.pyx" +#line 198 "root_numpy/src/converters.pyx" + __pyx_L0:; + +#line 198 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 80 "root_numpy/src/tree.pyx" +#line 198 "root_numpy/src/converters.pyx" return __pyx_r; -#line 80 "root_numpy/src/tree.pyx" +#line 198 "root_numpy/src/converters.pyx" } -#line 80 "root_numpy/src/tree.pyx" +/* "root_numpy/src/converters.pyx":207 + * Vector2Array[T] v2a + * + * __init__(): # <<<<<<<<<<<<<< + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] + */ +#line 207 "root_numpy/src/converters.pyx" -#line 80 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_4list_branches(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree) { -#line 80 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; +#line 207 "root_numpy/src/converters.pyx" +template + +#line 207 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_VectorConverter ::__pyx_t_13_librootnumpy_VectorConverter(void) { + TypeName __pyx_v_ast +#line 207 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_info = NULL +#line 207 "root_numpy/src/converters.pyx" +; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - Py_ssize_t __pyx_t_5; - PyObject *__pyx_t_6 = NULL; + int __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_branches", 0); +#line 207 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); - /* "root_numpy/src/tree.pyx":81 - * - * def list_branches(fname, tree=None): - * return list(list_structures(fname, tree).keys()) # <<<<<<<<<<<<<< - * + /* "root_numpy/src/converters.pyx":208 * + * __init__(): + * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize */ -#line 81 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_list_structures); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); - -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_4 = NULL; - -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 208 "root_numpy/src/converters.pyx" + __pyx_v_ast = TypeName (); -#line 81 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { + /* "root_numpy/src/converters.pyx":209 + * __init__(): + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] # <<<<<<<<<<<<<< + * this.elesize = info[1].itemsize + * this.nptypecode = info[2] + */ -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); +#line 209 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 81 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_4)) { +#line 209 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 81 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); +#line 209 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_ast.name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_4); +#line 209 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 209 "root_numpy/src/converters.pyx" + __pyx_t_3 = PyObject_GetItem(__pyx_t_1, __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_3, function); +#line 209 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_5 = 1; +#line 209 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 81 "root_numpy/src/tree.pyx" - } +#line 209 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 81 "root_numpy/src/tree.pyx" - } +#line 209 "root_numpy/src/converters.pyx" + __pyx_v_info = __pyx_t_3; -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 209 "root_numpy/src/converters.pyx" + __pyx_t_3 = 0; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); + /* "root_numpy/src/converters.pyx":210 + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize # <<<<<<<<<<<<<< + * this.nptypecode = info[2] + * + */ -#line 81 "root_numpy/src/tree.pyx" - if (__pyx_t_4) { +#line 210 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_info, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 81 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; +#line 210 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 81 "root_numpy/src/tree.pyx" - } +#line 210 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); +#line 210 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_v_fname); +#line 210 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_fname); +#line 210 "root_numpy/src/converters.pyx" + __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_tree); +#line 210 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 81 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_tree); +#line 210 "root_numpy/src/converters.pyx" + this->elesize = __pyx_t_4; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_tree); + /* "root_numpy/src/converters.pyx":211 + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize + * this.nptypecode = info[2] # <<<<<<<<<<<<<< + * + * int write(Column* col, void* buffer): + */ -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 211 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_info, 2, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 81 "root_numpy/src/tree.pyx" +#line 211 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_keys); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 211 "root_numpy/src/converters.pyx" + __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 81 "root_numpy/src/tree.pyx" +#line 211 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_2 = NULL; - -#line 81 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { +#line 211 "root_numpy/src/converters.pyx" + this->nptypecode = __pyx_t_4; -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":207 + * Vector2Array[T] v2a + * + * __init__(): # <<<<<<<<<<<<<< + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] + */ -#line 81 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_2)) { +#line 207 "root_numpy/src/converters.pyx" -#line 81 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_2); +#line 207 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 207 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_3, function); +#line 207 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 81 "root_numpy/src/tree.pyx" - } +#line 207 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 81 "root_numpy/src/tree.pyx" - } +#line 207 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 207 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 207 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 207 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 81 "root_numpy/src/tree.pyx" - } else { +#line 207 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_info); -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 207 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 81 "root_numpy/src/tree.pyx" - } +#line 207 "root_numpy/src/converters.pyx" +} -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +/* "root_numpy/src/converters.pyx":213 + * this.nptypecode = info[2] + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[T]* tmp = col.GetValuePointer() + * cdef unsigned long numele = tmp.size() + */ -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 213 "root_numpy/src/converters.pyx" -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 213 "root_numpy/src/converters.pyx" +template -#line 81 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); +#line 213 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VectorConverter ::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::vector *__pyx_v_tmp +#line 213 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_numele +#line 213 "root_numpy/src/converters.pyx" +; + T *__pyx_v_fa +#line 213 "root_numpy/src/converters.pyx" +; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 213 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 213 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyList_Type))), __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":214 + * + * int write(Column* col, void* buffer): + * cdef vector[T]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< + * cdef unsigned long numele = tmp.size() + * # check cython auto-generated code + */ -#line 81 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 214 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + /* "root_numpy/src/converters.pyx":215 + * int write(Column* col, void* buffer): + * cdef vector[T]* tmp = col.GetValuePointer() + * cdef unsigned long numele = tmp.size() # <<<<<<<<<<<<<< + * # check cython auto-generated code + * # if it really does &((*tmp)[0]) + */ -#line 81 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#line 215 "root_numpy/src/converters.pyx" + __pyx_v_numele = __pyx_v_tmp->size(); -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; + /* "root_numpy/src/converters.pyx":218 + * # check cython auto-generated code + * # if it really does &((*tmp)[0]) + * cdef T* fa = this.v2a.convert(tmp) # <<<<<<<<<<<<<< + * return create_numpyarray(buffer, fa, this.nptypecode, numele, this.elesize) + * + */ -#line 81 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 218 "root_numpy/src/converters.pyx" + __pyx_v_fa = this->v2a.convert(__pyx_v_tmp); - /* "root_numpy/src/tree.pyx":80 - * + /* "root_numpy/src/converters.pyx":219 + * # if it really does &((*tmp)[0]) + * cdef T* fa = this.v2a.convert(tmp) + * return create_numpyarray(buffer, fa, this.nptypecode, numele, this.elesize) # <<<<<<<<<<<<<< * - * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< - * return list(list_structures(fname, tree).keys()) * */ -#line 80 "root_numpy/src/tree.pyx" - - -#line 80 "root_numpy/src/tree.pyx" - /* function exit code */ - -#line 80 "root_numpy/src/tree.pyx" - __pyx_L1_error:; - -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 219 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray(__pyx_v_buffer, __pyx_v_fa, this->nptypecode, __pyx_v_numele, this->elesize, NULL); -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); - -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 219 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":213 + * this.nptypecode = info[2] + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[T]* tmp = col.GetValuePointer() + * cdef unsigned long numele = tmp.size() + */ -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); +#line 213 "root_numpy/src/converters.pyx" -#line 80 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 80 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 213 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 80 "root_numpy/src/tree.pyx" +#line 213 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); - -#line 80 "root_numpy/src/tree.pyx" +#line 213 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 80 "root_numpy/src/tree.pyx" +#line 213 "root_numpy/src/converters.pyx" return __pyx_r; -#line 80 "root_numpy/src/tree.pyx" +#line 213 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":84 - * +/* "root_numpy/src/converters.pyx":227 + * Vector2Array[T] v2a * - * cdef parse_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< - * cdef TObjArray* leaves - * cdef TLeaf* leaf + * __init__(): # <<<<<<<<<<<<<< + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] */ -#line 84 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/converters.pyx" -#line 84 "root_numpy/src/tree.pyx" -static PyObject *__pyx_f_13_librootnumpy_parse_branch_structure(TBranch *__pyx_v_branch) { - TObjArray *__pyx_v_leaves -#line 84 "root_numpy/src/tree.pyx" -; - TLeaf *__pyx_v_leaf -#line 84 "root_numpy/src/tree.pyx" -; - int __pyx_v_ileaf -#line 84 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_leaflist = NULL -#line 84 "root_numpy/src/tree.pyx" -; - const char *__pyx_v_lname -#line 84 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/converters.pyx" +template + +#line 227 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_VectorVectorConverter ::__pyx_t_13_librootnumpy_VectorVectorConverter(void) { + TypeName __pyx_v_ast +#line 227 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_ltype = NULL -#line 84 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_info = NULL +#line 227 "root_numpy/src/converters.pyx" ; - -#line 84 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; + PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6 = NULL; - int __pyx_t_7; - int __pyx_t_8; - int __pyx_t_9; - int __pyx_t_10; + int __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 84 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("parse_branch_structure", 0); +#line 227 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); - /* "root_numpy/src/tree.pyx":88 - * cdef TLeaf* leaf - * cdef int ileaf - * leaves = branch.GetListOfLeaves() # <<<<<<<<<<<<<< - * if leaves is NULL: - * raise RuntimeError("branch {0} has no leaves".format(branch.GetName())) + /* "root_numpy/src/converters.pyx":228 + * + * __init__(): + * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize */ -#line 88 "root_numpy/src/tree.pyx" - __pyx_v_leaves = __pyx_v_branch->GetListOfLeaves(); +#line 228 "root_numpy/src/converters.pyx" + __pyx_v_ast = TypeName (); - /* "root_numpy/src/tree.pyx":89 - * cdef int ileaf - * leaves = branch.GetListOfLeaves() - * if leaves is NULL: # <<<<<<<<<<<<<< - * raise RuntimeError("branch {0} has no leaves".format(branch.GetName())) - * leaflist = [] + /* "root_numpy/src/converters.pyx":229 + * __init__(): + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] # <<<<<<<<<<<<<< + * this.elesize = info[1].itemsize + * this.nptypecode = info[2] */ -#line 89 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_leaves == NULL) != 0); +#line 229 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 89 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 229 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":90 - * leaves = branch.GetListOfLeaves() - * if leaves is NULL: - * raise RuntimeError("branch {0} has no leaves".format(branch.GetName())) # <<<<<<<<<<<<<< - * leaflist = [] - * for ileaf in range(leaves.GetEntries()): - */ +#line 229 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_ast.name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_branch_0_has_no_leaves, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 229 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 229 "root_numpy/src/converters.pyx" + __pyx_t_3 = PyObject_GetItem(__pyx_t_1, __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 229 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 229 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#line 229 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 90 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { +#line 229 "root_numpy/src/converters.pyx" + __pyx_v_info = __pyx_t_3; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); +#line 229 "root_numpy/src/converters.pyx" + __pyx_t_3 = 0; -#line 90 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { + /* "root_numpy/src/converters.pyx":230 + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize # <<<<<<<<<<<<<< + * this.nptypecode = info[2] + * + */ -#line 90 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); +#line 230 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_info, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); - -#line 90 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); - -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_3, function); - -#line 90 "root_numpy/src/tree.pyx" - } - -#line 90 "root_numpy/src/tree.pyx" - } - -#line 90 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { - -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 230 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 230 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 230 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 90 "root_numpy/src/tree.pyx" - } else { +#line 230 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 230 "root_numpy/src/converters.pyx" + __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 230 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 90 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; +#line 230 "root_numpy/src/converters.pyx" + this->elesize = __pyx_t_4; -#line 90 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_4); + /* "root_numpy/src/converters.pyx":231 + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize + * this.nptypecode = info[2] # <<<<<<<<<<<<<< + * + * int write(Column* col, void* buffer): + */ -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_4); +#line 231 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_info, 2, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_4 = 0; +#line 231 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 231 "root_numpy/src/converters.pyx" + __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 231 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 231 "root_numpy/src/converters.pyx" + this->nptypecode = __pyx_t_4; -#line 90 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":227 + * Vector2Array[T] v2a + * + * __init__(): # <<<<<<<<<<<<<< + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] + */ -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 227 "root_numpy/src/converters.pyx" -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 227 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 90 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); +#line 227 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_2); +#line 227 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 227 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorVectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 227 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_info); -#line 90 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 227 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 90 "root_numpy/src/tree.pyx" - } +#line 227 "root_numpy/src/converters.pyx" +} - /* "root_numpy/src/tree.pyx":91 - * if leaves is NULL: - * raise RuntimeError("branch {0} has no leaves".format(branch.GetName())) - * leaflist = [] # <<<<<<<<<<<<<< - * for ileaf in range(leaves.GetEntries()): - * leaf = leaves.At(ileaf) +/* "root_numpy/src/converters.pyx":233 + * this.nptypecode = info[2] + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[vector[T]]* tmp = col.GetValuePointer() + * # this will hold number of subvectors */ -#line 91 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 91 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); - -#line 91 "root_numpy/src/tree.pyx" - __pyx_v_leaflist = ((PyObject*)__pyx_t_2); +#line 233 "root_numpy/src/converters.pyx" -#line 91 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":92 - * raise RuntimeError("branch {0} has no leaves".format(branch.GetName())) - * leaflist = [] - * for ileaf in range(leaves.GetEntries()): # <<<<<<<<<<<<<< - * leaf = leaves.At(ileaf) - * lname = leaf.GetName() - */ +#line 233 "root_numpy/src/converters.pyx" +template -#line 92 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_v_leaves->GetEntries(); +#line 233 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VectorVectorConverter ::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::vector > *__pyx_v_tmp +#line 233 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_numele +#line 233 "root_numpy/src/converters.pyx" +; + T *__pyx_v_fa +#line 233 "root_numpy/src/converters.pyx" +; + int __pyx_v_objsize +#line 233 "root_numpy/src/converters.pyx" +; + int __pyx_v_objtypecode +#line 233 "root_numpy/src/converters.pyx" +; + npy_intp __pyx_v_dims[1] +#line 233 "root_numpy/src/converters.pyx" +; + PyArrayObject *__pyx_v_outer = 0 +#line 233 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_outerobj +#line 233 "root_numpy/src/converters.pyx" +; + char *__pyx_v_dataptr +#line 233 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_i +#line 233 "root_numpy/src/converters.pyx" +; -#line 92 "root_numpy/src/tree.pyx" - for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { +#line 233 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + int __pyx_t_2; + unsigned long __pyx_t_3; + unsigned long __pyx_t_4; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 92 "root_numpy/src/tree.pyx" - __pyx_v_ileaf = __pyx_t_8; +#line 233 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); - /* "root_numpy/src/tree.pyx":93 - * leaflist = [] - * for ileaf in range(leaves.GetEntries()): - * leaf = leaves.At(ileaf) # <<<<<<<<<<<<<< - * lname = leaf.GetName() - * ltype = resolve_type(leaf.GetTypeName()) + /* "root_numpy/src/converters.pyx":234 + * + * int write(Column* col, void* buffer): + * cdef vector[vector[T]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< + * # this will hold number of subvectors + * cdef unsigned long numele */ -#line 93 "root_numpy/src/tree.pyx" - __pyx_v_leaf = ((TLeaf *)__pyx_v_leaves->At(__pyx_v_ileaf)); +#line 234 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); - /* "root_numpy/src/tree.pyx":94 - * for ileaf in range(leaves.GetEntries()): - * leaf = leaves.At(ileaf) - * lname = leaf.GetName() # <<<<<<<<<<<<<< - * ltype = resolve_type(leaf.GetTypeName()) - * leaflist.append((lname, ltype)) + /* "root_numpy/src/converters.pyx":239 + * cdef T* fa + * # these are defined solely for the outer array wrapper + * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< + * cdef int objtypecode = np.NPY_OBJECT + * numele = tmp[0].size() */ -#line 94 "root_numpy/src/tree.pyx" - __pyx_v_lname = __pyx_v_leaf->GetName(); - - /* "root_numpy/src/tree.pyx":95 - * leaf = leaves.At(ileaf) - * lname = leaf.GetName() - * ltype = resolve_type(leaf.GetTypeName()) # <<<<<<<<<<<<<< - * leaflist.append((lname, ltype)) - * if not leaflist: - */ +#line 239 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 95 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy_resolve_type(__pyx_v_leaf->GetTypeName()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 239 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 95 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 239 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; -#line 95 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_ltype, ((PyObject*)__pyx_t_2)); +#line 239 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 95 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 239 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; - /* "root_numpy/src/tree.pyx":96 - * lname = leaf.GetName() - * ltype = resolve_type(leaf.GetTypeName()) - * leaflist.append((lname, ltype)) # <<<<<<<<<<<<<< - * if not leaflist: - * raise RuntimeError( + /* "root_numpy/src/converters.pyx":240 + * # these are defined solely for the outer array wrapper + * cdef int objsize = np.dtype('O').itemsize + * cdef int objtypecode = np.NPY_OBJECT # <<<<<<<<<<<<<< + * numele = tmp[0].size() + * # create an outer array container that dataptr points to, */ -#line 96 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_lname); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 96 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); - -#line 96 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 240 "root_numpy/src/converters.pyx" + __pyx_v_objtypecode = NPY_OBJECT; -#line 96 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":241 + * cdef int objsize = np.dtype('O').itemsize + * cdef int objtypecode = np.NPY_OBJECT + * numele = tmp[0].size() # <<<<<<<<<<<<<< + * # create an outer array container that dataptr points to, + * # containing pointers from create_numpyarray(). + */ -#line 96 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); +#line 241 "root_numpy/src/converters.pyx" + __pyx_v_numele = (__pyx_v_tmp[0]).size(); -#line 96 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_2); + /* "root_numpy/src/converters.pyx":246 + * # define an (numele)-dimensional outer array to hold our subvectors fa + * cdef np.npy_intp dims[1] + * dims[0] = numele # <<<<<<<<<<<<<< + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + * cdef PyObject* outerobj = outer # borrow ref + */ -#line 96 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ltype); +#line 246 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 96 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_ltype); + /* "root_numpy/src/converters.pyx":247 + * cdef np.npy_intp dims[1] + * dims[0] = numele + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) # <<<<<<<<<<<<<< + * cdef PyObject* outerobj = outer # borrow ref + * # increase one since we are putting in buffer directly + */ -#line 96 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_ltype); +#line 247 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_objtypecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 96 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 247 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 96 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_leaflist, __pyx_t_3); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 247 "root_numpy/src/converters.pyx" + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 96 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 247 "root_numpy/src/converters.pyx" + __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); -#line 96 "root_numpy/src/tree.pyx" - } +#line 247 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":97 - * ltype = resolve_type(leaf.GetTypeName()) - * leaflist.append((lname, ltype)) - * if not leaflist: # <<<<<<<<<<<<<< - * raise RuntimeError( - * "leaf list for branch {0} is empty".format( + /* "root_numpy/src/converters.pyx":248 + * dims[0] = numele + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + * cdef PyObject* outerobj = outer # borrow ref # <<<<<<<<<<<<<< + * # increase one since we are putting in buffer directly + * Py_INCREF(outer) */ -#line 97 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_leaflist != Py_None) && (PyList_GET_SIZE(__pyx_v_leaflist) != 0); - -#line 97 "root_numpy/src/tree.pyx" - __pyx_t_10 = ((!__pyx_t_1) != 0); - -#line 97 "root_numpy/src/tree.pyx" - if (__pyx_t_10) { +#line 248 "root_numpy/src/converters.pyx" + __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); - /* "root_numpy/src/tree.pyx":99 - * if not leaflist: - * raise RuntimeError( - * "leaf list for branch {0} is empty".format( # <<<<<<<<<<<<<< - * branch.GetName())) - * return leaflist + /* "root_numpy/src/converters.pyx":250 + * cdef PyObject* outerobj = outer # borrow ref + * # increase one since we are putting in buffer directly + * Py_INCREF(outer) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &outerobj, sizeof(PyObject*)) */ -#line 99 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_leaf_list_for_branch_0_is_empty, __pyx_n_s_format); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 99 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 250 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_outer)); - /* "root_numpy/src/tree.pyx":100 - * raise RuntimeError( - * "leaf list for branch {0} is empty".format( - * branch.GetName())) # <<<<<<<<<<<<<< - * return leaflist - * + /* "root_numpy/src/converters.pyx":252 + * Py_INCREF(outer) + * # now write PyObject* to buffer + * memcpy(buffer, &outerobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * # build a dataptr pointing to outer, so we can shift and write each + * # of the subvectors */ -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_6 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 252 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); + /* "root_numpy/src/converters.pyx":255 + * # build a dataptr pointing to outer, so we can shift and write each + * # of the subvectors + * cdef char* dataptr = outer.data # <<<<<<<<<<<<<< + * # loop through all subvectors + * cdef unsigned long i + */ -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_4 = NULL; +#line 255 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_outer->data); -#line 100 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_2))) { + /* "root_numpy/src/converters.pyx":258 + * # loop through all subvectors + * cdef unsigned long i + * for i in range(numele): # <<<<<<<<<<<<<< + * fa = this.v2a.convert(&tmp[0][i]) + * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, + */ -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_2); +#line 258 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; -#line 100 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_4)) { +#line 258 "root_numpy/src/converters.pyx" + for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { -#line 100 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); +#line 258 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; -#line 100 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_4); + /* "root_numpy/src/converters.pyx":259 + * cdef unsigned long i + * for i in range(numele): + * fa = this.v2a.convert(&tmp[0][i]) # <<<<<<<<<<<<<< + * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, + * tmp[0][i].size(), this.elesize) + */ -#line 100 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 259 "root_numpy/src/converters.pyx" + __pyx_v_fa = this->v2a.convert((&((__pyx_v_tmp[0])[__pyx_v_i]))); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_2, function); + /* "root_numpy/src/converters.pyx":260 + * for i in range(numele): + * fa = this.v2a.convert(&tmp[0][i]) + * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, # <<<<<<<<<<<<<< + * tmp[0][i].size(), this.elesize) + * return sizeof(outerobj) + */ -#line 100 "root_numpy/src/tree.pyx" - } +#line 260 "root_numpy/src/converters.pyx" + __pyx_f_13_librootnumpy_create_numpyarray((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), __pyx_v_fa, this->nptypecode, ((__pyx_v_tmp[0])[__pyx_v_i]).size(), this->elesize, NULL); -#line 100 "root_numpy/src/tree.pyx" - } +#line 260 "root_numpy/src/converters.pyx" + } -#line 100 "root_numpy/src/tree.pyx" - if (!__pyx_t_4) { + /* "root_numpy/src/converters.pyx":262 + * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, + * tmp[0][i].size(), this.elesize) + * return sizeof(outerobj) # <<<<<<<<<<<<<< + * + * + */ -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 262 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_outerobj)); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 262 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 100 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/converters.pyx":233 + * this.nptypecode = info[2] + * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[vector[T]]* tmp = col.GetValuePointer() + * # this will hold number of subvectors + */ -#line 100 "root_numpy/src/tree.pyx" - } else { +#line 233 "root_numpy/src/converters.pyx" -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 100 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 233 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 100 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; +#line 233 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 100 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_6); +#line 233 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_6); +#line 233 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorVectorConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_6 = 0; +#line 233 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 233 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 100 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 233 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_outer); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 233 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 100 "root_numpy/src/tree.pyx" - } +#line 233 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 233 "root_numpy/src/converters.pyx" +} - /* "root_numpy/src/tree.pyx":98 - * leaflist.append((lname, ltype)) - * if not leaflist: - * raise RuntimeError( # <<<<<<<<<<<<<< - * "leaf list for branch {0} is empty".format( - * branch.GetName())) +/* "root_numpy/src/converters.pyx":267 + * cdef cppclass VectorBoolConverter(ObjectConverterBase): + * # Requires special treament since vector stores contents as bits... + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[bool]* tmp = col.GetValuePointer() + * return create_numpyarray_vectorbool(buffer, tmp) */ -#line 98 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 98 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); - -#line 98 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3); - -#line 98 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); - -#line 98 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; - -#line 98 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 267 "root_numpy/src/converters.pyx" -#line 98 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); -#line 98 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 267 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VectorBoolConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::vector *__pyx_v_tmp +#line 267 "root_numpy/src/converters.pyx" +; -#line 98 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); +#line 267 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 98 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 267 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 98 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":268 + * # Requires special treament since vector stores contents as bits... + * int write(Column* col, void* buffer): + * cdef vector[bool]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< + * return create_numpyarray_vectorbool(buffer, tmp) + * + */ -#line 98 "root_numpy/src/tree.pyx" - } +#line 268 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); - /* "root_numpy/src/tree.pyx":101 - * "leaf list for branch {0} is empty".format( - * branch.GetName())) - * return leaflist # <<<<<<<<<<<<<< + /* "root_numpy/src/converters.pyx":269 + * int write(Column* col, void* buffer): + * cdef vector[bool]* tmp = col.GetValuePointer() + * return create_numpyarray_vectorbool(buffer, tmp) # <<<<<<<<<<<<<< * * */ -#line 101 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#line 101 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaflist); - -#line 101 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_leaflist; +#line 269 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(__pyx_v_buffer, __pyx_v_tmp); -#line 101 "root_numpy/src/tree.pyx" +#line 269 "root_numpy/src/converters.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":84 - * - * - * cdef parse_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< - * cdef TObjArray* leaves - * cdef TLeaf* leaf + /* "root_numpy/src/converters.pyx":267 + * cdef cppclass VectorBoolConverter(ObjectConverterBase): + * # Requires special treament since vector stores contents as bits... + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[bool]* tmp = col.GetValuePointer() + * return create_numpyarray_vectorbool(buffer, tmp) */ -#line 84 "root_numpy/src/tree.pyx" +#line 267 "root_numpy/src/converters.pyx" -#line 84 "root_numpy/src/tree.pyx" +#line 267 "root_numpy/src/converters.pyx" /* function exit code */ -#line 84 "root_numpy/src/tree.pyx" - __pyx_L1_error:; - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.parse_branch_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); - -#line 84 "root_numpy/src/tree.pyx" - __pyx_r = 0; - -#line 84 "root_numpy/src/tree.pyx" +#line 267 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_leaflist); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_ltype); - -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); - -#line 84 "root_numpy/src/tree.pyx" +#line 267 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 84 "root_numpy/src/tree.pyx" +#line 267 "root_numpy/src/converters.pyx" return __pyx_r; -#line 84 "root_numpy/src/tree.pyx" +#line 267 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":104 - * - * - * cdef parse_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< - * cdef int ibranch - * cdef TBranch* branch +/* "root_numpy/src/converters.pyx":274 + * cdef cppclass VectorVectorBoolConverter(ObjectConverterBase): + * # Requires special treament since vector stores contents as bits... + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[vector[bool]]* tmp = col.GetValuePointer() + * # this will hold number of subvectors */ -#line 104 "root_numpy/src/tree.pyx" +#line 274 "root_numpy/src/converters.pyx" -#line 104 "root_numpy/src/tree.pyx" -static PyObject *__pyx_f_13_librootnumpy_parse_tree_structure(TTree *__pyx_v_tree, struct __pyx_opt_args_13_librootnumpy_parse_tree_structure *__pyx_optional_args) { - -#line 104 "root_numpy/src/tree.pyx" - PyObject *__pyx_v_branches = ((PyObject *)Py_None); - int __pyx_v_ibranch -#line 104 "root_numpy/src/tree.pyx" +#line 274 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VectorVectorBoolConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::vector > *__pyx_v_tmp +#line 274 "root_numpy/src/converters.pyx" ; - TBranch *__pyx_v_branch -#line 104 "root_numpy/src/tree.pyx" + unsigned long __pyx_v_numele +#line 274 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_ret = NULL -#line 104 "root_numpy/src/tree.pyx" + int __pyx_v_objsize +#line 274 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_branch_name = NULL -#line 104 "root_numpy/src/tree.pyx" + int __pyx_v_objtypecode +#line 274 "root_numpy/src/converters.pyx" ; - TObjArray *__pyx_v_all_branches -#line 104 "root_numpy/src/tree.pyx" + npy_intp __pyx_v_dims[1] +#line 274 "root_numpy/src/converters.pyx" +; + PyArrayObject *__pyx_v_outer = 0 +#line 274 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_outerobj +#line 274 "root_numpy/src/converters.pyx" +; + char *__pyx_v_dataptr +#line 274 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_i +#line 274 "root_numpy/src/converters.pyx" ; -#line 104 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; +#line 274 "root_numpy/src/converters.pyx" + int __pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - int __pyx_t_5; - Py_ssize_t __pyx_t_6; - PyObject *(*__pyx_t_7)(PyObject *); - const char *__pyx_t_8; - int __pyx_t_9; - int __pyx_t_10; + int __pyx_t_2; + unsigned long __pyx_t_3; + unsigned long __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 104 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("parse_tree_structure", 0); +#line 274 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 104 "root_numpy/src/tree.pyx" - if (__pyx_optional_args) { + /* "root_numpy/src/converters.pyx":275 + * # Requires special treament since vector stores contents as bits... + * int write(Column* col, void* buffer): + * cdef vector[vector[bool]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< + * # this will hold number of subvectors + * cdef unsigned long numele + */ -#line 104 "root_numpy/src/tree.pyx" - if (__pyx_optional_args->__pyx_n > 0) { +#line 275 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); -#line 104 "root_numpy/src/tree.pyx" - __pyx_v_branches = __pyx_optional_args->branches; + /* "root_numpy/src/converters.pyx":279 + * cdef unsigned long numele + * # these are defined solely for the outer array wrapper + * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< + * cdef int objtypecode = np.NPY_OBJECT + * numele = tmp[0].size() + */ -#line 104 "root_numpy/src/tree.pyx" - } +#line 279 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 104 "root_numpy/src/tree.pyx" - } +#line 279 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":107 - * cdef int ibranch - * cdef TBranch* branch - * ret = OrderedDict() # <<<<<<<<<<<<<< - * if branches is not None: - * for branch_name in branches: - */ - -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_OrderedDict); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 107 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); - -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_3 = NULL; - -#line 107 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_2))) { - -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); - -#line 107 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_3)) { - -#line 107 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); - -#line 107 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_3); +#line 279 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; -#line 107 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 279 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 107 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_2, function); +#line 279 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; -#line 107 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":280 + * # these are defined solely for the outer array wrapper + * cdef int objsize = np.dtype('O').itemsize + * cdef int objtypecode = np.NPY_OBJECT # <<<<<<<<<<<<<< + * numele = tmp[0].size() + * # create an outer array container that dataptr points to, + */ -#line 107 "root_numpy/src/tree.pyx" - } +#line 280 "root_numpy/src/converters.pyx" + __pyx_v_objtypecode = NPY_OBJECT; -#line 107 "root_numpy/src/tree.pyx" - if (__pyx_t_3) { + /* "root_numpy/src/converters.pyx":281 + * cdef int objsize = np.dtype('O').itemsize + * cdef int objtypecode = np.NPY_OBJECT + * numele = tmp[0].size() # <<<<<<<<<<<<<< + * # create an outer array container that dataptr points to, + * # containing pointers from create_numpyarray(). + */ -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 281 "root_numpy/src/converters.pyx" + __pyx_v_numele = (__pyx_v_tmp[0]).size(); -#line 107 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + /* "root_numpy/src/converters.pyx":286 + * # define an (numele)-dimensional outer array to hold our subvectors fa + * cdef np.npy_intp dims[1] + * dims[0] = numele # <<<<<<<<<<<<<< + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + * cdef PyObject* outerobj = outer # borrow ref + */ -#line 107 "root_numpy/src/tree.pyx" - } else { +#line 286 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":287 + * cdef np.npy_intp dims[1] + * dims[0] = numele + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) # <<<<<<<<<<<<<< + * cdef PyObject* outerobj = outer # borrow ref + * # increase one since we are putting in buffer directly + */ -#line 107 "root_numpy/src/tree.pyx" - } +#line 287 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_objtypecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 107 "root_numpy/src/tree.pyx" +#line 287 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 107 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 287 "root_numpy/src/converters.pyx" + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 107 "root_numpy/src/tree.pyx" - __pyx_v_ret = __pyx_t_1; +#line 287 "root_numpy/src/converters.pyx" + __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); -#line 107 "root_numpy/src/tree.pyx" +#line 287 "root_numpy/src/converters.pyx" __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":108 - * cdef TBranch* branch - * ret = OrderedDict() - * if branches is not None: # <<<<<<<<<<<<<< - * for branch_name in branches: - * branch = tree.GetBranch(branch_name) + /* "root_numpy/src/converters.pyx":288 + * dims[0] = numele + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + * cdef PyObject* outerobj = outer # borrow ref # <<<<<<<<<<<<<< + * # increase one since we are putting in buffer directly + * Py_INCREF(outer) */ -#line 108 "root_numpy/src/tree.pyx" - __pyx_t_4 = (__pyx_v_branches != Py_None); - -#line 108 "root_numpy/src/tree.pyx" - __pyx_t_5 = (__pyx_t_4 != 0); - -#line 108 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 288 "root_numpy/src/converters.pyx" + __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); - /* "root_numpy/src/tree.pyx":109 - * ret = OrderedDict() - * if branches is not None: - * for branch_name in branches: # <<<<<<<<<<<<<< - * branch = tree.GetBranch(branch_name) - * if branch is NULL: + /* "root_numpy/src/converters.pyx":290 + * cdef PyObject* outerobj = outer # borrow ref + * # increase one since we are putting in buffer directly + * Py_INCREF(outer) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &outerobj, sizeof(PyObject*)) */ -#line 109 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { - -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; - -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_7 = NULL; - -#line 109 "root_numpy/src/tree.pyx" - } else { - __pyx_t_6 = -1; -#line 109 "root_numpy/src/tree.pyx" -__pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 290 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_outer)); -#line 109 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); + /* "root_numpy/src/converters.pyx":292 + * Py_INCREF(outer) + * # now write PyObject* to buffer + * memcpy(buffer, &outerobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * # build a dataptr pointing to outer, so we can shift and write each + * # of the subvectors + */ -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 292 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); -#line 109 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/converters.pyx":295 + * # build a dataptr pointing to outer, so we can shift and write each + * # of the subvectors + * cdef char* dataptr = outer.data # <<<<<<<<<<<<<< + * # loop through all subvectors + * cdef unsigned long i + */ -#line 109 "root_numpy/src/tree.pyx" - for (;;) { +#line 295 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_outer->data); -#line 109 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_7)) { + /* "root_numpy/src/converters.pyx":298 + * # loop through all subvectors + * cdef unsigned long i + * for i in range(numele): # <<<<<<<<<<<<<< + * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) + * return sizeof(outerobj) + */ -#line 109 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_1))) { +#line 298 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; -#line 109 "root_numpy/src/tree.pyx" - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; +#line 298 "root_numpy/src/converters.pyx" + for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { -#line 109 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 298 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_2); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/converters.pyx":299 + * cdef unsigned long i + * for i in range(numele): + * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) # <<<<<<<<<<<<<< + * return sizeof(outerobj) + * + */ -#line 109 "root_numpy/src/tree.pyx" - #else +#line 299 "root_numpy/src/converters.pyx" + __pyx_f_13_librootnumpy_create_numpyarray_vectorbool((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&((__pyx_v_tmp[0])[__pyx_v_i]))); -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 299 "root_numpy/src/converters.pyx" + } -#line 109 "root_numpy/src/tree.pyx" - #endif + /* "root_numpy/src/converters.pyx":300 + * for i in range(numele): + * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) + * return sizeof(outerobj) # <<<<<<<<<<<<<< + * + * + */ -#line 109 "root_numpy/src/tree.pyx" - } else { +#line 300 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_outerobj)); -#line 109 "root_numpy/src/tree.pyx" - if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; +#line 300 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 109 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON + /* "root_numpy/src/converters.pyx":274 + * cdef cppclass VectorVectorBoolConverter(ObjectConverterBase): + * # Requires special treament since vector stores contents as bits... + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[vector[bool]]* tmp = col.GetValuePointer() + * # this will hold number of subvectors + */ -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_2); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 274 "root_numpy/src/converters.pyx" -#line 109 "root_numpy/src/tree.pyx" - #else -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 274 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 109 "root_numpy/src/tree.pyx" - #endif +#line 274 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 109 "root_numpy/src/tree.pyx" - } - } else -#line 109 "root_numpy/src/tree.pyx" -{ +#line 274 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_7(__pyx_t_1); +#line 274 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorVectorBoolConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 109 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_2)) { +#line 274 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 109 "root_numpy/src/tree.pyx" - PyObject* exc_type = PyErr_Occurred(); +#line 274 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 109 "root_numpy/src/tree.pyx" - if (exc_type) { +#line 274 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_outer); -#line 109 "root_numpy/src/tree.pyx" - if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 274 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 109 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 274 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 109 "root_numpy/src/tree.pyx" - } +#line 274 "root_numpy/src/converters.pyx" +} -#line 109 "root_numpy/src/tree.pyx" - break; +/* "root_numpy/src/converters.pyx":304 + * + * cdef cppclass StringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef string* s = col.GetValuePointer() + * py_bytes = str(s[0]) + */ -#line 109 "root_numpy/src/tree.pyx" - } +#line 304 "root_numpy/src/converters.pyx" -#line 109 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); -#line 109 "root_numpy/src/tree.pyx" - } +#line 304 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_StringConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::string *__pyx_v_s +#line 304 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_py_bytes = NULL +#line 304 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_tmpobj +#line 304 "root_numpy/src/converters.pyx" +; -#line 109 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_branch_name, __pyx_t_2); +#line 304 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 304 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); - /* "root_numpy/src/tree.pyx":110 - * if branches is not None: - * for branch_name in branches: - * branch = tree.GetBranch(branch_name) # <<<<<<<<<<<<<< - * if branch is NULL: - * continue + /* "root_numpy/src/converters.pyx":305 + * cdef cppclass StringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): + * cdef string* s = col.GetValuePointer() # <<<<<<<<<<<<<< + * py_bytes = str(s[0]) + * cdef PyObject* tmpobj = py_bytes # borrow ref */ -#line 110 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_v_branch_name); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 110 "root_numpy/src/tree.pyx" - __pyx_v_branch = __pyx_v_tree->GetBranch(__pyx_t_8); +#line 305 "root_numpy/src/converters.pyx" + __pyx_v_s = ((std::string *)__pyx_v_col->GetValuePointer()); - /* "root_numpy/src/tree.pyx":111 - * for branch_name in branches: - * branch = tree.GetBranch(branch_name) - * if branch is NULL: # <<<<<<<<<<<<<< - * continue - * ret[branch.GetName()] = parse_branch_structure(branch) + /* "root_numpy/src/converters.pyx":306 + * int write(Column* col, void* buffer): + * cdef string* s = col.GetValuePointer() + * py_bytes = str(s[0]) # <<<<<<<<<<<<<< + * cdef PyObject* tmpobj = py_bytes # borrow ref + * # increase one since we are putting in buffer directly */ -#line 111 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_branch == NULL) != 0); - -#line 111 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 306 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string((__pyx_v_s[0])); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":112 - * branch = tree.GetBranch(branch_name) - * if branch is NULL: - * continue # <<<<<<<<<<<<<< - * ret[branch.GetName()] = parse_branch_structure(branch) - * return ret - */ +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 112 "root_numpy/src/tree.pyx" - goto __pyx_L4_continue; +#line 306 "root_numpy/src/converters.pyx" + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 112 "root_numpy/src/tree.pyx" - } +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":113 - * if branch is NULL: - * continue - * ret[branch.GetName()] = parse_branch_structure(branch) # <<<<<<<<<<<<<< - * return ret - * # all branches - */ +#line 306 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 113 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy_parse_branch_structure(__pyx_v_branch); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 113 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 306 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 113 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 306 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 113 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 113 "root_numpy/src/tree.pyx" - if (unlikely(PyObject_SetItem(__pyx_v_ret, __pyx_t_3, __pyx_t_2) < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 306 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 113 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 306 "root_numpy/src/converters.pyx" + __pyx_v_py_bytes = __pyx_t_1; -#line 113 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 306 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":109 - * ret = OrderedDict() - * if branches is not None: - * for branch_name in branches: # <<<<<<<<<<<<<< - * branch = tree.GetBranch(branch_name) - * if branch is NULL: + /* "root_numpy/src/converters.pyx":307 + * cdef string* s = col.GetValuePointer() + * py_bytes = str(s[0]) + * cdef PyObject* tmpobj = py_bytes # borrow ref # <<<<<<<<<<<<<< + * # increase one since we are putting in buffer directly + * Py_INCREF(py_bytes) */ -#line 109 "root_numpy/src/tree.pyx" - __pyx_L4_continue:; - -#line 109 "root_numpy/src/tree.pyx" - } - -#line 109 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 307 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_py_bytes); - /* "root_numpy/src/tree.pyx":114 - * continue - * ret[branch.GetName()] = parse_branch_structure(branch) - * return ret # <<<<<<<<<<<<<< - * # all branches - * cdef TObjArray* all_branches = tree.GetListOfBranches() + /* "root_numpy/src/converters.pyx":309 + * cdef PyObject* tmpobj = py_bytes # borrow ref + * # increase one since we are putting in buffer directly + * Py_INCREF(py_bytes) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) */ -#line 114 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#line 114 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ret); - -#line 114 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_ret; - -#line 114 "root_numpy/src/tree.pyx" - goto __pyx_L0; - -#line 114 "root_numpy/src/tree.pyx" - } +#line 309 "root_numpy/src/converters.pyx" + Py_INCREF(__pyx_v_py_bytes); - /* "root_numpy/src/tree.pyx":116 - * return ret - * # all branches - * cdef TObjArray* all_branches = tree.GetListOfBranches() # <<<<<<<<<<<<<< - * if all_branches is NULL: - * return ret + /* "root_numpy/src/converters.pyx":311 + * Py_INCREF(py_bytes) + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * return sizeof(tmpobj) + * */ -#line 116 "root_numpy/src/tree.pyx" - __pyx_v_all_branches = __pyx_v_tree->GetListOfBranches(); +#line 311 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); - /* "root_numpy/src/tree.pyx":117 - * # all branches - * cdef TObjArray* all_branches = tree.GetListOfBranches() - * if all_branches is NULL: # <<<<<<<<<<<<<< - * return ret - * for ibranch in range(all_branches.GetEntries()): + /* "root_numpy/src/converters.pyx":312 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * */ -#line 117 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_all_branches == NULL) != 0); +#line 312 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); -#line 117 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 312 "root_numpy/src/converters.pyx" + goto __pyx_L0; - /* "root_numpy/src/tree.pyx":118 - * cdef TObjArray* all_branches = tree.GetListOfBranches() - * if all_branches is NULL: - * return ret # <<<<<<<<<<<<<< - * for ibranch in range(all_branches.GetEntries()): - * branch = (all_branches.At(ibranch)) + /* "root_numpy/src/converters.pyx":304 + * + * cdef cppclass StringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef string* s = col.GetValuePointer() + * py_bytes = str(s[0]) */ -#line 118 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 304 "root_numpy/src/converters.pyx" -#line 118 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ret); -#line 118 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_ret; +#line 304 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 118 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 304 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 118 "root_numpy/src/tree.pyx" - } +#line 304 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":119 - * if all_branches is NULL: - * return ret - * for ibranch in range(all_branches.GetEntries()): # <<<<<<<<<<<<<< - * branch = (all_branches.At(ibranch)) - * ret[branch.GetName()] = parse_branch_structure(branch) - */ +#line 304 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 119 "root_numpy/src/tree.pyx" - __pyx_t_9 = __pyx_v_all_branches->GetEntries(); +#line 304 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("StringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 119 "root_numpy/src/tree.pyx" - for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) { +#line 304 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 119 "root_numpy/src/tree.pyx" - __pyx_v_ibranch = __pyx_t_10; +#line 304 "root_numpy/src/converters.pyx" + __pyx_L0:; - /* "root_numpy/src/tree.pyx":120 - * return ret - * for ibranch in range(all_branches.GetEntries()): - * branch = (all_branches.At(ibranch)) # <<<<<<<<<<<<<< - * ret[branch.GetName()] = parse_branch_structure(branch) - * return ret - */ +#line 304 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_py_bytes); -#line 120 "root_numpy/src/tree.pyx" - __pyx_v_branch = ((TBranch *)__pyx_v_all_branches->At(__pyx_v_ibranch)); +#line 304 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); - /* "root_numpy/src/tree.pyx":121 - * for ibranch in range(all_branches.GetEntries()): - * branch = (all_branches.At(ibranch)) - * ret[branch.GetName()] = parse_branch_structure(branch) # <<<<<<<<<<<<<< - * return ret +#line 304 "root_numpy/src/converters.pyx" + return __pyx_r; + +#line 304 "root_numpy/src/converters.pyx" +} + +/* "root_numpy/src/converters.pyx":316 * + * cdef cppclass VectorStringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[string]* tmp = col.GetValuePointer() + * return create_numpyarray_vectorstring(buffer, tmp) */ -#line 121 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_f_13_librootnumpy_parse_branch_structure(__pyx_v_branch); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 121 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 316 "root_numpy/src/converters.pyx" -#line 121 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 121 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 316 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VectorStringConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::vector *__pyx_v_tmp +#line 316 "root_numpy/src/converters.pyx" +; -#line 121 "root_numpy/src/tree.pyx" - if (unlikely(PyObject_SetItem(__pyx_v_ret, __pyx_t_2, __pyx_t_1) < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 316 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 121 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 316 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 121 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + /* "root_numpy/src/converters.pyx":317 + * cdef cppclass VectorStringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): + * cdef vector[string]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< + * return create_numpyarray_vectorstring(buffer, tmp) + * + */ -#line 121 "root_numpy/src/tree.pyx" - } +#line 317 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); - /* "root_numpy/src/tree.pyx":122 - * branch = (all_branches.At(ibranch)) - * ret[branch.GetName()] = parse_branch_structure(branch) - * return ret # <<<<<<<<<<<<<< + /* "root_numpy/src/converters.pyx":318 + * int write(Column* col, void* buffer): + * cdef vector[string]* tmp = col.GetValuePointer() + * return create_numpyarray_vectorstring(buffer, tmp) # <<<<<<<<<<<<<< * * */ -#line 122 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#line 122 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ret); - -#line 122 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_ret; +#line 318 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorstring(__pyx_v_buffer, __pyx_v_tmp); -#line 122 "root_numpy/src/tree.pyx" +#line 318 "root_numpy/src/converters.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":104 - * + /* "root_numpy/src/converters.pyx":316 * - * cdef parse_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< - * cdef int ibranch - * cdef TBranch* branch + * cdef cppclass VectorStringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[string]* tmp = col.GetValuePointer() + * return create_numpyarray_vectorstring(buffer, tmp) */ -#line 104 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/converters.pyx" -#line 104 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/converters.pyx" /* function exit code */ -#line 104 "root_numpy/src/tree.pyx" - __pyx_L1_error:; - -#line 104 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); - -#line 104 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); - -#line 104 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); - -#line 104 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.parse_tree_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); - -#line 104 "root_numpy/src/tree.pyx" - __pyx_r = 0; - -#line 104 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 104 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_ret); - -#line 104 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_branch_name); - -#line 104 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); - -#line 104 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 104 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/converters.pyx" return __pyx_r; -#line 104 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":128 - * # given numelement and size of each element - * # and write it to buffer - * cdef inline int create_numpyarray(void* buffer, void* src, int typecode, # <<<<<<<<<<<<<< - * unsigned long numele, int elesize): - * cdef np.npy_intp dims[1] +/* "root_numpy/src/converters.pyx":322 + * + * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[vector[string]]* tmp = col.GetValuePointer() + * # this will hold number of subvectors */ -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" -#line 128 "root_numpy/src/tree.pyx" -static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray(void *__pyx_v_buffer, void *__pyx_v_src, int __pyx_v_typecode, unsigned long __pyx_v_numele, int __pyx_v_elesize) { +#line 322 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_VectorVectorStringConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { + std::vector > *__pyx_v_tmp +#line 322 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_numele +#line 322 "root_numpy/src/converters.pyx" +; + int __pyx_v_objsize +#line 322 "root_numpy/src/converters.pyx" +; + int __pyx_v_objtypecode +#line 322 "root_numpy/src/converters.pyx" +; npy_intp __pyx_v_dims[1] -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" ; - PyArrayObject *__pyx_v_tmp = 0 -#line 128 "root_numpy/src/tree.pyx" + PyArrayObject *__pyx_v_outer = 0 +#line 322 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_tmpobj -#line 128 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_outerobj +#line 322 "root_numpy/src/converters.pyx" ; - unsigned long __pyx_v_nbytes -#line 128 "root_numpy/src/tree.pyx" + char *__pyx_v_dataptr +#line 322 "root_numpy/src/converters.pyx" +; + unsigned long __pyx_v_i +#line 322 "root_numpy/src/converters.pyx" ; -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" int __pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; + int __pyx_t_2; + unsigned long __pyx_t_3; + unsigned long __pyx_t_4; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 128 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("create_numpyarray", 0); +#line 322 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); - /* "root_numpy/src/tree.pyx":131 - * unsigned long numele, int elesize): - * cdef np.npy_intp dims[1] - * dims[0] = numele; # <<<<<<<<<<<<<< - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, typecode, 0) - * cdef PyObject* tmpobj = tmp # borrow ref + /* "root_numpy/src/converters.pyx":323 + * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): + * cdef vector[vector[string]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< + * # this will hold number of subvectors + * cdef unsigned long numele + */ + +#line 323 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); + + /* "root_numpy/src/converters.pyx":327 + * cdef unsigned long numele + * # these are defined solely for the outer array wrapper + * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< + * cdef int objtypecode = np.NPY_OBJECT + * numele = tmp[0].size() + */ + +#line 327 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 327 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 327 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; + +#line 327 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 327 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; + + /* "root_numpy/src/converters.pyx":328 + * # these are defined solely for the outer array wrapper + * cdef int objsize = np.dtype('O').itemsize + * cdef int objtypecode = np.NPY_OBJECT # <<<<<<<<<<<<<< + * numele = tmp[0].size() + * # create an outer array container that dataptr points to, + */ + +#line 328 "root_numpy/src/converters.pyx" + __pyx_v_objtypecode = NPY_OBJECT; + + /* "root_numpy/src/converters.pyx":329 + * cdef int objsize = np.dtype('O').itemsize + * cdef int objtypecode = np.NPY_OBJECT + * numele = tmp[0].size() # <<<<<<<<<<<<<< + * # create an outer array container that dataptr points to, + * # containing pointers from create_numpyarray(). */ -#line 131 "root_numpy/src/tree.pyx" +#line 329 "root_numpy/src/converters.pyx" + __pyx_v_numele = (__pyx_v_tmp[0]).size(); + + /* "root_numpy/src/converters.pyx":334 + * # define an (numele)-dimensional outer array to hold our subvectors fa + * cdef np.npy_intp dims[1] + * dims[0] = numele # <<<<<<<<<<<<<< + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + * cdef PyObject* outerobj = outer # borrow ref + */ + +#line 334 "root_numpy/src/converters.pyx" (__pyx_v_dims[0]) = __pyx_v_numele; - /* "root_numpy/src/tree.pyx":132 - * cdef np.npy_intp dims[1] - * dims[0] = numele; - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, typecode, 0) # <<<<<<<<<<<<<< - * cdef PyObject* tmpobj = tmp # borrow ref - * # increase one since we are putting in buffer directly + /* "root_numpy/src/converters.pyx":335 + * cdef np.npy_intp dims[1] + * dims[0] = numele + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) # <<<<<<<<<<<<<< + * cdef PyObject* outerobj = outer # borrow ref + * # increase one since we are putting in buffer directly */ -#line 132 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_typecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 335 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_objtypecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 132 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 132 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 335 "root_numpy/src/converters.pyx" + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 132 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); +#line 335 "root_numpy/src/converters.pyx" + __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); -#line 132 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/converters.pyx" __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":133 - * dims[0] = numele; - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, typecode, 0) - * cdef PyObject* tmpobj = tmp # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(tmp) + /* "root_numpy/src/converters.pyx":336 + * dims[0] = numele + * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + * cdef PyObject* outerobj = outer # borrow ref # <<<<<<<<<<<<<< + * # increase one since we are putting in buffer directly + * Py_INCREF(outer) */ -#line 133 "root_numpy/src/tree.pyx" - __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); +#line 336 "root_numpy/src/converters.pyx" + __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); - /* "root_numpy/src/tree.pyx":135 - * cdef PyObject* tmpobj = tmp # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(tmp) # <<<<<<<<<<<<<< - * # copy to tmp.data - * cdef unsigned long nbytes = numele * elesize + /* "root_numpy/src/converters.pyx":338 + * cdef PyObject* outerobj = outer # borrow ref + * # increase one since we are putting in buffer directly + * Py_INCREF(outer) # <<<<<<<<<<<<<< + * # now write PyObject* to buffer + * memcpy(buffer, &outerobj, sizeof(PyObject*)) */ -#line 135 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_tmp)); +#line 338 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_outer)); - /* "root_numpy/src/tree.pyx":137 - * Py_INCREF(tmp) - * # copy to tmp.data - * cdef unsigned long nbytes = numele * elesize # <<<<<<<<<<<<<< - * memcpy(tmp.data, src, nbytes) - * # now write PyObject* to buffer + /* "root_numpy/src/converters.pyx":340 + * Py_INCREF(outer) + * # now write PyObject* to buffer + * memcpy(buffer, &outerobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * # build a dataptr pointing to outer, so we can shift and write each + * # of the subvectors */ -#line 137 "root_numpy/src/tree.pyx" - __pyx_v_nbytes = (__pyx_v_numele * __pyx_v_elesize); +#line 340 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); - /* "root_numpy/src/tree.pyx":138 - * # copy to tmp.data - * cdef unsigned long nbytes = numele * elesize - * memcpy(tmp.data, src, nbytes) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + /* "root_numpy/src/converters.pyx":343 + * # build a dataptr pointing to outer, so we can shift and write each + * # of the subvectors + * cdef char* dataptr = outer.data # <<<<<<<<<<<<<< + * # loop through all subvectors + * cdef unsigned long i */ -#line 138 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_tmp->data, __pyx_v_src, __pyx_v_nbytes); +#line 343 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_outer->data); - /* "root_numpy/src/tree.pyx":140 - * memcpy(tmp.data, src, nbytes) - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * return sizeof(tmpobj) + /* "root_numpy/src/converters.pyx":346 + * # loop through all subvectors + * cdef unsigned long i + * for i in range(numele): # <<<<<<<<<<<<<< + * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) + * return sizeof(outerobj) + */ + +#line 346 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; + +#line 346 "root_numpy/src/converters.pyx" + for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { + +#line 346 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; + + /* "root_numpy/src/converters.pyx":347 + * cdef unsigned long i + * for i in range(numele): + * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) # <<<<<<<<<<<<<< + * return sizeof(outerobj) * */ -#line 140 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); +#line 347 "root_numpy/src/converters.pyx" + __pyx_f_13_librootnumpy_create_numpyarray_vectorstring((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&((__pyx_v_tmp[0])[__pyx_v_i]))); - /* "root_numpy/src/tree.pyx":141 - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - * return sizeof(tmpobj) # <<<<<<<<<<<<<< +#line 347 "root_numpy/src/converters.pyx" + } + + /* "root_numpy/src/converters.pyx":348 + * for i in range(numele): + * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) + * return sizeof(outerobj) # <<<<<<<<<<<<<< * * */ -#line 141 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_tmpobj)); +#line 348 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_outerobj)); -#line 141 "root_numpy/src/tree.pyx" +#line 348 "root_numpy/src/converters.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":128 - * # given numelement and size of each element - * # and write it to buffer - * cdef inline int create_numpyarray(void* buffer, void* src, int typecode, # <<<<<<<<<<<<<< - * unsigned long numele, int elesize): - * cdef np.npy_intp dims[1] + /* "root_numpy/src/converters.pyx":322 + * + * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[vector[string]]* tmp = col.GetValuePointer() + * # this will hold number of subvectors */ -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" /* function exit code */ -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" __pyx_L1_error:; -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 128 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 322 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorVectorStringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" __pyx_r = 0; -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 128 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_tmp); +#line 322 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_outer); -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" return __pyx_r; -#line 128 "root_numpy/src/tree.pyx" +#line 322 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":145 +/* "root_numpy/src/converters.pyx":425 * - * # special treatment for vector - * cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): # <<<<<<<<<<<<<< - * cdef unsigned long numele = src.size() - * cdef np.npy_intp dims[1] + * + * cdef Converter* find_converter_by_typename(string typename): # <<<<<<<<<<<<<< + * it = CONVERTERS.find(typename) + * if it == CONVERTERS.end(): */ -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" -#line 145 "root_numpy/src/tree.pyx" -static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(void *__pyx_v_buffer, std::vector *__pyx_v_src) { - unsigned long __pyx_v_numele -#line 145 "root_numpy/src/tree.pyx" -; - npy_intp __pyx_v_dims[1] -#line 145 "root_numpy/src/tree.pyx" -; - PyArrayObject *__pyx_v_tmp = 0 -#line 145 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_tmpobj -#line 145 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_i -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" +static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_find_converter_by_typename(std::string __pyx_v_typename) { + std::map ::iterator __pyx_v_it +#line 425 "root_numpy/src/converters.pyx" ; -#line 145 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 425 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_Converter *__pyx_r; __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - unsigned long __pyx_t_2; - unsigned long __pyx_t_3; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; - -#line 145 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("create_numpyarray_vectorbool", 0); - - /* "root_numpy/src/tree.pyx":146 - * # special treatment for vector - * cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): - * cdef unsigned long numele = src.size() # <<<<<<<<<<<<<< - * cdef np.npy_intp dims[1] - * dims[0] = numele; - */ - -#line 146 "root_numpy/src/tree.pyx" - __pyx_v_numele = __pyx_v_src->size(); - - /* "root_numpy/src/tree.pyx":148 - * cdef unsigned long numele = src.size() - * cdef np.npy_intp dims[1] - * dims[0] = numele; # <<<<<<<<<<<<<< - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) - * cdef PyObject* tmpobj = tmp # borrow ref - */ - -#line 148 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; - - /* "root_numpy/src/tree.pyx":149 - * cdef np.npy_intp dims[1] - * dims[0] = numele; - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) # <<<<<<<<<<<<<< - * cdef PyObject* tmpobj = tmp # borrow ref - * # increase one since we are putting in buffer directly - */ - -#line 149 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, NPY_BOOL, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 149 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 149 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 149 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); - -#line 149 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; - - /* "root_numpy/src/tree.pyx":150 - * dims[0] = numele; - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) - * cdef PyObject* tmpobj = tmp # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(tmp) - */ + int __pyx_t_1; -#line 150 "root_numpy/src/tree.pyx" - __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); +#line 425 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("find_converter_by_typename", 0); - /* "root_numpy/src/tree.pyx":152 - * cdef PyObject* tmpobj = tmp # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(tmp) # <<<<<<<<<<<<<< - * # can't use memcpy here... - * cdef unsigned long i + /* "root_numpy/src/converters.pyx":426 + * + * cdef Converter* find_converter_by_typename(string typename): + * it = CONVERTERS.find(typename) # <<<<<<<<<<<<<< + * if it == CONVERTERS.end(): + * return NULL */ -#line 152 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_tmp)); +#line 426 "root_numpy/src/converters.pyx" + __pyx_v_it = __pyx_v_13_librootnumpy_CONVERTERS.find(__pyx_v_typename); - /* "root_numpy/src/tree.pyx":155 - * # can't use memcpy here... - * cdef unsigned long i - * for i in range(numele): # <<<<<<<<<<<<<< - * tmp[i] = src.at(i) - * # now write PyObject* to buffer + /* "root_numpy/src/converters.pyx":427 + * cdef Converter* find_converter_by_typename(string typename): + * it = CONVERTERS.find(typename) + * if it == CONVERTERS.end(): # <<<<<<<<<<<<<< + * return NULL + * return deref(it).second */ -#line 155 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_v_numele; - -#line 155 "root_numpy/src/tree.pyx" - for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) { +#line 427 "root_numpy/src/converters.pyx" + __pyx_t_1 = ((__pyx_v_it == __pyx_v_13_librootnumpy_CONVERTERS.end()) != 0); -#line 155 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_3; +#line 427 "root_numpy/src/converters.pyx" + if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":156 - * cdef unsigned long i - * for i in range(numele): - * tmp[i] = src.at(i) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + /* "root_numpy/src/converters.pyx":428 + * it = CONVERTERS.find(typename) + * if it == CONVERTERS.end(): + * return NULL # <<<<<<<<<<<<<< + * return deref(it).second + * */ -#line 156 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyBool_FromLong(__pyx_v_src->at(__pyx_v_i)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 156 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 156 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_tmp), __pyx_v_i, __pyx_t_1, unsigned long, 0, __Pyx_PyInt_From_unsigned_long, 0, 0, 1) < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 428 "root_numpy/src/converters.pyx" + __pyx_r = NULL; -#line 156 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 428 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 156 "root_numpy/src/tree.pyx" +#line 428 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":158 - * tmp[i] = src.at(i) - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * return sizeof(tmpobj) - * - */ - -#line 158 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); - - /* "root_numpy/src/tree.pyx":159 - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - * return sizeof(tmpobj) # <<<<<<<<<<<<<< + /* "root_numpy/src/converters.pyx":429 + * if it == CONVERTERS.end(): + * return NULL + * return deref(it).second # <<<<<<<<<<<<<< * * */ -#line 159 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_tmpobj)); +#line 429 "root_numpy/src/converters.pyx" + __pyx_r = (*__pyx_v_it).second; -#line 159 "root_numpy/src/tree.pyx" +#line 429 "root_numpy/src/converters.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":145 + /* "root_numpy/src/converters.pyx":425 * - * # special treatment for vector - * cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): # <<<<<<<<<<<<<< - * cdef unsigned long numele = src.size() - * cdef np.npy_intp dims[1] + * + * cdef Converter* find_converter_by_typename(string typename): # <<<<<<<<<<<<<< + * it = CONVERTERS.find(typename) + * if it == CONVERTERS.end(): */ -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" /* function exit code */ -#line 145 "root_numpy/src/tree.pyx" - __pyx_L1_error:; - -#line 145 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); - -#line 145 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorbool", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); - -#line 145 "root_numpy/src/tree.pyx" - __pyx_r = 0; - -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 145 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_tmp); - -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" return __pyx_r; -#line 145 "root_numpy/src/tree.pyx" +#line 425 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":162 +/* "root_numpy/src/converters.pyx":438 * * - * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): # <<<<<<<<<<<<<< - * cdef unsigned long numele = src.size() - * cdef np.npy_intp dims[1] + * cdef Converter* get_converter(TLeaf* leaf): # <<<<<<<<<<<<<< + * # Find existing converter or attempt to create a new one + * cdef Converter* conv */ -#line 162 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" -#line 162 "root_numpy/src/tree.pyx" -static CYTHON_INLINE int __pyx_f_13_librootnumpy_create_numpyarray_vectorstring(void *__pyx_v_buffer, std::vector *__pyx_v_src) { - unsigned long __pyx_v_numele -#line 162 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" +static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_get_converter(TLeaf *__pyx_v_leaf) { + __pyx_t_13_librootnumpy_Converter *__pyx_v_conv +#line 438 "root_numpy/src/converters.pyx" ; - npy_intp __pyx_v_dims[1] -#line 162 "root_numpy/src/tree.pyx" + __pyx_t_13_librootnumpy_Converter *__pyx_v_basic_conv +#line 438 "root_numpy/src/converters.pyx" ; - int __pyx_v_objsize -#line 162 "root_numpy/src/tree.pyx" + TLeaf *__pyx_v_leaf_count +#line 438 "root_numpy/src/converters.pyx" ; - PyArrayObject *__pyx_v_tmp = 0 -#line 162 "root_numpy/src/tree.pyx" + enum __pyx_t_13_librootnumpy_LeafShapeType __pyx_v_leaf_shape_type +#line 438 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_tmpobj -#line 162 "root_numpy/src/tree.pyx" + __pyx_t_13_librootnumpy_SIZE_t *__pyx_v_dims +#line 438 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_tmpstrobj -#line 162 "root_numpy/src/tree.pyx" + int __pyx_v_ndim +#line 438 "root_numpy/src/converters.pyx" ; - char *__pyx_v_dataptr -#line 162 "root_numpy/src/tree.pyx" + int __pyx_v_idim +#line 438 "root_numpy/src/converters.pyx" ; - unsigned long __pyx_v_i -#line 162 "root_numpy/src/tree.pyx" + CYTHON_UNUSED const char *__pyx_v_leaf_name +#line 438 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_py_bytes = NULL -#line 162 "root_numpy/src/tree.pyx" + const char *__pyx_v_leaf_title +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_leaf_type = NULL +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_leaf_shape = NULL +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_match = NULL +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_arraydef = NULL +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_arraytokens = NULL +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_shape = NULL +#line 438 "root_numpy/src/converters.pyx" +; + PyObject *__pyx_v_token = NULL +#line 438 "root_numpy/src/converters.pyx" ; -#line 162 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 438 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_Converter *__pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; - int __pyx_t_2; - unsigned long __pyx_t_3; - unsigned long __pyx_t_4; + PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; + PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; + Py_ssize_t __pyx_t_6; + PyObject *__pyx_t_7 = NULL; + int __pyx_t_8; + int __pyx_t_9; + PyObject *(*__pyx_t_10)(PyObject *); + int __pyx_t_11; + std::string __pyx_t_12; + int __pyx_t_13; + long __pyx_t_14; + __pyx_t_13_librootnumpy_SIZE_t __pyx_t_15; + __pyx_t_13_librootnumpy_CONVERTERS_ITEM __pyx_t_16; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 162 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("create_numpyarray_vectorstring", 0); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_converter", 0); - /* "root_numpy/src/tree.pyx":163 - * - * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): - * cdef unsigned long numele = src.size() # <<<<<<<<<<<<<< - * cdef np.npy_intp dims[1] - * dims[0] = numele; + /* "root_numpy/src/converters.pyx":442 + * cdef Converter* conv + * cdef Converter* basic_conv + * cdef TLeaf* leaf_count = leaf.GetLeafCount() # <<<<<<<<<<<<<< + * cdef LeafShapeType leaf_shape_type = SINGLE_VALUE + * cdef SIZE_t* dims */ -#line 163 "root_numpy/src/tree.pyx" - __pyx_v_numele = __pyx_v_src->size(); +#line 442 "root_numpy/src/converters.pyx" + __pyx_v_leaf_count = __pyx_v_leaf->GetLeafCount(); - /* "root_numpy/src/tree.pyx":165 - * cdef unsigned long numele = src.size() - * cdef np.npy_intp dims[1] - * dims[0] = numele; # <<<<<<<<<<<<<< - * cdef int objsize = np.dtype('O').itemsize - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) + /* "root_numpy/src/converters.pyx":443 + * cdef Converter* basic_conv + * cdef TLeaf* leaf_count = leaf.GetLeafCount() + * cdef LeafShapeType leaf_shape_type = SINGLE_VALUE # <<<<<<<<<<<<<< + * cdef SIZE_t* dims + * cdef int ndim, idim */ -#line 165 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; +#line 443 "root_numpy/src/converters.pyx" + __pyx_v_leaf_shape_type = __pyx_e_13_librootnumpy_SINGLE_VALUE; - /* "root_numpy/src/tree.pyx":166 - * cdef np.npy_intp dims[1] - * dims[0] = numele; - * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) - * cdef PyObject* tmpobj = tmp # borrow ref + /* "root_numpy/src/converters.pyx":447 + * cdef int ndim, idim + * + * leaf_name = leaf.GetName() # <<<<<<<<<<<<<< + * leaf_title = leaf.GetTitle() + * leaf_type = resolve_type(leaf.GetTypeName()) */ -#line 166 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 166 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 166 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; +#line 447 "root_numpy/src/converters.pyx" + __pyx_v_leaf_name = __pyx_v_leaf->GetName(); -#line 166 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + /* "root_numpy/src/converters.pyx":448 + * + * leaf_name = leaf.GetName() + * leaf_title = leaf.GetTitle() # <<<<<<<<<<<<<< + * leaf_type = resolve_type(leaf.GetTypeName()) + * leaf_shape = () + */ -#line 166 "root_numpy/src/tree.pyx" - __pyx_v_objsize = __pyx_t_2; +#line 448 "root_numpy/src/converters.pyx" + __pyx_v_leaf_title = __pyx_v_leaf->GetTitle(); - /* "root_numpy/src/tree.pyx":167 - * dims[0] = numele; - * cdef int objsize = np.dtype('O').itemsize - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) # <<<<<<<<<<<<<< - * cdef PyObject* tmpobj = tmp # borrow ref - * # increase one since we are putting in buffer directly + /* "root_numpy/src/converters.pyx":449 + * leaf_name = leaf.GetName() + * leaf_title = leaf.GetTitle() + * leaf_type = resolve_type(leaf.GetTypeName()) # <<<<<<<<<<<<<< + * leaf_shape = () + * */ -#line 167 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, NPY_OBJECT, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 449 "root_numpy/src/converters.pyx" + __pyx_t_1 = __pyx_f_13_librootnumpy_resolve_type(__pyx_v_leaf->GetTypeName()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 449; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 167 "root_numpy/src/tree.pyx" +#line 449 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 167 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 167 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); +#line 449 "root_numpy/src/converters.pyx" + __pyx_v_leaf_type = ((PyObject*)__pyx_t_1); -#line 167 "root_numpy/src/tree.pyx" +#line 449 "root_numpy/src/converters.pyx" __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":168 - * cdef int objsize = np.dtype('O').itemsize - * cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) - * cdef PyObject* tmpobj = tmp # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(tmp) + /* "root_numpy/src/converters.pyx":450 + * leaf_title = leaf.GetTitle() + * leaf_type = resolve_type(leaf.GetTypeName()) + * leaf_shape = () # <<<<<<<<<<<<<< + * + * # Determine shape of this leaf */ -#line 168 "root_numpy/src/tree.pyx" - __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); +#line 450 "root_numpy/src/converters.pyx" + __Pyx_INCREF(__pyx_empty_tuple); - /* "root_numpy/src/tree.pyx":170 - * cdef PyObject* tmpobj = tmp # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(tmp) # <<<<<<<<<<<<<< - * cdef PyObject* tmpstrobj - * cdef char* dataptr = tmp.data +#line 450 "root_numpy/src/converters.pyx" + __pyx_v_leaf_shape = __pyx_empty_tuple; + + /* "root_numpy/src/converters.pyx":453 + * + * # Determine shape of this leaf + * match = re.match(LEAF_PATTERN, leaf_title) # <<<<<<<<<<<<<< + * if match is not None: + * arraydef = match.group(1) */ -#line 170 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_tmp)); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_re); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":172 - * Py_INCREF(tmp) - * cdef PyObject* tmpstrobj - * cdef char* dataptr = tmp.data # <<<<<<<<<<<<<< - * # can't use memcpy here... - * cdef unsigned long i - */ +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 172 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_tmp->data); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_match); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":175 - * # can't use memcpy here... - * cdef unsigned long i - * for i in range(numele): # <<<<<<<<<<<<<< - * py_bytes = str(src.at(i)) - * Py_INCREF(py_bytes) - */ +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 175 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 175 "root_numpy/src/tree.pyx" - for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_LEAF_PATTERN); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 175 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":176 - * cdef unsigned long i - * for i in range(numele): - * py_bytes = str(src.at(i)) # <<<<<<<<<<<<<< - * Py_INCREF(py_bytes) - * tmpstrobj = py_bytes - */ +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_4 = __Pyx_PyStr_FromString(__pyx_v_leaf_title); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_src->at(__pyx_v_i)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 176 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_5 = NULL; -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_6 = 0; -#line 176 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 453 "root_numpy/src/converters.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { -#line 176 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); -#line 176 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + if (likely(__pyx_t_5)) { -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 453 "root_numpy/src/converters.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 453 "root_numpy/src/converters.pyx" + __Pyx_INCREF(__pyx_t_5); -#line 176 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_INCREF(function); -#line 176 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 176 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_py_bytes, __pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_6 = 1; -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 453 "root_numpy/src/converters.pyx" + } - /* "root_numpy/src/tree.pyx":177 - * for i in range(numele): - * py_bytes = str(src.at(i)) - * Py_INCREF(py_bytes) # <<<<<<<<<<<<<< - * tmpstrobj = py_bytes - * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) - */ +#line 453 "root_numpy/src/converters.pyx" + } -#line 177 "root_numpy/src/tree.pyx" - Py_INCREF(__pyx_v_py_bytes); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":178 - * py_bytes = str(src.at(i)) - * Py_INCREF(py_bytes) - * tmpstrobj = py_bytes # <<<<<<<<<<<<<< - * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) - * # now write PyObject* to buffer - */ +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_7); -#line 178 "root_numpy/src/tree.pyx" - __pyx_v_tmpstrobj = ((PyObject *)__pyx_v_py_bytes); - - /* "root_numpy/src/tree.pyx":179 - * Py_INCREF(py_bytes) - * tmpstrobj = py_bytes - * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - */ +#line 453 "root_numpy/src/converters.pyx" + if (__pyx_t_5) { -#line 179 "root_numpy/src/tree.pyx" - memcpy((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&__pyx_v_tmpstrobj), (sizeof(PyObject *))); +#line 453 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; -#line 179 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":181 - * memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * return sizeof(tmpobj) - * - */ +#line 453 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0+__pyx_t_6, __pyx_t_2); -#line 181 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":182 - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - * return sizeof(tmpobj) # <<<<<<<<<<<<<< - * - * - */ +#line 453 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_6, __pyx_t_4); -#line 182 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_tmpobj)); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_4); -#line 182 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":162 - * - * - * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): # <<<<<<<<<<<<<< - * cdef unsigned long numele = src.size() - * cdef np.npy_intp dims[1] +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_4 = 0; + +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 453 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +#line 453 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 453 "root_numpy/src/converters.pyx" + __pyx_v_match = __pyx_t_1; + +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; + + /* "root_numpy/src/converters.pyx":454 + * # Determine shape of this leaf + * match = re.match(LEAF_PATTERN, leaf_title) + * if match is not None: # <<<<<<<<<<<<<< + * arraydef = match.group(1) + * if arraydef is not None: */ -#line 162 "root_numpy/src/tree.pyx" +#line 454 "root_numpy/src/converters.pyx" + __pyx_t_8 = (__pyx_v_match != Py_None); +#line 454 "root_numpy/src/converters.pyx" + __pyx_t_9 = (__pyx_t_8 != 0); -#line 162 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 454 "root_numpy/src/converters.pyx" + if (__pyx_t_9) { -#line 162 "root_numpy/src/tree.pyx" - __pyx_L1_error:; + /* "root_numpy/src/converters.pyx":455 + * match = re.match(LEAF_PATTERN, leaf_title) + * if match is not None: + * arraydef = match.group(1) # <<<<<<<<<<<<<< + * if arraydef is not None: + * arraytokens = arraydef.strip('[]').split('][') + */ -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 455 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_match, __pyx_n_s_group); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); +#line 455 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 162 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorstring", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 455 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 162 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 455 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 162 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 455 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_tmp); +#line 455 "root_numpy/src/converters.pyx" + __pyx_v_arraydef = __pyx_t_3; -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_py_bytes); +#line 455 "root_numpy/src/converters.pyx" + __pyx_t_3 = 0; -#line 162 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/converters.pyx":456 + * if match is not None: + * arraydef = match.group(1) + * if arraydef is not None: # <<<<<<<<<<<<<< + * arraytokens = arraydef.strip('[]').split('][') + * shape = [] + */ -#line 162 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 456 "root_numpy/src/converters.pyx" + __pyx_t_9 = (__pyx_v_arraydef != Py_None); -#line 162 "root_numpy/src/tree.pyx" -} +#line 456 "root_numpy/src/converters.pyx" + __pyx_t_8 = (__pyx_t_9 != 0); -/* "root_numpy/src/tree.pyx":186 - * - * cdef cppclass Converter: - * __init__(): # <<<<<<<<<<<<<< - * pass - * +#line 456 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { + + /* "root_numpy/src/converters.pyx":457 + * arraydef = match.group(1) + * if arraydef is not None: + * arraytokens = arraydef.strip('[]').split('][') # <<<<<<<<<<<<<< + * shape = [] + * # First group might be the name of the length-leaf */ -#line 186 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_arraydef, __pyx_n_s_strip); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 186 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_Converter::__pyx_t_13_librootnumpy_Converter(void) { - __Pyx_RefNannyDeclarations +#line 457 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 186 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 186 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 457 "root_numpy/src/converters.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_split); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 186 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 186 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 186 "root_numpy/src/tree.pyx" -} +#line 457 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -/* "root_numpy/src/tree.pyx":189 - * pass - * - * __dealloc__(): # <<<<<<<<<<<<<< - * pass - * - */ +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 189 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 457 "root_numpy/src/converters.pyx" + __pyx_v_arraytokens = __pyx_t_1; -#line 189 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_Converter::~__pyx_t_13_librootnumpy_Converter(void) { - __Pyx_RefNannyDeclarations +#line 457 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 189 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); + /* "root_numpy/src/converters.pyx":458 + * if arraydef is not None: + * arraytokens = arraydef.strip('[]').split('][') + * shape = [] # <<<<<<<<<<<<<< + * # First group might be the name of the length-leaf + * if leaf_count != NULL: + */ -#line 189 "root_numpy/src/tree.pyx" +#line 458 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 458 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 189 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 458 "root_numpy/src/converters.pyx" + __pyx_v_shape = ((PyObject*)__pyx_t_1); -#line 189 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 458 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 189 "root_numpy/src/tree.pyx" -} + /* "root_numpy/src/converters.pyx":460 + * shape = [] + * # First group might be the name of the length-leaf + * if leaf_count != NULL: # <<<<<<<<<<<<<< + * # Ignore leaf name token + * arraytokens.pop(0) + */ -/* "root_numpy/src/tree.pyx":192 - * pass - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * pass - * +#line 460 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_leaf_count != NULL) != 0); + +#line 460 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { + + /* "root_numpy/src/converters.pyx":462 + * if leaf_count != NULL: + * # Ignore leaf name token + * arraytokens.pop(0) # <<<<<<<<<<<<<< + * leaf_shape_type = VARIABLE_LENGTH_ARRAY + * else: */ -#line 192 "root_numpy/src/tree.pyx" +#line 462 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_PopIndex(__pyx_v_arraytokens, 0, 1, Py_ssize_t, PyInt_FromSsize_t); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 462 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 192 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_Converter::write(CYTHON_UNUSED Column *__pyx_v_col, CYTHON_UNUSED void *__pyx_v_buffer) { +#line 462 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 192 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations + /* "root_numpy/src/converters.pyx":463 + * # Ignore leaf name token + * arraytokens.pop(0) + * leaf_shape_type = VARIABLE_LENGTH_ARRAY # <<<<<<<<<<<<<< + * else: + * leaf_shape_type = FIXED_LENGTH_ARRAY + */ -#line 192 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 463 "root_numpy/src/converters.pyx" + __pyx_v_leaf_shape_type = __pyx_e_13_librootnumpy_VARIABLE_LENGTH_ARRAY; -#line 192 "root_numpy/src/tree.pyx" +#line 463 "root_numpy/src/converters.pyx" + goto __pyx_L5; +#line 463 "root_numpy/src/converters.pyx" + } -#line 192 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 463 "root_numpy/src/converters.pyx" + /*else*/ { -#line 192 "root_numpy/src/tree.pyx" - __pyx_r = 0; + /* "root_numpy/src/converters.pyx":465 + * leaf_shape_type = VARIABLE_LENGTH_ARRAY + * else: + * leaf_shape_type = FIXED_LENGTH_ARRAY # <<<<<<<<<<<<<< + * shape.extend([int(token) for token in arraytokens]) + * leaf_shape = tuple(shape) + */ -#line 192 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 465 "root_numpy/src/converters.pyx" + __pyx_v_leaf_shape_type = __pyx_e_13_librootnumpy_FIXED_LENGTH_ARRAY; -#line 192 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 465 "root_numpy/src/converters.pyx" + } -#line 192 "root_numpy/src/tree.pyx" -} +#line 465 "root_numpy/src/converters.pyx" + __pyx_L5:; -/* "root_numpy/src/tree.pyx":195 - * pass - * - * object get_nptype(): # <<<<<<<<<<<<<< - * pass + /* "root_numpy/src/converters.pyx":466 + * else: + * leaf_shape_type = FIXED_LENGTH_ARRAY + * shape.extend([int(token) for token in arraytokens]) # <<<<<<<<<<<<<< + * leaf_shape = tuple(shape) * */ -#line 195 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 466 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 195 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_Converter::get_nptype(void) { +#line 466 "root_numpy/src/converters.pyx" + if (likely(PyList_CheckExact(__pyx_v_arraytokens)) || PyTuple_CheckExact(__pyx_v_arraytokens)) { -#line 195 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_arraytokens; __Pyx_INCREF(__pyx_t_3); __pyx_t_6 = 0; -#line 195 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_10 = NULL; -#line 195 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + } else { + __pyx_t_6 = -1; +#line 466 "root_numpy/src/converters.pyx" +__pyx_t_3 = PyObject_GetIter(__pyx_v_arraytokens); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 466 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 195 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_10 = Py_TYPE(__pyx_t_3)->tp_iternext; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 195 "root_numpy/src/tree.pyx" - __pyx_r = Py_None; __Pyx_INCREF(Py_None); +#line 466 "root_numpy/src/converters.pyx" + } -#line 195 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 466 "root_numpy/src/converters.pyx" + for (;;) { -#line 195 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 466 "root_numpy/src/converters.pyx" + if (likely(!__pyx_t_10)) { -#line 195 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 466 "root_numpy/src/converters.pyx" + if (likely(PyList_CheckExact(__pyx_t_3))) { -#line 195 "root_numpy/src/tree.pyx" -} +#line 466 "root_numpy/src/converters.pyx" + if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_3)) break; -/* "root_numpy/src/tree.pyx":205 - * string nptype - * - * __init__(int size, string nptype, int nptypecode): # <<<<<<<<<<<<<< - * this.size = size - * this.nptypecode = nptypecode - */ +#line 466 "root_numpy/src/converters.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 205 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_6); __Pyx_INCREF(__pyx_t_7); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 466 "root_numpy/src/converters.pyx" + #else -#line 205 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_BasicConverter::__pyx_t_13_librootnumpy_BasicConverter(int __pyx_v_size, std::string __pyx_v_nptype, int __pyx_v_nptypecode) { - __Pyx_RefNannyDeclarations +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = PySequence_ITEM(__pyx_t_3, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 205 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 466 "root_numpy/src/converters.pyx" + #endif - /* "root_numpy/src/tree.pyx":206 - * - * __init__(int size, string nptype, int nptypecode): - * this.size = size # <<<<<<<<<<<<<< - * this.nptypecode = nptypecode - * this.nptype = nptype - */ +#line 466 "root_numpy/src/converters.pyx" + } else { -#line 206 "root_numpy/src/tree.pyx" - this->size = __pyx_v_size; +#line 466 "root_numpy/src/converters.pyx" + if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_3)) break; - /* "root_numpy/src/tree.pyx":207 - * __init__(int size, string nptype, int nptypecode): - * this.size = size - * this.nptypecode = nptypecode # <<<<<<<<<<<<<< - * this.nptype = nptype - * - */ +#line 466 "root_numpy/src/converters.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 207 "root_numpy/src/tree.pyx" - this->nptypecode = __pyx_v_nptypecode; +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_6); __Pyx_INCREF(__pyx_t_7); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":208 - * this.size = size - * this.nptypecode = nptypecode - * this.nptype = nptype # <<<<<<<<<<<<<< - * - * int write(Column* col, void* buffer): - */ +#line 466 "root_numpy/src/converters.pyx" + #else -#line 208 "root_numpy/src/tree.pyx" - this->nptype = __pyx_v_nptype; +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = PySequence_ITEM(__pyx_t_3, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":205 - * string nptype - * - * __init__(int size, string nptype, int nptypecode): # <<<<<<<<<<<<<< - * this.size = size - * this.nptypecode = nptypecode - */ +#line 466 "root_numpy/src/converters.pyx" + #endif -#line 205 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + } + } else +#line 466 "root_numpy/src/converters.pyx" +{ +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = __pyx_t_10(__pyx_t_3); -#line 205 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 466 "root_numpy/src/converters.pyx" + if (unlikely(!__pyx_t_7)) { -#line 205 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 466 "root_numpy/src/converters.pyx" + PyObject* exc_type = PyErr_Occurred(); -#line 205 "root_numpy/src/tree.pyx" -} +#line 466 "root_numpy/src/converters.pyx" + if (exc_type) { -/* "root_numpy/src/tree.pyx":210 - * this.nptype = nptype - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef void* src = col.GetValuePointer() - * memcpy(buffer, src, this.size) - */ +#line 466 "root_numpy/src/converters.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 210 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 466 "root_numpy/src/converters.pyx" + } -#line 210 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_BasicConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - void *__pyx_v_src -#line 210 "root_numpy/src/tree.pyx" -; +#line 466 "root_numpy/src/converters.pyx" + break; -#line 210 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 466 "root_numpy/src/converters.pyx" + } -#line 210 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 466 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_7); - /* "root_numpy/src/tree.pyx":211 - * - * int write(Column* col, void* buffer): - * cdef void* src = col.GetValuePointer() # <<<<<<<<<<<<<< - * memcpy(buffer, src, this.size) - * return this.size - */ +#line 466 "root_numpy/src/converters.pyx" + } -#line 211 "root_numpy/src/tree.pyx" - __pyx_v_src = __pyx_v_col->GetValuePointer(); +#line 466 "root_numpy/src/converters.pyx" + __Pyx_XDECREF_SET(__pyx_v_token, __pyx_t_7); - /* "root_numpy/src/tree.pyx":212 - * int write(Column* col, void* buffer): - * cdef void* src = col.GetValuePointer() - * memcpy(buffer, src, this.size) # <<<<<<<<<<<<<< - * return this.size - * - */ +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = 0; -#line 212 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, __pyx_v_src, this->size); +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyNumber_Int(__pyx_v_token); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":213 - * cdef void* src = col.GetValuePointer() - * memcpy(buffer, src, this.size) - * return this.size # <<<<<<<<<<<<<< - * - * object get_nptype(): - */ +#line 466 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_7); -#line 213 "root_numpy/src/tree.pyx" - __pyx_r = this->size; +#line 466 "root_numpy/src/converters.pyx" + if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_7))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 213 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 466 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":210 - * this.nptype = nptype +#line 466 "root_numpy/src/converters.pyx" + } + +#line 466 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_11 = __Pyx_PyList_Extend(__pyx_v_shape, __pyx_t_1); if (unlikely(__pyx_t_11 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 466 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "root_numpy/src/converters.pyx":467 + * leaf_shape_type = FIXED_LENGTH_ARRAY + * shape.extend([int(token) for token in arraytokens]) + * leaf_shape = tuple(shape) # <<<<<<<<<<<<<< * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef void* src = col.GetValuePointer() - * memcpy(buffer, src, this.size) + * if leaf_shape_type == SINGLE_VALUE: */ -#line 210 "root_numpy/src/tree.pyx" +#line 467 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyList_AsTuple(__pyx_v_shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 467; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 467 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 210 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 467 "root_numpy/src/converters.pyx" + __Pyx_DECREF_SET(__pyx_v_leaf_shape, ((PyObject*)__pyx_t_1)); -#line 210 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 467 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 210 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 467 "root_numpy/src/converters.pyx" + goto __pyx_L4; -#line 210 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 467 "root_numpy/src/converters.pyx" + } -#line 210 "root_numpy/src/tree.pyx" -} +#line 467 "root_numpy/src/converters.pyx" + __pyx_L4:; -/* "root_numpy/src/tree.pyx":215 - * return this.size - * - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.dtype(this.nptype) - * - */ +#line 467 "root_numpy/src/converters.pyx" + goto __pyx_L3; -#line 215 "root_numpy/src/tree.pyx" +#line 467 "root_numpy/src/converters.pyx" + } +#line 467 "root_numpy/src/converters.pyx" + __pyx_L3:; -#line 215 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_BasicConverter::get_nptype(void) { + /* "root_numpy/src/converters.pyx":469 + * leaf_shape = tuple(shape) + * + * if leaf_shape_type == SINGLE_VALUE: # <<<<<<<<<<<<<< + * return find_converter_by_typename(leaf_type) + * + */ -#line 215 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 469 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_leaf_shape_type == __pyx_e_13_librootnumpy_SINGLE_VALUE) != 0); -#line 215 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); +#line 469 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { - /* "root_numpy/src/tree.pyx":216 + /* "root_numpy/src/converters.pyx":470 * - * object get_nptype(): - * return np.dtype(this.nptype) # <<<<<<<<<<<<<< + * if leaf_shape_type == SINGLE_VALUE: + * return find_converter_by_typename(leaf_type) # <<<<<<<<<<<<<< * - * int get_nptypecode(): + * if leaf_shape_type == VARIABLE_LENGTH_ARRAY: */ -#line 216 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 470 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_v_leaf_type); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(this->nptype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 470 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 470 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 470 "root_numpy/src/converters.pyx" + } -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); + /* "root_numpy/src/converters.pyx":472 + * return find_converter_by_typename(leaf_type) + * + * if leaf_shape_type == VARIABLE_LENGTH_ARRAY: # <<<<<<<<<<<<<< + * conv = find_converter_by_typename(leaf_type + arraydef) + * if conv == NULL: + */ -#line 216 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); +#line 472 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_leaf_shape_type == __pyx_e_13_librootnumpy_VARIABLE_LENGTH_ARRAY) != 0); -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 472 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; + /* "root_numpy/src/converters.pyx":473 + * + * if leaf_shape_type == VARIABLE_LENGTH_ARRAY: + * conv = find_converter_by_typename(leaf_type + arraydef) # <<<<<<<<<<<<<< + * if conv == NULL: + * # Create new converter on demand + */ -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 473 "root_numpy/src/converters.pyx" + if (unlikely(!__pyx_v_arraydef)) { __Pyx_RaiseUnboundLocalError("arraydef"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 473 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyNumber_Add(__pyx_v_leaf_type, __pyx_v_arraydef); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 216 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 473 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 216 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#line 473 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 473 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 216 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 473 "root_numpy/src/converters.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); - /* "root_numpy/src/tree.pyx":215 - * return this.size - * - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.dtype(this.nptype) - * + /* "root_numpy/src/converters.pyx":474 + * if leaf_shape_type == VARIABLE_LENGTH_ARRAY: + * conv = find_converter_by_typename(leaf_type + arraydef) + * if conv == NULL: # <<<<<<<<<<<<<< + * # Create new converter on demand + * basic_conv = find_converter_by_typename(leaf_type) */ -#line 215 "root_numpy/src/tree.pyx" - +#line 474 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_conv == NULL) != 0); -#line 215 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 474 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 215 "root_numpy/src/tree.pyx" - __pyx_L1_error:; + /* "root_numpy/src/converters.pyx":476 + * if conv == NULL: + * # Create new converter on demand + * basic_conv = find_converter_by_typename(leaf_type) # <<<<<<<<<<<<<< + * if basic_conv == NULL: + * return NULL + */ -#line 215 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 476 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_v_leaf_type); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 476; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 215 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 476 "root_numpy/src/converters.pyx" + __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); -#line 215 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("BasicConverter.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); + /* "root_numpy/src/converters.pyx":477 + * # Create new converter on demand + * basic_conv = find_converter_by_typename(leaf_type) + * if basic_conv == NULL: # <<<<<<<<<<<<<< + * return NULL + * ndim = len(leaf_shape) + 1 + */ -#line 215 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 477 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_basic_conv == NULL) != 0); -#line 215 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 477 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 215 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); + /* "root_numpy/src/converters.pyx":478 + * basic_conv = find_converter_by_typename(leaf_type) + * if basic_conv == NULL: + * return NULL # <<<<<<<<<<<<<< + * ndim = len(leaf_shape) + 1 + * dims = malloc(ndim * sizeof(SIZE_t)) + */ -#line 215 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 478 "root_numpy/src/converters.pyx" + __pyx_r = NULL; -#line 215 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 478 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 215 "root_numpy/src/tree.pyx" -} +#line 478 "root_numpy/src/converters.pyx" + } -/* "root_numpy/src/tree.pyx":218 - * return np.dtype(this.nptype) - * - * int get_nptypecode(): # <<<<<<<<<<<<<< - * return this.nptypecode - * + /* "root_numpy/src/converters.pyx":479 + * if basic_conv == NULL: + * return NULL + * ndim = len(leaf_shape) + 1 # <<<<<<<<<<<<<< + * dims = malloc(ndim * sizeof(SIZE_t)) + * for idim from 1 <= idim < ndim: */ -#line 218 "root_numpy/src/tree.pyx" - +#line 479 "root_numpy/src/converters.pyx" + __pyx_t_6 = PyTuple_GET_SIZE(__pyx_v_leaf_shape); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 218 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_BasicConverter::get_nptypecode(void) { +#line 479 "root_numpy/src/converters.pyx" + __pyx_v_ndim = (__pyx_t_6 + 1); -#line 218 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations + /* "root_numpy/src/converters.pyx":480 + * return NULL + * ndim = len(leaf_shape) + 1 + * dims = malloc(ndim * sizeof(SIZE_t)) # <<<<<<<<<<<<<< + * for idim from 1 <= idim < ndim: + * dims[idim] = leaf_shape[idim - 1] + */ -#line 218 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptypecode", 0); +#line 480 "root_numpy/src/converters.pyx" + __pyx_v_dims = ((__pyx_t_13_librootnumpy_SIZE_t *)malloc((__pyx_v_ndim * (sizeof(__pyx_t_13_librootnumpy_SIZE_t))))); - /* "root_numpy/src/tree.pyx":219 - * - * int get_nptypecode(): - * return this.nptypecode # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/converters.pyx":481 + * ndim = len(leaf_shape) + 1 + * dims = malloc(ndim * sizeof(SIZE_t)) + * for idim from 1 <= idim < ndim: # <<<<<<<<<<<<<< + * dims[idim] = leaf_shape[idim - 1] + * conv = new VaryArrayConverter( */ -#line 219 "root_numpy/src/tree.pyx" - __pyx_r = this->nptypecode; +#line 481 "root_numpy/src/converters.pyx" + __pyx_t_13 = __pyx_v_ndim; -#line 219 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 481 "root_numpy/src/converters.pyx" + for (__pyx_v_idim = 1; __pyx_v_idim < __pyx_t_13; __pyx_v_idim++) { - /* "root_numpy/src/tree.pyx":218 - * return np.dtype(this.nptype) - * - * int get_nptypecode(): # <<<<<<<<<<<<<< - * return this.nptypecode - * + /* "root_numpy/src/converters.pyx":482 + * dims = malloc(ndim * sizeof(SIZE_t)) + * for idim from 1 <= idim < ndim: + * dims[idim] = leaf_shape[idim - 1] # <<<<<<<<<<<<<< + * conv = new VaryArrayConverter( + * basic_conv, ndim, dims) */ -#line 218 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/converters.pyx" + __pyx_t_14 = (__pyx_v_idim - 1); +#line 482 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetItemInt_Tuple(__pyx_v_leaf_shape, __pyx_t_14, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 218 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 482 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 218 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 482 "root_numpy/src/converters.pyx" + __pyx_t_15 = __Pyx_PyInt_As_Py_intptr_t(__pyx_t_1); if (unlikely((__pyx_t_15 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 218 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 482 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 218 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 482 "root_numpy/src/converters.pyx" + (__pyx_v_dims[__pyx_v_idim]) = __pyx_t_15; -#line 218 "root_numpy/src/tree.pyx" -} +#line 482 "root_numpy/src/converters.pyx" + } -/* "root_numpy/src/tree.pyx":223 - * - * cdef cppclass ObjectConverterBase(Converter): - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.object + /* "root_numpy/src/converters.pyx":483 + * for idim from 1 <= idim < ndim: + * dims[idim] = leaf_shape[idim - 1] + * conv = new VaryArrayConverter( # <<<<<<<<<<<<<< + * basic_conv, ndim, dims) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + */ + +#line 483 "root_numpy/src/converters.pyx" + __pyx_v_conv = new __pyx_t_13_librootnumpy_VaryArrayConverter(((__pyx_t_13_librootnumpy_BasicConverter *)__pyx_v_basic_conv), __pyx_v_ndim, __pyx_v_dims); + + /* "root_numpy/src/converters.pyx":485 + * conv = new VaryArrayConverter( + * basic_conv, ndim, dims) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) # <<<<<<<<<<<<<< + * return conv * */ -#line 223 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/converters.pyx" + if (unlikely(!__pyx_v_arraydef)) { __Pyx_RaiseUnboundLocalError("arraydef"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } +#line 485 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyNumber_Add(__pyx_v_leaf_type, __pyx_v_arraydef); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 223 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptype(void) { +#line 485 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 223 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 485 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 223 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); +#line 485 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":224 - * cdef cppclass ObjectConverterBase(Converter): - * object get_nptype(): - * return np.object # <<<<<<<<<<<<<< - * - * object get_nptypecode(): - */ +#line 485 "root_numpy/src/converters.pyx" + try { -#line 224 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 485 "root_numpy/src/converters.pyx" + __pyx_t_16 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_12, __pyx_v_conv); -#line 224 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 485 "root_numpy/src/converters.pyx" + } catch(...) { -#line 224 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 485 "root_numpy/src/converters.pyx" + __Pyx_CppExn2PyErr(); -#line 224 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_object); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 485 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 224 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 485 "root_numpy/src/converters.pyx" + } -#line 224 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 485 "root_numpy/src/converters.pyx" + __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_16); -#line 224 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_2; +#line 485 "root_numpy/src/converters.pyx" + goto __pyx_L10; -#line 224 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 485 "root_numpy/src/converters.pyx" + } -#line 224 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 485 "root_numpy/src/converters.pyx" + __pyx_L10:; - /* "root_numpy/src/tree.pyx":223 - * - * cdef cppclass ObjectConverterBase(Converter): - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.object + /* "root_numpy/src/converters.pyx":486 + * basic_conv, ndim, dims) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + * return conv # <<<<<<<<<<<<<< * + * # Fixed-length array */ -#line 223 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_v_conv; +#line 486 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 223 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 486 "root_numpy/src/converters.pyx" + } -#line 223 "root_numpy/src/tree.pyx" - __pyx_L1_error:; + /* "root_numpy/src/converters.pyx":489 + * + * # Fixed-length array + * conv = find_converter_by_typename(leaf_type + arraydef) # <<<<<<<<<<<<<< + * if conv == NULL: + * # Create new converter on demand + */ -#line 223 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 489 "root_numpy/src/converters.pyx" + if (unlikely(!__pyx_v_arraydef)) { __Pyx_RaiseUnboundLocalError("arraydef"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } -#line 223 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 489 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyNumber_Add(__pyx_v_leaf_type, __pyx_v_arraydef); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 223 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("ObjectConverterBase.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 489 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 223 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 489 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 223 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 489 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 223 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 489 "root_numpy/src/converters.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); -#line 223 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/converters.pyx":490 + * # Fixed-length array + * conv = find_converter_by_typename(leaf_type + arraydef) + * if conv == NULL: # <<<<<<<<<<<<<< + * # Create new converter on demand + * basic_conv = find_converter_by_typename(leaf_type) + */ -#line 223 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 490 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_conv == NULL) != 0); -#line 223 "root_numpy/src/tree.pyx" -} +#line 490 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -/* "root_numpy/src/tree.pyx":226 - * return np.object - * - * object get_nptypecode(): # <<<<<<<<<<<<<< - * return np.NPY_OBJECT - * + /* "root_numpy/src/converters.pyx":492 + * if conv == NULL: + * # Create new converter on demand + * basic_conv = find_converter_by_typename(leaf_type) # <<<<<<<<<<<<<< + * if basic_conv == NULL: + * return NULL */ -#line 226 "root_numpy/src/tree.pyx" +#line 492 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_v_leaf_type); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 492; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 492 "root_numpy/src/converters.pyx" + __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); -#line 226 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptypecode(void) { + /* "root_numpy/src/converters.pyx":493 + * # Create new converter on demand + * basic_conv = find_converter_by_typename(leaf_type) + * if basic_conv == NULL: # <<<<<<<<<<<<<< + * return NULL + * conv = new FixedArrayConverter( + */ -#line 226 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 493 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_basic_conv == NULL) != 0); -#line 226 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptypecode", 0); +#line 493 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { - /* "root_numpy/src/tree.pyx":227 - * - * object get_nptypecode(): - * return np.NPY_OBJECT # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/converters.pyx":494 + * basic_conv = find_converter_by_typename(leaf_type) + * if basic_conv == NULL: + * return NULL # <<<<<<<<<<<<<< + * conv = new FixedArrayConverter( + * basic_conv, leaf_shape) */ -#line 227 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#line 227 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 494 "root_numpy/src/converters.pyx" + __pyx_r = NULL; -#line 227 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 494 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 227 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#line 494 "root_numpy/src/converters.pyx" + } -#line 227 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; + /* "root_numpy/src/converters.pyx":495 + * if basic_conv == NULL: + * return NULL + * conv = new FixedArrayConverter( # <<<<<<<<<<<<<< + * basic_conv, leaf_shape) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + */ -#line 227 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 495 "root_numpy/src/converters.pyx" + __pyx_v_conv = new __pyx_t_13_librootnumpy_FixedArrayConverter(((__pyx_t_13_librootnumpy_BasicConverter *)__pyx_v_basic_conv), ((PyObject *)__pyx_v_leaf_shape)); - /* "root_numpy/src/tree.pyx":226 - * return np.object - * - * object get_nptypecode(): # <<<<<<<<<<<<<< - * return np.NPY_OBJECT + /* "root_numpy/src/converters.pyx":497 + * conv = new FixedArrayConverter( + * basic_conv, leaf_shape) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) # <<<<<<<<<<<<<< + * return conv * */ -#line 226 "root_numpy/src/tree.pyx" - - -#line 226 "root_numpy/src/tree.pyx" - /* function exit code */ - -#line 226 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 497 "root_numpy/src/converters.pyx" + if (unlikely(!__pyx_v_arraydef)) { __Pyx_RaiseUnboundLocalError("arraydef"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } -#line 226 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); - -#line 226 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("ObjectConverterBase.get_nptypecode", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 497 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyNumber_Add(__pyx_v_leaf_type, __pyx_v_arraydef); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 226 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 497 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 226 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 497 "root_numpy/src/converters.pyx" + __pyx_t_12 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 226 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 497 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 226 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 497 "root_numpy/src/converters.pyx" + try { -#line 226 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 497 "root_numpy/src/converters.pyx" + __pyx_t_16 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_12, __pyx_v_conv); -#line 226 "root_numpy/src/tree.pyx" -} +#line 497 "root_numpy/src/converters.pyx" + } catch(...) { -/* "root_numpy/src/tree.pyx":235 - * int elesize - * - * __init__(BasicConverter* conv): # <<<<<<<<<<<<<< - * this.conv = conv - * this.typecode = conv.get_nptypecode() - */ +#line 497 "root_numpy/src/converters.pyx" + __Pyx_CppExn2PyErr(); -#line 235 "root_numpy/src/tree.pyx" +#line 497 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 497 "root_numpy/src/converters.pyx" + } -#line 235 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_VaryArrayConverter::__pyx_t_13_librootnumpy_VaryArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *__pyx_v_conv) { - __Pyx_RefNannyDeclarations - int __pyx_t_1; +#line 497 "root_numpy/src/converters.pyx" + __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_16); -#line 235 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 497 "root_numpy/src/converters.pyx" + goto __pyx_L14; - /* "root_numpy/src/tree.pyx":236 - * - * __init__(BasicConverter* conv): - * this.conv = conv # <<<<<<<<<<<<<< - * this.typecode = conv.get_nptypecode() - * this.elesize = conv.size - */ +#line 497 "root_numpy/src/converters.pyx" + } -#line 236 "root_numpy/src/tree.pyx" - this->conv = __pyx_v_conv; +#line 497 "root_numpy/src/converters.pyx" + __pyx_L14:; - /* "root_numpy/src/tree.pyx":237 - * __init__(BasicConverter* conv): - * this.conv = conv - * this.typecode = conv.get_nptypecode() # <<<<<<<<<<<<<< - * this.elesize = conv.size + /* "root_numpy/src/converters.pyx":498 + * basic_conv, leaf_shape) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + * return conv # <<<<<<<<<<<<<< * - */ - -#line 237 "root_numpy/src/tree.pyx" - this->typecode = __pyx_v_conv->get_nptypecode(); - - /* "root_numpy/src/tree.pyx":238 - * this.conv = conv - * this.typecode = conv.get_nptypecode() - * this.elesize = conv.size # <<<<<<<<<<<<<< * - * int write(Column* col, void* buffer): */ -#line 238 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_v_conv->size; +#line 498 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_v_conv; -#line 238 "root_numpy/src/tree.pyx" - this->elesize = __pyx_t_1; +#line 498 "root_numpy/src/converters.pyx" + goto __pyx_L0; - /* "root_numpy/src/tree.pyx":235 - * int elesize + /* "root_numpy/src/converters.pyx":438 * - * __init__(BasicConverter* conv): # <<<<<<<<<<<<<< - * this.conv = conv - * this.typecode = conv.get_nptypecode() + * + * cdef Converter* get_converter(TLeaf* leaf): # <<<<<<<<<<<<<< + * # Find existing converter or attempt to create a new one + * cdef Converter* conv */ -#line 235 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" -#line 235 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" /* function exit code */ -#line 235 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); - -#line 235 "root_numpy/src/tree.pyx" -} - -/* "root_numpy/src/tree.pyx":240 - * this.elesize = conv.size - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef int numele = col.GetLen() - * cdef void* src = col.GetValuePointer() - */ - -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" + __pyx_L1_error:; +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 240 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VaryArrayConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - int __pyx_v_numele -#line 240 "root_numpy/src/tree.pyx" -; - void *__pyx_v_src -#line 240 "root_numpy/src/tree.pyx" -; +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 240 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 240 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_4); - /* "root_numpy/src/tree.pyx":241 - * - * int write(Column* col, void* buffer): - * cdef int numele = col.GetLen() # <<<<<<<<<<<<<< - * cdef void* src = col.GetValuePointer() - * return create_numpyarray(buffer, src, this.typecode, numele, this.elesize) - */ +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 241 "root_numpy/src/tree.pyx" - __pyx_v_numele = __pyx_v_col->GetLen(); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_7); - /* "root_numpy/src/tree.pyx":242 - * int write(Column* col, void* buffer): - * cdef int numele = col.GetLen() - * cdef void* src = col.GetValuePointer() # <<<<<<<<<<<<<< - * return create_numpyarray(buffer, src, this.typecode, numele, this.elesize) - * - */ +#line 438 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.get_converter", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 242 "root_numpy/src/tree.pyx" - __pyx_v_src = __pyx_v_col->GetValuePointer(); +#line 438 "root_numpy/src/converters.pyx" + __pyx_r = 0; - /* "root_numpy/src/tree.pyx":243 - * cdef int numele = col.GetLen() - * cdef void* src = col.GetValuePointer() - * return create_numpyarray(buffer, src, this.typecode, numele, this.elesize) # <<<<<<<<<<<<<< - * - * - */ +#line 438 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 243 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray(__pyx_v_buffer, __pyx_v_src, this->typecode, __pyx_v_numele, this->elesize); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_leaf_type); -#line 243 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_leaf_shape); - /* "root_numpy/src/tree.pyx":240 - * this.elesize = conv.size - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef int numele = col.GetLen() - * cdef void* src = col.GetValuePointer() - */ +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_match); -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_arraydef); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_arraytokens); -#line 240 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_shape); -#line 240 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_token); -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" return __pyx_r; -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":250 - * int L # numele +/* "root_numpy/src/converters.pyx":502 * - * __init__(BasicConverter* conv, int L): # <<<<<<<<<<<<<< - * this.conv = conv - * this.L = L + * @atexit.register + * def cleanup(): # <<<<<<<<<<<<<< + * # Delete all converters when module is town down + * it = CONVERTERS.begin() */ -#line 250 "root_numpy/src/tree.pyx" - +#line 502 "root_numpy/src/converters.pyx" -#line 250 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_FixedArrayConverter::__pyx_t_13_librootnumpy_FixedArrayConverter(__pyx_t_13_librootnumpy_BasicConverter *__pyx_v_conv, int __pyx_v_L) { - __Pyx_RefNannyDeclarations -#line 250 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 502 "root_numpy/src/converters.pyx" +/* Python wrapper */ - /* "root_numpy/src/tree.pyx":251 - * - * __init__(BasicConverter* conv, int L): - * this.conv = conv # <<<<<<<<<<<<<< - * this.L = L - * - */ +#line 502 "root_numpy/src/converters.pyx" +static PyObject *__pyx_pw_13_librootnumpy_1cleanup(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_1cleanup = +#line 502 "root_numpy/src/converters.pyx" +{"cleanup", (PyCFunction)__pyx_pw_13_librootnumpy_1cleanup, METH_NOARGS, 0}; -#line 251 "root_numpy/src/tree.pyx" - this->conv = __pyx_v_conv; +#line 502 "root_numpy/src/converters.pyx" +static PyObject *__pyx_pw_13_librootnumpy_1cleanup(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) { - /* "root_numpy/src/tree.pyx":252 - * __init__(BasicConverter* conv, int L): - * this.conv = conv - * this.L = L # <<<<<<<<<<<<<< - * - * int write(Column* col, void* buffer): - */ +#line 502 "root_numpy/src/converters.pyx" + PyObject *__pyx_r = 0; -#line 252 "root_numpy/src/tree.pyx" - this->L = __pyx_v_L; +#line 502 "root_numpy/src/converters.pyx" + __Pyx_RefNannyDeclarations - /* "root_numpy/src/tree.pyx":250 - * int L # numele - * - * __init__(BasicConverter* conv, int L): # <<<<<<<<<<<<<< - * this.conv = conv - * this.L = L - */ +#line 502 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("cleanup (wrapper)", 0); + __pyx_r = +#line 502 "root_numpy/src/converters.pyx" +__pyx_pf_13_librootnumpy_cleanup(__pyx_self); -#line 250 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" -#line 250 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" /* function exit code */ -#line 250 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 250 "root_numpy/src/tree.pyx" -} +#line 502 "root_numpy/src/converters.pyx" + return __pyx_r; -/* "root_numpy/src/tree.pyx":254 - * this.L = L - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef void* src = col.GetValuePointer() - * cdef int nbytes = col.GetSize() - */ +#line 502 "root_numpy/src/converters.pyx" +} -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" -#line 254 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_FixedArrayConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - void *__pyx_v_src -#line 254 "root_numpy/src/tree.pyx" -; - int __pyx_v_nbytes -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" +static PyObject *__pyx_pf_13_librootnumpy_cleanup(CYTHON_UNUSED PyObject *__pyx_self) { + std::map ::iterator __pyx_v_it +#line 502 "root_numpy/src/converters.pyx" ; -#line 254 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 502 "root_numpy/src/converters.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations + int __pyx_t_1; -#line 254 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 502 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("cleanup", 0); - /* "root_numpy/src/tree.pyx":255 - * - * int write(Column* col, void* buffer): - * cdef void* src = col.GetValuePointer() # <<<<<<<<<<<<<< - * cdef int nbytes = col.GetSize() - * memcpy(buffer, src, nbytes) + /* "root_numpy/src/converters.pyx":504 + * def cleanup(): + * # Delete all converters when module is town down + * it = CONVERTERS.begin() # <<<<<<<<<<<<<< + * while it != CONVERTERS.end(): + * del deref(it).second */ -#line 255 "root_numpy/src/tree.pyx" - __pyx_v_src = __pyx_v_col->GetValuePointer(); +#line 504 "root_numpy/src/converters.pyx" + __pyx_v_it = __pyx_v_13_librootnumpy_CONVERTERS.begin(); - /* "root_numpy/src/tree.pyx":256 - * int write(Column* col, void* buffer): - * cdef void* src = col.GetValuePointer() - * cdef int nbytes = col.GetSize() # <<<<<<<<<<<<<< - * memcpy(buffer, src, nbytes) - * return nbytes + /* "root_numpy/src/converters.pyx":505 + * # Delete all converters when module is town down + * it = CONVERTERS.begin() + * while it != CONVERTERS.end(): # <<<<<<<<<<<<<< + * del deref(it).second + * inc(it) */ -#line 256 "root_numpy/src/tree.pyx" - __pyx_v_nbytes = __pyx_v_col->GetSize(); +#line 505 "root_numpy/src/converters.pyx" + while (1) { - /* "root_numpy/src/tree.pyx":257 - * cdef void* src = col.GetValuePointer() - * cdef int nbytes = col.GetSize() - * memcpy(buffer, src, nbytes) # <<<<<<<<<<<<<< - * return nbytes - * +#line 505 "root_numpy/src/converters.pyx" + __pyx_t_1 = ((__pyx_v_it != __pyx_v_13_librootnumpy_CONVERTERS.end()) != 0); + +#line 505 "root_numpy/src/converters.pyx" + if (!__pyx_t_1) break; + + /* "root_numpy/src/converters.pyx":506 + * it = CONVERTERS.begin() + * while it != CONVERTERS.end(): + * del deref(it).second # <<<<<<<<<<<<<< + * inc(it) */ -#line 257 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, __pyx_v_src, __pyx_v_nbytes); +#line 506 "root_numpy/src/converters.pyx" + delete (*__pyx_v_it).second; - /* "root_numpy/src/tree.pyx":258 - * cdef int nbytes = col.GetSize() - * memcpy(buffer, src, nbytes) - * return nbytes # <<<<<<<<<<<<<< - * - * object get_nptype(): + /* "root_numpy/src/converters.pyx":507 + * while it != CONVERTERS.end(): + * del deref(it).second + * inc(it) # <<<<<<<<<<<<<< */ -#line 258 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_nbytes; +#line 507 "root_numpy/src/converters.pyx" + (++__pyx_v_it); -#line 258 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 507 "root_numpy/src/converters.pyx" + } - /* "root_numpy/src/tree.pyx":254 - * this.L = L + /* "root_numpy/src/converters.pyx":502 * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef void* src = col.GetValuePointer() - * cdef int nbytes = col.GetSize() + * @atexit.register + * def cleanup(): # <<<<<<<<<<<<<< + * # Delete all converters when module is town down + * it = CONVERTERS.begin() */ -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" /* function exit code */ -#line 254 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 502 "root_numpy/src/converters.pyx" + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + +#line 502 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" return __pyx_r; -#line 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":260 - * return nbytes +/* "root_numpy/src/tree.pyx":4 * - * object get_nptype(): # <<<<<<<<<<<<<< - * return (np.dtype(this.conv.nptype), this.L) * + * def list_trees(fname): # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: */ -#line 260 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" -#line 260 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_FixedArrayConverter::get_nptype(void) { +#line 4 "root_numpy/src/tree.pyx" +/* Python wrapper */ + +#line 4 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_3list_trees(PyObject *__pyx_self, PyObject *__pyx_v_fname); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_3list_trees = +#line 4 "root_numpy/src/tree.pyx" +{"list_trees", (PyCFunction)__pyx_pw_13_librootnumpy_3list_trees, METH_O, 0}; + +#line 4 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_3list_trees(PyObject *__pyx_self, PyObject *__pyx_v_fname) { + +#line 4 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = 0; + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannyDeclarations + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_trees (wrapper)", 0); + __pyx_r = +#line 4 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_2list_trees(__pyx_self, ((PyObject *)__pyx_v_fname)); + +#line 4 "root_numpy/src/tree.pyx" + + +#line 4 "root_numpy/src/tree.pyx" + /* function exit code */ + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 4 "root_numpy/src/tree.pyx" + return __pyx_r; + +#line 4 "root_numpy/src/tree.pyx" +} + +#line 4 "root_numpy/src/tree.pyx" + -#line 260 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname) { + TFile *__pyx_v_rfile +#line 4 "root_numpy/src/tree.pyx" +; + TList *__pyx_v_keys +#line 4 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_ret = NULL +#line 4 "root_numpy/src/tree.pyx" +; + int __pyx_v_nkeys +#line 4 "root_numpy/src/tree.pyx" +; + TKey *__pyx_v_key +#line 4 "root_numpy/src/tree.pyx" +; + int __pyx_v_i +#line 4 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_clsname = NULL +#line 4 "root_numpy/src/tree.pyx" +; + +#line 4 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; + const char *__pyx_t_1; + int __pyx_t_2; PyObject *__pyx_t_3 = NULL; + PyObject *__pyx_t_4 = NULL; + PyObject *__pyx_t_5 = NULL; + PyObject *__pyx_t_6 = NULL; + int __pyx_t_7; + int __pyx_t_8; + int __pyx_t_9; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 260 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_trees", 0); - /* "root_numpy/src/tree.pyx":261 - * - * object get_nptype(): - * return (np.dtype(this.conv.nptype), this.L) # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":5 * - * int get_nptypecode(): + * def list_trees(fname): + * cdef TFile* rfile = Open(fname, 'read') # <<<<<<<<<<<<<< + * if rfile == NULL: + * raise IOError("cannot read {0}".format(fname)) */ -#line 261 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 5 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_fname); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(this->conv->nptype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 5 "root_numpy/src/tree.pyx" + __pyx_v_rfile = TFile::Open(__pyx_t_1, __pyx_k_read); -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); + /* "root_numpy/src/tree.pyx":6 + * def list_trees(fname): + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: # <<<<<<<<<<<<<< + * raise IOError("cannot read {0}".format(fname)) + * cdef TList* keys = rfile.GetListOfKeys() + */ -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 6 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_rfile == NULL) != 0); -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 6 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { -#line 261 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); + /* "root_numpy/src/tree.pyx":7 + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: + * raise IOError("cannot read {0}".format(fname)) # <<<<<<<<<<<<<< + * cdef TList* keys = rfile.GetListOfKeys() + * if keys == NULL: + */ -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_read_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_5 = NULL; -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 7 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { -#line 261 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyInt_From_int(this->L); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_5)) { -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 7 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_5); -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 261 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_4, function); -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 7 "root_numpy/src/tree.pyx" + } -#line 261 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); +#line 7 "root_numpy/src/tree.pyx" + } -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_2); +#line 7 "root_numpy/src/tree.pyx" + if (!__pyx_t_5) { -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 261 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_3; +#line 7 "root_numpy/src/tree.pyx" + } else { -#line 261 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 261 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); - /* "root_numpy/src/tree.pyx":260 - * return nbytes - * - * object get_nptype(): # <<<<<<<<<<<<<< - * return (np.dtype(this.conv.nptype), this.L) - * - */ +#line 7 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; -#line 260 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); +#line 7 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_fname); -#line 260 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#line 260 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 7 "root_numpy/src/tree.pyx" + } -#line 260 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("FixedArrayConverter.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 260 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 260 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 7 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 260 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 260 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 260 "root_numpy/src/tree.pyx" -} +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -/* "root_numpy/src/tree.pyx":263 - * return (np.dtype(this.conv.nptype), this.L) - * - * int get_nptypecode(): # <<<<<<<<<<<<<< - * return this.conv.nptypecode - * - */ +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 263 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_3, 0, 0, 0); -#line 263 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_FixedArrayConverter::get_nptypecode(void) { +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 263 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 7 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 263 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptypecode", 0); +#line 7 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":264 - * - * int get_nptypecode(): - * return this.conv.nptypecode # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/tree.pyx":8 + * if rfile == NULL: + * raise IOError("cannot read {0}".format(fname)) + * cdef TList* keys = rfile.GetListOfKeys() # <<<<<<<<<<<<<< + * if keys == NULL: + * raise IOError("unable to get keys in {0}".format(fname)) */ -#line 264 "root_numpy/src/tree.pyx" - __pyx_r = this->conv->nptypecode; - -#line 264 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 8 "root_numpy/src/tree.pyx" + __pyx_v_keys = __pyx_v_rfile->GetListOfKeys(); - /* "root_numpy/src/tree.pyx":263 - * return (np.dtype(this.conv.nptype), this.L) - * - * int get_nptypecode(): # <<<<<<<<<<<<<< - * return this.conv.nptypecode - * + /* "root_numpy/src/tree.pyx":9 + * raise IOError("cannot read {0}".format(fname)) + * cdef TList* keys = rfile.GetListOfKeys() + * if keys == NULL: # <<<<<<<<<<<<<< + * raise IOError("unable to get keys in {0}".format(fname)) + * ret = dict() */ -#line 263 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_keys == NULL) != 0); +#line 9 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { -#line 263 "root_numpy/src/tree.pyx" - /* function exit code */ + /* "root_numpy/src/tree.pyx":10 + * cdef TList* keys = rfile.GetListOfKeys() + * if keys == NULL: + * raise IOError("unable to get keys in {0}".format(fname)) # <<<<<<<<<<<<<< + * ret = dict() + * cdef int nkeys = keys.GetEntries() + */ -#line 263 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_unable_to_get_keys_in_0, __pyx_n_s_format); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 263 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 263 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_6 = NULL; -#line 263 "root_numpy/src/tree.pyx" -} +#line 10 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { -/* "root_numpy/src/tree.pyx":272 - * Vector2Array[T] v2a - * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] - */ +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); -#line 272 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_6)) { +#line 10 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); -#line 272 "root_numpy/src/tree.pyx" -template +#line 10 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_6); -#line 272 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_VectorConverter ::__pyx_t_13_librootnumpy_VectorConverter(void) { - TypeName __pyx_v_ast -#line 272 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_info = NULL -#line 272 "root_numpy/src/tree.pyx" -; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_4, function); - /* "root_numpy/src/tree.pyx":273 - * - * __init__(): - * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize - */ +#line 10 "root_numpy/src/tree.pyx" + } -#line 273 "root_numpy/src/tree.pyx" - __pyx_v_ast = TypeName (); +#line 10 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":274 - * __init__(): - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] # <<<<<<<<<<<<<< - * this.elesize = info[1].itemsize - * this.nptypecode = info[2] - */ +#line 10 "root_numpy/src/tree.pyx" + if (!__pyx_t_6) { -#line 274 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 274 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 274 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_ast.name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/tree.pyx" + } else { -#line 274 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 274 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyObject_GetItem(__pyx_t_1, __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 274 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 10 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; -#line 274 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); -#line 274 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 10 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); -#line 274 "root_numpy/src/tree.pyx" - __pyx_v_info = __pyx_t_3; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#line 274 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":275 - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize # <<<<<<<<<<<<<< - * this.nptypecode = info[2] - * - */ +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 275 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_info, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 275 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 10 "root_numpy/src/tree.pyx" + } -#line 275 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 275 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 275 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 275 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 275 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 275 "root_numpy/src/tree.pyx" - this->elesize = __pyx_t_4; +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":276 - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize - * this.nptypecode = info[2] # <<<<<<<<<<<<<< - * - * int write(Column* col, void* buffer): - */ +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 276 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_info, 2, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 276 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 276 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_3, 0, 0, 0); -#line 276 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 276 "root_numpy/src/tree.pyx" - this->nptypecode = __pyx_t_4; +#line 10 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":272 - * Vector2Array[T] v2a - * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] - */ +#line 10 "root_numpy/src/tree.pyx" + } -#line 272 "root_numpy/src/tree.pyx" + /* "root_numpy/src/tree.pyx":11 + * if keys == NULL: + * raise IOError("unable to get keys in {0}".format(fname)) + * ret = dict() # <<<<<<<<<<<<<< + * cdef int nkeys = keys.GetEntries() + * cdef TKey* key + */ +#line 11 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 272 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 11 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 272 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 11 "root_numpy/src/tree.pyx" + __pyx_v_ret = ((PyObject*)__pyx_t_3); -#line 272 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 11 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); + /* "root_numpy/src/tree.pyx":12 + * raise IOError("unable to get keys in {0}".format(fname)) + * ret = dict() + * cdef int nkeys = keys.GetEntries() # <<<<<<<<<<<<<< + * cdef TKey* key + * for i in range(nkeys): + */ -#line 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 12 "root_numpy/src/tree.pyx" + __pyx_v_nkeys = __pyx_v_keys->GetEntries(); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); + /* "root_numpy/src/tree.pyx":14 + * cdef int nkeys = keys.GetEntries() + * cdef TKey* key + * for i in range(nkeys): # <<<<<<<<<<<<<< + * key = keys.At(i) + * clsname = str(key.GetClassName()) + */ -#line 272 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 14 "root_numpy/src/tree.pyx" + __pyx_t_7 = __pyx_v_nkeys; -#line 272 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 14 "root_numpy/src/tree.pyx" + for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { -#line 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_info); +#line 14 "root_numpy/src/tree.pyx" + __pyx_v_i = __pyx_t_8; -#line 272 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/tree.pyx":15 + * cdef TKey* key + * for i in range(nkeys): + * key = keys.At(i) # <<<<<<<<<<<<<< + * clsname = str(key.GetClassName()) + * if clsname == 'TTree' or clsname == 'TNtuple': + */ -#line 272 "root_numpy/src/tree.pyx" -} +#line 15 "root_numpy/src/tree.pyx" + __pyx_v_key = ((TKey *)__pyx_v_keys->At(__pyx_v_i)); -/* "root_numpy/src/tree.pyx":278 - * this.nptypecode = info[2] - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[T]* tmp = col.GetValuePointer() - * cdef unsigned long numele = tmp.size() + /* "root_numpy/src/tree.pyx":16 + * for i in range(nkeys): + * key = keys.At(i) + * clsname = str(key.GetClassName()) # <<<<<<<<<<<<<< + * if clsname == 'TTree' or clsname == 'TNtuple': + * ret[str(key.GetName())] = None */ -#line 278 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyStr_FromString(__pyx_v_key->GetClassName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 278 "root_numpy/src/tree.pyx" -template +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 278 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VectorConverter ::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::vector *__pyx_v_tmp -#line 278 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_numele -#line 278 "root_numpy/src/tree.pyx" -; - T *__pyx_v_fa -#line 278 "root_numpy/src/tree.pyx" -; +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 278 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 16 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 278 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); - /* "root_numpy/src/tree.pyx":279 - * - * int write(Column* col, void* buffer): - * cdef vector[T]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * cdef unsigned long numele = tmp.size() - * # check cython auto-generated code - */ +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 279 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":280 - * int write(Column* col, void* buffer): - * cdef vector[T]* tmp = col.GetValuePointer() - * cdef unsigned long numele = tmp.size() # <<<<<<<<<<<<<< - * # check cython auto-generated code - * # if it really does &((*tmp)[0]) - */ +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 280 "root_numpy/src/tree.pyx" - __pyx_v_numele = __pyx_v_tmp->size(); +#line 16 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "root_numpy/src/tree.pyx":283 - * # check cython auto-generated code - * # if it really does &((*tmp)[0]) - * cdef T* fa = this.v2a.convert(tmp) # <<<<<<<<<<<<<< - * return create_numpyarray(buffer, fa, this.nptypecode, numele, this.elesize) - * - */ +#line 16 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_clsname, __pyx_t_3); -#line 283 "root_numpy/src/tree.pyx" - __pyx_v_fa = this->v2a.convert(__pyx_v_tmp); +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":284 - * # if it really does &((*tmp)[0]) - * cdef T* fa = this.v2a.convert(tmp) - * return create_numpyarray(buffer, fa, this.nptypecode, numele, this.elesize) # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/tree.pyx":17 + * key = keys.At(i) + * clsname = str(key.GetClassName()) + * if clsname == 'TTree' or clsname == 'TNtuple': # <<<<<<<<<<<<<< + * ret[str(key.GetName())] = None + * rfile.Close() */ -#line 284 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray(__pyx_v_buffer, __pyx_v_fa, this->nptypecode, __pyx_v_numele, this->elesize); +#line 17 "root_numpy/src/tree.pyx" + __pyx_t_9 = (__Pyx_PyString_Equals(__pyx_v_clsname, __pyx_n_s_TTree, Py_EQ)); if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 284 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 17 "root_numpy/src/tree.pyx" + if (!__pyx_t_9) { - /* "root_numpy/src/tree.pyx":278 - * this.nptypecode = info[2] - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[T]* tmp = col.GetValuePointer() - * cdef unsigned long numele = tmp.size() - */ +#line 17 "root_numpy/src/tree.pyx" + } else { -#line 278 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_9; +#line 17 "root_numpy/src/tree.pyx" + goto __pyx_L8_bool_binop_done; -#line 278 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 17 "root_numpy/src/tree.pyx" + } -#line 278 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 17 "root_numpy/src/tree.pyx" + __pyx_t_9 = (__Pyx_PyString_Equals(__pyx_v_clsname, __pyx_n_s_TNtuple, Py_EQ)); if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 278 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 17 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_9; -#line 278 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 17 "root_numpy/src/tree.pyx" + __pyx_L8_bool_binop_done:; -#line 278 "root_numpy/src/tree.pyx" -} +#line 17 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { -/* "root_numpy/src/tree.pyx":292 - * Vector2Array[T] v2a - * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] + /* "root_numpy/src/tree.pyx":18 + * clsname = str(key.GetClassName()) + * if clsname == 'TTree' or clsname == 'TNtuple': + * ret[str(key.GetName())] = None # <<<<<<<<<<<<<< + * rfile.Close() + * del rfile */ -#line 292 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyStr_FromString(__pyx_v_key->GetName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 292 "root_numpy/src/tree.pyx" -template +#line 18 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 292 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_VectorVectorConverter ::__pyx_t_13_librootnumpy_VectorVectorConverter(void) { - TypeName __pyx_v_ast -#line 292 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_info = NULL -#line 292 "root_numpy/src/tree.pyx" -; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; - PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 18 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 292 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 18 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); - /* "root_numpy/src/tree.pyx":293 - * - * __init__(): - * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize - */ +#line 18 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 293 "root_numpy/src/tree.pyx" - __pyx_v_ast = TypeName (); +#line 18 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":294 - * __init__(): - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] # <<<<<<<<<<<<<< - * this.elesize = info[1].itemsize - * this.nptypecode = info[2] - */ +#line 18 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 294 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 294 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 18 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 294 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_ast.name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/tree.pyx" + if (unlikely(PyDict_SetItem(__pyx_v_ret, __pyx_t_3, Py_None) < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 294 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 18 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 294 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyObject_GetItem(__pyx_t_1, __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 18 "root_numpy/src/tree.pyx" + goto __pyx_L7; -#line 294 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 18 "root_numpy/src/tree.pyx" + } -#line 294 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 18 "root_numpy/src/tree.pyx" + __pyx_L7:; -#line 294 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 18 "root_numpy/src/tree.pyx" + } -#line 294 "root_numpy/src/tree.pyx" - __pyx_v_info = __pyx_t_3; + /* "root_numpy/src/tree.pyx":19 + * if clsname == 'TTree' or clsname == 'TNtuple': + * ret[str(key.GetName())] = None + * rfile.Close() # <<<<<<<<<<<<<< + * del rfile + * return list(ret.keys()) + */ -#line 294 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 19 "root_numpy/src/tree.pyx" + __pyx_v_rfile->Close(); - /* "root_numpy/src/tree.pyx":295 - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize # <<<<<<<<<<<<<< - * this.nptypecode = info[2] + /* "root_numpy/src/tree.pyx":20 + * ret[str(key.GetName())] = None + * rfile.Close() + * del rfile # <<<<<<<<<<<<<< + * return list(ret.keys()) * */ -#line 295 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_info, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 20 "root_numpy/src/tree.pyx" + delete __pyx_v_rfile; -#line 295 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/tree.pyx":21 + * rfile.Close() + * del rfile + * return list(ret.keys()) # <<<<<<<<<<<<<< + * + * + */ -#line 295 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 21 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 295 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 21 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyDict_Keys(__pyx_v_ret); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 295 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 21 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 295 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 21 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 295 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 21 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 295 "root_numpy/src/tree.pyx" - this->elesize = __pyx_t_4; +#line 21 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); - /* "root_numpy/src/tree.pyx":296 - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize - * this.nptypecode = info[2] # <<<<<<<<<<<<<< - * - * int write(Column* col, void* buffer): - */ +#line 21 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 296 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_info, 2, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 21 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 296 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 21 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyList_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 296 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 21 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 296 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 21 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 296 "root_numpy/src/tree.pyx" - this->nptypecode = __pyx_t_4; +#line 21 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_3; - /* "root_numpy/src/tree.pyx":292 - * Vector2Array[T] v2a +#line 21 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; + +#line 21 "root_numpy/src/tree.pyx" + goto __pyx_L0; + + /* "root_numpy/src/tree.pyx":4 * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] + * + * def list_trees(fname): # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: */ -#line 292 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" -#line 292 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" /* function exit code */ -#line 292 "root_numpy/src/tree.pyx" - goto __pyx_L0; - -#line 292 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 292 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); - -#line 292 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); - -#line 292 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 292 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); -#line 292 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 292 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_info); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_trees", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 4 "root_numpy/src/tree.pyx" + __pyx_r = NULL; + +#line 4 "root_numpy/src/tree.pyx" + __pyx_L0:; + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_ret); + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_clsname); + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 292 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 292 "root_numpy/src/tree.pyx" +#line 4 "root_numpy/src/tree.pyx" + return __pyx_r; + +#line 4 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":298 - * this.nptypecode = info[2] +/* "root_numpy/src/tree.pyx":24 * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[T]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors + * + * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< + * if tree == None: + * # automatically select single tree */ -#line 298 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" -#line 298 "root_numpy/src/tree.pyx" -template +#line 24 "root_numpy/src/tree.pyx" +/* Python wrapper */ -#line 298 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VectorVectorConverter ::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::vector > *__pyx_v_tmp -#line 298 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_numele -#line 298 "root_numpy/src/tree.pyx" -; - T *__pyx_v_fa -#line 298 "root_numpy/src/tree.pyx" -; - int __pyx_v_objsize -#line 298 "root_numpy/src/tree.pyx" -; - int __pyx_v_objtypecode -#line 298 "root_numpy/src/tree.pyx" -; - npy_intp __pyx_v_dims[1] -#line 298 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_5list_structures(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_5list_structures = +#line 24 "root_numpy/src/tree.pyx" +{"list_structures", (PyCFunction)__pyx_pw_13_librootnumpy_5list_structures, METH_VARARGS|METH_KEYWORDS, 0}; + +#line 24 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_5list_structures(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + PyObject *__pyx_v_fname = 0 +#line 24 "root_numpy/src/tree.pyx" ; - PyArrayObject *__pyx_v_outer = 0 -#line 298 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_tree = 0 +#line 24 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_outerobj -#line 298 "root_numpy/src/tree.pyx" + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; + +#line 24 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = 0; + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_RefNannyDeclarations + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_structures (wrapper)", 0); + +#line 24 "root_numpy/src/tree.pyx" + { + +#line 24 "root_numpy/src/tree.pyx" + static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; + +#line 24 "root_numpy/src/tree.pyx" + PyObject* values[2] = {0,0}; + +#line 24 "root_numpy/src/tree.pyx" + values[1] = ((PyObject *)Py_None); + +#line 24 "root_numpy/src/tree.pyx" + if (unlikely(__pyx_kwds)) { + +#line 24 "root_numpy/src/tree.pyx" + Py_ssize_t kw_args; + +#line 24 "root_numpy/src/tree.pyx" + const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); + +#line 24 "root_numpy/src/tree.pyx" + switch (pos_args) { + case 2: +#line 24 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 24 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + +#line 24 "root_numpy/src/tree.pyx" + case 0: break; + default: +#line 24 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + kw_args = PyDict_Size(__pyx_kwds); + +#line 24 "root_numpy/src/tree.pyx" + switch (pos_args) { + +#line 24 "root_numpy/src/tree.pyx" + case 0: + +#line 24 "root_numpy/src/tree.pyx" + if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; + else +#line 24 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 24 "root_numpy/src/tree.pyx" + case 1: + +#line 24 "root_numpy/src/tree.pyx" + if (kw_args > 0) { + +#line 24 "root_numpy/src/tree.pyx" + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); + +#line 24 "root_numpy/src/tree.pyx" + if (value) { values[1] = value; kw_args--; } + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + if (unlikely(kw_args > 0)) { + +#line 24 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "list_structures") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + } else { + +#line 24 "root_numpy/src/tree.pyx" + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 2: +#line 24 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 24 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + +#line 24 "root_numpy/src/tree.pyx" + break; + default: +#line 24 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + __pyx_v_fname = values[0]; + +#line 24 "root_numpy/src/tree.pyx" + __pyx_v_tree = values[1]; + +#line 24 "root_numpy/src/tree.pyx" + } + +#line 24 "root_numpy/src/tree.pyx" + goto __pyx_L4_argument_unpacking_done; + +#line 24 "root_numpy/src/tree.pyx" + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("list_structures", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); +#line 24 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 24 "root_numpy/src/tree.pyx" + __pyx_L3_error:; + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 24 "root_numpy/src/tree.pyx" + return NULL; + +#line 24 "root_numpy/src/tree.pyx" + __pyx_L4_argument_unpacking_done:; + __pyx_r = +#line 24 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_4list_structures(__pyx_self, __pyx_v_fname, __pyx_v_tree); + +#line 24 "root_numpy/src/tree.pyx" + + +#line 24 "root_numpy/src/tree.pyx" + /* function exit code */ + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 24 "root_numpy/src/tree.pyx" + return __pyx_r; + +#line 24 "root_numpy/src/tree.pyx" +} + +#line 24 "root_numpy/src/tree.pyx" + + +#line 24 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree) { + TFile *__pyx_v_rfile +#line 24 "root_numpy/src/tree.pyx" ; - char *__pyx_v_dataptr -#line 298 "root_numpy/src/tree.pyx" + TTree *__pyx_v_rtree +#line 24 "root_numpy/src/tree.pyx" ; - unsigned long __pyx_v_i -#line 298 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_structure = NULL +#line 24 "root_numpy/src/tree.pyx" ; -#line 298 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 24 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; int __pyx_t_2; - unsigned long __pyx_t_3; - unsigned long __pyx_t_4; + PyObject *__pyx_t_3 = NULL; + PyObject *__pyx_t_4 = NULL; + PyObject *__pyx_t_5 = NULL; + Py_ssize_t __pyx_t_6; + PyObject *__pyx_t_7 = NULL; + const char *__pyx_t_8; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 298 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 24 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_structures", 0); - /* "root_numpy/src/tree.pyx":299 +#line 24 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_tree); + + /* "root_numpy/src/tree.pyx":25 * - * int write(Column* col, void* buffer): - * cdef vector[vector[T]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * # this will hold number of subvectors - * cdef unsigned long numele + * def list_structures(fname, tree=None): + * if tree == None: # <<<<<<<<<<<<<< + * # automatically select single tree + * tree = list_trees(fname) */ -#line 299 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); +#line 25 "root_numpy/src/tree.pyx" + __pyx_t_1 = PyObject_RichCompare(__pyx_v_tree, Py_None, Py_EQ); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":304 - * cdef T* fa - * # these are defined solely for the outer array wrapper - * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< - * cdef int objtypecode = np.NPY_OBJECT - * numele = tmp[0].size() +#line 25 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 25 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + + /* "root_numpy/src/tree.pyx":27 + * if tree == None: + * # automatically select single tree + * tree = list_trees(fname) # <<<<<<<<<<<<<< + * if len(tree) != 1: + * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) */ -#line 304 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 304; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_list_trees); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 304 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 304 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; -#line 304 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 27 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { -#line 304 "root_numpy/src/tree.pyx" - __pyx_v_objsize = __pyx_t_2; +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); - /* "root_numpy/src/tree.pyx":305 - * # these are defined solely for the outer array wrapper - * cdef int objsize = np.dtype('O').itemsize - * cdef int objtypecode = np.NPY_OBJECT # <<<<<<<<<<<<<< - * numele = tmp[0].size() - * # create an outer array container that dataptr points to, - */ +#line 27 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { -#line 305 "root_numpy/src/tree.pyx" - __pyx_v_objtypecode = NPY_OBJECT; +#line 27 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - /* "root_numpy/src/tree.pyx":306 - * cdef int objsize = np.dtype('O').itemsize - * cdef int objtypecode = np.NPY_OBJECT - * numele = tmp[0].size() # <<<<<<<<<<<<<< - * # create an outer array container that dataptr points to, - * # containing pointers from create_numpyarray(). - */ +#line 27 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); -#line 306 "root_numpy/src/tree.pyx" - __pyx_v_numele = (__pyx_v_tmp[0]).size(); +#line 27 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); - /* "root_numpy/src/tree.pyx":311 - * # define an (numele)-dimensional outer array to hold our subvectors fa - * cdef np.npy_intp dims[1] - * dims[0] = numele # <<<<<<<<<<<<<< - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - * cdef PyObject* outerobj = outer # borrow ref - */ +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 311 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; +#line 27 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":312 - * cdef np.npy_intp dims[1] - * dims[0] = numele - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) # <<<<<<<<<<<<<< - * cdef PyObject* outerobj = outer # borrow ref - * # increase one since we are putting in buffer directly - */ +#line 27 "root_numpy/src/tree.pyx" + } -#line 312 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_objtypecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/tree.pyx" + if (!__pyx_t_4) { -#line 312 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_fname); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 312 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 312 "root_numpy/src/tree.pyx" - __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); +#line 27 "root_numpy/src/tree.pyx" + } else { -#line 312 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":313 - * dims[0] = numele - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - * cdef PyObject* outerobj = outer # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(outer) - */ +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 313 "root_numpy/src/tree.pyx" - __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); +#line 27 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; - /* "root_numpy/src/tree.pyx":315 - * cdef PyObject* outerobj = outer # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(outer) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &outerobj, sizeof(PyObject*)) - */ +#line 27 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); -#line 315 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_outer)); +#line 27 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); - /* "root_numpy/src/tree.pyx":317 - * Py_INCREF(outer) - * # now write PyObject* to buffer - * memcpy(buffer, &outerobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * # build a dataptr pointing to outer, so we can shift and write each - * # of the subvectors - */ +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#line 317 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":320 - * # build a dataptr pointing to outer, so we can shift and write each - * # of the subvectors - * cdef char* dataptr = outer.data # <<<<<<<<<<<<<< - * # loop through all subvectors - * cdef unsigned long i - */ +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 320 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_outer->data); +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":323 - * # loop through all subvectors - * cdef unsigned long i - * for i in range(numele): # <<<<<<<<<<<<<< - * fa = this.v2a.convert(&tmp[0][i]) - * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, +#line 27 "root_numpy/src/tree.pyx" + } + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_1); + +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + + /* "root_numpy/src/tree.pyx":28 + * # automatically select single tree + * tree = list_trees(fname) + * if len(tree) != 1: # <<<<<<<<<<<<<< + * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) + * tree = tree[0] */ -#line 323 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 28 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyObject_Length(__pyx_v_tree); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 323 "root_numpy/src/tree.pyx" - for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { +#line 28 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_t_6 != 1) != 0); -#line 323 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 28 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":324 - * cdef unsigned long i - * for i in range(numele): - * fa = this.v2a.convert(&tmp[0][i]) # <<<<<<<<<<<<<< - * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, - * tmp[0][i].size(), this.elesize) + /* "root_numpy/src/tree.pyx":29 + * tree = list_trees(fname) + * if len(tree) != 1: + * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) # <<<<<<<<<<<<<< + * tree = tree[0] + * cdef TFile* rfile = Open(fname, 'read') */ -#line 324 "root_numpy/src/tree.pyx" - __pyx_v_fa = this->v2a.convert((&((__pyx_v_tmp[0])[__pyx_v_i]))); +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_multiple_trees_found_0, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":325 - * for i in range(numele): - * fa = this.v2a.convert(&tmp[0][i]) - * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, # <<<<<<<<<<<<<< - * tmp[0][i].size(), this.elesize) - * return sizeof(outerobj) +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyString_Join(__pyx_kp_s__10, __pyx_v_tree); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; + +#line 29 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); + +#line 29 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { + +#line 29 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); + +#line 29 "root_numpy/src/tree.pyx" + } + +#line 29 "root_numpy/src/tree.pyx" + } + +#line 29 "root_numpy/src/tree.pyx" + if (!__pyx_t_4) { + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 29 "root_numpy/src/tree.pyx" + } else { + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 29 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; + +#line 29 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_5); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_5); + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +#line 29 "root_numpy/src/tree.pyx" + } + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 29 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 29 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_1, 0, 0, 0); + +#line 29 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 29 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":30 + * if len(tree) != 1: + * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) + * tree = tree[0] # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: */ -#line 325 "root_numpy/src/tree.pyx" - __pyx_f_13_librootnumpy_create_numpyarray((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), __pyx_v_fa, this->nptypecode, ((__pyx_v_tmp[0])[__pyx_v_i]).size(), this->elesize); +#line 30 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_tree, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 325 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 30 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_1); + +#line 30 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 30 "root_numpy/src/tree.pyx" + goto __pyx_L3; + +#line 30 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":327 - * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, - * tmp[0][i].size(), this.elesize) - * return sizeof(outerobj) # <<<<<<<<<<<<<< - * - * +#line 30 "root_numpy/src/tree.pyx" + __pyx_L3:; + + /* "root_numpy/src/tree.pyx":31 + * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) + * tree = tree[0] + * cdef TFile* rfile = Open(fname, 'read') # <<<<<<<<<<<<<< + * if rfile == NULL: + * raise IOError("cannot read {0}".format(fname)) */ -#line 327 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_outerobj)); +#line 31 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_v_fname); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 327 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 31 "root_numpy/src/tree.pyx" + __pyx_v_rfile = TFile::Open(__pyx_t_8, __pyx_k_read); - /* "root_numpy/src/tree.pyx":298 - * this.nptypecode = info[2] - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[T]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors + /* "root_numpy/src/tree.pyx":32 + * tree = tree[0] + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: # <<<<<<<<<<<<<< + * raise IOError("cannot read {0}".format(fname)) + * cdef TTree* rtree = rfile.Get(tree) */ -#line 298 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_rfile == NULL) != 0); +#line 32 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { -#line 298 "root_numpy/src/tree.pyx" - /* function exit code */ + /* "root_numpy/src/tree.pyx":33 + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: + * raise IOError("cannot read {0}".format(fname)) # <<<<<<<<<<<<<< + * cdef TTree* rtree = rfile.Get(tree) + * if rtree == NULL: + */ -#line 298 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_read_0, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 298 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 298 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_7 = NULL; -#line 298 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 33 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 298 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_3); -#line 298 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_outer); +#line 33 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_7)) { -#line 298 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 33 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 298 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 33 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_7); -#line 298 "root_numpy/src/tree.pyx" -} +#line 33 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -/* "root_numpy/src/tree.pyx":332 - * cdef cppclass VectorBoolConverter(ObjectConverterBase): - * # Requires special treament since vector stores contents as bits... - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[bool]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorbool(buffer, tmp) - */ +#line 33 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 332 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" + } +#line 33 "root_numpy/src/tree.pyx" + } -#line 332 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VectorBoolConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::vector *__pyx_v_tmp -#line 332 "root_numpy/src/tree.pyx" -; +#line 33 "root_numpy/src/tree.pyx" + if (!__pyx_t_7) { -#line 332 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_fname); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 332 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":333 - * # Requires special treament since vector stores contents as bits... - * int write(Column* col, void* buffer): - * cdef vector[bool]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * return create_numpyarray_vectorbool(buffer, tmp) - * +#line 33 "root_numpy/src/tree.pyx" + } else { + +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); + +#line 33 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_7); __Pyx_GIVEREF(__pyx_t_7); __pyx_t_7 = NULL; + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); + +#line 33 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); + +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +#line 33 "root_numpy/src/tree.pyx" + } + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 33 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); + +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_1, 0, 0, 0); + +#line 33 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 33 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 33 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":34 + * if rfile == NULL: + * raise IOError("cannot read {0}".format(fname)) + * cdef TTree* rtree = rfile.Get(tree) # <<<<<<<<<<<<<< + * if rtree == NULL: + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) */ -#line 333 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_v_tree); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":334 - * int write(Column* col, void* buffer): - * cdef vector[bool]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorbool(buffer, tmp) # <<<<<<<<<<<<<< - * - * +#line 34 "root_numpy/src/tree.pyx" + __pyx_v_rtree = ((TTree *)__pyx_v_rfile->Get(__pyx_t_8)); + + /* "root_numpy/src/tree.pyx":35 + * raise IOError("cannot read {0}".format(fname)) + * cdef TTree* rtree = rfile.Get(tree) + * if rtree == NULL: # <<<<<<<<<<<<<< + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) + * structure = get_tree_structure(rtree) */ -#line 334 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(__pyx_v_buffer, __pyx_v_tmp); +#line 35 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_rtree == NULL) != 0); -#line 334 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 35 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":332 - * cdef cppclass VectorBoolConverter(ObjectConverterBase): - * # Requires special treament since vector stores contents as bits... - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[bool]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorbool(buffer, tmp) + /* "root_numpy/src/tree.pyx":36 + * cdef TTree* rtree = rfile.Get(tree) + * if rtree == NULL: + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) # <<<<<<<<<<<<<< + * structure = get_tree_structure(rtree) + * rfile.Close() */ -#line 332 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_tree_0_not_found_in_1, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 332 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_5 = NULL; -#line 332 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; -#line 332 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 36 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 332 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); -#line 332 "root_numpy/src/tree.pyx" -} +#line 36 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_5)) { -/* "root_numpy/src/tree.pyx":339 - * cdef cppclass VectorVectorBoolConverter(ObjectConverterBase): - * # Requires special treament since vector stores contents as bits... - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[bool]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors - */ +#line 36 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 339 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_5); +#line 36 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 339 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VectorVectorBoolConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::vector > *__pyx_v_tmp -#line 339 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_numele -#line 339 "root_numpy/src/tree.pyx" -; - int __pyx_v_objsize -#line 339 "root_numpy/src/tree.pyx" -; - int __pyx_v_objtypecode -#line 339 "root_numpy/src/tree.pyx" -; - npy_intp __pyx_v_dims[1] -#line 339 "root_numpy/src/tree.pyx" -; - PyArrayObject *__pyx_v_outer = 0 -#line 339 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_outerobj -#line 339 "root_numpy/src/tree.pyx" -; - char *__pyx_v_dataptr -#line 339 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_i -#line 339 "root_numpy/src/tree.pyx" -; +#line 36 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 339 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - int __pyx_t_2; - unsigned long __pyx_t_3; - unsigned long __pyx_t_4; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_6 = 1; -#line 339 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 36 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":340 - * # Requires special treament since vector stores contents as bits... - * int write(Column* col, void* buffer): - * cdef vector[vector[bool]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * # this will hold number of subvectors - * cdef unsigned long numele - */ +#line 36 "root_numpy/src/tree.pyx" + } -#line 340 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":344 - * cdef unsigned long numele - * # these are defined solely for the outer array wrapper - * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< - * cdef int objtypecode = np.NPY_OBJECT - * numele = tmp[0].size() - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); -#line 344 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 36 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { -#line 344 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 36 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; -#line 344 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; +#line 36 "root_numpy/src/tree.pyx" + } + +#line 36 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_tree); -#line 344 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 36 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0+__pyx_t_6, __pyx_v_tree); -#line 344 "root_numpy/src/tree.pyx" - __pyx_v_objsize = __pyx_t_2; +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_tree); - /* "root_numpy/src/tree.pyx":345 - * # these are defined solely for the outer array wrapper - * cdef int objsize = np.dtype('O').itemsize - * cdef int objtypecode = np.NPY_OBJECT # <<<<<<<<<<<<<< - * numele = tmp[0].size() - * # create an outer array container that dataptr points to, - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); -#line 345 "root_numpy/src/tree.pyx" - __pyx_v_objtypecode = NPY_OBJECT; +#line 36 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_6, __pyx_v_fname); - /* "root_numpy/src/tree.pyx":346 - * cdef int objsize = np.dtype('O').itemsize - * cdef int objtypecode = np.NPY_OBJECT - * numele = tmp[0].size() # <<<<<<<<<<<<<< - * # create an outer array container that dataptr points to, - * # containing pointers from create_numpyarray(). - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#line 346 "root_numpy/src/tree.pyx" - __pyx_v_numele = (__pyx_v_tmp[0]).size(); +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":351 - * # define an (numele)-dimensional outer array to hold our subvectors fa - * cdef np.npy_intp dims[1] - * dims[0] = numele # <<<<<<<<<<<<<< - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - * cdef PyObject* outerobj = outer # borrow ref - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 351 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; +#line 36 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":352 - * cdef np.npy_intp dims[1] - * dims[0] = numele - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) # <<<<<<<<<<<<<< - * cdef PyObject* outerobj = outer # borrow ref - * # increase one since we are putting in buffer directly - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 352 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_objtypecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 352 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 352 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 36 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#line 352 "root_numpy/src/tree.pyx" - __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 352 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":353 - * dims[0] = numele - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - * cdef PyObject* outerobj = outer # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(outer) - */ +#line 36 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 353 "root_numpy/src/tree.pyx" - __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); +#line 36 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":355 - * cdef PyObject* outerobj = outer # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(outer) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &outerobj, sizeof(PyObject*)) - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 355 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_outer)); +#line 36 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_1, 0, 0, 0); - /* "root_numpy/src/tree.pyx":357 - * Py_INCREF(outer) - * # now write PyObject* to buffer - * memcpy(buffer, &outerobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * # build a dataptr pointing to outer, so we can shift and write each - * # of the subvectors - */ +#line 36 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 357 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); +#line 36 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":360 - * # build a dataptr pointing to outer, so we can shift and write each - * # of the subvectors - * cdef char* dataptr = outer.data # <<<<<<<<<<<<<< - * # loop through all subvectors - * cdef unsigned long i +#line 36 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":37 + * if rtree == NULL: + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) + * structure = get_tree_structure(rtree) # <<<<<<<<<<<<<< + * rfile.Close() + * del rfile */ -#line 360 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_outer->data); +#line 37 "root_numpy/src/tree.pyx" + __pyx_t_1 = __pyx_f_13_librootnumpy_get_tree_structure(__pyx_v_rtree, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":363 - * # loop through all subvectors - * cdef unsigned long i - * for i in range(numele): # <<<<<<<<<<<<<< - * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) - * return sizeof(outerobj) - */ +#line 37 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 363 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 37 "root_numpy/src/tree.pyx" + __pyx_v_structure = __pyx_t_1; -#line 363 "root_numpy/src/tree.pyx" - for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { +#line 37 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#line 363 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; + /* "root_numpy/src/tree.pyx":38 + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) + * structure = get_tree_structure(rtree) + * rfile.Close() # <<<<<<<<<<<<<< + * del rfile + * return structure + */ - /* "root_numpy/src/tree.pyx":364 - * cdef unsigned long i - * for i in range(numele): - * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) # <<<<<<<<<<<<<< - * return sizeof(outerobj) +#line 38 "root_numpy/src/tree.pyx" + __pyx_v_rfile->Close(); + + /* "root_numpy/src/tree.pyx":39 + * structure = get_tree_structure(rtree) + * rfile.Close() + * del rfile # <<<<<<<<<<<<<< + * return structure * */ -#line 364 "root_numpy/src/tree.pyx" - __pyx_f_13_librootnumpy_create_numpyarray_vectorbool((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&((__pyx_v_tmp[0])[__pyx_v_i]))); - -#line 364 "root_numpy/src/tree.pyx" - } +#line 39 "root_numpy/src/tree.pyx" + delete __pyx_v_rfile; - /* "root_numpy/src/tree.pyx":365 - * for i in range(numele): - * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) - * return sizeof(outerobj) # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":40 + * rfile.Close() + * del rfile + * return structure # <<<<<<<<<<<<<< * * */ -#line 365 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_outerobj)); +#line 40 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + +#line 40 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_structure); + +#line 40 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_structure; -#line 365 "root_numpy/src/tree.pyx" +#line 40 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":339 - * cdef cppclass VectorVectorBoolConverter(ObjectConverterBase): - * # Requires special treament since vector stores contents as bits... - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[bool]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors + /* "root_numpy/src/tree.pyx":24 + * + * + * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< + * if tree == None: + * # automatically select single tree */ -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" /* function exit code */ -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 339 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorBoolConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 339 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_7); + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 24 "root_numpy/src/tree.pyx" + __pyx_r = NULL; + +#line 24 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 339 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_outer); +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_structure); -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_tree); + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); + +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" return __pyx_r; -#line 339 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":369 +/* "root_numpy/src/tree.pyx":43 + * + * + * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< + * return list(list_structures(fname, tree).keys()) * - * cdef cppclass StringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef string* s = col.GetValuePointer() - * py_bytes = str(s[0]) */ -#line 369 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 369 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_StringConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::string *__pyx_v_s -#line 369 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_py_bytes = NULL -#line 369 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" +/* Python wrapper */ + +#line 43 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_7list_branches(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_7list_branches = +#line 43 "root_numpy/src/tree.pyx" +{"list_branches", (PyCFunction)__pyx_pw_13_librootnumpy_7list_branches, METH_VARARGS|METH_KEYWORDS, 0}; + +#line 43 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_7list_branches(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + PyObject *__pyx_v_fname = 0 +#line 43 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_tmpobj -#line 369 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_tree = 0 +#line 43 "root_numpy/src/tree.pyx" ; - -#line 369 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 369 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 43 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = 0; - /* "root_numpy/src/tree.pyx":370 - * cdef cppclass StringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): - * cdef string* s = col.GetValuePointer() # <<<<<<<<<<<<<< - * py_bytes = str(s[0]) - * cdef PyObject* tmpobj = py_bytes # borrow ref - */ +#line 43 "root_numpy/src/tree.pyx" + __Pyx_RefNannyDeclarations -#line 370 "root_numpy/src/tree.pyx" - __pyx_v_s = ((std::string *)__pyx_v_col->GetValuePointer()); +#line 43 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_branches (wrapper)", 0); - /* "root_numpy/src/tree.pyx":371 - * int write(Column* col, void* buffer): - * cdef string* s = col.GetValuePointer() - * py_bytes = str(s[0]) # <<<<<<<<<<<<<< - * cdef PyObject* tmpobj = py_bytes # borrow ref - * # increase one since we are putting in buffer directly - */ +#line 43 "root_numpy/src/tree.pyx" + { -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string((__pyx_v_s[0])); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 43 "root_numpy/src/tree.pyx" + static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 43 "root_numpy/src/tree.pyx" + PyObject* values[2] = {0,0}; -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 43 "root_numpy/src/tree.pyx" + values[1] = ((PyObject *)Py_None); -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 43 "root_numpy/src/tree.pyx" + if (unlikely(__pyx_kwds)) { -#line 371 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); +#line 43 "root_numpy/src/tree.pyx" + Py_ssize_t kw_args; -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 43 "root_numpy/src/tree.pyx" + const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 43 "root_numpy/src/tree.pyx" + switch (pos_args) { + case 2: +#line 43 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 43 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 43 "root_numpy/src/tree.pyx" + case 0: break; + default: +#line 43 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 43 "root_numpy/src/tree.pyx" + } -#line 371 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 43 "root_numpy/src/tree.pyx" + kw_args = PyDict_Size(__pyx_kwds); -#line 371 "root_numpy/src/tree.pyx" - __pyx_v_py_bytes = __pyx_t_1; +#line 43 "root_numpy/src/tree.pyx" + switch (pos_args) { -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 43 "root_numpy/src/tree.pyx" + case 0: - /* "root_numpy/src/tree.pyx":372 - * cdef string* s = col.GetValuePointer() - * py_bytes = str(s[0]) - * cdef PyObject* tmpobj = py_bytes # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(py_bytes) - */ +#line 43 "root_numpy/src/tree.pyx" + if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; + else +#line 43 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; -#line 372 "root_numpy/src/tree.pyx" - __pyx_v_tmpobj = ((PyObject *)__pyx_v_py_bytes); +#line 43 "root_numpy/src/tree.pyx" + case 1: - /* "root_numpy/src/tree.pyx":374 - * cdef PyObject* tmpobj = py_bytes # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(py_bytes) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - */ +#line 43 "root_numpy/src/tree.pyx" + if (kw_args > 0) { -#line 374 "root_numpy/src/tree.pyx" - Py_INCREF(__pyx_v_py_bytes); +#line 43 "root_numpy/src/tree.pyx" + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); - /* "root_numpy/src/tree.pyx":376 - * Py_INCREF(py_bytes) - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * return sizeof(tmpobj) - * - */ +#line 43 "root_numpy/src/tree.pyx" + if (value) { values[1] = value; kw_args--; } -#line 376 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); +#line 43 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":377 - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - * return sizeof(tmpobj) # <<<<<<<<<<<<<< - * - * - */ +#line 43 "root_numpy/src/tree.pyx" + } -#line 377 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_tmpobj)); +#line 43 "root_numpy/src/tree.pyx" + if (unlikely(kw_args > 0)) { -#line 377 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 43 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "list_branches") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} - /* "root_numpy/src/tree.pyx":369 - * - * cdef cppclass StringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef string* s = col.GetValuePointer() - * py_bytes = str(s[0]) - */ +#line 43 "root_numpy/src/tree.pyx" + } -#line 369 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" + } else { +#line 43 "root_numpy/src/tree.pyx" + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 2: +#line 43 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 43 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 369 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 43 "root_numpy/src/tree.pyx" + break; + default: +#line 43 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; -#line 369 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 43 "root_numpy/src/tree.pyx" + } -#line 369 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 43 "root_numpy/src/tree.pyx" + } -#line 369 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 43 "root_numpy/src/tree.pyx" + __pyx_v_fname = values[0]; -#line 369 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("StringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 43 "root_numpy/src/tree.pyx" + __pyx_v_tree = values[1]; -#line 369 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 43 "root_numpy/src/tree.pyx" + } -#line 369 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 43 "root_numpy/src/tree.pyx" + goto __pyx_L4_argument_unpacking_done; -#line 369 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_py_bytes); +#line 43 "root_numpy/src/tree.pyx" + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("list_branches", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); +#line 43 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 43 "root_numpy/src/tree.pyx" + __pyx_L3_error:; + +#line 43 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 369 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 369 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" + return NULL; + +#line 43 "root_numpy/src/tree.pyx" + __pyx_L4_argument_unpacking_done:; + __pyx_r = +#line 43 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_6list_branches(__pyx_self, __pyx_v_fname, __pyx_v_tree); + +#line 43 "root_numpy/src/tree.pyx" + + +#line 43 "root_numpy/src/tree.pyx" + /* function exit code */ + +#line 43 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 43 "root_numpy/src/tree.pyx" return __pyx_r; -#line 369 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":381 - * - * cdef cppclass VectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[string]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorstring(buffer, tmp) - */ - -#line 381 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 381 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VectorStringConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::vector *__pyx_v_tmp -#line 381 "root_numpy/src/tree.pyx" -; +#line 43 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_6list_branches(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fname, PyObject *__pyx_v_tree) { -#line 381 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 43 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations + PyObject *__pyx_t_1 = NULL; + PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; + PyObject *__pyx_t_4 = NULL; + Py_ssize_t __pyx_t_5; + PyObject *__pyx_t_6 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 381 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 43 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_branches", 0); - /* "root_numpy/src/tree.pyx":382 - * cdef cppclass VectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): - * cdef vector[string]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * return create_numpyarray_vectorstring(buffer, tmp) + /* "root_numpy/src/tree.pyx":44 * - */ - -#line 382 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); - - /* "root_numpy/src/tree.pyx":383 - * int write(Column* col, void* buffer): - * cdef vector[string]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorstring(buffer, tmp) # <<<<<<<<<<<<<< + * def list_branches(fname, tree=None): + * return list(list_structures(fname, tree).keys()) # <<<<<<<<<<<<<< * * */ -#line 383 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorstring(__pyx_v_buffer, __pyx_v_tmp); +#line 44 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 383 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_list_structures); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":381 - * - * cdef cppclass VectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[string]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorstring(buffer, tmp) - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 381 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; -#line 381 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 44 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { -#line 381 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); -#line 381 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 44 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { -#line 381 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 44 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 381 "root_numpy/src/tree.pyx" -} +#line 44 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); -/* "root_numpy/src/tree.pyx":387 - * - * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[string]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 387 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_5 = 1; -#line 387 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_VectorVectorStringConverter::write(Column *__pyx_v_col, void *__pyx_v_buffer) { - std::vector > *__pyx_v_tmp -#line 387 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_numele -#line 387 "root_numpy/src/tree.pyx" -; - int __pyx_v_objsize -#line 387 "root_numpy/src/tree.pyx" -; - int __pyx_v_objtypecode -#line 387 "root_numpy/src/tree.pyx" -; - npy_intp __pyx_v_dims[1] -#line 387 "root_numpy/src/tree.pyx" -; - PyArrayObject *__pyx_v_outer = 0 -#line 387 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_outerobj -#line 387 "root_numpy/src/tree.pyx" -; - char *__pyx_v_dataptr -#line 387 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_i -#line 387 "root_numpy/src/tree.pyx" -; +#line 44 "root_numpy/src/tree.pyx" + } -#line 387 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - int __pyx_t_2; - unsigned long __pyx_t_3; - unsigned long __pyx_t_4; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 44 "root_numpy/src/tree.pyx" + } -#line 387 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(2+__pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":388 - * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): - * cdef vector[vector[string]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * # this will hold number of subvectors - * cdef unsigned long numele - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 388 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); +#line 44 "root_numpy/src/tree.pyx" + if (__pyx_t_4) { - /* "root_numpy/src/tree.pyx":392 - * cdef unsigned long numele - * # these are defined solely for the outer array wrapper - * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< - * cdef int objtypecode = np.NPY_OBJECT - * numele = tmp[0].size() - */ +#line 44 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; -#line 392 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 44 "root_numpy/src/tree.pyx" + } -#line 392 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 44 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); -#line 392 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; +#line 44 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_v_fname); -#line 392 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#line 392 "root_numpy/src/tree.pyx" - __pyx_v_objsize = __pyx_t_2; +#line 44 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_tree); - /* "root_numpy/src/tree.pyx":393 - * # these are defined solely for the outer array wrapper - * cdef int objsize = np.dtype('O').itemsize - * cdef int objtypecode = np.NPY_OBJECT # <<<<<<<<<<<<<< - * numele = tmp[0].size() - * # create an outer array container that dataptr points to, - */ +#line 44 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_tree); -#line 393 "root_numpy/src/tree.pyx" - __pyx_v_objtypecode = NPY_OBJECT; +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_tree); - /* "root_numpy/src/tree.pyx":394 - * cdef int objsize = np.dtype('O').itemsize - * cdef int objtypecode = np.NPY_OBJECT - * numele = tmp[0].size() # <<<<<<<<<<<<<< - * # create an outer array container that dataptr points to, - * # containing pointers from create_numpyarray(). - */ +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 394 "root_numpy/src/tree.pyx" - __pyx_v_numele = (__pyx_v_tmp[0]).size(); +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":399 - * # define an (numele)-dimensional outer array to hold our subvectors fa - * cdef np.npy_intp dims[1] - * dims[0] = numele # <<<<<<<<<<<<<< - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - * cdef PyObject* outerobj = outer # borrow ref - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_keys); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_2 = NULL; + +#line 44 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { + +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); -#line 399 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; +#line 44 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_2)) { - /* "root_numpy/src/tree.pyx":400 - * cdef np.npy_intp dims[1] - * dims[0] = numele - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) # <<<<<<<<<<<<<< - * cdef PyObject* outerobj = outer # borrow ref - * # increase one since we are putting in buffer directly - */ +#line 44 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 400 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyArray_EMPTY(1, __pyx_v_dims, __pyx_v_objtypecode, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 44 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_2); -#line 400 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 44 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 400 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 400 "root_numpy/src/tree.pyx" - __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); +#line 44 "root_numpy/src/tree.pyx" + } -#line 400 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 44 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":401 - * dims[0] = numele - * cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - * cdef PyObject* outerobj = outer # borrow ref # <<<<<<<<<<<<<< - * # increase one since we are putting in buffer directly - * Py_INCREF(outer) - */ +#line 44 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { -#line 401 "root_numpy/src/tree.pyx" - __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":403 - * cdef PyObject* outerobj = outer # borrow ref - * # increase one since we are putting in buffer directly - * Py_INCREF(outer) # <<<<<<<<<<<<<< - * # now write PyObject* to buffer - * memcpy(buffer, &outerobj, sizeof(PyObject*)) - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 403 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_outer)); +#line 44 "root_numpy/src/tree.pyx" + } else { - /* "root_numpy/src/tree.pyx":405 - * Py_INCREF(outer) - * # now write PyObject* to buffer - * memcpy(buffer, &outerobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * # build a dataptr pointing to outer, so we can shift and write each - * # of the subvectors - */ +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 405 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); +#line 44 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":408 - * # build a dataptr pointing to outer, so we can shift and write each - * # of the subvectors - * cdef char* dataptr = outer.data # <<<<<<<<<<<<<< - * # loop through all subvectors - * cdef unsigned long i - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 408 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_outer->data); +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":411 - * # loop through all subvectors - * cdef unsigned long i - * for i in range(numele): # <<<<<<<<<<<<<< - * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) - * return sizeof(outerobj) - */ +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 411 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 411 "root_numpy/src/tree.pyx" - for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { +#line 44 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#line 411 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":412 - * cdef unsigned long i - * for i in range(numele): - * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) # <<<<<<<<<<<<<< - * return sizeof(outerobj) - * - */ +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#line 412 "root_numpy/src/tree.pyx" - __pyx_f_13_librootnumpy_create_numpyarray_vectorstring((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&((__pyx_v_tmp[0])[__pyx_v_i]))); +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyList_Type))), __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 412 "root_numpy/src/tree.pyx" - } +#line 44 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":413 - * for i in range(numele): - * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) - * return sizeof(outerobj) # <<<<<<<<<<<<<< - * - * - */ +#line 44 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 413 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_outerobj)); +#line 44 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_1; -#line 413 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 44 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":387 + /* "root_numpy/src/tree.pyx":43 + * + * + * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< + * return list(list_structures(fname, tree).keys()) * - * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[string]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors */ -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" /* function exit code */ -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 387 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorStringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 43 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 387 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 43 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); + +#line 43 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); + +#line 43 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 43 "root_numpy/src/tree.pyx" + __pyx_r = NULL; + +#line 43 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 387 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_outer); +#line 43 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" return __pyx_r; -#line 387 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":489 +/* "root_numpy/src/tree.pyx":47 * * - * cdef Converter* find_converter(Column* col): # <<<<<<<<<<<<<< - * cdef ColumnType ct = col.coltype - * cdef string typename = string(col.GetTypeName()) + * cdef get_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< + * cdef TObjArray* leaves + * cdef TLeaf* leaf */ -#line 489 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" -#line 489 "root_numpy/src/tree.pyx" -static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_find_converter(Column *__pyx_v_col) { - enum ColumnType __pyx_v_ct -#line 489 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" +static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_branch) { + TObjArray *__pyx_v_leaves +#line 47 "root_numpy/src/tree.pyx" ; - std::string __pyx_v_typename -#line 489 "root_numpy/src/tree.pyx" + TLeaf *__pyx_v_leaf +#line 47 "root_numpy/src/tree.pyx" ; - __pyx_t_13_librootnumpy_Converter *__pyx_v_conv -#line 489 "root_numpy/src/tree.pyx" + int __pyx_v_ileaf +#line 47 "root_numpy/src/tree.pyx" ; - __pyx_t_13_librootnumpy_Converter *__pyx_v_basic_conv -#line 489 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_leaflist = NULL +#line 47 "root_numpy/src/tree.pyx" ; -#line 489 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_Converter *__pyx_r; +#line 47 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - enum ColumnType __pyx_t_1; - std::string __pyx_t_2; + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; - __pyx_t_13_librootnumpy_CONVERTERS_ITEM __pyx_t_6; + PyObject *__pyx_t_5 = NULL; + PyObject *__pyx_t_6 = NULL; + int __pyx_t_7; + int __pyx_t_8; + int __pyx_t_9; + int __pyx_t_10; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 489 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("find_converter", 0); - - /* "root_numpy/src/tree.pyx":490 - * - * cdef Converter* find_converter(Column* col): - * cdef ColumnType ct = col.coltype # <<<<<<<<<<<<<< - * cdef string typename = string(col.GetTypeName()) - * cdef Converter* conv - */ - -#line 490 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_v_col->coltype; - -#line 490 "root_numpy/src/tree.pyx" - __pyx_v_ct = __pyx_t_1; - - /* "root_numpy/src/tree.pyx":491 - * cdef Converter* find_converter(Column* col): - * cdef ColumnType ct = col.coltype - * cdef string typename = string(col.GetTypeName()) # <<<<<<<<<<<<<< - * cdef Converter* conv - * cdef Converter* basic_conv - */ - -#line 491 "root_numpy/src/tree.pyx" - try { - -#line 491 "root_numpy/src/tree.pyx" - __pyx_t_2 = std::string(__pyx_v_col->GetTypeName()); - -#line 491 "root_numpy/src/tree.pyx" - } catch(...) { - -#line 491 "root_numpy/src/tree.pyx" - __Pyx_CppExn2PyErr(); - -#line 491 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 491 "root_numpy/src/tree.pyx" - } - -#line 491 "root_numpy/src/tree.pyx" - __pyx_v_typename = __pyx_t_2; - - /* "root_numpy/src/tree.pyx":508 - * typename + '[fixed]', conv)) - * return conv - * elif ct == VARY: # <<<<<<<<<<<<<< - * conv = find_converter_by_typename(typename + '[vary]') - * if conv == NULL: - */ - -#line 508 "root_numpy/src/tree.pyx" - switch (__pyx_v_ct) { +#line 47 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("get_branch_structure", 0); - /* "root_numpy/src/tree.pyx":494 - * cdef Converter* conv - * cdef Converter* basic_conv - * if ct == SINGLE: # <<<<<<<<<<<<<< - * return find_converter_by_typename(typename) - * elif ct == FIXED: + /* "root_numpy/src/tree.pyx":51 + * cdef TLeaf* leaf + * cdef int ileaf + * leaves = branch.GetListOfLeaves() # <<<<<<<<<<<<<< + * if leaves == NULL: + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) */ -#line 494 "root_numpy/src/tree.pyx" - case SINGLE: +#line 51 "root_numpy/src/tree.pyx" + __pyx_v_leaves = __pyx_v_branch->GetListOfLeaves(); - /* "root_numpy/src/tree.pyx":495 - * cdef Converter* basic_conv - * if ct == SINGLE: - * return find_converter_by_typename(typename) # <<<<<<<<<<<<<< - * elif ct == FIXED: - * conv = find_converter_by_typename(typename + '[fixed]') + /* "root_numpy/src/tree.pyx":52 + * cdef int ileaf + * leaves = branch.GetListOfLeaves() + * if leaves == NULL: # <<<<<<<<<<<<<< + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) + * leaflist = [] */ -#line 495 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_v_typename); - -#line 495 "root_numpy/src/tree.pyx" - goto __pyx_L0; - -#line 495 "root_numpy/src/tree.pyx" - break; - - /* "root_numpy/src/tree.pyx":496 - * if ct == SINGLE: - * return find_converter_by_typename(typename) - * elif ct == FIXED: # <<<<<<<<<<<<<< - * conv = find_converter_by_typename(typename + '[fixed]') - * if conv == NULL: - */ +#line 52 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_leaves == NULL) != 0); -#line 496 "root_numpy/src/tree.pyx" - case FIXED: +#line 52 "root_numpy/src/tree.pyx" + if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":497 - * return find_converter_by_typename(typename) - * elif ct == FIXED: - * conv = find_converter_by_typename(typename + '[fixed]') # <<<<<<<<<<<<<< - * if conv == NULL: - * basic_conv = find_converter_by_typename(typename) + /* "root_numpy/src/tree.pyx":53 + * leaves = branch.GetListOfLeaves() + * if leaves == NULL: + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) # <<<<<<<<<<<<<< + * leaflist = [] + * for ileaf in range(leaves.GetEntries()): */ -#line 497 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_typename); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_branch_0_has_no_leaves, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 497 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 497 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_kp_s_fixed); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 497 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 497 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - -#line 497 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_string_from_py_std__string(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 497 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - -#line 497 "root_numpy/src/tree.pyx" - __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_2); - - /* "root_numpy/src/tree.pyx":498 - * elif ct == FIXED: - * conv = find_converter_by_typename(typename + '[fixed]') - * if conv == NULL: # <<<<<<<<<<<<<< - * basic_conv = find_converter_by_typename(typename) - * if basic_conv == NULL: - */ - -#line 498 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_conv == NULL) != 0); - -#line 498 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { - - /* "root_numpy/src/tree.pyx":499 - * conv = find_converter_by_typename(typename + '[fixed]') - * if conv == NULL: - * basic_conv = find_converter_by_typename(typename) # <<<<<<<<<<<<<< - * if basic_conv == NULL: - * return NULL - */ +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_5 = NULL; -#line 499 "root_numpy/src/tree.pyx" - __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_v_typename); +#line 53 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { - /* "root_numpy/src/tree.pyx":500 - * if conv == NULL: - * basic_conv = find_converter_by_typename(typename) - * if basic_conv == NULL: # <<<<<<<<<<<<<< - * return NULL - * conv = new FixedArrayConverter( - */ +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); -#line 500 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_basic_conv == NULL) != 0); +#line 53 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_5)) { -#line 500 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 53 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - /* "root_numpy/src/tree.pyx":501 - * basic_conv = find_converter_by_typename(typename) - * if basic_conv == NULL: - * return NULL # <<<<<<<<<<<<<< - * conv = new FixedArrayConverter( - * basic_conv, - */ +#line 53 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_5); -#line 501 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 53 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 501 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 53 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 501 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":502 - * if basic_conv == NULL: - * return NULL - * conv = new FixedArrayConverter( # <<<<<<<<<<<<<< - * basic_conv, - * col.countval) - */ - -#line 502 "root_numpy/src/tree.pyx" - __pyx_v_conv = new __pyx_t_13_librootnumpy_FixedArrayConverter(((__pyx_t_13_librootnumpy_BasicConverter *)__pyx_v_basic_conv), __pyx_v_col->countval); - - /* "root_numpy/src/tree.pyx":506 - * col.countval) - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[fixed]', conv)) # <<<<<<<<<<<<<< - * return conv - * elif ct == VARY: - */ - -#line 506 "root_numpy/src/tree.pyx" - __pyx_t_4 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_typename); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 506; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 506 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 53 "root_numpy/src/tree.pyx" + } -#line 506 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_kp_s_fixed); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 506; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + if (!__pyx_t_5) { -#line 506 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 506 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 506 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_string_from_py_std__string(__pyx_t_3); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 506; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 506 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 53 "root_numpy/src/tree.pyx" + } else { - /* "root_numpy/src/tree.pyx":505 - * basic_conv, - * col.countval) - * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< - * typename + '[fixed]', conv)) - * return conv - */ +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 505 "root_numpy/src/tree.pyx" - try { +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 505 "root_numpy/src/tree.pyx" - __pyx_t_6 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_2, __pyx_v_conv); +#line 53 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; -#line 505 "root_numpy/src/tree.pyx" - } catch(...) { +#line 53 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_4); -#line 505 "root_numpy/src/tree.pyx" - __Pyx_CppExn2PyErr(); +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_4); -#line 505 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 505; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 505 "root_numpy/src/tree.pyx" - } +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 505 "root_numpy/src/tree.pyx" - __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_6); +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 505 "root_numpy/src/tree.pyx" - goto __pyx_L3; +#line 53 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 505 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } -#line 505 "root_numpy/src/tree.pyx" - __pyx_L3:; - - /* "root_numpy/src/tree.pyx":507 - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[fixed]', conv)) - * return conv # <<<<<<<<<<<<<< - * elif ct == VARY: - * conv = find_converter_by_typename(typename + '[vary]') - */ - -#line 507 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_conv; - -#line 507 "root_numpy/src/tree.pyx" - goto __pyx_L0; - -#line 507 "root_numpy/src/tree.pyx" - break; +#line 53 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":508 - * typename + '[fixed]', conv)) - * return conv - * elif ct == VARY: # <<<<<<<<<<<<<< - * conv = find_converter_by_typename(typename + '[vary]') - * if conv == NULL: - */ +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 508 "root_numpy/src/tree.pyx" - case VARY: +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); - /* "root_numpy/src/tree.pyx":509 - * return conv - * elif ct == VARY: - * conv = find_converter_by_typename(typename + '[vary]') # <<<<<<<<<<<<<< - * if conv == NULL: - * basic_conv = find_converter_by_typename(typename) - */ +#line 53 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); -#line 509 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_typename); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 509 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 509 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_kp_s_vary); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 509 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 53 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 509 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 509 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_string_from_py_std__string(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 509; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 509 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 53 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 509 "root_numpy/src/tree.pyx" - __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_2); +#line 53 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":510 - * elif ct == VARY: - * conv = find_converter_by_typename(typename + '[vary]') - * if conv == NULL: # <<<<<<<<<<<<<< - * basic_conv = find_converter_by_typename(typename) - * if basic_conv == NULL: +#line 53 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":54 + * if leaves == NULL: + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) + * leaflist = [] # <<<<<<<<<<<<<< + * for ileaf in range(leaves.GetEntries()): + * leaf = leaves.At(ileaf) */ -#line 510 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_conv == NULL) != 0); +#line 54 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 510 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 54 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":511 - * conv = find_converter_by_typename(typename + '[vary]') - * if conv == NULL: - * basic_conv = find_converter_by_typename(typename) # <<<<<<<<<<<<<< - * if basic_conv == NULL: - * return NULL - */ +#line 54 "root_numpy/src/tree.pyx" + __pyx_v_leaflist = ((PyObject*)__pyx_t_2); -#line 511 "root_numpy/src/tree.pyx" - __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_v_typename); +#line 54 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":512 - * if conv == NULL: - * basic_conv = find_converter_by_typename(typename) - * if basic_conv == NULL: # <<<<<<<<<<<<<< - * return NULL - * conv = new VaryArrayConverter( + /* "root_numpy/src/tree.pyx":55 + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) + * leaflist = [] + * for ileaf in range(leaves.GetEntries()): # <<<<<<<<<<<<<< + * leaf = leaves.At(ileaf) + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) */ -#line 512 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_basic_conv == NULL) != 0); +#line 55 "root_numpy/src/tree.pyx" + __pyx_t_7 = __pyx_v_leaves->GetEntries(); -#line 512 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 55 "root_numpy/src/tree.pyx" + for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { - /* "root_numpy/src/tree.pyx":513 - * basic_conv = find_converter_by_typename(typename) - * if basic_conv == NULL: - * return NULL # <<<<<<<<<<<<<< - * conv = new VaryArrayConverter( - * basic_conv) +#line 55 "root_numpy/src/tree.pyx" + __pyx_v_ileaf = __pyx_t_8; + + /* "root_numpy/src/tree.pyx":56 + * leaflist = [] + * for ileaf in range(leaves.GetEntries()): + * leaf = leaves.At(ileaf) # <<<<<<<<<<<<<< + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) + * if not leaflist: */ -#line 513 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 56 "root_numpy/src/tree.pyx" + __pyx_v_leaf = ((TLeaf *)__pyx_v_leaves->At(__pyx_v_ileaf)); -#line 513 "root_numpy/src/tree.pyx" - goto __pyx_L0; + /* "root_numpy/src/tree.pyx":57 + * for ileaf in range(leaves.GetEntries()): + * leaf = leaves.At(ileaf) + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) # <<<<<<<<<<<<<< + * if not leaflist: + * raise RuntimeError( + */ -#line 513 "root_numpy/src/tree.pyx" - } +#line 57 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_leaf->GetTitle()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":514 - * if basic_conv == NULL: - * return NULL - * conv = new VaryArrayConverter( # <<<<<<<<<<<<<< - * basic_conv) - * CONVERTERS.insert(CONVERTERS_ITEM( - */ +#line 57 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 514 "root_numpy/src/tree.pyx" - __pyx_v_conv = new __pyx_t_13_librootnumpy_VaryArrayConverter(((__pyx_t_13_librootnumpy_BasicConverter *)__pyx_v_basic_conv)); +#line 57 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_f_13_librootnumpy_resolve_type(__pyx_v_leaf->GetTypeName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":517 - * basic_conv) - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[vary]', conv)) # <<<<<<<<<<<<<< - * return conv - * return NULL - */ +#line 57 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 517 "root_numpy/src/tree.pyx" - __pyx_t_4 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_typename); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 57 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 517 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 57 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 517 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_kp_s_vary); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 57 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2); -#line 517 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 57 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 517 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 57 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3); -#line 517 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_string_from_py_std__string(__pyx_t_3); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 57 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 517 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 57 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":516 - * conv = new VaryArrayConverter( - * basic_conv) - * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< - * typename + '[vary]', conv)) - * return conv - */ +#line 57 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 516 "root_numpy/src/tree.pyx" - try { +#line 57 "root_numpy/src/tree.pyx" + __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_leaflist, __pyx_t_6); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 516 "root_numpy/src/tree.pyx" - __pyx_t_6 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_2, __pyx_v_conv); +#line 57 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 516 "root_numpy/src/tree.pyx" - } catch(...) { +#line 57 "root_numpy/src/tree.pyx" + } -#line 516 "root_numpy/src/tree.pyx" - __Pyx_CppExn2PyErr(); + /* "root_numpy/src/tree.pyx":58 + * leaf = leaves.At(ileaf) + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) + * if not leaflist: # <<<<<<<<<<<<<< + * raise RuntimeError( + * "leaf list for branch '{0}' is empty".format( + */ -#line 516 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 516; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 58 "root_numpy/src/tree.pyx" + __pyx_t_1 = (__pyx_v_leaflist != Py_None) && (PyList_GET_SIZE(__pyx_v_leaflist) != 0); -#line 516 "root_numpy/src/tree.pyx" - } +#line 58 "root_numpy/src/tree.pyx" + __pyx_t_10 = ((!__pyx_t_1) != 0); -#line 516 "root_numpy/src/tree.pyx" - __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_6); +#line 58 "root_numpy/src/tree.pyx" + if (__pyx_t_10) { -#line 516 "root_numpy/src/tree.pyx" - goto __pyx_L5; + /* "root_numpy/src/tree.pyx":60 + * if not leaflist: + * raise RuntimeError( + * "leaf list for branch '{0}' is empty".format( # <<<<<<<<<<<<<< + * branch.GetName())) + * return leaflist + */ -#line 516 "root_numpy/src/tree.pyx" - } +#line 60 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_leaf_list_for_branch_0_is_empty, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 516 "root_numpy/src/tree.pyx" - __pyx_L5:; +#line 60 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); - /* "root_numpy/src/tree.pyx":518 - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[vary]', conv)) - * return conv # <<<<<<<<<<<<<< - * return NULL + /* "root_numpy/src/tree.pyx":61 + * raise RuntimeError( + * "leaf list for branch '{0}' is empty".format( + * branch.GetName())) # <<<<<<<<<<<<<< + * return leaflist * */ -#line 518 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_conv; +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 518 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 61 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 518 "root_numpy/src/tree.pyx" - break; +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; -#line 518 "root_numpy/src/tree.pyx" - default: break; +#line 61 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 518 "root_numpy/src/tree.pyx" - } +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); - /* "root_numpy/src/tree.pyx":519 - * typename + '[vary]', conv)) - * return conv - * return NULL # <<<<<<<<<<<<<< - * - * - */ +#line 61 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { -#line 519 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 61 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 519 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 61 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); - /* "root_numpy/src/tree.pyx":489 - * - * - * cdef Converter* find_converter(Column* col): # <<<<<<<<<<<<<< - * cdef ColumnType ct = col.coltype - * cdef string typename = string(col.GetTypeName()) - */ +#line 61 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 489 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); +#line 61 "root_numpy/src/tree.pyx" + } -#line 489 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 61 "root_numpy/src/tree.pyx" + } -#line 489 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 61 "root_numpy/src/tree.pyx" + if (!__pyx_t_4) { -#line 489 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 489 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); +#line 61 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 489 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.find_converter", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 61 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 489 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 61 "root_numpy/src/tree.pyx" + } else { -#line 489 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 489 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 61 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 489 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 61 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; -#line 489 "root_numpy/src/tree.pyx" -} +#line 61 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_2); -/* "root_numpy/src/tree.pyx":522 - * - * - * cdef Converter* find_converter_by_typename(string typename): # <<<<<<<<<<<<<< - * it = CONVERTERS.find(resolve_type(typename.c_str())) - * if it == CONVERTERS.end(): - */ +#line 61 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 522 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; +#line 61 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 522 "root_numpy/src/tree.pyx" -static __pyx_t_13_librootnumpy_Converter *__pyx_f_13_librootnumpy_find_converter_by_typename(std::string __pyx_v_typename) { - std::map ::iterator __pyx_v_it -#line 522 "root_numpy/src/tree.pyx" -; +#line 61 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 522 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_Converter *__pyx_r; - __Pyx_RefNannyDeclarations - PyObject *__pyx_t_1 = NULL; - std::string __pyx_t_2; - int __pyx_t_3; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 61 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 522 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("find_converter_by_typename", 0); +#line 61 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":523 - * - * cdef Converter* find_converter_by_typename(string typename): - * it = CONVERTERS.find(resolve_type(typename.c_str())) # <<<<<<<<<<<<<< - * if it == CONVERTERS.end(): - * return NULL +#line 61 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + + /* "root_numpy/src/tree.pyx":59 + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) + * if not leaflist: + * raise RuntimeError( # <<<<<<<<<<<<<< + * "leaf list for branch '{0}' is empty".format( + * branch.GetName())) */ -#line 523 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_f_13_librootnumpy_resolve_type(__pyx_v_typename.c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 523; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 59 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 523 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 59 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 523 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 523; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 59 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6); -#line 523 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 59 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_6); -#line 523 "root_numpy/src/tree.pyx" - __pyx_v_it = __pyx_v_13_librootnumpy_CONVERTERS.find(__pyx_t_2); +#line 59 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; - /* "root_numpy/src/tree.pyx":524 - * cdef Converter* find_converter_by_typename(string typename): - * it = CONVERTERS.find(resolve_type(typename.c_str())) - * if it == CONVERTERS.end(): # <<<<<<<<<<<<<< - * return NULL - * return deref(it).second - */ +#line 59 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 524 "root_numpy/src/tree.pyx" - __pyx_t_3 = ((__pyx_v_it == __pyx_v_13_librootnumpy_CONVERTERS.end()) != 0); +#line 59 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 524 "root_numpy/src/tree.pyx" - if (__pyx_t_3) { +#line 59 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":525 - * it = CONVERTERS.find(resolve_type(typename.c_str())) - * if it == CONVERTERS.end(): - * return NULL # <<<<<<<<<<<<<< - * return deref(it).second - * - */ +#line 59 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_6, 0, 0, 0); -#line 525 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 59 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 525 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 59 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 525 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":526 - * if it == CONVERTERS.end(): - * return NULL - * return deref(it).second # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":62 + * "leaf list for branch '{0}' is empty".format( + * branch.GetName())) + * return leaflist # <<<<<<<<<<<<<< * * */ -#line 526 "root_numpy/src/tree.pyx" - __pyx_r = (*__pyx_v_it).second; +#line 62 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + +#line 62 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_leaflist); + +#line 62 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_leaflist; -#line 526 "root_numpy/src/tree.pyx" +#line 62 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":522 + /* "root_numpy/src/tree.pyx":47 * * - * cdef Converter* find_converter_by_typename(string typename): # <<<<<<<<<<<<<< - * it = CONVERTERS.find(resolve_type(typename.c_str())) - * if it == CONVERTERS.end(): + * cdef get_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< + * cdef TObjArray* leaves + * cdef TLeaf* leaf */ -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" /* function exit code */ -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 522 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); + +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); + +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); + +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 522 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.find_converter_by_typename", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); + +#line 47 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.get_branch_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_leaflist); + +#line 47 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); + +#line 47 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" return __pyx_r; -#line 522 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":529 +/* "root_numpy/src/tree.pyx":65 * * - * cdef np.ndarray init_array(vector[Column*]& columns, # <<<<<<<<<<<<<< - * vector[Converter*]& cv, - * unsigned long entries, + * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< + * cdef int ibranch + * cdef TBranch* branch */ -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" -#line 529 "root_numpy/src/tree.pyx" -static PyArrayObject *__pyx_f_13_librootnumpy_init_array(std::vector &__pyx_v_columns, std::vector<__pyx_t_13_librootnumpy_Converter *> &__pyx_v_cv, unsigned long __pyx_v_entries, PyObject *__pyx_v_include_weight, PyObject *__pyx_v_weight_name) { - Column *__pyx_v_this_col -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" +static PyObject *__pyx_f_13_librootnumpy_get_tree_structure(TTree *__pyx_v_tree, struct __pyx_opt_args_13_librootnumpy_get_tree_structure *__pyx_optional_args) { + +#line 65 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_branches = ((PyObject *)Py_None); + int __pyx_v_ibranch +#line 65 "root_numpy/src/tree.pyx" ; - __pyx_t_13_librootnumpy_Converter *__pyx_v_this_conv -#line 529 "root_numpy/src/tree.pyx" + TBranch *__pyx_v_branch +#line 65 "root_numpy/src/tree.pyx" ; - unsigned int __pyx_v_i -#line 529 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_ret = NULL +#line 65 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_branch_name = NULL +#line 65 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_nst = NULL -#line 529 "root_numpy/src/tree.pyx" + TObjArray *__pyx_v_all_branches +#line 65 "root_numpy/src/tree.pyx" ; -#line 529 "root_numpy/src/tree.pyx" - PyArrayObject *__pyx_r = NULL; +#line 65 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; - size_t __pyx_t_2; - unsigned int __pyx_t_3; + PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; int __pyx_t_4; - PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6 = NULL; - PyObject *__pyx_t_7 = NULL; - PyObject *__pyx_t_8 = NULL; + int __pyx_t_5; + Py_ssize_t __pyx_t_6; + PyObject *(*__pyx_t_7)(PyObject *); + const char *__pyx_t_8; int __pyx_t_9; + int __pyx_t_10; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 529 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("init_array", 0); +#line 65 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("get_tree_structure", 0); - /* "root_numpy/src/tree.pyx":537 - * cdef Converter* this_conv - * cdef unsigned int i - * nst = [] # <<<<<<<<<<<<<< - * for i in range(columns.size()): - * this_col = columns[i] - */ +#line 65 "root_numpy/src/tree.pyx" + if (__pyx_optional_args) { -#line 537 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 65 "root_numpy/src/tree.pyx" + if (__pyx_optional_args->__pyx_n > 0) { -#line 537 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 65 "root_numpy/src/tree.pyx" + __pyx_v_branches = __pyx_optional_args->branches; -#line 537 "root_numpy/src/tree.pyx" - __pyx_v_nst = ((PyObject*)__pyx_t_1); +#line 65 "root_numpy/src/tree.pyx" + } -#line 537 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 65 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":538 - * cdef unsigned int i - * nst = [] - * for i in range(columns.size()): # <<<<<<<<<<<<<< - * this_col = columns[i] - * this_conv = find_converter(this_col) + /* "root_numpy/src/tree.pyx":68 + * cdef int ibranch + * cdef TBranch* branch + * ret = OrderedDict() # <<<<<<<<<<<<<< + * if branches is not None: + * for branch_name in branches: */ -#line 538 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_v_columns.size(); - -#line 538 "root_numpy/src/tree.pyx" - for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) { +#line 68 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_OrderedDict); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 538 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_3; +#line 68 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":539 - * nst = [] - * for i in range(columns.size()): - * this_col = columns[i] # <<<<<<<<<<<<<< - * this_conv = find_converter(this_col) - * if this_conv == NULL: - */ +#line 68 "root_numpy/src/tree.pyx" + __pyx_t_3 = NULL; -#line 539 "root_numpy/src/tree.pyx" - __pyx_v_this_col = (__pyx_v_columns[__pyx_v_i]); +#line 68 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_2))) { - /* "root_numpy/src/tree.pyx":540 - * for i in range(columns.size()): - * this_col = columns[i] - * this_conv = find_converter(this_col) # <<<<<<<<<<<<<< - * if this_conv == NULL: - * raise ValueError("no converter for {0}".format(this_col.GetTypeName())) - */ +#line 68 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); -#line 540 "root_numpy/src/tree.pyx" - __pyx_v_this_conv = __pyx_f_13_librootnumpy_find_converter(__pyx_v_this_col); +#line 68 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_3)) { - /* "root_numpy/src/tree.pyx":541 - * this_col = columns[i] - * this_conv = find_converter(this_col) - * if this_conv == NULL: # <<<<<<<<<<<<<< - * raise ValueError("no converter for {0}".format(this_col.GetTypeName())) - * nst.append((this_col.colname, this_conv.get_nptype())) - */ +#line 68 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); -#line 541 "root_numpy/src/tree.pyx" - __pyx_t_4 = ((__pyx_v_this_conv == NULL) != 0); +#line 68 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_3); -#line 541 "root_numpy/src/tree.pyx" - if (__pyx_t_4) { +#line 68 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); - /* "root_numpy/src/tree.pyx":542 - * this_conv = find_converter(this_col) - * if this_conv == NULL: - * raise ValueError("no converter for {0}".format(this_col.GetTypeName())) # <<<<<<<<<<<<<< - * nst.append((this_col.colname, this_conv.get_nptype())) - * cv.push_back(this_conv) - */ +#line 68 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_2, function); -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_no_converter_for_0, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 68 "root_numpy/src/tree.pyx" + } -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 68 "root_numpy/src/tree.pyx" + } -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_6 = __Pyx_PyStr_FromString(__pyx_v_this_col->GetTypeName()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 68 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 68 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_7 = NULL; +#line 68 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 542 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { +#line 68 "root_numpy/src/tree.pyx" + } else { -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_5); +#line 68 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_7)) { +#line 68 "root_numpy/src/tree.pyx" + } -#line 542 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); +#line 68 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_7); +#line 68 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 68 "root_numpy/src/tree.pyx" + __pyx_v_ret = __pyx_t_1; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_5, function); +#line 68 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#line 542 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":69 + * cdef TBranch* branch + * ret = OrderedDict() + * if branches is not None: # <<<<<<<<<<<<<< + * for branch_name in branches: + * branch = tree.GetBranch(branch_name) + */ -#line 542 "root_numpy/src/tree.pyx" - } +#line 69 "root_numpy/src/tree.pyx" + __pyx_t_4 = (__pyx_v_branches != Py_None); -#line 542 "root_numpy/src/tree.pyx" - if (!__pyx_t_7) { +#line 69 "root_numpy/src/tree.pyx" + __pyx_t_5 = (__pyx_t_4 != 0); -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 69 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + /* "root_numpy/src/tree.pyx":70 + * ret = OrderedDict() + * if branches is not None: + * for branch_name in branches: # <<<<<<<<<<<<<< + * branch = tree.GetBranch(branch_name) + * if branch == NULL: + */ -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { -#line 542 "root_numpy/src/tree.pyx" - } else { +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_1 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_7 = NULL; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 70 "root_numpy/src/tree.pyx" + } else { + __pyx_t_6 = -1; +#line 70 "root_numpy/src/tree.pyx" +__pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); __Pyx_GIVEREF(__pyx_t_7); __pyx_t_7 = NULL; +#line 70 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 542 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_t_6); +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_6); +#line 70 "root_numpy/src/tree.pyx" + } -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_6 = 0; +#line 70 "root_numpy/src/tree.pyx" + for (;;) { -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_7)) { -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_1))) { -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 70 "root_numpy/src/tree.pyx" + if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; -#line 542 "root_numpy/src/tree.pyx" - } +#line 70 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_2); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + #else -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + #endif -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + } else { -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 70 "root_numpy/src/tree.pyx" + if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_2); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 70 "root_numpy/src/tree.pyx" + #else -#line 542 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_1, 0, 0, 0); +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 70 "root_numpy/src/tree.pyx" + #endif -#line 542 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + } + } else +#line 70 "root_numpy/src/tree.pyx" +{ -#line 542 "root_numpy/src/tree.pyx" - } +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_7(__pyx_t_1); - /* "root_numpy/src/tree.pyx":543 - * if this_conv == NULL: - * raise ValueError("no converter for {0}".format(this_col.GetTypeName())) - * nst.append((this_col.colname, this_conv.get_nptype())) # <<<<<<<<<<<<<< - * cv.push_back(this_conv) - * if include_weight: - */ +#line 70 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_2)) { -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_this_col->colname); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + PyObject* exc_type = PyErr_Occurred(); -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + if (exc_type) { -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_5 = __pyx_v_this_conv->get_nptype(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 70 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + } -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 70 "root_numpy/src/tree.pyx" + break; -#line 543 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + } -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 70 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 543 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_5); +#line 70 "root_numpy/src/tree.pyx" + } -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); +#line 70 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_branch_name, __pyx_t_2); -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 70 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; + /* "root_numpy/src/tree.pyx":71 + * if branches is not None: + * for branch_name in branches: + * branch = tree.GetBranch(branch_name) # <<<<<<<<<<<<<< + * if branch == NULL: + * continue + */ -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_nst, __pyx_t_8); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 71 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_v_branch_name); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 543 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 71 "root_numpy/src/tree.pyx" + __pyx_v_branch = __pyx_v_tree->GetBranch(__pyx_t_8); - /* "root_numpy/src/tree.pyx":544 - * raise ValueError("no converter for {0}".format(this_col.GetTypeName())) - * nst.append((this_col.colname, this_conv.get_nptype())) - * cv.push_back(this_conv) # <<<<<<<<<<<<<< - * if include_weight: - * nst.append((weight_name, np.dtype('d'))) + /* "root_numpy/src/tree.pyx":72 + * for branch_name in branches: + * branch = tree.GetBranch(branch_name) + * if branch == NULL: # <<<<<<<<<<<<<< + * continue + * ret[branch.GetName()] = get_branch_structure(branch) */ -#line 544 "root_numpy/src/tree.pyx" - __pyx_v_cv.push_back(__pyx_v_this_conv); +#line 72 "root_numpy/src/tree.pyx" + __pyx_t_5 = ((__pyx_v_branch == NULL) != 0); -#line 544 "root_numpy/src/tree.pyx" - } +#line 72 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { - /* "root_numpy/src/tree.pyx":545 - * nst.append((this_col.colname, this_conv.get_nptype())) - * cv.push_back(this_conv) - * if include_weight: # <<<<<<<<<<<<<< - * nst.append((weight_name, np.dtype('d'))) - * return np.empty(entries, dtype=nst) + /* "root_numpy/src/tree.pyx":73 + * branch = tree.GetBranch(branch_name) + * if branch == NULL: + * continue # <<<<<<<<<<<<<< + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret */ -#line 545 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_include_weight); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 545; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 73 "root_numpy/src/tree.pyx" + goto __pyx_L4_continue; -#line 545 "root_numpy/src/tree.pyx" - if (__pyx_t_4) { +#line 73 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":546 - * cv.push_back(this_conv) - * if include_weight: - * nst.append((weight_name, np.dtype('d'))) # <<<<<<<<<<<<<< - * return np.empty(entries, dtype=nst) - * + /* "root_numpy/src/tree.pyx":74 + * if branch == NULL: + * continue + * ret[branch.GetName()] = get_branch_structure(branch) # <<<<<<<<<<<<<< + * return ret + * # all branches */ -#line 546 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__6, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 74 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_f_13_librootnumpy_get_branch_structure(__pyx_v_branch); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 74 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 546 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 74 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 74 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 546 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_weight_name); +#line 74 "root_numpy/src/tree.pyx" + if (unlikely(PyObject_SetItem(__pyx_v_ret, __pyx_t_3, __pyx_t_2) < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 546 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_weight_name); +#line 74 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_weight_name); +#line 74 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 546 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_8); + /* "root_numpy/src/tree.pyx":70 + * ret = OrderedDict() + * if branches is not None: + * for branch_name in branches: # <<<<<<<<<<<<<< + * branch = tree.GetBranch(branch_name) + * if branch == NULL: + */ -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_8); +#line 70 "root_numpy/src/tree.pyx" + __pyx_L4_continue:; -#line 546 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 70 "root_numpy/src/tree.pyx" + } -#line 546 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_nst, __pyx_t_5); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 546 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + /* "root_numpy/src/tree.pyx":75 + * continue + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret # <<<<<<<<<<<<<< + * # all branches + * cdef TObjArray* all_branches = tree.GetListOfBranches() + */ -#line 546 "root_numpy/src/tree.pyx" - goto __pyx_L6; +#line 75 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + +#line 75 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_ret); -#line 546 "root_numpy/src/tree.pyx" +#line 75 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_ret; + +#line 75 "root_numpy/src/tree.pyx" + goto __pyx_L0; + +#line 75 "root_numpy/src/tree.pyx" } -#line 546 "root_numpy/src/tree.pyx" - __pyx_L6:; + /* "root_numpy/src/tree.pyx":77 + * return ret + * # all branches + * cdef TObjArray* all_branches = tree.GetListOfBranches() # <<<<<<<<<<<<<< + * if all_branches == NULL: + * return ret + */ - /* "root_numpy/src/tree.pyx":547 - * if include_weight: - * nst.append((weight_name, np.dtype('d'))) - * return np.empty(entries, dtype=nst) # <<<<<<<<<<<<<< - * - * +#line 77 "root_numpy/src/tree.pyx" + __pyx_v_all_branches = __pyx_v_tree->GetListOfBranches(); + + /* "root_numpy/src/tree.pyx":78 + * # all branches + * cdef TObjArray* all_branches = tree.GetListOfBranches() + * if all_branches == NULL: # <<<<<<<<<<<<<< + * return ret + * for ibranch in range(all_branches.GetEntries()): */ -#line 547 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(((PyObject *)__pyx_r)); +#line 78 "root_numpy/src/tree.pyx" + __pyx_t_5 = ((__pyx_v_all_branches == NULL) != 0); -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 78 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); + /* "root_numpy/src/tree.pyx":79 + * cdef TObjArray* all_branches = tree.GetListOfBranches() + * if all_branches == NULL: + * return ret # <<<<<<<<<<<<<< + * for ibranch in range(all_branches.GetEntries()): + * branch = (all_branches.At(ibranch)) + */ -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 79 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 79 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_ret); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 79 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_ret; -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyInt_From_unsigned_long(__pyx_v_entries); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 79 "root_numpy/src/tree.pyx" + goto __pyx_L0; -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 79 "root_numpy/src/tree.pyx" + } -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/tree.pyx":80 + * if all_branches == NULL: + * return ret + * for ibranch in range(all_branches.GetEntries()): # <<<<<<<<<<<<<< + * branch = (all_branches.At(ibranch)) + * ret[branch.GetName()] = get_branch_structure(branch) + */ -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 80 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_v_all_branches->GetEntries(); -#line 547 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5); +#line 80 "root_numpy/src/tree.pyx" + for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) { -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); +#line 80 "root_numpy/src/tree.pyx" + __pyx_v_ibranch = __pyx_t_10; -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; + /* "root_numpy/src/tree.pyx":81 + * return ret + * for ibranch in range(all_branches.GetEntries()): + * branch = (all_branches.At(ibranch)) # <<<<<<<<<<<<<< + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret + */ -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 81 "root_numpy/src/tree.pyx" + __pyx_v_branch = ((TBranch *)__pyx_v_all_branches->At(__pyx_v_ibranch)); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); + /* "root_numpy/src/tree.pyx":82 + * for ibranch in range(all_branches.GetEntries()): + * branch = (all_branches.At(ibranch)) + * ret[branch.GetName()] = get_branch_structure(branch) # <<<<<<<<<<<<<< + * return ret + * + */ -#line 547 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_v_nst) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 82 "root_numpy/src/tree.pyx" + __pyx_t_1 = __pyx_f_13_librootnumpy_get_branch_structure(__pyx_v_branch); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 82 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 82 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyStr_FromString(__pyx_v_branch->GetName()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 82 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 82 "root_numpy/src/tree.pyx" + if (unlikely(PyObject_SetItem(__pyx_v_ret, __pyx_t_2, __pyx_t_1) < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 82 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 547 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 547; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 82 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 547 "root_numpy/src/tree.pyx" - __pyx_r = ((PyArrayObject *)__pyx_t_6); +#line 82 "root_numpy/src/tree.pyx" + } -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_6 = 0; + /* "root_numpy/src/tree.pyx":83 + * branch = (all_branches.At(ibranch)) + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret # <<<<<<<<<<<<<< + * + * + */ + +#line 83 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + +#line 83 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_ret); + +#line 83 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_ret; -#line 547 "root_numpy/src/tree.pyx" +#line 83 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":529 + /* "root_numpy/src/tree.pyx":65 * * - * cdef np.ndarray init_array(vector[Column*]& columns, # <<<<<<<<<<<<<< - * vector[Converter*]& cv, - * unsigned long entries, + * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< + * cdef int ibranch + * cdef TBranch* branch */ -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" /* function exit code */ -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); - -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); - -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); +#line 65 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); +#line 65 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.init_array", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 65 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.get_tree_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_nst); +#line 65 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_ret); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF((PyObject *)__pyx_r); +#line 65 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_branch_name); + +#line 65 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" return __pyx_r; -#line 529 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":550 +/* "root_numpy/src/tree.pyx":86 * * * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< @@ -11261,16 +11732,16 @@ static PyArrayObject *__pyx_f_13_librootnumpy_init_array(std::vector * return */ -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __pyx_opt_args_13_librootnumpy_handle_load *__pyx_optional_args) { -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" bool __pyx_v_ignore_index = ((bool)0); -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -11279,25 +11750,25 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("handle_load", 0); -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" if (__pyx_optional_args) { -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 0) { -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_v_ignore_index = __pyx_optional_args->ignore_index; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" } -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":551 + /* "root_numpy/src/tree.pyx":87 * * cdef handle_load(int load, bool ignore_index=False): * if load >= 0: # <<<<<<<<<<<<<< @@ -11305,13 +11776,13 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * if load == -1: */ -#line 551 "root_numpy/src/tree.pyx" +#line 87 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_load >= 0) != 0); -#line 551 "root_numpy/src/tree.pyx" +#line 87 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":552 + /* "root_numpy/src/tree.pyx":88 * cdef handle_load(int load, bool ignore_index=False): * if load >= 0: * return # <<<<<<<<<<<<<< @@ -11319,19 +11790,19 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise ValueError("chain is empty") */ -#line 552 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 552 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 552 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 552 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":561 + /* "root_numpy/src/tree.pyx":97 * elif load == -3: * raise IOError("cannot open current file") * elif load == -4: # <<<<<<<<<<<<<< @@ -11339,10 +11810,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise RuntimeError("the chain is not initialized") */ -#line 561 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" switch (__pyx_v_load) { - /* "root_numpy/src/tree.pyx":553 + /* "root_numpy/src/tree.pyx":89 * if load >= 0: * return * if load == -1: # <<<<<<<<<<<<<< @@ -11350,10 +11821,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * elif load == -2: */ -#line 553 "root_numpy/src/tree.pyx" +#line 89 "root_numpy/src/tree.pyx" case -1: - /* "root_numpy/src/tree.pyx":554 + /* "root_numpy/src/tree.pyx":90 * return * if load == -1: * raise ValueError("chain is empty") # <<<<<<<<<<<<<< @@ -11361,25 +11832,25 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * if ignore_index: */ -#line 554 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 554; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 90 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 554 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 554 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 554 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 554 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 554; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 90 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 554 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" break; - /* "root_numpy/src/tree.pyx":555 + /* "root_numpy/src/tree.pyx":91 * if load == -1: * raise ValueError("chain is empty") * elif load == -2: # <<<<<<<<<<<<<< @@ -11387,10 +11858,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * return */ -#line 555 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/tree.pyx" case -2: - /* "root_numpy/src/tree.pyx":556 + /* "root_numpy/src/tree.pyx":92 * raise ValueError("chain is empty") * elif load == -2: * if ignore_index: # <<<<<<<<<<<<<< @@ -11398,13 +11869,13 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise IndexError("tree index in chain is out of bounds") */ -#line 556 "root_numpy/src/tree.pyx" +#line 92 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_ignore_index != 0); -#line 556 "root_numpy/src/tree.pyx" +#line 92 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":557 + /* "root_numpy/src/tree.pyx":93 * elif load == -2: * if ignore_index: * return # <<<<<<<<<<<<<< @@ -11412,19 +11883,19 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * elif load == -3: */ -#line 557 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 557 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 557 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 557 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":558 + /* "root_numpy/src/tree.pyx":94 * if ignore_index: * return * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< @@ -11432,25 +11903,25 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise IOError("cannot open current file") */ -#line 558 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_IndexError, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 94 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_IndexError, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 558 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 558 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 558 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 558 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 94 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 558 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" break; - /* "root_numpy/src/tree.pyx":559 + /* "root_numpy/src/tree.pyx":95 * return * raise IndexError("tree index in chain is out of bounds") * elif load == -3: # <<<<<<<<<<<<<< @@ -11458,10 +11929,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * elif load == -4: */ -#line 559 "root_numpy/src/tree.pyx" +#line 95 "root_numpy/src/tree.pyx" case -3: - /* "root_numpy/src/tree.pyx":560 + /* "root_numpy/src/tree.pyx":96 * raise IndexError("tree index in chain is out of bounds") * elif load == -3: * raise IOError("cannot open current file") # <<<<<<<<<<<<<< @@ -11469,25 +11940,25 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise IOError("cannot access tree in current file") */ -#line 560 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 96 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_tuple__13, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 560 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 560 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 560 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 560 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 96 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 560 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" break; - /* "root_numpy/src/tree.pyx":561 + /* "root_numpy/src/tree.pyx":97 * elif load == -3: * raise IOError("cannot open current file") * elif load == -4: # <<<<<<<<<<<<<< @@ -11495,10 +11966,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise RuntimeError("the chain is not initialized") */ -#line 561 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" case -4: - /* "root_numpy/src/tree.pyx":562 + /* "root_numpy/src/tree.pyx":98 * raise IOError("cannot open current file") * elif load == -4: * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< @@ -11506,31 +11977,31 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * */ -#line 562 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 98 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_tuple__14, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 562 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 562 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 562 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 562 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 98 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 562 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" break; -#line 562 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" default: break; -#line 562 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":563 + /* "root_numpy/src/tree.pyx":99 * elif load == -4: * raise IOError("cannot access tree in current file") * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< @@ -11538,22 +12009,22 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * */ -#line 563 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 99 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__15, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 563 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 563 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 563 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 563 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 99 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":550 + /* "root_numpy/src/tree.pyx":86 * * * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< @@ -11561,2060 +12032,2798 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * return */ -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" /* function exit code */ -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.handle_load", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" return __pyx_r; -#line 550 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":566 +/* "root_numpy/src/tree.pyx":102 * * - * cdef object tree2array(TTree* tree, branches, selection, # <<<<<<<<<<<<<< + * cdef object tree2array(TTree* tree, branches, string selection, # <<<<<<<<<<<<<< * start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" -#line 566 "root_numpy/src/tree.pyx" -static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, PyObject *__pyx_v_include_weight, PyObject *__pyx_v_weight_name) { - std::vector __pyx_v_columns -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" +static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObject *__pyx_v_branches, std::string __pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, bool __pyx_v_include_weight, std::string __pyx_v_weight_name) { + int __pyx_v_num_requested_branches +#line 102 "root_numpy/src/tree.pyx" ; - Column *__pyx_v_col -#line 566 "root_numpy/src/tree.pyx" + int __pyx_v_num_entries +#line 102 "root_numpy/src/tree.pyx" +; + int __pyx_v_num_entries_selected +#line 102 "root_numpy/src/tree.pyx" ; TreeChain *__pyx_v_chain -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" +; + TObjArray *__pyx_v_branch_array +#line 102 "root_numpy/src/tree.pyx" +; + TObjArray *__pyx_v_leaf_array +#line 102 "root_numpy/src/tree.pyx" +; + TBranch *__pyx_v_tbranch +#line 102 "root_numpy/src/tree.pyx" +; + TLeaf *__pyx_v_tleaf +#line 102 "root_numpy/src/tree.pyx" +; + Column *__pyx_v_col +#line 102 "root_numpy/src/tree.pyx" +; + __pyx_t_13_librootnumpy_Converter *__pyx_v_conv +#line 102 "root_numpy/src/tree.pyx" +; + std::vector __pyx_v_columns +#line 102 "root_numpy/src/tree.pyx" +; + std::vector<__pyx_t_13_librootnumpy_Converter *> __pyx_v_converters +#line 102 "root_numpy/src/tree.pyx" +; + std::vector > __pyx_v_column_buckets +#line 102 "root_numpy/src/tree.pyx" +; + std::vector > __pyx_v_converter_buckets +#line 102 "root_numpy/src/tree.pyx" ; TTreeFormula *__pyx_v_selection_formula -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TTreeFormula *__pyx_v_formula -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; - int __pyx_v_num_entries -#line 566 "root_numpy/src/tree.pyx" + int __pyx_v_ibranch +#line 102 "root_numpy/src/tree.pyx" ; - int __pyx_v_num_entries_selected -#line 566 "root_numpy/src/tree.pyx" + int __pyx_v_ileaf +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_ientry -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; - __pyx_t_13_librootnumpy_Converter *__pyx_v_conv -#line 566 "root_numpy/src/tree.pyx" + int __pyx_v_branch_idx +#line 102 "root_numpy/src/tree.pyx" +; + int __pyx_v_num_branches +#line 102 "root_numpy/src/tree.pyx" ; - unsigned long __pyx_v_numcol -#line 566 "root_numpy/src/tree.pyx" + unsigned int __pyx_v_icol +#line 102 "root_numpy/src/tree.pyx" ; - void *__pyx_v_dataptr -#line 566 "root_numpy/src/tree.pyx" + unsigned int __pyx_v_num_columns +#line 102 "root_numpy/src/tree.pyx" ; PyArrayObject *__pyx_v_arr = 0 -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; - int __pyx_v_nb -#line 566 "root_numpy/src/tree.pyx" + void *__pyx_v_data_ptr +#line 102 "root_numpy/src/tree.pyx" ; - int __pyx_v_entry_size -#line 566 "root_numpy/src/tree.pyx" + int __pyx_v_num_bytes +#line 102 "root_numpy/src/tree.pyx" ; - std::vector<__pyx_t_13_librootnumpy_Converter *> __pyx_v_conv_array -#line 566 "root_numpy/src/tree.pyx" + int __pyx_v_entry_size +#line 102 "root_numpy/src/tree.pyx" ; char *__pyx_v_c_string -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_structure = NULL -#line 566 "root_numpy/src/tree.pyx" + bool __pyx_v_shortname +#line 102 "root_numpy/src/tree.pyx" +; + std::string __pyx_v_column_name +#line 102 "root_numpy/src/tree.pyx" ; - int __pyx_v_user_branches -#line 566 "root_numpy/src/tree.pyx" + const char *__pyx_v_branch_name +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_branch = NULL -#line 566 "root_numpy/src/tree.pyx" + const char *__pyx_v_leaf_name +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_leaves = NULL -#line 566 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_branch_dict = NULL +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_shortname = NULL -#line 566 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_expression = NULL +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_leaf = NULL -#line 566 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_dtype = NULL +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_ltype = NULL -#line 566 "root_numpy/src/tree.pyx" + Column *__pyx_v_this_col +#line 102 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_colname = NULL -#line 566 "root_numpy/src/tree.pyx" + __pyx_t_13_librootnumpy_Converter *__pyx_v_this_conv +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_indices = NULL -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_idx = NULL +#line 102 "root_numpy/src/tree.pyx" ; - unsigned long __pyx_v_icol -#line 566 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_b = NULL +#line 102 "root_numpy/src/tree.pyx" ; -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; PyObject *__pyx_t_2 = NULL; - struct __pyx_opt_args_13_librootnumpy_handle_load __pyx_t_3; - char *__pyx_t_4; - int __pyx_t_5; - struct __pyx_opt_args_13_librootnumpy_parse_tree_structure __pyx_t_6; - PyObject *__pyx_t_7 = NULL; + int __pyx_t_3; + Py_ssize_t __pyx_t_4; + struct __pyx_opt_args_13_librootnumpy_handle_load __pyx_t_5; + std::vector __pyx_t_6; + std::vector<__pyx_t_13_librootnumpy_Converter *> __pyx_t_7; PyObject *__pyx_t_8 = NULL; - Py_ssize_t __pyx_t_9; - Py_ssize_t __pyx_t_10; - PyObject *(*__pyx_t_11)(PyObject *); + PyObject *__pyx_t_9 = NULL; + PyObject *__pyx_t_10 = NULL; + PyObject *__pyx_t_11 = NULL; PyObject *(*__pyx_t_12)(PyObject *); - PyObject *__pyx_t_13 = NULL; - PyObject *__pyx_t_14 = NULL; - PyObject *__pyx_t_15 = NULL; - PyObject *(*__pyx_t_16)(PyObject *); + int __pyx_t_13; + int __pyx_t_14; + int __pyx_t_15; + int __pyx_t_16; std::string __pyx_t_17; - Py_ssize_t __pyx_t_18; + std::string __pyx_t_18; PyObject *__pyx_t_19 = NULL; - std::string __pyx_t_20; - std::string __pyx_t_21; + PyObject *__pyx_t_20 = NULL; + PyObject *__pyx_t_21 = NULL; PyObject *__pyx_t_22 = NULL; - int __pyx_t_23; - unsigned long __pyx_t_24; - unsigned long __pyx_t_25; + char *__pyx_t_23; + size_t __pyx_t_24; + unsigned int __pyx_t_25; int __pyx_t_26; - char const *__pyx_t_27; - PyObject *__pyx_t_28 = NULL; + unsigned int __pyx_t_27; + char const *__pyx_t_28; PyObject *__pyx_t_29 = NULL; PyObject *__pyx_t_30 = NULL; PyObject *__pyx_t_31 = NULL; PyObject *__pyx_t_32 = NULL; PyObject *__pyx_t_33 = NULL; + PyObject *__pyx_t_34 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("tree2array", 0); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branches); - - /* "root_numpy/src/tree.pyx":570 - * include_weight, weight_name): + /* "root_numpy/src/tree.pyx":106 + * bool include_weight, string weight_name): * * if tree.GetNbranches() == 0: # <<<<<<<<<<<<<< * raise ValueError("tree has no branches") * */ -#line 570 "root_numpy/src/tree.pyx" +#line 106 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_tree->GetNbranches() == 0) != 0); -#line 570 "root_numpy/src/tree.pyx" +#line 106 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":571 + /* "root_numpy/src/tree.pyx":107 * * if tree.GetNbranches() == 0: * raise ValueError("tree has no branches") # <<<<<<<<<<<<<< * - * cdef vector[Column*] columns + * cdef int num_requested_branches = 0 */ -#line 571 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 107 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 571 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 571 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 571 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 571 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 107 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 107 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":109 + * raise ValueError("tree has no branches") + * + * cdef int num_requested_branches = 0 # <<<<<<<<<<<<<< + * if branches is not None: + * num_requested_branches = len(branches) + */ + +#line 109 "root_numpy/src/tree.pyx" + __pyx_v_num_requested_branches = 0; + + /* "root_numpy/src/tree.pyx":110 + * + * cdef int num_requested_branches = 0 + * if branches is not None: # <<<<<<<<<<<<<< + * num_requested_branches = len(branches) + * if num_requested_branches == 0: + */ + +#line 110 "root_numpy/src/tree.pyx" + __pyx_t_1 = (__pyx_v_branches != Py_None); + +#line 110 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_t_1 != 0); + +#line 110 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":111 + * cdef int num_requested_branches = 0 + * if branches is not None: + * num_requested_branches = len(branches) # <<<<<<<<<<<<<< + * if num_requested_branches == 0: + * raise ValueError("branches is an empty list") + */ + +#line 111 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyObject_Length(__pyx_v_branches); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 111 "root_numpy/src/tree.pyx" + __pyx_v_num_requested_branches = __pyx_t_4; + + /* "root_numpy/src/tree.pyx":112 + * if branches is not None: + * num_requested_branches = len(branches) + * if num_requested_branches == 0: # <<<<<<<<<<<<<< + * raise ValueError("branches is an empty list") + * + */ + +#line 112 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches == 0) != 0); + +#line 112 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":113 + * num_requested_branches = len(branches) + * if num_requested_branches == 0: + * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< + * + * cdef int num_entries = tree.GetEntries() + */ + +#line 113 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 113 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 113 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); + +#line 113 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 113 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 113 "root_numpy/src/tree.pyx" + } + +#line 113 "root_numpy/src/tree.pyx" + goto __pyx_L4; -#line 571 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":576 - * cdef Column* col +#line 113 "root_numpy/src/tree.pyx" + __pyx_L4:; + + /* "root_numpy/src/tree.pyx":115 + * raise ValueError("branches is an empty list") + * + * cdef int num_entries = tree.GetEntries() # <<<<<<<<<<<<<< + * cdef int num_entries_selected = 0 + * + */ + +#line 115 "root_numpy/src/tree.pyx" + __pyx_v_num_entries = __pyx_v_tree->GetEntries(); + + /* "root_numpy/src/tree.pyx":116 + * + * cdef int num_entries = tree.GetEntries() + * cdef int num_entries_selected = 0 # <<<<<<<<<<<<<< + * + * cdef TreeChain* chain = new TreeChain(tree) + */ + +#line 116 "root_numpy/src/tree.pyx" + __pyx_v_num_entries_selected = 0; + + /* "root_numpy/src/tree.pyx":118 + * cdef int num_entries_selected = 0 * * cdef TreeChain* chain = new TreeChain(tree) # <<<<<<<<<<<<<< * handle_load(chain.Prepare(), True) * */ -#line 576 "root_numpy/src/tree.pyx" +#line 118 "root_numpy/src/tree.pyx" __pyx_v_chain = new TreeChain(__pyx_v_tree); - /* "root_numpy/src/tree.pyx":577 + /* "root_numpy/src/tree.pyx":119 * * cdef TreeChain* chain = new TreeChain(tree) * handle_load(chain.Prepare(), True) # <<<<<<<<<<<<<< * - * cdef TTreeFormula* selection_formula = NULL + * cdef TObjArray* branch_array = tree.GetListOfBranches() */ -#line 577 "root_numpy/src/tree.pyx" - __pyx_t_3.__pyx_n = 1; +#line 119 "root_numpy/src/tree.pyx" + __pyx_t_5.__pyx_n = 1; -#line 577 "root_numpy/src/tree.pyx" - __pyx_t_3.ignore_index = 1; +#line 119 "root_numpy/src/tree.pyx" + __pyx_t_5.ignore_index = 1; -#line 577 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy_handle_load(__pyx_v_chain->Prepare(), &__pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 577; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 119 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_f_13_librootnumpy_handle_load(__pyx_v_chain->Prepare(), &__pyx_t_5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 577 "root_numpy/src/tree.pyx" +#line 119 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 577 "root_numpy/src/tree.pyx" +#line 119 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":579 + /* "root_numpy/src/tree.pyx":121 * handle_load(chain.Prepare(), True) * + * cdef TObjArray* branch_array = tree.GetListOfBranches() # <<<<<<<<<<<<<< + * cdef TObjArray* leaf_array + * cdef TBranch* tbranch + */ + +#line 121 "root_numpy/src/tree.pyx" + __pyx_v_branch_array = __pyx_v_tree->GetListOfBranches(); + + /* "root_numpy/src/tree.pyx":136 + * # Avoid calling FindBranch for each branch since that results in O(n^2) + * * cdef TTreeFormula* selection_formula = NULL # <<<<<<<<<<<<<< * cdef TTreeFormula* formula = NULL - * cdef int num_entries = chain.GetEntries() + * */ -#line 579 "root_numpy/src/tree.pyx" +#line 136 "root_numpy/src/tree.pyx" __pyx_v_selection_formula = NULL; - /* "root_numpy/src/tree.pyx":580 + /* "root_numpy/src/tree.pyx":137 * * cdef TTreeFormula* selection_formula = NULL * cdef TTreeFormula* formula = NULL # <<<<<<<<<<<<<< - * cdef int num_entries = chain.GetEntries() - * cdef int num_entries_selected = 0 + * + * cdef int ibranch, ileaf, ientry, branch_idx = 0 */ -#line 580 "root_numpy/src/tree.pyx" +#line 137 "root_numpy/src/tree.pyx" __pyx_v_formula = NULL; - /* "root_numpy/src/tree.pyx":581 - * cdef TTreeFormula* selection_formula = NULL + /* "root_numpy/src/tree.pyx":139 * cdef TTreeFormula* formula = NULL - * cdef int num_entries = chain.GetEntries() # <<<<<<<<<<<<<< - * cdef int num_entries_selected = 0 - * cdef int ientry + * + * cdef int ibranch, ileaf, ientry, branch_idx = 0 # <<<<<<<<<<<<<< + * cdef int num_branches = branch_array.GetEntries() + * cdef unsigned int icol, num_columns */ -#line 581 "root_numpy/src/tree.pyx" - __pyx_v_num_entries = __pyx_v_chain->GetEntries(); +#line 139 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = 0; - /* "root_numpy/src/tree.pyx":582 - * cdef TTreeFormula* formula = NULL - * cdef int num_entries = chain.GetEntries() - * cdef int num_entries_selected = 0 # <<<<<<<<<<<<<< - * cdef int ientry + /* "root_numpy/src/tree.pyx":140 + * + * cdef int ibranch, ileaf, ientry, branch_idx = 0 + * cdef int num_branches = branch_array.GetEntries() # <<<<<<<<<<<<<< + * cdef unsigned int icol, num_columns * */ -#line 582 "root_numpy/src/tree.pyx" - __pyx_v_num_entries_selected = 0; +#line 140 "root_numpy/src/tree.pyx" + __pyx_v_num_branches = __pyx_v_branch_array->GetEntries(); - /* "root_numpy/src/tree.pyx":594 - * cdef char* c_string + /* "root_numpy/src/tree.pyx":154 + * cdef const_char* leaf_name * - * try: # <<<<<<<<<<<<<< - * # Set up the selection if we have one - * if selection: + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * columns.reserve(num_requested_branches) + * converters.reserve(num_requested_branches) */ -#line 594 "root_numpy/src/tree.pyx" - /*try:*/ { +#line 154 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); + +#line 154 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":155 + * + * if num_requested_branches > 0: + * columns.reserve(num_requested_branches) # <<<<<<<<<<<<<< + * converters.reserve(num_requested_branches) + * column_buckets.assign(num_requested_branches, vector['Column*']()) + */ + +#line 155 "root_numpy/src/tree.pyx" + __pyx_v_columns.reserve(__pyx_v_num_requested_branches); + + /* "root_numpy/src/tree.pyx":156 + * if num_requested_branches > 0: + * columns.reserve(num_requested_branches) + * converters.reserve(num_requested_branches) # <<<<<<<<<<<<<< + * column_buckets.assign(num_requested_branches, vector['Column*']()) + * converter_buckets.assign(num_requested_branches, vector['Converter*']()) + */ + +#line 156 "root_numpy/src/tree.pyx" + __pyx_v_converters.reserve(__pyx_v_num_requested_branches); + + /* "root_numpy/src/tree.pyx":157 + * columns.reserve(num_requested_branches) + * converters.reserve(num_requested_branches) + * column_buckets.assign(num_requested_branches, vector['Column*']()) # <<<<<<<<<<<<<< + * converter_buckets.assign(num_requested_branches, vector['Converter*']()) + * else: + */ + +#line 157 "root_numpy/src/tree.pyx" + try { + +#line 157 "root_numpy/src/tree.pyx" + __pyx_t_6 = std::vector (); + +#line 157 "root_numpy/src/tree.pyx" + } catch(...) { + +#line 157 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); - /* "root_numpy/src/tree.pyx":596 +#line 157 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 157 "root_numpy/src/tree.pyx" + } + +#line 157 "root_numpy/src/tree.pyx" + __pyx_v_column_buckets.assign(__pyx_v_num_requested_branches, __pyx_t_6); + + /* "root_numpy/src/tree.pyx":158 + * converters.reserve(num_requested_branches) + * column_buckets.assign(num_requested_branches, vector['Column*']()) + * converter_buckets.assign(num_requested_branches, vector['Converter*']()) # <<<<<<<<<<<<<< + * else: + * columns.reserve(num_branches) + */ + +#line 158 "root_numpy/src/tree.pyx" + try { + +#line 158 "root_numpy/src/tree.pyx" + __pyx_t_7 = std::vector<__pyx_t_13_librootnumpy_Converter *> (); + +#line 158 "root_numpy/src/tree.pyx" + } catch(...) { + +#line 158 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); + +#line 158 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 158 "root_numpy/src/tree.pyx" + } + +#line 158 "root_numpy/src/tree.pyx" + __pyx_v_converter_buckets.assign(__pyx_v_num_requested_branches, __pyx_t_7); + +#line 158 "root_numpy/src/tree.pyx" + goto __pyx_L6; + +#line 158 "root_numpy/src/tree.pyx" + } + +#line 158 "root_numpy/src/tree.pyx" + /*else*/ { + + /* "root_numpy/src/tree.pyx":160 + * converter_buckets.assign(num_requested_branches, vector['Converter*']()) + * else: + * columns.reserve(num_branches) # <<<<<<<<<<<<<< + * converters.reserve(num_branches) + * + */ + +#line 160 "root_numpy/src/tree.pyx" + __pyx_v_columns.reserve(__pyx_v_num_branches); + + /* "root_numpy/src/tree.pyx":161 + * else: + * columns.reserve(num_branches) + * converters.reserve(num_branches) # <<<<<<<<<<<<<< + * * try: - * # Set up the selection if we have one - * if selection: # <<<<<<<<<<<<<< - * c_string = selection - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) */ -#line 596 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_selection); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 161 "root_numpy/src/tree.pyx" + __pyx_v_converters.reserve(__pyx_v_num_branches); -#line 596 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 161 "root_numpy/src/tree.pyx" + } + +#line 161 "root_numpy/src/tree.pyx" + __pyx_L6:; + + /* "root_numpy/src/tree.pyx":163 + * converters.reserve(num_branches) + * + * try: # <<<<<<<<<<<<<< + * # Set up the selection if we have one + * if selection.size(): + */ - /* "root_numpy/src/tree.pyx":597 +#line 163 "root_numpy/src/tree.pyx" + /*try:*/ { + + /* "root_numpy/src/tree.pyx":165 + * try: * # Set up the selection if we have one - * if selection: - * c_string = selection # <<<<<<<<<<<<<< - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) + * if selection.size(): # <<<<<<<<<<<<<< + * selection_formula = new TTreeFormula("selection", selection.c_str(), tree) * if selection_formula == NULL or selection_formula.GetNdim() == 0: */ -#line 597 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_AsString(__pyx_v_selection); if (unlikely((!__pyx_t_4) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 597; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 165 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_v_selection.size() != 0); -#line 597 "root_numpy/src/tree.pyx" - __pyx_v_c_string = __pyx_t_4; +#line 165 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":598 - * if selection: - * c_string = selection - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":166 + * # Set up the selection if we have one + * if selection.size(): + * selection_formula = new TTreeFormula("selection", selection.c_str(), tree) # <<<<<<<<<<<<<< * if selection_formula == NULL or selection_formula.GetNdim() == 0: * del selection_formula */ -#line 598 "root_numpy/src/tree.pyx" - __pyx_v_selection_formula = new TTreeFormula(__pyx_k_selection, __pyx_v_c_string, __pyx_v_chain->fChain); +#line 166 "root_numpy/src/tree.pyx" + __pyx_v_selection_formula = new TTreeFormula(__pyx_k_selection, __pyx_v_selection.c_str(), __pyx_v_tree); - /* "root_numpy/src/tree.pyx":599 - * c_string = selection - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) + /* "root_numpy/src/tree.pyx":167 + * if selection.size(): + * selection_formula = new TTreeFormula("selection", selection.c_str(), tree) * if selection_formula == NULL or selection_formula.GetNdim() == 0: # <<<<<<<<<<<<<< * del selection_formula - * raise ValueError("could not compile selection formula") + * raise ValueError( */ -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_selection_formula == NULL) != 0); +#line 167 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_selection_formula == NULL) != 0); -#line 599 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 167 "root_numpy/src/tree.pyx" + if (!__pyx_t_1) { -#line 599 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" } else { -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 167 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 599 "root_numpy/src/tree.pyx" - goto __pyx_L9_bool_binop_done; +#line 167 "root_numpy/src/tree.pyx" + goto __pyx_L12_bool_binop_done; -#line 599 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" } -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_selection_formula->GetNdim() == 0) != 0); +#line 167 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_selection_formula->GetNdim() == 0) != 0); -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 167 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 599 "root_numpy/src/tree.pyx" - __pyx_L9_bool_binop_done:; +#line 167 "root_numpy/src/tree.pyx" + __pyx_L12_bool_binop_done:; -#line 599 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 167 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":600 - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) + /* "root_numpy/src/tree.pyx":168 + * selection_formula = new TTreeFormula("selection", selection.c_str(), tree) * if selection_formula == NULL or selection_formula.GetNdim() == 0: * del selection_formula # <<<<<<<<<<<<<< - * raise ValueError("could not compile selection formula") - * # The chain will take care of updating the formula leaves when + * raise ValueError( + * "could not compile selection expression '{0}'".format(selection)) */ -#line 600 "root_numpy/src/tree.pyx" +#line 168 "root_numpy/src/tree.pyx" delete __pyx_v_selection_formula; - /* "root_numpy/src/tree.pyx":601 - * if selection_formula == NULL or selection_formula.GetNdim() == 0: + /* "root_numpy/src/tree.pyx":170 * del selection_formula - * raise ValueError("could not compile selection formula") # <<<<<<<<<<<<<< + * raise ValueError( + * "could not compile selection expression '{0}'".format(selection)) # <<<<<<<<<<<<<< * # The chain will take care of updating the formula leaves when * # rolling over to the next tree. */ -#line 601 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__13, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_could_not_compile_selection_expr, __pyx_n_s_format); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_selection); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_10 = NULL; + +#line 170 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_8); + +#line 170 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_10)) { + +#line 170 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_10); + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_8, function); + +#line 170 "root_numpy/src/tree.pyx" + } + +#line 170 "root_numpy/src/tree.pyx" + } + +#line 170 "root_numpy/src/tree.pyx" + if (!__pyx_t_10) { + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_9); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 170 "root_numpy/src/tree.pyx" + } else { + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); + +#line 170 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_10); __Pyx_GIVEREF(__pyx_t_10); __pyx_t_10 = NULL; + +#line 170 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_t_9); + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; + +#line 170 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_11, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; + +#line 170 "root_numpy/src/tree.pyx" + } + +#line 170 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; + + /* "root_numpy/src/tree.pyx":169 + * if selection_formula == NULL or selection_formula.GetNdim() == 0: + * del selection_formula + * raise ValueError( # <<<<<<<<<<<<<< + * "could not compile selection expression '{0}'".format(selection)) + * # The chain will take care of updating the formula leaves when + */ + +#line 169 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 169 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); + +#line 169 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); + +#line 169 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 601 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; + +#line 169 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 169 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 601 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; + +#line 169 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 601 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 601 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 169 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 601 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":604 + /* "root_numpy/src/tree.pyx":173 * # The chain will take care of updating the formula leaves when * # rolling over to the next tree. * chain.AddFormula(selection_formula) # <<<<<<<<<<<<<< * - * # Parse the tree structure to determine branches and leaves + * branch_dict = None */ -#line 604 "root_numpy/src/tree.pyx" +#line 173 "root_numpy/src/tree.pyx" __pyx_v_chain->AddFormula(__pyx_v_selection_formula); -#line 604 "root_numpy/src/tree.pyx" - goto __pyx_L7; +#line 173 "root_numpy/src/tree.pyx" + goto __pyx_L10; -#line 604 "root_numpy/src/tree.pyx" +#line 173 "root_numpy/src/tree.pyx" } -#line 604 "root_numpy/src/tree.pyx" - __pyx_L7:; +#line 173 "root_numpy/src/tree.pyx" + __pyx_L10:; + + /* "root_numpy/src/tree.pyx":175 + * chain.AddFormula(selection_formula) + * + * branch_dict = None # <<<<<<<<<<<<<< + * if num_requested_branches > 0: + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + */ + +#line 175 "root_numpy/src/tree.pyx" + __Pyx_INCREF(Py_None); - /* "root_numpy/src/tree.pyx":607 +#line 175 "root_numpy/src/tree.pyx" + __pyx_v_branch_dict = Py_None; + + /* "root_numpy/src/tree.pyx":176 * - * # Parse the tree structure to determine branches and leaves - * structure = parse_tree_structure(tree, branches=branches) # <<<<<<<<<<<<<< - * user_branches = False - * if branches is None: + * branch_dict = None + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + * if len(branch_dict) != num_requested_branches: + */ + +#line 176 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); + +#line 176 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":177 + * branch_dict = None + * if num_requested_branches > 0: + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) # <<<<<<<<<<<<<< + * if len(branch_dict) != num_requested_branches: + * raise ValueError("duplicate branches requested") */ -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_6.__pyx_n = 1; +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 177 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_int_0); + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_int_0; + +#line 177 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_11 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_11); __pyx_t_4 = 0; + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_12 = NULL; + +#line 177 "root_numpy/src/tree.pyx" + } else { + __pyx_t_4 = -1; +#line 177 "root_numpy/src/tree.pyx" +__pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_12 = Py_TYPE(__pyx_t_11)->tp_iternext; if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + } + +#line 177 "root_numpy/src/tree.pyx" + for (;;) { + +#line 177 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_12)) { + +#line 177 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_11))) { + +#line 177 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_11)) break; + +#line 177 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyList_GET_ITEM(__pyx_t_11, __pyx_t_4); __Pyx_INCREF(__pyx_t_9); __pyx_t_4++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + #else + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = PySequence_ITEM(__pyx_t_11, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + #endif + +#line 177 "root_numpy/src/tree.pyx" + } else { + +#line 177 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_11)) break; + +#line 177 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_GET_ITEM(__pyx_t_11, __pyx_t_4); __Pyx_INCREF(__pyx_t_9); __pyx_t_4++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + #else + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = PySequence_ITEM(__pyx_t_11, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + #endif + +#line 177 "root_numpy/src/tree.pyx" + } + } else +#line 177 "root_numpy/src/tree.pyx" +{ + +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_t_12(__pyx_t_11); + +#line 177 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_9)) { + +#line 177 "root_numpy/src/tree.pyx" + PyObject* exc_type = PyErr_Occurred(); + +#line 177 "root_numpy/src/tree.pyx" + if (exc_type) { + +#line 177 "root_numpy/src/tree.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); + +#line 177 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 177 "root_numpy/src/tree.pyx" + } -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_6.branches = __pyx_v_branches; +#line 177 "root_numpy/src/tree.pyx" + break; -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy_parse_tree_structure(__pyx_v_tree, &__pyx_t_6); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 607; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 177 "root_numpy/src/tree.pyx" + } -#line 607 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 607 "root_numpy/src/tree.pyx" - __pyx_v_structure = __pyx_t_2; +#line 177 "root_numpy/src/tree.pyx" + } -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 177 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_9); - /* "root_numpy/src/tree.pyx":608 - * # Parse the tree structure to determine branches and leaves - * structure = parse_tree_structure(tree, branches=branches) - * user_branches = False # <<<<<<<<<<<<<< - * if branches is None: - * branches = structure.keys() - */ +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 608 "root_numpy/src/tree.pyx" - __pyx_v_user_branches = 0; +#line 177 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_8); - /* "root_numpy/src/tree.pyx":609 - * structure = parse_tree_structure(tree, branches=branches) - * user_branches = False - * if branches is None: # <<<<<<<<<<<<<< - * branches = structure.keys() - * elif len(branches) == 0: - */ +#line 177 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_idx, __pyx_t_8); -#line 609 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_branches == Py_None); +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyNumber_Add(__pyx_t_8, __pyx_int_1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 609 "root_numpy/src/tree.pyx" - __pyx_t_5 = (__pyx_t_1 != 0); +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 609 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 177 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); - /* "root_numpy/src/tree.pyx":610 - * user_branches = False - * if branches is None: - * branches = structure.keys() # <<<<<<<<<<<<<< - * elif len(branches) == 0: - * raise ValueError("branches is an empty list") - */ +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_t_9; -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_structure, __pyx_n_s_keys); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 610 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_New(2); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_8 = NULL; +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 610 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_7))) { +#line 177 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_b); -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_7); +#line 177 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_v_b); -#line 610 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_8)) { +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_b); -#line 610 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); +#line 177 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_idx); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_8); +#line 177 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_v_idx); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_idx); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_7, function); +#line 177 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_9))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 610 "root_numpy/src/tree.pyx" - } +#line 177 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 610 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } -#line 610 "root_numpy/src/tree.pyx" - if (__pyx_t_8) { +#line 177 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 177 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 610 "root_numpy/src/tree.pyx" - } else { +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_CallNoArg(__pyx_t_7); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 177 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 610 "root_numpy/src/tree.pyx" - } +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyDict_Type))), __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_v_branches, __pyx_t_2); +#line 177 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 177 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 610 "root_numpy/src/tree.pyx" - goto __pyx_L11; +#line 177 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_v_branch_dict, __pyx_t_2); -#line 610 "root_numpy/src/tree.pyx" - } +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":611 - * if branches is None: - * branches = structure.keys() - * elif len(branches) == 0: # <<<<<<<<<<<<<< - * raise ValueError("branches is an empty list") - * elif len(branches) != len(set(branches)): + /* "root_numpy/src/tree.pyx":178 + * if num_requested_branches > 0: + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + * if len(branch_dict) != num_requested_branches: # <<<<<<<<<<<<<< + * raise ValueError("duplicate branches requested") + * */ -#line 611 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyObject_Length(__pyx_v_branches); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 611; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 178 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyObject_Length(__pyx_v_branch_dict); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 611 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_t_9 == 0) != 0); +#line 178 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_t_4 != __pyx_v_num_requested_branches) != 0); -#line 611 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 178 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":612 - * branches = structure.keys() - * elif len(branches) == 0: - * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< - * elif len(branches) != len(set(branches)): - * raise ValueError("duplicate branches requested") + /* "root_numpy/src/tree.pyx":179 + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + * if len(branch_dict) != num_requested_branches: + * raise ValueError("duplicate branches requested") # <<<<<<<<<<<<<< + * + * # Build vector of Converters for branches */ -#line 612 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__14, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 612; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 179 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__18, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 179 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 612 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 179 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 612 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 179 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 612 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 179 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 179 "root_numpy/src/tree.pyx" + } -#line 612 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 612; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 179 "root_numpy/src/tree.pyx" + goto __pyx_L14; -#line 612 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":613 - * elif len(branches) == 0: - * raise ValueError("branches is an empty list") - * elif len(branches) != len(set(branches)): # <<<<<<<<<<<<<< - * raise ValueError("duplicate branches requested") - * else: +#line 179 "root_numpy/src/tree.pyx" + __pyx_L14:; + + /* "root_numpy/src/tree.pyx":182 + * + * # Build vector of Converters for branches + * for ibranch in range(num_branches): # <<<<<<<<<<<<<< + * tbranch = branch_array.At(ibranch) + * branch_name = tbranch.GetName() */ -#line 613 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyObject_Length(__pyx_v_branches); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 182 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_v_num_branches; -#line 613 "root_numpy/src/tree.pyx" - __pyx_t_2 = PySet_New(__pyx_v_branches); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 182 "root_numpy/src/tree.pyx" + for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 613 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 182 "root_numpy/src/tree.pyx" + __pyx_v_ibranch = __pyx_t_14; -#line 613 "root_numpy/src/tree.pyx" - __pyx_t_10 = PySet_Size(__pyx_t_2); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + /* "root_numpy/src/tree.pyx":183 + * # Build vector of Converters for branches + * for ibranch in range(num_branches): + * tbranch = branch_array.At(ibranch) # <<<<<<<<<<<<<< + * branch_name = tbranch.GetName() + * if num_requested_branches > 0: + */ -#line 613 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 183 "root_numpy/src/tree.pyx" + __pyx_v_tbranch = ((TBranch *)__pyx_v_branch_array->At(__pyx_v_ibranch)); -#line 613 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_t_9 != __pyx_t_10) != 0); + /* "root_numpy/src/tree.pyx":184 + * for ibranch in range(num_branches): + * tbranch = branch_array.At(ibranch) + * branch_name = tbranch.GetName() # <<<<<<<<<<<<<< + * if num_requested_branches > 0: + * if len(branch_dict) == 0: + */ -#line 613 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 184 "root_numpy/src/tree.pyx" + __pyx_v_branch_name = __pyx_v_tbranch->GetName(); - /* "root_numpy/src/tree.pyx":614 - * raise ValueError("branches is an empty list") - * elif len(branches) != len(set(branches)): - * raise ValueError("duplicate branches requested") # <<<<<<<<<<<<<< - * else: - * user_branches = True + /* "root_numpy/src/tree.pyx":185 + * tbranch = branch_array.At(ibranch) + * branch_name = tbranch.GetName() + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * if len(branch_dict) == 0: + * # No more branches to consider */ -#line 614 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__15, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 614; __pyx_clineno = __LINE__; goto __pyx_L5_error;} - -#line 614 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 185 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 614 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 185 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 614 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + /* "root_numpy/src/tree.pyx":186 + * branch_name = tbranch.GetName() + * if num_requested_branches > 0: + * if len(branch_dict) == 0: # <<<<<<<<<<<<<< + * # No more branches to consider + * break + */ -#line 614 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 614; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 186 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyObject_Length(__pyx_v_branch_dict); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 614 "root_numpy/src/tree.pyx" - } +#line 186 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_t_4 == 0) != 0); -#line 614 "root_numpy/src/tree.pyx" - /*else*/ { +#line 186 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":616 - * raise ValueError("duplicate branches requested") - * else: - * user_branches = True # <<<<<<<<<<<<<< - * - * for branch in branches: + /* "root_numpy/src/tree.pyx":188 + * if len(branch_dict) == 0: + * # No more branches to consider + * break # <<<<<<<<<<<<<< + * branch_idx = branch_dict.pop(branch_name, -1) + * if branch_idx == -1: */ -#line 616 "root_numpy/src/tree.pyx" - __pyx_v_user_branches = 1; - -#line 616 "root_numpy/src/tree.pyx" - } +#line 188 "root_numpy/src/tree.pyx" + goto __pyx_L19_break; -#line 616 "root_numpy/src/tree.pyx" - __pyx_L11:; +#line 188 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":618 - * user_branches = True - * - * for branch in branches: # <<<<<<<<<<<<<< - * if branch in structure: - * leaves = structure[branch] + /* "root_numpy/src/tree.pyx":189 + * # No more branches to consider + * break + * branch_idx = branch_dict.pop(branch_name, -1) # <<<<<<<<<<<<<< + * if branch_idx == -1: + * # This branch was not selected by the user */ -#line 618 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_branch_dict, __pyx_n_s_pop); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_2); __pyx_t_10 = 0; +#line 189 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_11 = NULL; +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_11 = __Pyx_PyStr_FromString(__pyx_v_branch_name); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - } else { - __pyx_t_10 = -1; -#line 618 "root_numpy/src/tree.pyx" -__pyx_t_2 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 618 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_9 = NULL; -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_11 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 618 "root_numpy/src/tree.pyx" - } +#line 189 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 618 "root_numpy/src/tree.pyx" - for (;;) { +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_8); -#line 618 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_11)) { +#line 189 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_9)) { -#line 618 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_2))) { +#line 189 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 618 "root_numpy/src/tree.pyx" - if (__pyx_t_10 >= PyList_GET_SIZE(__pyx_t_2)) break; +#line 189 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 618 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 189 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_10); __Pyx_INCREF(__pyx_t_7); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_8, function); -#line 618 "root_numpy/src/tree.pyx" - #else +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = PySequence_ITEM(__pyx_t_2, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + } -#line 618 "root_numpy/src/tree.pyx" - #endif +#line 189 "root_numpy/src/tree.pyx" + } -#line 618 "root_numpy/src/tree.pyx" - } else { +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_10 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - if (__pyx_t_10 >= PyTuple_GET_SIZE(__pyx_t_2)) break; +#line 189 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); -#line 618 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 189 "root_numpy/src/tree.pyx" + if (__pyx_t_9) { -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_10); __Pyx_INCREF(__pyx_t_7); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_9); __Pyx_GIVEREF(__pyx_t_9); __pyx_t_9 = NULL; -#line 618 "root_numpy/src/tree.pyx" - #else +#line 189 "root_numpy/src/tree.pyx" + } -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = PySequence_ITEM(__pyx_t_2, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_10, 0+__pyx_t_4, __pyx_t_11); -#line 618 "root_numpy/src/tree.pyx" - #endif +#line 189 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_11); -#line 618 "root_numpy/src/tree.pyx" - } - } else -#line 618 "root_numpy/src/tree.pyx" -{ +#line 189 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_int_neg_1); -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_t_11(__pyx_t_2); +#line 189 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_4, __pyx_int_neg_1); -#line 618 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_7)) { +#line 189 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_int_neg_1); -#line 618 "root_numpy/src/tree.pyx" - PyObject* exc_type = PyErr_Occurred(); +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_11 = 0; -#line 618 "root_numpy/src/tree.pyx" - if (exc_type) { +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_10, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 189 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 618 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 189 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 618 "root_numpy/src/tree.pyx" - } +#line 189 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 618 "root_numpy/src/tree.pyx" - break; +#line 189 "root_numpy/src/tree.pyx" + __pyx_t_15 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_15 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - } +#line 189 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 618 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 189 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = __pyx_t_15; -#line 618 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":190 + * break + * branch_idx = branch_dict.pop(branch_name, -1) + * if branch_idx == -1: # <<<<<<<<<<<<<< + * # This branch was not selected by the user + * continue + */ -#line 618 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_branch, __pyx_t_7); +#line 190 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_branch_idx == -1) != 0); -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 190 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":619 + /* "root_numpy/src/tree.pyx":192 + * if branch_idx == -1: + * # This branch was not selected by the user + * continue # <<<<<<<<<<<<<< * - * for branch in branches: - * if branch in structure: # <<<<<<<<<<<<<< - * leaves = structure[branch] - * shortname = len(leaves) == 1 + * leaf_array = tbranch.GetListOfLeaves() */ -#line 619 "root_numpy/src/tree.pyx" - __pyx_t_5 = (__Pyx_PySequence_Contains(__pyx_v_branch, __pyx_v_structure, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 619; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 192 "root_numpy/src/tree.pyx" + goto __pyx_L18_continue; -#line 619 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_t_5 != 0); +#line 192 "root_numpy/src/tree.pyx" + } -#line 619 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 192 "root_numpy/src/tree.pyx" + goto __pyx_L20; - /* "root_numpy/src/tree.pyx":620 - * for branch in branches: - * if branch in structure: - * leaves = structure[branch] # <<<<<<<<<<<<<< - * shortname = len(leaves) == 1 - * for leaf, ltype in leaves: - */ +#line 192 "root_numpy/src/tree.pyx" + } -#line 620 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyObject_GetItem(__pyx_v_structure, __pyx_v_branch); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 620; __pyx_clineno = __LINE__; goto __pyx_L5_error;}; +#line 192 "root_numpy/src/tree.pyx" + __pyx_L20:; -#line 620 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); + /* "root_numpy/src/tree.pyx":194 + * continue + * + * leaf_array = tbranch.GetListOfLeaves() # <<<<<<<<<<<<<< + * shortname = leaf_array.GetEntries() == 1 + * + */ -#line 620 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_leaves, __pyx_t_7); +#line 194 "root_numpy/src/tree.pyx" + __pyx_v_leaf_array = __pyx_v_tbranch->GetListOfLeaves(); -#line 620 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; + /* "root_numpy/src/tree.pyx":195 + * + * leaf_array = tbranch.GetListOfLeaves() + * shortname = leaf_array.GetEntries() == 1 # <<<<<<<<<<<<<< + * + * for ileaf in range(leaf_array.GetEntries()): + */ + +#line 195 "root_numpy/src/tree.pyx" + __pyx_v_shortname = (__pyx_v_leaf_array->GetEntries() == 1); - /* "root_numpy/src/tree.pyx":621 - * if branch in structure: - * leaves = structure[branch] - * shortname = len(leaves) == 1 # <<<<<<<<<<<<<< - * for leaf, ltype in leaves: - * if CONVERTERS.find(ltype) != CONVERTERS.end(): + /* "root_numpy/src/tree.pyx":197 + * shortname = leaf_array.GetEntries() == 1 + * + * for ileaf in range(leaf_array.GetEntries()): # <<<<<<<<<<<<<< + * tleaf = leaf_array.At(ileaf) + * leaf_name = tleaf.GetName() */ -#line 621 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyObject_Length(__pyx_v_leaves); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 621; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 197 "root_numpy/src/tree.pyx" + __pyx_t_15 = __pyx_v_leaf_array->GetEntries(); -#line 621 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyBool_FromLong((__pyx_t_9 == 1)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 621; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 197 "root_numpy/src/tree.pyx" + for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { -#line 621 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 197 "root_numpy/src/tree.pyx" + __pyx_v_ileaf = __pyx_t_16; -#line 621 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_shortname, __pyx_t_7); + /* "root_numpy/src/tree.pyx":198 + * + * for ileaf in range(leaf_array.GetEntries()): + * tleaf = leaf_array.At(ileaf) # <<<<<<<<<<<<<< + * leaf_name = tleaf.GetName() + * conv = get_converter(tleaf) + */ -#line 621 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 198 "root_numpy/src/tree.pyx" + __pyx_v_tleaf = ((TLeaf *)__pyx_v_leaf_array->At(__pyx_v_ileaf)); - /* "root_numpy/src/tree.pyx":622 - * leaves = structure[branch] - * shortname = len(leaves) == 1 - * for leaf, ltype in leaves: # <<<<<<<<<<<<<< - * if CONVERTERS.find(ltype) != CONVERTERS.end(): - * colname = branch if shortname else '{0}_{1}'.format(branch, leaf) + /* "root_numpy/src/tree.pyx":199 + * for ileaf in range(leaf_array.GetEntries()): + * tleaf = leaf_array.At(ileaf) + * leaf_name = tleaf.GetName() # <<<<<<<<<<<<<< + * conv = get_converter(tleaf) + * if conv != NULL: */ -#line 622 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_v_leaves)) || PyTuple_CheckExact(__pyx_v_leaves)) { +#line 199 "root_numpy/src/tree.pyx" + __pyx_v_leaf_name = __pyx_v_tleaf->GetName(); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_v_leaves; __Pyx_INCREF(__pyx_t_7); __pyx_t_9 = 0; + /* "root_numpy/src/tree.pyx":200 + * tleaf = leaf_array.At(ileaf) + * leaf_name = tleaf.GetName() + * conv = get_converter(tleaf) # <<<<<<<<<<<<<< + * if conv != NULL: + * # A converter exists for this leaf + */ -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_12 = NULL; +#line 200 "root_numpy/src/tree.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_get_converter(__pyx_v_tleaf); -#line 622 "root_numpy/src/tree.pyx" - } else { - __pyx_t_9 = -1; -#line 622 "root_numpy/src/tree.pyx" -__pyx_t_7 = PyObject_GetIter(__pyx_v_leaves); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + /* "root_numpy/src/tree.pyx":201 + * leaf_name = tleaf.GetName() + * conv = get_converter(tleaf) + * if conv != NULL: # <<<<<<<<<<<<<< + * # A converter exists for this leaf + * column_name = string(branch_name) + */ -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 201 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_conv != NULL) != 0); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_12 = Py_TYPE(__pyx_t_7)->tp_iternext; if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 201 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 622 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":203 + * if conv != NULL: + * # A converter exists for this leaf + * column_name = string(branch_name) # <<<<<<<<<<<<<< + * if not shortname: + * column_name.append( '_') + */ -#line 622 "root_numpy/src/tree.pyx" - for (;;) { +#line 203 "root_numpy/src/tree.pyx" + try { -#line 622 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_12)) { +#line 203 "root_numpy/src/tree.pyx" + __pyx_t_17 = std::string(__pyx_v_branch_name); -#line 622 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_7))) { +#line 203 "root_numpy/src/tree.pyx" + } catch(...) { -#line 622 "root_numpy/src/tree.pyx" - if (__pyx_t_9 >= PyList_GET_SIZE(__pyx_t_7)) break; +#line 203 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 203 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_9); __Pyx_INCREF(__pyx_t_8); __pyx_t_9++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 203 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - #else +#line 203 "root_numpy/src/tree.pyx" + __pyx_v_column_name = __pyx_t_17; -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_7, __pyx_t_9); __pyx_t_9++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + /* "root_numpy/src/tree.pyx":204 + * # A converter exists for this leaf + * column_name = string(branch_name) + * if not shortname: # <<<<<<<<<<<<<< + * column_name.append( '_') + * column_name.append(leaf_name) + */ -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 204 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((!(__pyx_v_shortname != 0)) != 0); -#line 622 "root_numpy/src/tree.pyx" - } else { +#line 204 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 622 "root_numpy/src/tree.pyx" - if (__pyx_t_9 >= PyTuple_GET_SIZE(__pyx_t_7)) break; + /* "root_numpy/src/tree.pyx":205 + * column_name = string(branch_name) + * if not shortname: + * column_name.append( '_') # <<<<<<<<<<<<<< + * column_name.append(leaf_name) + * # Create a column for this branch/leaf pair + */ + +#line 205 "root_numpy/src/tree.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_n_b__19); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 205 "root_numpy/src/tree.pyx" + __pyx_v_column_name.append(((std::string)__pyx_t_17)); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_9); __Pyx_INCREF(__pyx_t_8); __pyx_t_9++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + /* "root_numpy/src/tree.pyx":206 + * if not shortname: + * column_name.append( '_') + * column_name.append(leaf_name) # <<<<<<<<<<<<<< + * # Create a column for this branch/leaf pair + * col = new BranchColumn(column_name, tleaf) + */ -#line 622 "root_numpy/src/tree.pyx" - #else +#line 206 "root_numpy/src/tree.pyx" + __pyx_v_column_name.append(__pyx_v_leaf_name); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_7, __pyx_t_9); __pyx_t_9++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 206 "root_numpy/src/tree.pyx" + goto __pyx_L26; -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 206 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - } - } else -#line 622 "root_numpy/src/tree.pyx" -{ +#line 206 "root_numpy/src/tree.pyx" + __pyx_L26:; -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_t_12(__pyx_t_7); + /* "root_numpy/src/tree.pyx":208 + * column_name.append(leaf_name) + * # Create a column for this branch/leaf pair + * col = new BranchColumn(column_name, tleaf) # <<<<<<<<<<<<<< + * + * if num_requested_branches > 0: + */ -#line 622 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_8)) { +#line 208 "root_numpy/src/tree.pyx" + __pyx_v_col = new BranchColumn(__pyx_v_column_name, __pyx_v_tleaf); -#line 622 "root_numpy/src/tree.pyx" - PyObject* exc_type = PyErr_Occurred(); + /* "root_numpy/src/tree.pyx":210 + * col = new BranchColumn(column_name, tleaf) + * + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * column_buckets[branch_idx].push_back(col) + * converter_buckets[branch_idx].push_back(conv) + */ -#line 622 "root_numpy/src/tree.pyx" - if (exc_type) { +#line 210 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 622 "root_numpy/src/tree.pyx" - if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 210 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 622 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + /* "root_numpy/src/tree.pyx":211 + * + * if num_requested_branches > 0: + * column_buckets[branch_idx].push_back(col) # <<<<<<<<<<<<<< + * converter_buckets[branch_idx].push_back(conv) + * else: + */ -#line 622 "root_numpy/src/tree.pyx" - } +#line 211 "root_numpy/src/tree.pyx" + (__pyx_v_column_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_col); -#line 622 "root_numpy/src/tree.pyx" - break; + /* "root_numpy/src/tree.pyx":212 + * if num_requested_branches > 0: + * column_buckets[branch_idx].push_back(col) + * converter_buckets[branch_idx].push_back(conv) # <<<<<<<<<<<<<< + * else: + * columns.push_back(col) + */ -#line 622 "root_numpy/src/tree.pyx" - } +#line 212 "root_numpy/src/tree.pyx" + (__pyx_v_converter_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_conv); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 212 "root_numpy/src/tree.pyx" + goto __pyx_L27; -#line 622 "root_numpy/src/tree.pyx" +#line 212 "root_numpy/src/tree.pyx" } -#line 622 "root_numpy/src/tree.pyx" - if ((likely(PyTuple_CheckExact(__pyx_t_8))) || (PyList_CheckExact(__pyx_t_8))) { +#line 212 "root_numpy/src/tree.pyx" + /*else*/ { -#line 622 "root_numpy/src/tree.pyx" - PyObject* sequence = __pyx_t_8; + /* "root_numpy/src/tree.pyx":214 + * converter_buckets[branch_idx].push_back(conv) + * else: + * columns.push_back(col) # <<<<<<<<<<<<<< + * converters.push_back(conv) + * + */ -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 214 "root_numpy/src/tree.pyx" + __pyx_v_columns.push_back(__pyx_v_col); -#line 622 "root_numpy/src/tree.pyx" - Py_ssize_t size = Py_SIZE(sequence); + /* "root_numpy/src/tree.pyx":215 + * else: + * columns.push_back(col) + * converters.push_back(conv) # <<<<<<<<<<<<<< + * + * chain.AddColumn(string(branch_name), string(leaf_name), + */ -#line 622 "root_numpy/src/tree.pyx" - #else +#line 215 "root_numpy/src/tree.pyx" + __pyx_v_converters.push_back(__pyx_v_conv); -#line 622 "root_numpy/src/tree.pyx" - Py_ssize_t size = PySequence_Size(sequence); +#line 215 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 215 "root_numpy/src/tree.pyx" + __pyx_L27:; -#line 622 "root_numpy/src/tree.pyx" - if (unlikely(size != 2)) { + /* "root_numpy/src/tree.pyx":217 + * converters.push_back(conv) + * + * chain.AddColumn(string(branch_name), string(leaf_name), # <<<<<<<<<<<<<< + * col) + * + */ -#line 622 "root_numpy/src/tree.pyx" - if (size > 2) __Pyx_RaiseTooManyValuesError(2); +#line 217 "root_numpy/src/tree.pyx" + try { -#line 622 "root_numpy/src/tree.pyx" - else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); +#line 217 "root_numpy/src/tree.pyx" + __pyx_t_17 = std::string(__pyx_v_branch_name); -#line 622 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 217 "root_numpy/src/tree.pyx" + } catch(...) { -#line 622 "root_numpy/src/tree.pyx" - } +#line 217 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 217 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - if (likely(PyTuple_CheckExact(sequence))) { +#line 217 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = PyTuple_GET_ITEM(sequence, 0); +#line 217 "root_numpy/src/tree.pyx" + try { -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = PyTuple_GET_ITEM(sequence, 1); +#line 217 "root_numpy/src/tree.pyx" + __pyx_t_18 = std::string(__pyx_v_leaf_name); -#line 622 "root_numpy/src/tree.pyx" - } else { +#line 217 "root_numpy/src/tree.pyx" + } catch(...) { -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = PyList_GET_ITEM(sequence, 0); +#line 217 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = PyList_GET_ITEM(sequence, 1); +#line 217 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } +#line 217 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_13); + /* "root_numpy/src/tree.pyx":218 + * + * chain.AddColumn(string(branch_name), string(leaf_name), + * col) # <<<<<<<<<<<<<< + * + * elif num_requested_branches > 0: + */ -#line 622 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_14); +#line 218 "root_numpy/src/tree.pyx" + __pyx_v_chain->AddColumn(__pyx_t_17, __pyx_t_18, ((BranchColumn *)__pyx_v_col)); -#line 622 "root_numpy/src/tree.pyx" - #else +#line 218 "root_numpy/src/tree.pyx" + goto __pyx_L25; -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 218 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); + /* "root_numpy/src/tree.pyx":220 + * col) + * + * elif num_requested_branches > 0: # <<<<<<<<<<<<<< + * # User explicitly requested this branch but there is no + * # converter to handle it + */ -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 220 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 220 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 622 "root_numpy/src/tree.pyx" - #endif + /* "root_numpy/src/tree.pyx":225 + * raise TypeError( + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}'".format( # <<<<<<<<<<<<<< + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName()))) + */ -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 225 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_convert_leaf_0_of_branch, __pyx_n_s_format); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } else { +#line 225 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 622 "root_numpy/src/tree.pyx" - Py_ssize_t index = -1; + /* "root_numpy/src/tree.pyx":226 + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}'".format( + * branch_name, leaf_name, # <<<<<<<<<<<<<< + * resolve_type(tleaf.GetTypeName()))) + * else: + */ -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 226 "root_numpy/src/tree.pyx" + __pyx_t_10 = __Pyx_PyStr_FromString(__pyx_v_branch_name); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 226 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 226 "root_numpy/src/tree.pyx" + __pyx_t_11 = __Pyx_PyStr_FromString(__pyx_v_leaf_name); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_16 = Py_TYPE(__pyx_t_15)->tp_iternext; - index = 0; __pyx_t_13 = __pyx_t_16(__pyx_t_15); if (unlikely(!__pyx_t_13)) -#line 622 "root_numpy/src/tree.pyx" -goto __pyx_L17_unpacking_failed; +#line 226 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); - index = 1; __pyx_t_14 = __pyx_t_16(__pyx_t_15); if (unlikely(!__pyx_t_14)) -#line 622 "root_numpy/src/tree.pyx" -goto __pyx_L17_unpacking_failed; + /* "root_numpy/src/tree.pyx":227 + * "with type '{2}'".format( + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName()))) # <<<<<<<<<<<<<< + * else: + * # Just warn that this branch cannot be converted + */ -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_f_13_librootnumpy_resolve_type(__pyx_v_tleaf->GetTypeName()); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_16(__pyx_t_15), 2) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 227 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_16 = NULL; +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_19 = NULL; -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 622 "root_numpy/src/tree.pyx" - goto __pyx_L18_unpacking_done; +#line 227 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 622 "root_numpy/src/tree.pyx" - __pyx_L17_unpacking_failed:; +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_8); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 227 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_19)) { -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_16 = NULL; +#line 227 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 622 "root_numpy/src/tree.pyx" - if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); +#line 227 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_19); -#line 622 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 227 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 622 "root_numpy/src/tree.pyx" - __pyx_L18_unpacking_done:; +#line 227 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_8, function); -#line 622 "root_numpy/src/tree.pyx" - } +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 622 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_leaf, __pyx_t_13); +#line 227 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = 0; +#line 227 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_ltype, __pyx_t_14); +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; +#line 227 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); - /* "root_numpy/src/tree.pyx":623 - * shortname = len(leaves) == 1 - * for leaf, ltype in leaves: - * if CONVERTERS.find(ltype) != CONVERTERS.end(): # <<<<<<<<<<<<<< - * colname = branch if shortname else '{0}_{1}'.format(branch, leaf) - * col = chain.MakeColumn(branch, leaf, colname) - */ +#line 227 "root_numpy/src/tree.pyx" + if (__pyx_t_19) { -#line 623 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_v_ltype); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 623; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 227 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 0, __pyx_t_19); __Pyx_GIVEREF(__pyx_t_19); __pyx_t_19 = NULL; -#line 623 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_13_librootnumpy_CONVERTERS.find(__pyx_t_17) != __pyx_v_13_librootnumpy_CONVERTERS.end()) != 0); +#line 227 "root_numpy/src/tree.pyx" + } -#line 623 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 227 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 0+__pyx_t_4, __pyx_t_10); - /* "root_numpy/src/tree.pyx":624 - * for leaf, ltype in leaves: - * if CONVERTERS.find(ltype) != CONVERTERS.end(): - * colname = branch if shortname else '{0}_{1}'.format(branch, leaf) # <<<<<<<<<<<<<< - * col = chain.MakeColumn(branch, leaf, colname) - * columns.push_back(col) - */ +#line 227 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_10); -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_shortname); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 227 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 1+__pyx_t_4, __pyx_t_11); -#line 624 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 227 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_11); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 227 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 2+__pyx_t_4, __pyx_t_9); -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_v_branch; +#line 227 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 624 "root_numpy/src/tree.pyx" - } else { +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_10 = 0; -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_0___1, __pyx_n_s_format); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_11 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_15 = NULL; +#line 227 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_20, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; +#line 227 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 624 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_13))) { +#line 227 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_13); +#line 227 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 624 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_15)) { + /* "root_numpy/src/tree.pyx":223 + * # User explicitly requested this branch but there is no + * # converter to handle it + * raise TypeError( # <<<<<<<<<<<<<< + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}'".format( + */ -#line 624 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13); +#line 223 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_15); +#line 223 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 223 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_13, function); +#line 223 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; +#line 223 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 624 "root_numpy/src/tree.pyx" - } +#line 223 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - } +#line 223 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyTuple_New(2+__pyx_t_18); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 223 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 223 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 624 "root_numpy/src/tree.pyx" - if (__pyx_t_15) { +#line 223 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 624 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_15); __Pyx_GIVEREF(__pyx_t_15); __pyx_t_15 = NULL; +#line 223 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - } +#line 223 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 223 "root_numpy/src/tree.pyx" + /*else*/ { -#line 624 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_18, __pyx_v_branch); + /* "root_numpy/src/tree.pyx":230 + * else: + * # Just warn that this branch cannot be converted + * warnings.warn( # <<<<<<<<<<<<<< + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}' (skipping)".format( + */ -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 230 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_warnings); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaf); +#line 230 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 624 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_18, __pyx_v_leaf); +#line 230 "root_numpy/src/tree.pyx" + __pyx_t_20 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_warn); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_leaf); +#line 230 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_14 = __Pyx_PyObject_Call(__pyx_t_13, __pyx_t_19, NULL); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 624; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 230 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); + /* "root_numpy/src/tree.pyx":232 + * warnings.warn( + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}' (skipping)".format( # <<<<<<<<<<<<<< + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName())), + */ -#line 624 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 232 "root_numpy/src/tree.pyx" + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_convert_leaf_0_of_branch_2, __pyx_n_s_format); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; +#line 232 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_t_14; + /* "root_numpy/src/tree.pyx":233 + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}' (skipping)".format( + * branch_name, leaf_name, # <<<<<<<<<<<<<< + * resolve_type(tleaf.GetTypeName())), + * RootNumpyUnconvertibleWarning) + */ -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; +#line 233 "root_numpy/src/tree.pyx" + __pyx_t_11 = __Pyx_PyStr_FromString(__pyx_v_branch_name); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - } +#line 233 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_colname, __pyx_t_8); +#line 233 "root_numpy/src/tree.pyx" + __pyx_t_10 = __Pyx_PyStr_FromString(__pyx_v_leaf_name); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 233 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); - /* "root_numpy/src/tree.pyx":625 - * if CONVERTERS.find(ltype) != CONVERTERS.end(): - * colname = branch if shortname else '{0}_{1}'.format(branch, leaf) - * col = chain.MakeColumn(branch, leaf, colname) # <<<<<<<<<<<<<< - * columns.push_back(col) - * elif user_branches: + /* "root_numpy/src/tree.pyx":234 + * "with type '{2}' (skipping)".format( + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName())), # <<<<<<<<<<<<<< + * RootNumpyUnconvertibleWarning) + * */ -#line 625 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_v_branch); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 625; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_19 = __pyx_f_13_librootnumpy_resolve_type(__pyx_v_tleaf->GetTypeName()); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 625 "root_numpy/src/tree.pyx" - __pyx_t_20 = __pyx_convert_string_from_py_std__string(__pyx_v_leaf); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 625; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 625 "root_numpy/src/tree.pyx" - __pyx_t_21 = __pyx_convert_string_from_py_std__string(__pyx_v_colname); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 625; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_21 = NULL; -#line 625 "root_numpy/src/tree.pyx" - __pyx_v_col = __pyx_v_chain->MakeColumn(__pyx_t_17, __pyx_t_20, __pyx_t_21); +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; - /* "root_numpy/src/tree.pyx":626 - * colname = branch if shortname else '{0}_{1}'.format(branch, leaf) - * col = chain.MakeColumn(branch, leaf, colname) - * columns.push_back(col) # <<<<<<<<<<<<<< - * elif user_branches: - * raise TypeError( - */ +#line 234 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_9))) { -#line 626 "root_numpy/src/tree.pyx" - __pyx_v_columns.push_back(__pyx_v_col); +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_21 = PyMethod_GET_SELF(__pyx_t_9); -#line 626 "root_numpy/src/tree.pyx" - goto __pyx_L19; +#line 234 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_21)) { -#line 626 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9); - /* "root_numpy/src/tree.pyx":627 - * col = chain.MakeColumn(branch, leaf, colname) - * columns.push_back(col) - * elif user_branches: # <<<<<<<<<<<<<< - * raise TypeError( - * "cannot convert leaf {0} of branch {1} " - */ +#line 234 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_21); -#line 627 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_user_branches != 0); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 627 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_9, function); - /* "root_numpy/src/tree.pyx":630 - * raise TypeError( - * "cannot convert leaf {0} of branch {1} " - * "with type {2} (skipping)".format(branch, leaf, ltype)) # <<<<<<<<<<<<<< - * else: - * warnings.warn( - */ +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_convert_leaf_0_of_branch, __pyx_n_s_format); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 630; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 234 "root_numpy/src/tree.pyx" + } -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 234 "root_numpy/src/tree.pyx" + } -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_13 = NULL; +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_22 = PyTuple_New(3+__pyx_t_4); if (unlikely(!__pyx_t_22)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_22); -#line 630 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_14))) { +#line 234 "root_numpy/src/tree.pyx" + if (__pyx_t_21) { -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_13 = PyMethod_GET_SELF(__pyx_t_14); +#line 234 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 0, __pyx_t_21); __Pyx_GIVEREF(__pyx_t_21); __pyx_t_21 = NULL; -#line 630 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_13)) { +#line 234 "root_numpy/src/tree.pyx" + } -#line 630 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_14); +#line 234 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 0+__pyx_t_4, __pyx_t_11); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_13); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_11); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 234 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 1+__pyx_t_4, __pyx_t_10); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_14, function); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_10); -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; +#line 234 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 2+__pyx_t_4, __pyx_t_19); -#line 630 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_19); -#line 630 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_11 = 0; -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyTuple_New(3+__pyx_t_18); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 630; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_10 = 0; -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_19 = 0; -#line 630 "root_numpy/src/tree.pyx" - if (__pyx_t_13) { +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_22, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_13); __Pyx_GIVEREF(__pyx_t_13); __pyx_t_13 = NULL; +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 630 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_22); __pyx_t_22 = 0; -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 630 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_18, __pyx_v_branch); + /* "root_numpy/src/tree.pyx":235 + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName())), + * RootNumpyUnconvertibleWarning) # <<<<<<<<<<<<<< + * + * if num_requested_branches > 0: + */ -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_RootNumpyUnconvertibleWarning); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaf); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 630 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_18, __pyx_v_leaf); +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_22 = NULL; -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_leaf); +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ltype); +#line 235 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_20))) { -#line 630 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 2+__pyx_t_18, __pyx_v_ltype); +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_22 = PyMethod_GET_SELF(__pyx_t_20); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_ltype); +#line 235 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_22)) { -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_19, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 630; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_20); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_22); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 235 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 235 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_20, function); - /* "root_numpy/src/tree.pyx":628 - * columns.push_back(col) - * elif user_branches: - * raise TypeError( # <<<<<<<<<<<<<< - * "cannot convert leaf {0} of branch {1} " - * "with type {2} (skipping)".format(branch, leaf, ltype)) - */ +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 628 "root_numpy/src/tree.pyx" - __pyx_t_14 = PyTuple_New(1); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + } -#line 628 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 235 "root_numpy/src/tree.pyx" + } -#line 628 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_8); +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(2+__pyx_t_4); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 628 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_8); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 628 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 235 "root_numpy/src/tree.pyx" + if (__pyx_t_22) { -#line 628 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_14, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_22); __Pyx_GIVEREF(__pyx_t_22); __pyx_t_22 = NULL; -#line 628 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 235 "root_numpy/src/tree.pyx" + } -#line 628 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 235 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_4, __pyx_t_8); -#line 628 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_8, 0, 0, 0); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_8); -#line 628 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 235 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_4, __pyx_t_9); -#line 628 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 628 "root_numpy/src/tree.pyx" - } +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; -#line 628 "root_numpy/src/tree.pyx" - /*else*/ { +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":632 - * "with type {2} (skipping)".format(branch, leaf, ltype)) - * else: - * warnings.warn( # <<<<<<<<<<<<<< - * "cannot convert leaf {0} of branch {1} " - * "with type {2} (skipping)".format(branch, leaf, ltype), - */ +#line 235 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_20, __pyx_t_19, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 235 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 632 "root_numpy/src/tree.pyx" - __pyx_t_14 = __Pyx_GetModuleGlobalName(__pyx_n_s_warnings); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 632 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 632 "root_numpy/src/tree.pyx" - __pyx_t_19 = __Pyx_PyObject_GetAttrStr(__pyx_t_14, __pyx_n_s_warn); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 632 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 235 "root_numpy/src/tree.pyx" + } -#line 632 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 235 "root_numpy/src/tree.pyx" + __pyx_L25:; - /* "root_numpy/src/tree.pyx":634 - * warnings.warn( - * "cannot convert leaf {0} of branch {1} " - * "with type {2} (skipping)".format(branch, leaf, ltype), # <<<<<<<<<<<<<< - * RootNumpyUnconvertibleWarning) - * else: - */ +#line 235 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_convert_leaf_0_of_branch, __pyx_n_s_format); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 235 "root_numpy/src/tree.pyx" + __pyx_L18_continue:; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 235 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_15 = NULL; +#line 235 "root_numpy/src/tree.pyx" + __pyx_L19_break:; -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; + /* "root_numpy/src/tree.pyx":237 + * RootNumpyUnconvertibleWarning) + * + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * # Attempt to interpret remaining "branches" as expressions + * for expression in branch_dict.keys(): + */ -#line 634 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_13))) { +#line 237 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_13); +#line 237 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 634 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_15)) { + /* "root_numpy/src/tree.pyx":239 + * if num_requested_branches > 0: + * # Attempt to interpret remaining "branches" as expressions + * for expression in branch_dict.keys(): # <<<<<<<<<<<<<< + * branch_idx = branch_dict[expression] + * c_string = expression + */ -#line 634 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_20 = __Pyx_PyObject_GetAttrStr(__pyx_v_branch_dict, __pyx_n_s_keys); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_15); +#line 239 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_19 = NULL; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_13, function); +#line 239 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_20))) { -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_20); -#line 634 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_19)) { -#line 634 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_20); -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_22 = PyTuple_New(3+__pyx_t_18); if (unlikely(!__pyx_t_22)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 239 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_19); -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_22); +#line 239 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 634 "root_numpy/src/tree.pyx" - if (__pyx_t_15) { +#line 239 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_20, function); -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 0, __pyx_t_15); __Pyx_GIVEREF(__pyx_t_15); __pyx_t_15 = NULL; +#line 239 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 239 "root_numpy/src/tree.pyx" + if (__pyx_t_19) { -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 0+__pyx_t_18, __pyx_v_branch); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_20, __pyx_t_19); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 239 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaf); +#line 239 "root_numpy/src/tree.pyx" + } else { -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 1+__pyx_t_18, __pyx_v_leaf); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_CallNoArg(__pyx_t_20); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_leaf); +#line 239 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ltype); +#line 239 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 2+__pyx_t_18, __pyx_v_ltype); +#line 239 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_ltype); +#line 239 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) { -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_14 = __Pyx_PyObject_Call(__pyx_t_13, __pyx_t_22, NULL); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_20 = __pyx_t_2; __Pyx_INCREF(__pyx_t_20); __pyx_t_4 = 0; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_12 = NULL; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_22); __pyx_t_22 = 0; +#line 239 "root_numpy/src/tree.pyx" + } else { + __pyx_t_4 = -1; +#line 239 "root_numpy/src/tree.pyx" +__pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; +#line 239 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); - /* "root_numpy/src/tree.pyx":635 - * "cannot convert leaf {0} of branch {1} " - * "with type {2} (skipping)".format(branch, leaf, ltype), - * RootNumpyUnconvertibleWarning) # <<<<<<<<<<<<<< - * else: - * # Attempt to interpret as an expression - */ +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_12 = Py_TYPE(__pyx_t_20)->tp_iternext; if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_13 = __Pyx_GetModuleGlobalName(__pyx_n_s_RootNumpyUnconvertibleWarning); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 635; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 239 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 239 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_22 = NULL; +#line 239 "root_numpy/src/tree.pyx" + for (;;) { -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; +#line 239 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_12)) { -#line 635 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_19))) { +#line 239 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_20))) { -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_22 = PyMethod_GET_SELF(__pyx_t_19); +#line 239 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_20)) break; -#line 635 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_22)) { +#line 239 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 635 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_20, __pyx_t_4); __Pyx_INCREF(__pyx_t_2); __pyx_t_4++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_22); +#line 239 "root_numpy/src/tree.pyx" + #else -#line 635 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = PySequence_ITEM(__pyx_t_20, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_19, function); +#line 239 "root_numpy/src/tree.pyx" + #endif -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; +#line 239 "root_numpy/src/tree.pyx" + } else { -#line 635 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_20)) break; -#line 635 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyTuple_New(2+__pyx_t_18); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_20, __pyx_t_4); __Pyx_INCREF(__pyx_t_2); __pyx_t_4++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 239 "root_numpy/src/tree.pyx" + #else -#line 635 "root_numpy/src/tree.pyx" - if (__pyx_t_22) { +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = PySequence_ITEM(__pyx_t_20, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0, __pyx_t_22); __Pyx_GIVEREF(__pyx_t_22); __pyx_t_22 = NULL; +#line 239 "root_numpy/src/tree.pyx" + #endif -#line 635 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + } + } else +#line 239 "root_numpy/src/tree.pyx" +{ -#line 635 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0+__pyx_t_18, __pyx_t_14); +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_12(__pyx_t_20); -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_14); +#line 239 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_2)) { -#line 635 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 1+__pyx_t_18, __pyx_t_13); +#line 239 "root_numpy/src/tree.pyx" + PyObject* exc_type = PyErr_Occurred(); -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_13); +#line 239 "root_numpy/src/tree.pyx" + if (exc_type) { -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; +#line 239 "root_numpy/src/tree.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_13 = 0; +#line 239 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_19, __pyx_t_15, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 632; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 239 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 239 "root_numpy/src/tree.pyx" + break; -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 239 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 239 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 239 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_expression, __pyx_t_2); -#line 635 "root_numpy/src/tree.pyx" - __pyx_L19:; +#line 239 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":622 - * leaves = structure[branch] - * shortname = len(leaves) == 1 - * for leaf, ltype in leaves: # <<<<<<<<<<<<<< - * if CONVERTERS.find(ltype) != CONVERTERS.end(): - * colname = branch if shortname else '{0}_{1}'.format(branch, leaf) + /* "root_numpy/src/tree.pyx":240 + * # Attempt to interpret remaining "branches" as expressions + * for expression in branch_dict.keys(): + * branch_idx = branch_dict[expression] # <<<<<<<<<<<<<< + * c_string = expression + * formula = new TTreeFormula(c_string, c_string, tree) */ -#line 622 "root_numpy/src/tree.pyx" - } +#line 240 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyObject_GetItem(__pyx_v_branch_dict, __pyx_v_expression); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L8_error;}; -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 240 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 622 "root_numpy/src/tree.pyx" - goto __pyx_L14; +#line 240 "root_numpy/src/tree.pyx" + __pyx_t_13 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_13 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } +#line 240 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 622 "root_numpy/src/tree.pyx" - /*else*/ { +#line 240 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = __pyx_t_13; - /* "root_numpy/src/tree.pyx":638 - * else: - * # Attempt to interpret as an expression - * c_string = branch # <<<<<<<<<<<<<< - * formula = new TTreeFormula(c_string, c_string, chain.fChain) + /* "root_numpy/src/tree.pyx":241 + * for expression in branch_dict.keys(): + * branch_idx = branch_dict[expression] + * c_string = expression # <<<<<<<<<<<<<< + * formula = new TTreeFormula(c_string, c_string, tree) * if formula == NULL or formula.GetNdim() == 0: */ -#line 638 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_AsString(__pyx_v_branch); if (unlikely((!__pyx_t_4) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 241 "root_numpy/src/tree.pyx" + __pyx_t_23 = __Pyx_PyObject_AsString(__pyx_v_expression); if (unlikely((!__pyx_t_23) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 638 "root_numpy/src/tree.pyx" - __pyx_v_c_string = __pyx_t_4; +#line 241 "root_numpy/src/tree.pyx" + __pyx_v_c_string = __pyx_t_23; - /* "root_numpy/src/tree.pyx":639 - * # Attempt to interpret as an expression - * c_string = branch - * formula = new TTreeFormula(c_string, c_string, chain.fChain) # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":242 + * branch_idx = branch_dict[expression] + * c_string = expression + * formula = new TTreeFormula(c_string, c_string, tree) # <<<<<<<<<<<<<< * if formula == NULL or formula.GetNdim() == 0: * del formula */ -#line 639 "root_numpy/src/tree.pyx" - __pyx_v_formula = new TTreeFormula(__pyx_v_c_string, __pyx_v_c_string, __pyx_v_chain->fChain); +#line 242 "root_numpy/src/tree.pyx" + __pyx_v_formula = new TTreeFormula(__pyx_v_c_string, __pyx_v_c_string, __pyx_v_tree); - /* "root_numpy/src/tree.pyx":640 - * c_string = branch - * formula = new TTreeFormula(c_string, c_string, chain.fChain) + /* "root_numpy/src/tree.pyx":243 + * c_string = expression + * formula = new TTreeFormula(c_string, c_string, tree) * if formula == NULL or formula.GetNdim() == 0: # <<<<<<<<<<<<<< * del formula * raise ValueError( */ -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_formula == NULL) != 0); +#line 243 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_formula == NULL) != 0); -#line 640 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 243 "root_numpy/src/tree.pyx" + if (!__pyx_t_1) { -#line 640 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" } else { -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 243 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 640 "root_numpy/src/tree.pyx" - goto __pyx_L21_bool_binop_done; +#line 243 "root_numpy/src/tree.pyx" + goto __pyx_L32_bool_binop_done; -#line 640 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" } -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_formula->GetNdim() == 0) != 0); +#line 243 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_formula->GetNdim() == 0) != 0); -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 243 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 640 "root_numpy/src/tree.pyx" - __pyx_L21_bool_binop_done:; +#line 243 "root_numpy/src/tree.pyx" + __pyx_L32_bool_binop_done:; -#line 640 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 243 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":641 - * formula = new TTreeFormula(c_string, c_string, chain.fChain) + /* "root_numpy/src/tree.pyx":244 + * formula = new TTreeFormula(c_string, c_string, tree) * if formula == NULL or formula.GetNdim() == 0: * del formula # <<<<<<<<<<<<<< * raise ValueError( - * "the branch or expression {0} " + * "the branch or expression '{0}' " */ -#line 641 "root_numpy/src/tree.pyx" +#line 244 "root_numpy/src/tree.pyx" delete __pyx_v_formula; - /* "root_numpy/src/tree.pyx":644 + /* "root_numpy/src/tree.pyx":247 * raise ValueError( - * "the branch or expression {0} " - * "is not present or valid".format(branch)) # <<<<<<<<<<<<<< + * "the branch or expression '{0}' " + * "is not present or valid".format(expression)) # <<<<<<<<<<<<<< * # The chain will take care of updating the formula leaves when * # rolling over to the next tree. */ -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_the_branch_or_expression_0_is_no, __pyx_n_s_format); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 247 "root_numpy/src/tree.pyx" + __pyx_t_19 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_the_branch_or_expression_0_is_no, __pyx_n_s_format); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_19 = NULL; +#line 247 "root_numpy/src/tree.pyx" + __pyx_t_9 = NULL; -#line 644 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { +#line 247 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_8); +#line 247 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_19); -#line 644 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_19)) { +#line 247 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_9)) { -#line 644 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); +#line 247 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_19); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 644 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_8, function); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_19, function); -#line 644 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } -#line 644 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } -#line 644 "root_numpy/src/tree.pyx" - if (!__pyx_t_19) { +#line 247 "root_numpy/src/tree.pyx" + if (!__pyx_t_9) { -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_v_branch); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 247 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_19, __pyx_v_expression); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 644 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } else { -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyTuple_New(1+1); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 247 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 644 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0, __pyx_t_19); __Pyx_GIVEREF(__pyx_t_19); __pyx_t_19 = NULL; +#line 247 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_9); __Pyx_GIVEREF(__pyx_t_9); __pyx_t_9 = NULL; -#line 644 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_expression); -#line 644 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0+1, __pyx_v_branch); +#line 247 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_v_expression); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_expression); -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_15, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 644; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 247 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_19, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 247 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 247 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 644 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } -#line 644 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 247 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - /* "root_numpy/src/tree.pyx":642 + /* "root_numpy/src/tree.pyx":245 * if formula == NULL or formula.GetNdim() == 0: * del formula * raise ValueError( # <<<<<<<<<<<<<< - * "the branch or expression {0} " - * "is not present or valid".format(branch)) + * "the branch or expression '{0}' " + * "is not present or valid".format(expression)) */ -#line 642 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 245 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 642 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 245 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 642 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); +#line 245 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_2); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_7); +#line 245 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 642 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 245 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 642 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 245 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_19, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 642 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 245 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 245 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 642 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_7, 0, 0, 0); +#line 245 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 245 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 642 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 245 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 642 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":647 + /* "root_numpy/src/tree.pyx":250 * # The chain will take care of updating the formula leaves when * # rolling over to the next tree. * chain.AddFormula(formula) # <<<<<<<<<<<<<< - * col = new FormulaColumn(branch, formula) - * columns.push_back(col) + * col = new FormulaColumn(expression, formula) + * conv = find_converter_by_typename('double') */ -#line 647 "root_numpy/src/tree.pyx" +#line 250 "root_numpy/src/tree.pyx" __pyx_v_chain->AddFormula(__pyx_v_formula); - /* "root_numpy/src/tree.pyx":648 + /* "root_numpy/src/tree.pyx":251 * # rolling over to the next tree. * chain.AddFormula(formula) - * col = new FormulaColumn(branch, formula) # <<<<<<<<<<<<<< - * columns.push_back(col) - * + * col = new FormulaColumn(expression, formula) # <<<<<<<<<<<<<< + * conv = find_converter_by_typename('double') + * if conv == NULL: */ -#line 648 "root_numpy/src/tree.pyx" - __pyx_t_21 = __pyx_convert_string_from_py_std__string(__pyx_v_branch); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 648; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 251 "root_numpy/src/tree.pyx" + __pyx_t_18 = __pyx_convert_string_from_py_std__string(__pyx_v_expression); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 648 "root_numpy/src/tree.pyx" - __pyx_v_col = new FormulaColumn(__pyx_t_21, __pyx_v_formula); +#line 251 "root_numpy/src/tree.pyx" + __pyx_v_col = new FormulaColumn(__pyx_t_18, __pyx_v_formula); - /* "root_numpy/src/tree.pyx":649 + /* "root_numpy/src/tree.pyx":252 * chain.AddFormula(formula) - * col = new FormulaColumn(branch, formula) - * columns.push_back(col) # <<<<<<<<<<<<<< + * col = new FormulaColumn(expression, formula) + * conv = find_converter_by_typename('double') # <<<<<<<<<<<<<< + * if conv == NULL: + * # Oops, this should never happen + */ + +#line 252 "root_numpy/src/tree.pyx" + __pyx_t_18 = __pyx_convert_string_from_py_std__string(__pyx_n_b_double); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 252 "root_numpy/src/tree.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_18); + + /* "root_numpy/src/tree.pyx":253 + * col = new FormulaColumn(expression, formula) + * conv = find_converter_by_typename('double') + * if conv == NULL: # <<<<<<<<<<<<<< + * # Oops, this should never happen + * raise AssertionError( + */ + +#line 253 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_conv == NULL) != 0); + +#line 253 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":255 + * if conv == NULL: + * # Oops, this should never happen + * raise AssertionError( # <<<<<<<<<<<<<< + * "could not find double converter for formula") + * + */ + +#line 255 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_AssertionError, __pyx_tuple__20, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 255 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 255 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); + +#line 255 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 255 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 255 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":258 + * "could not find double converter for formula") + * + * column_buckets[branch_idx].push_back(col) # <<<<<<<<<<<<<< + * converter_buckets[branch_idx].push_back(conv) + * + */ + +#line 258 "root_numpy/src/tree.pyx" + (__pyx_v_column_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_col); + + /* "root_numpy/src/tree.pyx":259 * - * if columns.size() == 0: + * column_buckets[branch_idx].push_back(col) + * converter_buckets[branch_idx].push_back(conv) # <<<<<<<<<<<<<< + * + * # Flatten buckets into 1D vectors, thus preserving branch order */ -#line 649 "root_numpy/src/tree.pyx" - __pyx_v_columns.push_back(__pyx_v_col); +#line 259 "root_numpy/src/tree.pyx" + (__pyx_v_converter_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_conv); + + /* "root_numpy/src/tree.pyx":239 + * if num_requested_branches > 0: + * # Attempt to interpret remaining "branches" as expressions + * for expression in branch_dict.keys(): # <<<<<<<<<<<<<< + * branch_idx = branch_dict[expression] + * c_string = expression + */ -#line 649 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 649 "root_numpy/src/tree.pyx" - __pyx_L14:; +#line 239 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; - /* "root_numpy/src/tree.pyx":618 - * user_branches = True + /* "root_numpy/src/tree.pyx":262 * - * for branch in branches: # <<<<<<<<<<<<<< - * if branch in structure: - * leaves = structure[branch] + * # Flatten buckets into 1D vectors, thus preserving branch order + * for branch_idx in range(num_requested_branches): # <<<<<<<<<<<<<< + * columns.insert(columns.end(), + * column_buckets[branch_idx].begin(), */ -#line 618 "root_numpy/src/tree.pyx" - } +#line 262 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_v_num_requested_branches; -#line 618 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 262 "root_numpy/src/tree.pyx" + for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { + +#line 262 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = __pyx_t_14; - /* "root_numpy/src/tree.pyx":651 - * columns.push_back(col) + /* "root_numpy/src/tree.pyx":263 + * # Flatten buckets into 1D vectors, thus preserving branch order + * for branch_idx in range(num_requested_branches): + * columns.insert(columns.end(), # <<<<<<<<<<<<<< + * column_buckets[branch_idx].begin(), + * column_buckets[branch_idx].end()) + */ + +#line 263 "root_numpy/src/tree.pyx" + __pyx_v_columns.insert(__pyx_v_columns.end(), (__pyx_v_column_buckets[__pyx_v_branch_idx]).begin(), (__pyx_v_column_buckets[__pyx_v_branch_idx]).end()); + + /* "root_numpy/src/tree.pyx":266 + * column_buckets[branch_idx].begin(), + * column_buckets[branch_idx].end()) + * converters.insert(converters.end(), # <<<<<<<<<<<<<< + * converter_buckets[branch_idx].begin(), + * converter_buckets[branch_idx].end()) + */ + +#line 266 "root_numpy/src/tree.pyx" + __pyx_v_converters.insert(__pyx_v_converters.end(), (__pyx_v_converter_buckets[__pyx_v_branch_idx]).begin(), (__pyx_v_converter_buckets[__pyx_v_branch_idx]).end()); + +#line 266 "root_numpy/src/tree.pyx" + } + +#line 266 "root_numpy/src/tree.pyx" + goto __pyx_L28; + +#line 266 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":270 + * converter_buckets[branch_idx].end()) * - * if columns.size() == 0: # <<<<<<<<<<<<<< + * elif columns.size() == 0: # <<<<<<<<<<<<<< * raise RuntimeError("unable to convert any branches in this tree") * */ -#line 651 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_columns.size() == 0) != 0); +#line 270 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_columns.size() == 0) != 0); -#line 651 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 270 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":652 + /* "root_numpy/src/tree.pyx":271 * - * if columns.size() == 0: + * elif columns.size() == 0: * raise RuntimeError("unable to convert any branches in this tree") # <<<<<<<<<<<<<< * * # Activate branches used by formulae and columns */ -#line 652 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__16, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 271 "root_numpy/src/tree.pyx" + __pyx_t_20 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__21, NULL); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 652 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 271 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 652 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 271 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_20, 0, 0, 0); -#line 652 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 271 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 652 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 271 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 652 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":656 +#line 271 "root_numpy/src/tree.pyx" + __pyx_L28:; + + /* "root_numpy/src/tree.pyx":275 * # Activate branches used by formulae and columns * # and deactivate all others * chain.InitBranches() # <<<<<<<<<<<<<< @@ -13622,300 +14831,542 @@ goto __pyx_L17_unpacking_failed; * # Now that we have all the columns we can */ -#line 656 "root_numpy/src/tree.pyx" +#line 275 "root_numpy/src/tree.pyx" __pyx_v_chain->InitBranches(); - /* "root_numpy/src/tree.pyx":660 + /* "root_numpy/src/tree.pyx":279 * # Now that we have all the columns we can * # make an appropriate array structure - * arr = init_array(columns, conv_array, num_entries, # <<<<<<<<<<<<<< - * include_weight, weight_name) - * # Exclude weight column + * dtype = [] # <<<<<<<<<<<<<< + * for icol in range(columns.size()): + * this_col = columns[icol] + */ + +#line 279 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyList_New(0); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 279 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); + +#line 279 "root_numpy/src/tree.pyx" + __pyx_v_dtype = ((PyObject*)__pyx_t_20); + +#line 279 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; + + /* "root_numpy/src/tree.pyx":280 + * # make an appropriate array structure + * dtype = [] + * for icol in range(columns.size()): # <<<<<<<<<<<<<< + * this_col = columns[icol] + * this_conv = converters[icol] + */ + +#line 280 "root_numpy/src/tree.pyx" + __pyx_t_24 = __pyx_v_columns.size(); + +#line 280 "root_numpy/src/tree.pyx" + for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { + +#line 280 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_25; + + /* "root_numpy/src/tree.pyx":281 + * dtype = [] + * for icol in range(columns.size()): + * this_col = columns[icol] # <<<<<<<<<<<<<< + * this_conv = converters[icol] + * dtype.append((this_col.name, this_conv.get_nptype())) + */ + +#line 281 "root_numpy/src/tree.pyx" + __pyx_v_this_col = (__pyx_v_columns[__pyx_v_icol]); + + /* "root_numpy/src/tree.pyx":282 + * for icol in range(columns.size()): + * this_col = columns[icol] + * this_conv = converters[icol] # <<<<<<<<<<<<<< + * dtype.append((this_col.name, this_conv.get_nptype())) + * if include_weight: + */ + +#line 282 "root_numpy/src/tree.pyx" + __pyx_v_this_conv = (__pyx_v_converters[__pyx_v_icol]); + + /* "root_numpy/src/tree.pyx":283 + * this_col = columns[icol] + * this_conv = converters[icol] + * dtype.append((this_col.name, this_conv.get_nptype())) # <<<<<<<<<<<<<< + * if include_weight: + * dtype.append((weight_name, np.dtype('d'))) + */ + +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_20 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_this_col->name); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); + +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_v_this_conv->get_nptype(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(2); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); + +#line 283 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); + +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_20); + +#line 283 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 1, __pyx_t_2); + +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); + +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; + +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; + +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_26 = __Pyx_PyList_Append(__pyx_v_dtype, __pyx_t_19); if (unlikely(__pyx_t_26 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 283 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; + +#line 283 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":284 + * this_conv = converters[icol] + * dtype.append((this_col.name, this_conv.get_nptype())) + * if include_weight: # <<<<<<<<<<<<<< + * dtype.append((weight_name, np.dtype('d'))) + * + */ + +#line 284 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_v_include_weight != 0); + +#line 284 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":285 + * dtype.append((this_col.name, this_conv.get_nptype())) + * if include_weight: + * dtype.append((weight_name, np.dtype('d'))) # <<<<<<<<<<<<<< + * + * # Initialize the array + */ + +#line 285 "root_numpy/src/tree.pyx" + __pyx_t_19 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_weight_name); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); + +#line 285 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_tuple__22, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 285 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyTuple_New(2); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); + +#line 285 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 0, __pyx_t_19); + +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_19); + +#line 285 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 1, __pyx_t_2); + +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); + +#line 285 "root_numpy/src/tree.pyx" + __pyx_t_19 = 0; + +#line 285 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; + +#line 285 "root_numpy/src/tree.pyx" + __pyx_t_26 = __Pyx_PyList_Append(__pyx_v_dtype, __pyx_t_20); if (unlikely(__pyx_t_26 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 285 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; + +#line 285 "root_numpy/src/tree.pyx" + goto __pyx_L39; + +#line 285 "root_numpy/src/tree.pyx" + } + +#line 285 "root_numpy/src/tree.pyx" + __pyx_L39:; + + /* "root_numpy/src/tree.pyx":288 + * + * # Initialize the array + * arr = np.empty(num_entries, dtype=dtype) # <<<<<<<<<<<<<< + * + * # Exclude weight column in num_columns */ -#line 660 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_init_array(__pyx_v_columns, __pyx_v_conv_array, __pyx_v_num_entries, __pyx_v_include_weight, __pyx_v_weight_name)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_20 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); + +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_20, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 660 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 660 "root_numpy/src/tree.pyx" - __pyx_v_arr = ((PyArrayObject *)__pyx_t_2); +#line 288 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 660 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_20 = __Pyx_PyInt_From_int(__pyx_v_num_entries); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); + +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); + +#line 288 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_20); + +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; + +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyDict_New(); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); + +#line 288 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_t_20, __pyx_n_s_dtype, __pyx_v_dtype) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_19, __pyx_t_20); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; + +#line 288 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; + +#line 288 "root_numpy/src/tree.pyx" + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":663 - * include_weight, weight_name) - * # Exclude weight column - * numcol = columns.size() # <<<<<<<<<<<<<< +#line 288 "root_numpy/src/tree.pyx" + __pyx_v_arr = ((PyArrayObject *)__pyx_t_8); + +#line 288 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; + + /* "root_numpy/src/tree.pyx":291 * - * indices = slice(start, stop, step).indices(num_entries) + * # Exclude weight column in num_columns + * num_columns = columns.size() # <<<<<<<<<<<<<< + * + * # Loop on entries in the tree and write the data in the array */ -#line 663 "root_numpy/src/tree.pyx" - __pyx_v_numcol = __pyx_v_columns.size(); +#line 291 "root_numpy/src/tree.pyx" + __pyx_v_num_columns = __pyx_v_columns.size(); - /* "root_numpy/src/tree.pyx":665 - * numcol = columns.size() + /* "root_numpy/src/tree.pyx":294 * + * # Loop on entries in the tree and write the data in the array * indices = slice(start, stop, step).indices(num_entries) # <<<<<<<<<<<<<< * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) */ -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_7 = PySlice_New(__pyx_v_start, __pyx_v_stop, __pyx_v_step); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_20 = PySlice_New(__pyx_v_start, __pyx_v_stop, __pyx_v_step); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_indices); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_19 = __Pyx_PyObject_GetAttrStr(__pyx_t_20, __pyx_n_s_indices); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 294 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_num_entries); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_20 = __Pyx_PyInt_From_int(__pyx_v_num_entries); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_15 = NULL; +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_2 = NULL; -#line 665 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { +#line 294 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_8); +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_19); -#line 665 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_15)) { +#line 294 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_2)) { -#line 665 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); +#line 294 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 665 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_15); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_2); -#line 665 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_8, function); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_19, function); -#line 665 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } -#line 665 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } -#line 665 "root_numpy/src/tree.pyx" - if (!__pyx_t_15) { +#line 294 "root_numpy/src/tree.pyx" + if (!__pyx_t_2) { -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_7); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_t_19, __pyx_t_20); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 294 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 665 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } else { -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyTuple_New(1+1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 665 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_15); __Pyx_GIVEREF(__pyx_t_15); __pyx_t_15 = NULL; +#line 294 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_2); __Pyx_GIVEREF(__pyx_t_2); __pyx_t_2 = NULL; -#line 665 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0+1, __pyx_t_7); +#line 294 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_t_20); -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_7); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_20); -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_19, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_19, __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 294 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 665 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 294 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 665 "root_numpy/src/tree.pyx" - __pyx_v_indices = __pyx_t_2; +#line 294 "root_numpy/src/tree.pyx" + __pyx_v_indices = __pyx_t_8; -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 294 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":666 - * + /* "root_numpy/src/tree.pyx":295 + * # Loop on entries in the tree and write the data in the array * indices = slice(start, stop, step).indices(num_entries) * for ientry in xrange(*indices): # <<<<<<<<<<<<<< * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) */ -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_2 = PySequence_Tuple(__pyx_v_indices); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_8 = PySequence_Tuple(__pyx_v_indices); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 295 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_xrange, __pyx_t_2, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_19 = __Pyx_PyObject_Call(__pyx_builtin_xrange, __pyx_t_8, NULL); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 295 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 295 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 666 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_8)) || PyTuple_CheckExact(__pyx_t_8)) { +#line 295 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_19)) || PyTuple_CheckExact(__pyx_t_19)) { -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_8; __Pyx_INCREF(__pyx_t_2); __pyx_t_10 = 0; +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_t_19; __Pyx_INCREF(__pyx_t_8); __pyx_t_4 = 0; -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_11 = NULL; +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_12 = NULL; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } else { - __pyx_t_10 = -1; -#line 666 "root_numpy/src/tree.pyx" -__pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} + __pyx_t_4 = -1; +#line 295 "root_numpy/src/tree.pyx" +__pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 295 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_11 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_12 = Py_TYPE(__pyx_t_8)->tp_iternext; if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 295 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" for (;;) { -#line 666 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_11)) { +#line 295 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_12)) { -#line 666 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_2))) { +#line 295 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_8))) { -#line 666 "root_numpy/src/tree.pyx" - if (__pyx_t_10 >= PyList_GET_SIZE(__pyx_t_2)) break; +#line 295 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_8)) break; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_10); __Pyx_INCREF(__pyx_t_8); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyList_GET_ITEM(__pyx_t_8, __pyx_t_4); __Pyx_INCREF(__pyx_t_19); __pyx_t_4++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #else -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_2, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_19 = PySequence_ITEM(__pyx_t_8, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #endif -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } else { -#line 666 "root_numpy/src/tree.pyx" - if (__pyx_t_10 >= PyTuple_GET_SIZE(__pyx_t_2)) break; +#line 295 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_8)) break; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_10); __Pyx_INCREF(__pyx_t_8); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_GET_ITEM(__pyx_t_8, __pyx_t_4); __Pyx_INCREF(__pyx_t_19); __pyx_t_4++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #else -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_2, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_19 = PySequence_ITEM(__pyx_t_8, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #endif -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } } else -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" { -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_t_11(__pyx_t_2); +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_19 = __pyx_t_12(__pyx_t_8); -#line 666 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_8)) { +#line 295 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_19)) { -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (exc_type) { -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 666 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" break; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 295 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_23 = __Pyx_PyInt_As_int(__pyx_t_8); if (unlikely((__pyx_t_23 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 295 "root_numpy/src/tree.pyx" + __pyx_t_13 = __Pyx_PyInt_As_int(__pyx_t_19); if (unlikely((__pyx_t_13 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 295 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 666 "root_numpy/src/tree.pyx" - __pyx_v_ientry = __pyx_t_23; +#line 295 "root_numpy/src/tree.pyx" + __pyx_v_ientry = __pyx_t_13; - /* "root_numpy/src/tree.pyx":667 + /* "root_numpy/src/tree.pyx":296 * indices = slice(start, stop, step).indices(num_entries) * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) # <<<<<<<<<<<<<< @@ -13923,10 +15374,10 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * if entry_size == 0: */ -#line 667 "root_numpy/src/tree.pyx" +#line 296 "root_numpy/src/tree.pyx" __pyx_v_entry_size = __pyx_v_chain->GetEntry(__pyx_v_ientry); - /* "root_numpy/src/tree.pyx":668 + /* "root_numpy/src/tree.pyx":297 * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) # <<<<<<<<<<<<<< @@ -13934,16 +15385,16 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * raise IOError("read failure in current tree") */ -#line 668 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_f_13_librootnumpy_handle_load(__pyx_v_entry_size, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 668; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 297 "root_numpy/src/tree.pyx" + __pyx_t_19 = __pyx_f_13_librootnumpy_handle_load(__pyx_v_entry_size, NULL); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 297; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 668 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 297 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 668 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 297 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - /* "root_numpy/src/tree.pyx":669 + /* "root_numpy/src/tree.pyx":298 * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) * if entry_size == 0: # <<<<<<<<<<<<<< @@ -13951,13 +15402,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * */ -#line 669 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_entry_size == 0) != 0); +#line 298 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_entry_size == 0) != 0); -#line 669 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 298 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":670 + /* "root_numpy/src/tree.pyx":299 * handle_load(entry_size) * if entry_size == 0: * raise IOError("read failure in current tree") # <<<<<<<<<<<<<< @@ -13965,25 +15416,25 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * # Determine if this entry passes the selection, */ -#line 670 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 670; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 299 "root_numpy/src/tree.pyx" + __pyx_t_19 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_tuple__23, NULL); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 670 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 299 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 670 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_8, 0, 0, 0); +#line 299 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_19, 0, 0, 0); -#line 670 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 299 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 670 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 670; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 299 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 670 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":674 + /* "root_numpy/src/tree.pyx":303 * # Determine if this entry passes the selection, * # similar to the code in ROOT's tree/treeplayer/src/TTreePlayer.cxx * if selection_formula != NULL: # <<<<<<<<<<<<<< @@ -13991,13 +15442,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * if selection_formula.EvalInstance(0) == 0: */ -#line 674 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_selection_formula != NULL) != 0); +#line 303 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_selection_formula != NULL) != 0); -#line 674 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 303 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":675 + /* "root_numpy/src/tree.pyx":304 * # similar to the code in ROOT's tree/treeplayer/src/TTreePlayer.cxx * if selection_formula != NULL: * selection_formula.GetNdata() # required, as in TTreePlayer # <<<<<<<<<<<<<< @@ -14005,10 +15456,10 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * continue */ -#line 675 "root_numpy/src/tree.pyx" +#line 304 "root_numpy/src/tree.pyx" __pyx_v_selection_formula->GetNdata(); - /* "root_numpy/src/tree.pyx":676 + /* "root_numpy/src/tree.pyx":305 * if selection_formula != NULL: * selection_formula.GetNdata() # required, as in TTreePlayer * if selection_formula.EvalInstance(0) == 0: # <<<<<<<<<<<<<< @@ -14016,13 +15467,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * */ -#line 676 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_selection_formula->EvalInstance(0) == 0.0) != 0); +#line 305 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_selection_formula->EvalInstance(0) == 0.0) != 0); -#line 676 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 305 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":677 + /* "root_numpy/src/tree.pyx":306 * selection_formula.GetNdata() # required, as in TTreePlayer * if selection_formula.EvalInstance(0) == 0: * continue # <<<<<<<<<<<<<< @@ -14030,426 +15481,499 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * # Copy the values into the array */ -#line 677 "root_numpy/src/tree.pyx" - goto __pyx_L24_continue; +#line 306 "root_numpy/src/tree.pyx" + goto __pyx_L40_continue; -#line 677 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" } -#line 677 "root_numpy/src/tree.pyx" - goto __pyx_L27; +#line 306 "root_numpy/src/tree.pyx" + goto __pyx_L43; -#line 677 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" } -#line 677 "root_numpy/src/tree.pyx" - __pyx_L27:; +#line 306 "root_numpy/src/tree.pyx" + __pyx_L43:; - /* "root_numpy/src/tree.pyx":680 + /* "root_numpy/src/tree.pyx":309 * * # Copy the values into the array - * dataptr = np.PyArray_GETPTR1(arr, num_entries_selected) # <<<<<<<<<<<<<< - * for icol in xrange(numcol): + * data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) # <<<<<<<<<<<<<< + * for icol in range(num_columns): * col = columns[icol] */ -#line 680 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = PyArray_GETPTR1(__pyx_v_arr, __pyx_v_num_entries_selected); +#line 309 "root_numpy/src/tree.pyx" + __pyx_v_data_ptr = PyArray_GETPTR1(__pyx_v_arr, __pyx_v_num_entries_selected); - /* "root_numpy/src/tree.pyx":681 + /* "root_numpy/src/tree.pyx":310 * # Copy the values into the array - * dataptr = np.PyArray_GETPTR1(arr, num_entries_selected) - * for icol in xrange(numcol): # <<<<<<<<<<<<<< + * data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) + * for icol in range(num_columns): # <<<<<<<<<<<<<< * col = columns[icol] - * conv = conv_array[icol] + * conv = converters[icol] */ -#line 681 "root_numpy/src/tree.pyx" - __pyx_t_24 = __pyx_v_numcol; +#line 310 "root_numpy/src/tree.pyx" + __pyx_t_25 = __pyx_v_num_columns; -#line 681 "root_numpy/src/tree.pyx" - for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { +#line 310 "root_numpy/src/tree.pyx" + for (__pyx_t_27 = 0; __pyx_t_27 < __pyx_t_25; __pyx_t_27+=1) { -#line 681 "root_numpy/src/tree.pyx" - __pyx_v_icol = __pyx_t_25; +#line 310 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_27; - /* "root_numpy/src/tree.pyx":682 - * dataptr = np.PyArray_GETPTR1(arr, num_entries_selected) - * for icol in xrange(numcol): + /* "root_numpy/src/tree.pyx":311 + * data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) + * for icol in range(num_columns): * col = columns[icol] # <<<<<<<<<<<<<< - * conv = conv_array[icol] - * nb = conv.write(col, dataptr) + * conv = converters[icol] + * num_bytes = conv.write(col, data_ptr) */ -#line 682 "root_numpy/src/tree.pyx" +#line 311 "root_numpy/src/tree.pyx" __pyx_v_col = (__pyx_v_columns[__pyx_v_icol]); - /* "root_numpy/src/tree.pyx":683 - * for icol in xrange(numcol): + /* "root_numpy/src/tree.pyx":312 + * for icol in range(num_columns): * col = columns[icol] - * conv = conv_array[icol] # <<<<<<<<<<<<<< - * nb = conv.write(col, dataptr) - * # poorman pointer magic + * conv = converters[icol] # <<<<<<<<<<<<<< + * num_bytes = conv.write(col, data_ptr) + * data_ptr = shift(data_ptr, num_bytes) */ -#line 683 "root_numpy/src/tree.pyx" - __pyx_v_conv = (__pyx_v_conv_array[__pyx_v_icol]); +#line 312 "root_numpy/src/tree.pyx" + __pyx_v_conv = (__pyx_v_converters[__pyx_v_icol]); - /* "root_numpy/src/tree.pyx":684 + /* "root_numpy/src/tree.pyx":313 * col = columns[icol] - * conv = conv_array[icol] - * nb = conv.write(col, dataptr) # <<<<<<<<<<<<<< - * # poorman pointer magic - * dataptr = shift(dataptr, nb) + * conv = converters[icol] + * num_bytes = conv.write(col, data_ptr) # <<<<<<<<<<<<<< + * data_ptr = shift(data_ptr, num_bytes) + * if include_weight: */ -#line 684 "root_numpy/src/tree.pyx" - __pyx_v_nb = __pyx_v_conv->write(__pyx_v_col, __pyx_v_dataptr); +#line 313 "root_numpy/src/tree.pyx" + __pyx_v_num_bytes = __pyx_v_conv->write(__pyx_v_col, __pyx_v_data_ptr); - /* "root_numpy/src/tree.pyx":686 - * nb = conv.write(col, dataptr) - * # poorman pointer magic - * dataptr = shift(dataptr, nb) # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":314 + * conv = converters[icol] + * num_bytes = conv.write(col, data_ptr) + * data_ptr = shift(data_ptr, num_bytes) # <<<<<<<<<<<<<< * if include_weight: - * ( dataptr)[0] = chain.GetWeight() + * ( data_ptr)[0] = tree.GetWeight() */ -#line 686 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = shift(__pyx_v_dataptr, __pyx_v_nb); +#line 314 "root_numpy/src/tree.pyx" + __pyx_v_data_ptr = shift(__pyx_v_data_ptr, __pyx_v_num_bytes); -#line 686 "root_numpy/src/tree.pyx" +#line 314 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":687 - * # poorman pointer magic - * dataptr = shift(dataptr, nb) + /* "root_numpy/src/tree.pyx":315 + * num_bytes = conv.write(col, data_ptr) + * data_ptr = shift(data_ptr, num_bytes) * if include_weight: # <<<<<<<<<<<<<< - * ( dataptr)[0] = chain.GetWeight() + * ( data_ptr)[0] = tree.GetWeight() * */ -#line 687 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_include_weight); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 315 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_v_include_weight != 0); -#line 687 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 315 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":688 - * dataptr = shift(dataptr, nb) + /* "root_numpy/src/tree.pyx":316 + * data_ptr = shift(data_ptr, num_bytes) * if include_weight: - * ( dataptr)[0] = chain.GetWeight() # <<<<<<<<<<<<<< + * ( data_ptr)[0] = tree.GetWeight() # <<<<<<<<<<<<<< * * # Increment number of selected entries last */ -#line 688 "root_numpy/src/tree.pyx" - (((double *)__pyx_v_dataptr)[0]) = __pyx_v_chain->GetWeight(); +#line 316 "root_numpy/src/tree.pyx" + (((double *)__pyx_v_data_ptr)[0]) = __pyx_v_tree->GetWeight(); -#line 688 "root_numpy/src/tree.pyx" - goto __pyx_L31; +#line 316 "root_numpy/src/tree.pyx" + goto __pyx_L47; -#line 688 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/tree.pyx" } -#line 688 "root_numpy/src/tree.pyx" - __pyx_L31:; +#line 316 "root_numpy/src/tree.pyx" + __pyx_L47:; - /* "root_numpy/src/tree.pyx":691 + /* "root_numpy/src/tree.pyx":319 * * # Increment number of selected entries last * num_entries_selected += 1 # <<<<<<<<<<<<<< + * * finally: - * del chain */ -#line 691 "root_numpy/src/tree.pyx" +#line 319 "root_numpy/src/tree.pyx" __pyx_v_num_entries_selected = (__pyx_v_num_entries_selected + 1); - /* "root_numpy/src/tree.pyx":666 - * + /* "root_numpy/src/tree.pyx":295 + * # Loop on entries in the tree and write the data in the array * indices = slice(start, stop, step).indices(num_entries) * for ientry in xrange(*indices): # <<<<<<<<<<<<<< * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) */ -#line 666 "root_numpy/src/tree.pyx" - __pyx_L24_continue:; +#line 295 "root_numpy/src/tree.pyx" + __pyx_L40_continue:; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 295 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 666 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":693 - * num_entries_selected += 1 + /* "root_numpy/src/tree.pyx":323 * finally: + * # Delete TreeChain * del chain # <<<<<<<<<<<<<< - * - * # If we selected fewer than num_entries entries then shrink the array + * # Delete Columns + * for icol in range(columns.size()): */ -#line 693 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 693 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 693 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" delete __pyx_v_chain; -#line 693 "root_numpy/src/tree.pyx" - goto __pyx_L6; + /* "root_numpy/src/tree.pyx":325 + * del chain + * # Delete Columns + * for icol in range(columns.size()): # <<<<<<<<<<<<<< + * del columns[icol] + * + */ + +#line 325 "root_numpy/src/tree.pyx" + __pyx_t_24 = __pyx_v_columns.size(); + +#line 325 "root_numpy/src/tree.pyx" + for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { + +#line 325 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_25; + + /* "root_numpy/src/tree.pyx":326 + * # Delete Columns + * for icol in range(columns.size()): + * del columns[icol] # <<<<<<<<<<<<<< + * + * # Shrink the array if we selected fewer than num_entries entries + */ + +#line 326 "root_numpy/src/tree.pyx" + delete (__pyx_v_columns[__pyx_v_icol]); + +#line 326 "root_numpy/src/tree.pyx" + } + +#line 326 "root_numpy/src/tree.pyx" + goto __pyx_L9; -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 693 "root_numpy/src/tree.pyx" - __pyx_L5_error:; +#line 326 "root_numpy/src/tree.pyx" + __pyx_L8_error:; -#line 693 "root_numpy/src/tree.pyx" - __pyx_t_28 = 0; __pyx_t_29 = 0; __pyx_t_30 = 0; __pyx_t_31 = 0; __pyx_t_32 = 0; __pyx_t_33 = 0; +#line 326 "root_numpy/src/tree.pyx" + __pyx_t_29 = 0; __pyx_t_30 = 0; __pyx_t_31 = 0; __pyx_t_32 = 0; __pyx_t_33 = 0; __pyx_t_34 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_22); __pyx_t_22 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_21); __pyx_t_21 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_22); __pyx_t_22 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 693 "root_numpy/src/tree.pyx" - if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_31, &__pyx_t_32, &__pyx_t_33); +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 693 "root_numpy/src/tree.pyx" - if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_28, &__pyx_t_29, &__pyx_t_30) < 0)) __Pyx_ErrFetch(&__pyx_t_28, &__pyx_t_29, &__pyx_t_30); +#line 326 "root_numpy/src/tree.pyx" + if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_32, &__pyx_t_33, &__pyx_t_34); -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_28); +#line 326 "root_numpy/src/tree.pyx" + if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_29, &__pyx_t_30, &__pyx_t_31) < 0)) __Pyx_ErrFetch(&__pyx_t_29, &__pyx_t_30, &__pyx_t_31); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_29); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_30); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_31); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_32); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_33); -#line 693 "root_numpy/src/tree.pyx" - __pyx_t_23 = __pyx_lineno; __pyx_t_26 = __pyx_clineno; __pyx_t_27 = __pyx_filename; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_34); + +#line 326 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_lineno; __pyx_t_14 = __pyx_clineno; __pyx_t_28 = __pyx_filename; -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" { -#line 693 "root_numpy/src/tree.pyx" + /* "root_numpy/src/tree.pyx":323 + * finally: + * # Delete TreeChain + * del chain # <<<<<<<<<<<<<< + * # Delete Columns + * for icol in range(columns.size()): + */ + +#line 323 "root_numpy/src/tree.pyx" delete __pyx_v_chain; -#line 693 "root_numpy/src/tree.pyx" + /* "root_numpy/src/tree.pyx":325 + * del chain + * # Delete Columns + * for icol in range(columns.size()): # <<<<<<<<<<<<<< + * del columns[icol] + * + */ + +#line 325 "root_numpy/src/tree.pyx" + __pyx_t_24 = __pyx_v_columns.size(); + +#line 325 "root_numpy/src/tree.pyx" + for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { + +#line 325 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_25; + + /* "root_numpy/src/tree.pyx":326 + * # Delete Columns + * for icol in range(columns.size()): + * del columns[icol] # <<<<<<<<<<<<<< + * + * # Shrink the array if we selected fewer than num_entries entries + */ + +#line 326 "root_numpy/src/tree.pyx" + delete (__pyx_v_columns[__pyx_v_icol]); + +#line 326 "root_numpy/src/tree.pyx" + } + +#line 326 "root_numpy/src/tree.pyx" } -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_31); - -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_32); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_33); -#line 693 "root_numpy/src/tree.pyx" - __Pyx_ExceptionReset(__pyx_t_31, __pyx_t_32, __pyx_t_33); +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_34); -#line 693 "root_numpy/src/tree.pyx" - } +#line 326 "root_numpy/src/tree.pyx" + __Pyx_ExceptionReset(__pyx_t_32, __pyx_t_33, __pyx_t_34); -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_28); +#line 326 "root_numpy/src/tree.pyx" + } -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_29); -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_30); -#line 693 "root_numpy/src/tree.pyx" - __Pyx_ErrRestore(__pyx_t_28, __pyx_t_29, __pyx_t_30); +#line 326 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_31); -#line 693 "root_numpy/src/tree.pyx" - __pyx_t_28 = 0; __pyx_t_29 = 0; __pyx_t_30 = 0; __pyx_t_31 = 0; __pyx_t_32 = 0; __pyx_t_33 = 0; +#line 326 "root_numpy/src/tree.pyx" + __Pyx_ErrRestore(__pyx_t_29, __pyx_t_30, __pyx_t_31); -#line 693 "root_numpy/src/tree.pyx" - __pyx_lineno = __pyx_t_23; __pyx_clineno = __pyx_t_26; __pyx_filename = __pyx_t_27; +#line 326 "root_numpy/src/tree.pyx" + __pyx_t_29 = 0; __pyx_t_30 = 0; __pyx_t_31 = 0; __pyx_t_32 = 0; __pyx_t_33 = 0; __pyx_t_34 = 0; -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" + __pyx_lineno = __pyx_t_13; __pyx_clineno = __pyx_t_14; __pyx_filename = __pyx_t_28; + +#line 326 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 693 "root_numpy/src/tree.pyx" - __pyx_L6:; +#line 326 "root_numpy/src/tree.pyx" + __pyx_L9:; -#line 693 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":696 + /* "root_numpy/src/tree.pyx":329 * - * # If we selected fewer than num_entries entries then shrink the array + * # Shrink the array if we selected fewer than num_entries entries * if num_entries_selected < num_entries: # <<<<<<<<<<<<<< * arr.resize(num_entries_selected) * */ -#line 696 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_num_entries_selected < __pyx_v_num_entries) != 0); +#line 329 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_entries_selected < __pyx_v_num_entries) != 0); -#line 696 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 329 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":697 - * # If we selected fewer than num_entries entries then shrink the array + /* "root_numpy/src/tree.pyx":330 + * # Shrink the array if we selected fewer than num_entries entries * if num_entries_selected < num_entries: * arr.resize(num_entries_selected) # <<<<<<<<<<<<<< * * return arr */ -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_arr), __pyx_n_s_resize); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_19 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_arr), __pyx_n_s_resize); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_19 = __Pyx_PyInt_From_int(__pyx_v_num_entries_selected); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_9 = __Pyx_PyInt_From_int(__pyx_v_num_entries_selected); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_7 = NULL; +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_20 = NULL; -#line 697 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { +#line 330 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_8); +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyMethod_GET_SELF(__pyx_t_19); -#line 697 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_7)) { +#line 330 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_20)) { -#line 697 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); +#line 330 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 697 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_7); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_20); -#line 697 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_8, function); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_19, function); -#line 697 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" - if (!__pyx_t_7) { +#line 330 "root_numpy/src/tree.pyx" + if (!__pyx_t_20) { -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_19); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_t_19, __pyx_t_9); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 330 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 697 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } else { -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyTuple_New(1+1); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 697 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0, __pyx_t_7); __Pyx_GIVEREF(__pyx_t_7); __pyx_t_7 = NULL; +#line 330 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_20); __Pyx_GIVEREF(__pyx_t_20); __pyx_t_20 = NULL; -#line 697 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0+1, __pyx_t_19); +#line 330 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0+1, __pyx_t_9); -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_19); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_19 = 0; +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_15, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 330 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_19, __pyx_t_2, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 330 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 697 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 330 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 330 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 697 "root_numpy/src/tree.pyx" - goto __pyx_L34; +#line 330 "root_numpy/src/tree.pyx" + goto __pyx_L54; -#line 697 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" - __pyx_L34:; +#line 330 "root_numpy/src/tree.pyx" + __pyx_L54:; - /* "root_numpy/src/tree.pyx":699 + /* "root_numpy/src/tree.pyx":332 * arr.resize(num_entries_selected) * * return arr # <<<<<<<<<<<<<< @@ -14457,710 +15981,704 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * */ -#line 699 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 699 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" __Pyx_INCREF(((PyObject *)__pyx_v_arr)); -#line 699 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" __pyx_r = ((PyObject *)__pyx_v_arr); -#line 699 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":566 + /* "root_numpy/src/tree.pyx":102 * * - * cdef object tree2array(TTree* tree, branches, selection, # <<<<<<<<<<<<<< + * cdef object tree2array(TTree* tree, branches, string selection, # <<<<<<<<<<<<<< * start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" /* function exit code */ -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); - -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_13); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_14); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_15); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_19); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_20); + +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_21); + +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_22); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.tree2array", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF((PyObject *)__pyx_v_arr); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_structure); - -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_branch); - -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_leaves); - -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_shortname); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_branch_dict); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_leaf); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_expression); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_ltype); - -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_colname); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_dtype); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_indices); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_branches); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_idx); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_b); + +#line 102 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" return __pyx_r; -#line 566 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":702 +/* "root_numpy/src/tree.pyx":335 * * - * def root2array_fromFname(fnames, treename, branches, # <<<<<<<<<<<<<< + * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< * selection, start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 702 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_7root2array_fromFname(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_7root2array_fromFname = -#line 702 "root_numpy/src/tree.pyx" -{"root2array_fromFname", (PyCFunction)__pyx_pw_13_librootnumpy_7root2array_fromFname, METH_VARARGS|METH_KEYWORDS, 0}; +#line 335 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_9root2array_fromFname(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_9root2array_fromFname = +#line 335 "root_numpy/src/tree.pyx" +{"root2array_fromFname", (PyCFunction)__pyx_pw_13_librootnumpy_9root2array_fromFname, METH_VARARGS|METH_KEYWORDS, 0}; -#line 702 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_7root2array_fromFname(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { +#line 335 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_9root2array_fromFname(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_fnames = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_treename = 0 -#line 702 "root_numpy/src/tree.pyx" + std::string __pyx_v_treename +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branches = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_selection = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_start = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_stop = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_step = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_include_weight = 0 -#line 702 "root_numpy/src/tree.pyx" + bool __pyx_v_include_weight +#line 335 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_weight_name = 0 -#line 702 "root_numpy/src/tree.pyx" + std::string __pyx_v_weight_name +#line 335 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromFname (wrapper)", 0); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" { -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fnames,&__pyx_n_s_treename,&__pyx_n_s_branches,&__pyx_n_s_selection,&__pyx_n_s_start,&__pyx_n_s_stop,&__pyx_n_s_step,&__pyx_n_s_include_weight,&__pyx_n_s_weight_name,0}; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" PyObject* values[9] = {0,0,0,0,0,0,0,0,0}; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" switch (pos_args) { case 9: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[8] = PyTuple_GET_ITEM(__pyx_args, 8); case 8: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); case 5: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 0: break; default: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 0: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fnames)) != 0)) kw_args--; else -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 1: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_treename)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 1); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 2: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_branches)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 2); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 3: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_selection)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 3); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 4: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_start)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 4); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 5: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[5] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_stop)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 5); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 6: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[6] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_step)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 6); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 7: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[7] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_include_weight)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 7); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 8: -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (likely((values[8] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_weight_name)) != 0)) kw_args--; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 8); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 702 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "root2array_fromFname") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "root2array_fromFname") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } else if (PyTuple_GET_SIZE(__pyx_args) != 9) { -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } else { -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[8] = PyTuple_GET_ITEM(__pyx_args, 8); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_fnames = values[0]; -#line 702 "root_numpy/src/tree.pyx" - __pyx_v_treename = values[1]; +#line 335 "root_numpy/src/tree.pyx" + __pyx_v_treename = __pyx_convert_string_from_py_std__string(values[1]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_branches = values[2]; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_selection = values[3]; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_start = values[4]; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_stop = values[5]; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_step = values[6]; -#line 702 "root_numpy/src/tree.pyx" - __pyx_v_include_weight = values[7]; +#line 335 "root_numpy/src/tree.pyx" + __pyx_v_include_weight = __Pyx_PyObject_IsTrue(values[7]); if (unlikely((__pyx_v_include_weight == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" - __pyx_v_weight_name = values[8]; +#line 335 "root_numpy/src/tree.pyx" + __pyx_v_weight_name = __pyx_convert_string_from_py_std__string(values[8]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 337; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, PyTuple_GET_SIZE(__pyx_args)); -#line 702 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 335 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromFname", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" return NULL; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 702 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_6root2array_fromFname(__pyx_self, __pyx_v_fnames, __pyx_v_treename, __pyx_v_branches, __pyx_v_selection, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); +#line 335 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_8root2array_fromFname(__pyx_self, __pyx_v_fnames, __pyx_v_treename, __pyx_v_branches, __pyx_v_selection, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" /* function exit code */ -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" return __pyx_r; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_6root2array_fromFname(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fnames, PyObject *__pyx_v_treename, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, PyObject *__pyx_v_include_weight, PyObject *__pyx_v_weight_name) { +#line 335 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_fnames, std::string __pyx_v_treename, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, bool __pyx_v_include_weight, std::string __pyx_v_weight_name) { TChain *__pyx_v_ttree -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fn = NULL -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_ret = NULL -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - const char *__pyx_t_1; - PyObject *__pyx_t_2 = NULL; - Py_ssize_t __pyx_t_3; - PyObject *(*__pyx_t_4)(PyObject *); - PyObject *__pyx_t_5 = NULL; + PyObject *__pyx_t_1 = NULL; + Py_ssize_t __pyx_t_2; + PyObject *(*__pyx_t_3)(PyObject *); + PyObject *__pyx_t_4 = NULL; + const char *__pyx_t_5; int __pyx_t_6; PyObject *__pyx_t_7 = NULL; PyObject *__pyx_t_8 = NULL; - Py_ssize_t __pyx_t_9; - PyObject *__pyx_t_10 = NULL; - int __pyx_t_11; - int __pyx_t_12; - char const *__pyx_t_13; - PyObject *__pyx_t_14 = NULL; - PyObject *__pyx_t_15 = NULL; - PyObject *__pyx_t_16 = NULL; + PyObject *__pyx_t_9 = NULL; + Py_ssize_t __pyx_t_10; + PyObject *__pyx_t_11 = NULL; + std::string __pyx_t_12; + std::string __pyx_t_13; + int __pyx_t_14; + int __pyx_t_15; + char const *__pyx_t_16; PyObject *__pyx_t_17 = NULL; PyObject *__pyx_t_18 = NULL; PyObject *__pyx_t_19 = NULL; + PyObject *__pyx_t_20 = NULL; + PyObject *__pyx_t_21 = NULL; + PyObject *__pyx_t_22 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromFname", 0); - /* "root_numpy/src/tree.pyx":705 + /* "root_numpy/src/tree.pyx":338 * selection, start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): * cdef TChain* ttree = NULL # <<<<<<<<<<<<<< * try: - * ttree = new TChain(treename) + * ttree = new TChain(treename.c_str()) */ -#line 705 "root_numpy/src/tree.pyx" +#line 338 "root_numpy/src/tree.pyx" __pyx_v_ttree = NULL; - /* "root_numpy/src/tree.pyx":706 - * include_weight, weight_name): + /* "root_numpy/src/tree.pyx":339 + * bool include_weight, string weight_name): * cdef TChain* ttree = NULL * try: # <<<<<<<<<<<<<< - * ttree = new TChain(treename) + * ttree = new TChain(treename.c_str()) * for fn in fnames: */ -#line 706 "root_numpy/src/tree.pyx" +#line 339 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":707 + /* "root_numpy/src/tree.pyx":340 * cdef TChain* ttree = NULL * try: - * ttree = new TChain(treename) # <<<<<<<<<<<<<< + * ttree = new TChain(treename.c_str()) # <<<<<<<<<<<<<< * for fn in fnames: * if ttree.Add(fn, -1) == 0: */ -#line 707 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_treename); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L4_error;} - -#line 707 "root_numpy/src/tree.pyx" - __pyx_v_ttree = new TChain(__pyx_t_1); +#line 340 "root_numpy/src/tree.pyx" + __pyx_v_ttree = new TChain(__pyx_v_treename.c_str()); - /* "root_numpy/src/tree.pyx":708 + /* "root_numpy/src/tree.pyx":341 * try: - * ttree = new TChain(treename) + * ttree = new TChain(treename.c_str()) * for fn in fnames: # <<<<<<<<<<<<<< * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( */ -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_v_fnames)) || PyTuple_CheckExact(__pyx_v_fnames)) { -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_v_fnames; __Pyx_INCREF(__pyx_t_2); __pyx_t_3 = 0; +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_1 = __pyx_v_fnames; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0; -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_4 = NULL; +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_3 = NULL; -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } else { - __pyx_t_3 = -1; -#line 708 "root_numpy/src/tree.pyx" -__pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + __pyx_t_2 = -1; +#line 341 "root_numpy/src/tree.pyx" +__pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 341 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_4 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_3 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" for (;;) { -#line 708 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_4)) { +#line 341 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_3)) { -#line 708 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_2))) { +#line 341 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_1))) { -#line 708 "root_numpy/src/tree.pyx" - if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_2)) break; +#line 341 "root_numpy/src/tree.pyx" + if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break; -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #else -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #endif -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } else { -#line 708 "root_numpy/src/tree.pyx" - if (__pyx_t_3 >= PyTuple_GET_SIZE(__pyx_t_2)) break; +#line 341 "root_numpy/src/tree.pyx" + if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break; -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_5); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #else -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #endif -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } } else -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" { -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = __pyx_t_4(__pyx_t_2); +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_4 = __pyx_t_3(__pyx_t_1); -#line 708 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_5)) { +#line 341 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_4)) { -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (exc_type) { -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 708 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 341 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" break; -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 341 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_fn, __pyx_t_5); +#line 341 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_fn, __pyx_t_4); -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 341 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; - /* "root_numpy/src/tree.pyx":709 - * ttree = new TChain(treename) + /* "root_numpy/src/tree.pyx":342 + * ttree = new TChain(treename.c_str()) * for fn in fnames: * if ttree.Add(fn, -1) == 0: # <<<<<<<<<<<<<< * raise IOError("unable to access tree '{0}' in {1}".format( * treename, fn)) */ -#line 709 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_fn); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 342 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_AsString(__pyx_v_fn); if (unlikely((!__pyx_t_5) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 709 "root_numpy/src/tree.pyx" - __pyx_t_6 = ((__pyx_v_ttree->Add(__pyx_t_1, -1) == 0) != 0); +#line 342 "root_numpy/src/tree.pyx" + __pyx_t_6 = ((__pyx_v_ttree->Add(__pyx_t_5, -1) == 0) != 0); -#line 709 "root_numpy/src/tree.pyx" +#line 342 "root_numpy/src/tree.pyx" if (__pyx_t_6) { - /* "root_numpy/src/tree.pyx":710 + /* "root_numpy/src/tree.pyx":343 * for fn in fnames: * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( # <<<<<<<<<<<<<< @@ -15168,13 +16686,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * ret = tree2array( */ -#line 710 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_unable_to_access_tree_0_in_1, __pyx_n_s_format); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 343 "root_numpy/src/tree.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_unable_to_access_tree_0_in_1, __pyx_n_s_format); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); - /* "root_numpy/src/tree.pyx":711 + /* "root_numpy/src/tree.pyx":344 * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( * treename, fn)) # <<<<<<<<<<<<<< @@ -15182,88 +16700,94 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * ttree, branches, */ -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_8 = NULL; +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_treename); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_9 = 0; +#line 344 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_9 = NULL; + +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_10 = 0; + +#line 344 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_7))) { -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_7); +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_7); -#line 711 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_8)) { +#line 344 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_9)) { -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); -#line 711 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_8); +#line 344 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_7, function); -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_9 = 1; +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_10 = 1; -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" } -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" } -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_11 = PyTuple_New(2+__pyx_t_10); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 711 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_10); +#line 344 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 711 "root_numpy/src/tree.pyx" - if (__pyx_t_8) { +#line 344 "root_numpy/src/tree.pyx" + if (__pyx_t_9) { -#line 711 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8); __Pyx_GIVEREF(__pyx_t_8); __pyx_t_8 = NULL; +#line 344 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_9); __Pyx_GIVEREF(__pyx_t_9); __pyx_t_9 = NULL; -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" } -#line 711 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_treename); - -#line 711 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_10, 0+__pyx_t_9, __pyx_v_treename); +#line 344 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_11, 0+__pyx_t_10, __pyx_t_8); -#line 711 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_treename); +#line 344 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_8); -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_fn); -#line 711 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_9, __pyx_v_fn); +#line 344 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_11, 1+__pyx_t_10, __pyx_v_fn); -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_fn); -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_10, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; -#line 711 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 344 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 711 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; +#line 344 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); + +#line 344 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 711 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":710 + /* "root_numpy/src/tree.pyx":343 * for fn in fnames: * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( # <<<<<<<<<<<<<< @@ -15271,80 +16795,118 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * ret = tree2array( */ -#line 710 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 343 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 710 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); +#line 343 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); -#line 710 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); +#line 343 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_4); -#line 710 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 343 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 710 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 343 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 343 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 710 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 710 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_5, 0, 0, 0); +#line 343 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 710 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 343 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 710 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 343 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":708 + /* "root_numpy/src/tree.pyx":341 * try: - * ttree = new TChain(treename) + * ttree = new TChain(treename.c_str()) * for fn in fnames: # <<<<<<<<<<<<<< * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( */ -#line 708 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 341 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "root_numpy/src/tree.pyx":347 + * ret = tree2array( + * ttree, branches, + * selection or '', start, stop, step, # <<<<<<<<<<<<<< + * include_weight, weight_name) + * finally: + */ + +#line 347 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_selection); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + +#line 347 "root_numpy/src/tree.pyx" + if (!__pyx_t_6) { + +#line 347 "root_numpy/src/tree.pyx" + } else { + +#line 347 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_convert_string_from_py_std__string(__pyx_v_selection); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + +#line 347 "root_numpy/src/tree.pyx" + __pyx_t_12 = __pyx_t_13; + +#line 347 "root_numpy/src/tree.pyx" + goto __pyx_L9_bool_binop_done; + +#line 347 "root_numpy/src/tree.pyx" + } + +#line 347 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_convert_string_from_py_std__string(__pyx_kp_s__24); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + +#line 347 "root_numpy/src/tree.pyx" + __pyx_t_12 = __pyx_t_13; + +#line 347 "root_numpy/src/tree.pyx" + __pyx_L9_bool_binop_done:; - /* "root_numpy/src/tree.pyx":712 + /* "root_numpy/src/tree.pyx":345 * raise IOError("unable to access tree '{0}' in {1}".format( * treename, fn)) * ret = tree2array( # <<<<<<<<<<<<<< * ttree, branches, - * selection, start, stop, step, + * selection or '', start, stop, step, */ -#line 712 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy_tree2array(((TTree *)__pyx_v_ttree), __pyx_v_branches, __pyx_v_selection, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 712; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#line 345 "root_numpy/src/tree.pyx" + __pyx_t_1 = __pyx_f_13_librootnumpy_tree2array(((TTree *)__pyx_v_ttree), __pyx_v_branches, __pyx_t_12, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 345; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 712 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 345 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 712 "root_numpy/src/tree.pyx" - __pyx_v_ret = __pyx_t_2; +#line 345 "root_numpy/src/tree.pyx" + __pyx_v_ret = __pyx_t_1; -#line 712 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 345 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#line 712 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":717 + /* "root_numpy/src/tree.pyx":350 * include_weight, weight_name) * finally: * del ttree # <<<<<<<<<<<<<< @@ -15352,130 +16914,133 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * */ -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" delete __pyx_v_ttree; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" goto __pyx_L5; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __pyx_L4_error:; -#line 717 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; +#line 350 "root_numpy/src/tree.pyx" + __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; + +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; - -#line 717 "root_numpy/src/tree.pyx" - if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 717 "root_numpy/src/tree.pyx" - if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16) < 0)) __Pyx_ErrFetch(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16); - -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_14); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_15); +#line 350 "root_numpy/src/tree.pyx" + if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_16); +#line 350 "root_numpy/src/tree.pyx" + if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19) < 0)) __Pyx_ErrFetch(&__pyx_t_17, &__pyx_t_18, &__pyx_t_19); -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_17); -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_18); -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_19); -#line 717 "root_numpy/src/tree.pyx" - __pyx_t_11 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_13 = __pyx_filename; +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_20); + +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_21); + +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_22); -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" + __pyx_t_14 = __pyx_lineno; __pyx_t_15 = __pyx_clineno; __pyx_t_16 = __pyx_filename; + +#line 350 "root_numpy/src/tree.pyx" { -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" delete __pyx_v_ttree; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_17); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_20); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_18); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_21); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_19); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_22); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_ExceptionReset(__pyx_t_17, __pyx_t_18, __pyx_t_19); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22); -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_14); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_17); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_15); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_18); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_16); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_19); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_ErrRestore(__pyx_t_14, __pyx_t_15, __pyx_t_16); +#line 350 "root_numpy/src/tree.pyx" + __Pyx_ErrRestore(__pyx_t_17, __pyx_t_18, __pyx_t_19); -#line 717 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0; __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; +#line 350 "root_numpy/src/tree.pyx" + __pyx_t_17 = 0; __pyx_t_18 = 0; __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; -#line 717 "root_numpy/src/tree.pyx" - __pyx_lineno = __pyx_t_11; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_13; +#line 350 "root_numpy/src/tree.pyx" + __pyx_lineno = __pyx_t_14; __pyx_clineno = __pyx_t_15; __pyx_filename = __pyx_t_16; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __pyx_L5:; -#line 717 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":718 + /* "root_numpy/src/tree.pyx":351 * finally: * del ttree * return ret # <<<<<<<<<<<<<< @@ -15483,656 +17048,659 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * */ -#line 718 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 718 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_ret); -#line 718 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_ret; -#line 718 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":702 + /* "root_numpy/src/tree.pyx":335 * * - * def root2array_fromFname(fnames, treename, branches, # <<<<<<<<<<<<<< + * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< * selection, start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" /* function exit code */ -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 702 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 335 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 702 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); +#line 335 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); -#line 702 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_10); +#line 335 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); + +#line 335 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromFname", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fn); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_ret); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" return __pyx_r; -#line 702 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":721 +/* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< * start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 721 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_9root2array_fromCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_9root2array_fromCObj = -#line 721 "root_numpy/src/tree.pyx" -{"root2array_fromCObj", (PyCFunction)__pyx_pw_13_librootnumpy_9root2array_fromCObj, METH_VARARGS|METH_KEYWORDS, 0}; +#line 354 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_11root2array_fromCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_11root2array_fromCObj = +#line 354 "root_numpy/src/tree.pyx" +{"root2array_fromCObj", (PyCFunction)__pyx_pw_13_librootnumpy_11root2array_fromCObj, METH_VARARGS|METH_KEYWORDS, 0}; -#line 721 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_9root2array_fromCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { +#line 354 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_11root2array_fromCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_tree = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branches = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_selection = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_start = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_stop = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_step = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_include_weight = 0 -#line 721 "root_numpy/src/tree.pyx" + bool __pyx_v_include_weight +#line 354 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_weight_name = 0 -#line 721 "root_numpy/src/tree.pyx" + std::string __pyx_v_weight_name +#line 354 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromCObj (wrapper)", 0); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" { -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_tree,&__pyx_n_s_branches,&__pyx_n_s_selection,&__pyx_n_s_start,&__pyx_n_s_stop,&__pyx_n_s_step,&__pyx_n_s_include_weight,&__pyx_n_s_weight_name,0}; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" PyObject* values[8] = {0,0,0,0,0,0,0,0}; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" switch (pos_args) { case 8: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); case 5: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 0: break; default: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 0: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree)) != 0)) kw_args--; else -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 1: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_branches)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 1); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 2: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_selection)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 2); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 3: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_start)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 3); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 4: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_stop)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 4); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 5: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[5] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_step)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 5); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 6: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[6] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_include_weight)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 6); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 7: -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (likely((values[7] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_weight_name)) != 0)) kw_args--; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 7); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 721 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "root2array_fromCObj") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "root2array_fromCObj") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } else if (PyTuple_GET_SIZE(__pyx_args) != 8) { -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } else { -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_tree = values[0]; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_branches = values[1]; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_selection = values[2]; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_start = values[3]; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_stop = values[4]; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_step = values[5]; -#line 721 "root_numpy/src/tree.pyx" - __pyx_v_include_weight = values[6]; +#line 354 "root_numpy/src/tree.pyx" + __pyx_v_include_weight = __Pyx_PyObject_IsTrue(values[6]); if (unlikely((__pyx_v_include_weight == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" - __pyx_v_weight_name = values[7]; +#line 354 "root_numpy/src/tree.pyx" + __pyx_v_weight_name = __pyx_convert_string_from_py_std__string(values[7]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, PyTuple_GET_SIZE(__pyx_args)); -#line 721 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 354 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" return NULL; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 721 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_8root2array_fromCObj(__pyx_self, __pyx_v_tree, __pyx_v_branches, __pyx_v_selection, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); +#line 354 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_10root2array_fromCObj(__pyx_self, __pyx_v_tree, __pyx_v_branches, __pyx_v_selection, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" /* function exit code */ -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" return __pyx_r; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_tree, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, PyObject *__pyx_v_include_weight, PyObject *__pyx_v_weight_name) { +#line 354 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_tree, PyObject *__pyx_v_branches, PyObject *__pyx_v_selection, PyObject *__pyx_v_start, PyObject *__pyx_v_stop, PyObject *__pyx_v_step, bool __pyx_v_include_weight, std::string __pyx_v_weight_name) { TTree *__pyx_v_chain -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations - int __pyx_t_1; - PyObject *__pyx_t_2 = NULL; - void *__pyx_t_3; + void *__pyx_t_1; + std::string __pyx_t_2; + int __pyx_t_3; + std::string __pyx_t_4; + PyObject *__pyx_t_5 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromCObj", 0); - /* "root_numpy/src/tree.pyx":727 - * # provided here for convenience only - * # typecheck should be implemented by the wrapper - * if not PyCObject_Check(tree): # <<<<<<<<<<<<<< - * raise ValueError("tree must be PyCObject") - * cdef TTree* chain = PyCObject_AsVoidPtr(tree) + /* "root_numpy/src/tree.pyx":357 + * start, stop, step, + * bool include_weight, string weight_name): + * cdef TTree* chain = PyCObject_AsVoidPtr(tree) # <<<<<<<<<<<<<< + * return tree2array( + * chain, branches, */ -#line 727 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((!(PyCObject_Check(__pyx_v_tree) != 0)) != 0); +#line 357 "root_numpy/src/tree.pyx" + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_tree); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 727 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 357 "root_numpy/src/tree.pyx" + __pyx_v_chain = ((TTree *)__pyx_t_1); - /* "root_numpy/src/tree.pyx":728 - * # typecheck should be implemented by the wrapper - * if not PyCObject_Check(tree): - * raise ValueError("tree must be PyCObject") # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":358 + * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) + * return tree2array( # <<<<<<<<<<<<<< + * chain, branches, + * selection or '', start, stop, step, + */ + +#line 358 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + + /* "root_numpy/src/tree.pyx":360 * return tree2array( + * chain, branches, + * selection or '', start, stop, step, # <<<<<<<<<<<<<< + * include_weight, weight_name) + * */ -#line 728 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__18, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 728; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 360 "root_numpy/src/tree.pyx" + __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_selection); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 728 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 360 "root_numpy/src/tree.pyx" + if (!__pyx_t_3) { -#line 728 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 360 "root_numpy/src/tree.pyx" + } else { -#line 728 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 360 "root_numpy/src/tree.pyx" + __pyx_t_4 = __pyx_convert_string_from_py_std__string(__pyx_v_selection); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 728 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 728; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 360 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_4; + +#line 360 "root_numpy/src/tree.pyx" + goto __pyx_L3_bool_binop_done; -#line 728 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":729 - * if not PyCObject_Check(tree): - * raise ValueError("tree must be PyCObject") - * cdef TTree* chain = PyCObject_AsVoidPtr(tree) # <<<<<<<<<<<<<< - * return tree2array( - * chain, branches, selection, - */ +#line 360 "root_numpy/src/tree.pyx" + __pyx_t_4 = __pyx_convert_string_from_py_std__string(__pyx_kp_s__24); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 729 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyCObject_AsVoidPtr(__pyx_v_tree); if (unlikely(__pyx_t_3 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 360 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_4; -#line 729 "root_numpy/src/tree.pyx" - __pyx_v_chain = ((TTree *)__pyx_t_3); +#line 360 "root_numpy/src/tree.pyx" + __pyx_L3_bool_binop_done:; - /* "root_numpy/src/tree.pyx":730 - * raise ValueError("tree must be PyCObject") + /* "root_numpy/src/tree.pyx":358 + * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) * return tree2array( # <<<<<<<<<<<<<< - * chain, branches, selection, - * start, stop, step, - */ - -#line 730 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - - /* "root_numpy/src/tree.pyx":733 - * chain, branches, selection, - * start, stop, step, - * include_weight, weight_name) # <<<<<<<<<<<<<< - * - * + * chain, branches, + * selection or '', start, stop, step, */ -#line 733 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy_tree2array(__pyx_v_chain, __pyx_v_branches, __pyx_v_selection, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 730; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/tree.pyx" + __pyx_t_5 = __pyx_f_13_librootnumpy_tree2array(__pyx_v_chain, __pyx_v_branches, __pyx_t_2, __pyx_v_start, __pyx_v_stop, __pyx_v_step, __pyx_v_include_weight, __pyx_v_weight_name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 733 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 358 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 733 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_2; +#line 358 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_5; -#line 733 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 358 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; -#line 733 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":721 + /* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< * start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" /* function exit code */ -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 721 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 354 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" return __pyx_r; -#line 721 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":741 - * +/* "root_numpy/src/tree.pyx":370 * cdef cppclass NP2CConverter: + * * void fill_from(void* source): # <<<<<<<<<<<<<< * pass - * __dealloc__(): + * */ -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_v_source) { __Pyx_RefNannyDeclarations -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("fill_from", 0); -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" /* function exit code */ -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 741 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":743 - * void fill_from(void* source): +/* "root_numpy/src/tree.pyx":373 * pass + * * __dealloc__(): # <<<<<<<<<<<<<< * pass * */ -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" __pyx_t_13_librootnumpy_NP2CConverter::~__pyx_t_13_librootnumpy_NP2CConverter(void) { __Pyx_RefNannyDeclarations -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("", 0); -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" /* function exit code */ -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 743 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":755 - * # don't use copy constructor of this one since it will screw up - * # tree binding and/or ownership of value +/* "root_numpy/src/tree.pyx":384 + * TBranch* branch + * * __init__(TTree* tree, string name, string roottype, int nbytes): # <<<<<<<<<<<<<< * cdef string leaflist * this.nbytes = nbytes */ -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __pyx_t_13_librootnumpy_ScalarNP2CConverter::__pyx_t_13_librootnumpy_ScalarNP2CConverter(TTree *__pyx_v_tree, std::string __pyx_v_name, std::string __pyx_v_roottype, int __pyx_v_nbytes) { std::string __pyx_v_leaflist -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_existing_type = NULL -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" ; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -16148,10 +17716,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("", 0); - /* "root_numpy/src/tree.pyx":757 + /* "root_numpy/src/tree.pyx":386 * __init__(TTree* tree, string name, string roottype, int nbytes): * cdef string leaflist * this.nbytes = nbytes # <<<<<<<<<<<<<< @@ -16159,10 +17727,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.name = name */ -#line 757 "root_numpy/src/tree.pyx" +#line 386 "root_numpy/src/tree.pyx" this->nbytes = __pyx_v_nbytes; - /* "root_numpy/src/tree.pyx":758 + /* "root_numpy/src/tree.pyx":387 * cdef string leaflist * this.nbytes = nbytes * this.roottype = roottype # <<<<<<<<<<<<<< @@ -16170,10 +17738,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.value = malloc(nbytes) */ -#line 758 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" this->roottype = __pyx_v_roottype; - /* "root_numpy/src/tree.pyx":759 + /* "root_numpy/src/tree.pyx":388 * this.nbytes = nbytes * this.roottype = roottype * this.name = name # <<<<<<<<<<<<<< @@ -16181,10 +17749,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.branch = tree.GetBranch(this.name.c_str()) */ -#line 759 "root_numpy/src/tree.pyx" +#line 388 "root_numpy/src/tree.pyx" this->name = __pyx_v_name; - /* "root_numpy/src/tree.pyx":760 + /* "root_numpy/src/tree.pyx":389 * this.roottype = roottype * this.name = name * this.value = malloc(nbytes) # <<<<<<<<<<<<<< @@ -16192,10 +17760,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * if this.branch == NULL: */ -#line 760 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/tree.pyx" this->value = malloc(__pyx_v_nbytes); - /* "root_numpy/src/tree.pyx":761 + /* "root_numpy/src/tree.pyx":390 * this.name = name * this.value = malloc(nbytes) * this.branch = tree.GetBranch(this.name.c_str()) # <<<<<<<<<<<<<< @@ -16203,10 +17771,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * leaflist = this.name + '/' + this.roottype */ -#line 761 "root_numpy/src/tree.pyx" +#line 390 "root_numpy/src/tree.pyx" this->branch = __pyx_v_tree->GetBranch(this->name.c_str()); - /* "root_numpy/src/tree.pyx":762 + /* "root_numpy/src/tree.pyx":391 * this.value = malloc(nbytes) * this.branch = tree.GetBranch(this.name.c_str()) * if this.branch == NULL: # <<<<<<<<<<<<<< @@ -16214,13 +17782,13 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.branch = tree.Branch(this.name.c_str(), this.value, leaflist.c_str()) */ -#line 762 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __pyx_t_1 = ((this->branch == NULL) != 0); -#line 762 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":763 + /* "root_numpy/src/tree.pyx":392 * this.branch = tree.GetBranch(this.name.c_str()) * if this.branch == NULL: * leaflist = this.name + '/' + this.roottype # <<<<<<<<<<<<<< @@ -16228,49 +17796,49 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * else: */ -#line 763 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_PyStr_string_to_py_std__string(this->name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 763; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 392 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_convert_PyStr_string_to_py_std__string(this->name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 763 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyNumber_Add(__pyx_t_2, __pyx_kp_s__19); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 763; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 392 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyNumber_Add(__pyx_t_2, __pyx_kp_s__25); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 763 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_PyStr_string_to_py_std__string(this->roottype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 763; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 392 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_convert_PyStr_string_to_py_std__string(this->roottype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 763 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 763; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 392 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 763 "root_numpy/src/tree.pyx" - __pyx_t_5 = __pyx_convert_string_from_py_std__string(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 763; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 392 "root_numpy/src/tree.pyx" + __pyx_t_5 = __pyx_convert_string_from_py_std__string(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 763 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __pyx_v_leaflist = __pyx_t_5; - /* "root_numpy/src/tree.pyx":764 + /* "root_numpy/src/tree.pyx":393 * if this.branch == NULL: * leaflist = this.name + '/' + this.roottype * this.branch = tree.Branch(this.name.c_str(), this.value, leaflist.c_str()) # <<<<<<<<<<<<<< @@ -16278,19 +17846,19 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * # check type compatibility of existing branch */ -#line 764 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" this->branch = __pyx_v_tree->Branch(this->name.c_str(), this->value, __pyx_v_leaflist.c_str()); -#line 764 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 764 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" } -#line 764 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" /*else*/ { - /* "root_numpy/src/tree.pyx":767 + /* "root_numpy/src/tree.pyx":396 * else: * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] # <<<<<<<<<<<<<< @@ -16298,284 +17866,284 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * raise TypeError( */ -#line 767 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyStr_FromString(this->branch->GetTitle()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 396 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyStr_FromString(this->branch->GetTitle()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 767 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_rpartition); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 396 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_rpartition); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 767 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__20, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 396 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__26, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 767 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_4, -1, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 396 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_4, -1, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_v_existing_type = __pyx_t_2; -#line 767 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":768 + /* "root_numpy/src/tree.pyx":397 * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] * if str(roottype) != existing_type: # <<<<<<<<<<<<<< * raise TypeError( - * "field `{0}` of type `{1}` is not compatible " + * "field '{0}' of type '{1}' is not compatible " */ -#line 768 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_roottype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 397 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_roottype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 397 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 768 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 397 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 768 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyObject_RichCompare(__pyx_t_2, __pyx_v_existing_type, Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 397 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyObject_RichCompare(__pyx_t_2, __pyx_v_existing_type, Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 768 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 397 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 768 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":771 + /* "root_numpy/src/tree.pyx":400 * raise TypeError( - * "field `{0}` of type `{1}` is not compatible " - * "with existing branch of type `{2}`".format( # <<<<<<<<<<<<<< + * "field '{0}' of type '{1}' is not compatible " + * "with existing branch of type '{2}'".format( # <<<<<<<<<<<<<< * name, roottype, existing_type)) * this.branch.SetAddress(this.value) */ -#line 771 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_field_0_of_type_1_is_not_compati, __pyx_n_s_format); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 771; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 400 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_field_0_of_type_1_is_not_compati, __pyx_n_s_format); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 771 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":772 - * "field `{0}` of type `{1}` is not compatible " - * "with existing branch of type `{2}`".format( + /* "root_numpy/src/tree.pyx":401 + * "field '{0}' of type '{1}' is not compatible " + * "with existing branch of type '{2}'".format( * name, roottype, existing_type)) # <<<<<<<<<<<<<< * this.branch.SetAddress(this.value) * this.branch.SetStatus(1) */ -#line 772 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_name); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 772; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 401 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_name); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 401; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 772 "root_numpy/src/tree.pyx" - __pyx_t_6 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_roottype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 772; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 401 "root_numpy/src/tree.pyx" + __pyx_t_6 = __pyx_convert_PyStr_string_to_py_std__string(__pyx_v_roottype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 401; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_2))) { -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_2); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_2, function); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_8 = 1; -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" } -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" } -#line 772 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(3+__pyx_t_8); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 771; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 401 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_New(3+__pyx_t_8); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" if (__pyx_t_7) { -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7); __Pyx_GIVEREF(__pyx_t_7); __pyx_t_7 = NULL; -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" } -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0+__pyx_t_8, __pyx_t_3); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_3); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_8, __pyx_t_6); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_6); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_existing_type); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 2+__pyx_t_8, __pyx_v_existing_type); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_existing_type); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_3 = 0; -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_6 = 0; -#line 772 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 771; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 401 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 772 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":769 + /* "root_numpy/src/tree.pyx":398 * existing_type = this.branch.GetTitle().rpartition('/')[-1] * if str(roottype) != existing_type: * raise TypeError( # <<<<<<<<<<<<<< - * "field `{0}` of type `{1}` is not compatible " - * "with existing branch of type `{2}`".format( + * "field '{0}' of type '{1}' is not compatible " + * "with existing branch of type '{2}'".format( */ -#line 769 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 769; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 398 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 398; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 769 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 769; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 398 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 398; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 769 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 769; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 398 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 398; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 769 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":773 - * "with existing branch of type `{2}`".format( + /* "root_numpy/src/tree.pyx":402 + * "with existing branch of type '{2}'".format( * name, roottype, existing_type)) * this.branch.SetAddress(this.value) # <<<<<<<<<<<<<< * this.branch.SetStatus(1) * */ -#line 773 "root_numpy/src/tree.pyx" +#line 402 "root_numpy/src/tree.pyx" this->branch->SetAddress(this->value); -#line 773 "root_numpy/src/tree.pyx" +#line 402 "root_numpy/src/tree.pyx" } -#line 773 "root_numpy/src/tree.pyx" +#line 402 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":774 + /* "root_numpy/src/tree.pyx":403 * name, roottype, existing_type)) * this.branch.SetAddress(this.value) * this.branch.SetStatus(1) # <<<<<<<<<<<<<< @@ -16583,63 +18151,63 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * __del__(self): # does this do what I want? */ -#line 774 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" this->branch->SetStatus(1); - /* "root_numpy/src/tree.pyx":755 - * # don't use copy constructor of this one since it will screw up - * # tree binding and/or ownership of value + /* "root_numpy/src/tree.pyx":384 + * TBranch* branch + * * __init__(TTree* tree, string name, string roottype, int nbytes): # <<<<<<<<<<<<<< * cdef string leaflist * this.nbytes = nbytes */ -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" /* function exit code */ -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_WriteUnraisable("ScalarNP2CConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_existing_type); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 755 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":776 +/* "root_numpy/src/tree.pyx":405 * this.branch.SetStatus(1) * * __del__(self): # does this do what I want? # <<<<<<<<<<<<<< @@ -16647,20 +18215,20 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * */ -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyObject *__pyx_v_self) { -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("__del__", 0); - /* "root_numpy/src/tree.pyx":777 + /* "root_numpy/src/tree.pyx":406 * * __del__(self): # does this do what I want? * free(this.value) # <<<<<<<<<<<<<< @@ -16668,10 +18236,10 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * void fill_from(void* source): */ -#line 777 "root_numpy/src/tree.pyx" +#line 406 "root_numpy/src/tree.pyx" free(this->value); - /* "root_numpy/src/tree.pyx":776 + /* "root_numpy/src/tree.pyx":405 * this.branch.SetStatus(1) * * __del__(self): # does this do what I want? # <<<<<<<<<<<<<< @@ -16679,28 +18247,28 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * */ -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" /* function exit code */ -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" return __pyx_r; -#line 776 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":779 +/* "root_numpy/src/tree.pyx":408 * free(this.value) * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -16708,17 +18276,17 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * this.branch.Fill() */ -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source) { __Pyx_RefNannyDeclarations -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("fill_from", 0); - /* "root_numpy/src/tree.pyx":780 + /* "root_numpy/src/tree.pyx":409 * * void fill_from(void* source): * memcpy(this.value, source, this.nbytes) # <<<<<<<<<<<<<< @@ -16726,10 +18294,10 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * */ -#line 780 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/tree.pyx" memcpy(this->value, __pyx_v_source, this->nbytes); - /* "root_numpy/src/tree.pyx":781 + /* "root_numpy/src/tree.pyx":410 * void fill_from(void* source): * memcpy(this.value, source, this.nbytes) * this.branch.Fill() # <<<<<<<<<<<<<< @@ -16737,10 +18305,10 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * */ -#line 781 "root_numpy/src/tree.pyx" +#line 410 "root_numpy/src/tree.pyx" this->branch->Fill(); - /* "root_numpy/src/tree.pyx":779 + /* "root_numpy/src/tree.pyx":408 * free(this.value) * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -16748,39 +18316,39 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * this.branch.Fill() */ -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" /* function exit code */ -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 779 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":784 +/* "root_numpy/src/tree.pyx":413 * * - * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype, peekvalue=None): # <<<<<<<<<<<<<< + * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype): # <<<<<<<<<<<<<< * # TODO: - * # np.float16: #this needs special treatment root doesn't have 16 bit float? + * # np.float16 needs special treatment. ROOT doesn't support 16-bit floats. */ -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" -#line 784 "root_numpy/src/tree.pyx" -static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_converter(TTree *__pyx_v_tree, PyObject *__pyx_v_name, PyObject *__pyx_v_dtype, struct __pyx_opt_args_13_librootnumpy_find_np2c_converter *__pyx_optional_args) { +#line 413 "root_numpy/src/tree.pyx" +static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_converter(TTree *__pyx_v_tree, PyObject *__pyx_v_name, PyObject *__pyx_v_dtype) { PyObject *__pyx_v_nbytes = NULL -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_roottype = NULL -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" ; -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_13_librootnumpy_NP2CConverter *__pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -16794,766 +18362,637 @@ static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_ std::string __pyx_t_9; int __pyx_t_10; PyObject *__pyx_t_11 = NULL; + PyObject *__pyx_t_12 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("find_np2c_converter", 0); -#line 784 "root_numpy/src/tree.pyx" - if (__pyx_optional_args) { - -#line 784 "root_numpy/src/tree.pyx" - } - - /* "root_numpy/src/tree.pyx":789 - * # np.object #this too should detect basic numpy array - * # How to detect fixed length array? + /* "root_numpy/src/tree.pyx":417 + * # np.float16 needs special treatment. ROOT doesn't support 16-bit floats. + * # Handle np.object (array) columns * if dtype in TYPES_NUMPY2ROOT: # <<<<<<<<<<<<<< * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] * return new ScalarNP2CConverter(tree, name, roottype, nbytes) */ -#line 789 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES_NUMPY2ROOT); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 417 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES_NUMPY2ROOT); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 789 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 789 "root_numpy/src/tree.pyx" - __pyx_t_2 = (__Pyx_PySequence_Contains(__pyx_v_dtype, __pyx_t_1, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 417 "root_numpy/src/tree.pyx" + __pyx_t_2 = (__Pyx_PySequence_Contains(__pyx_v_dtype, __pyx_t_1, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 789 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 789 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_t_2 != 0); -#line 789 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":790 - * # How to detect fixed length array? + /* "root_numpy/src/tree.pyx":418 + * # Handle np.object (array) columns * if dtype in TYPES_NUMPY2ROOT: * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] # <<<<<<<<<<<<<< * return new ScalarNP2CConverter(tree, name, roottype, nbytes) - * elif dtype == np.dtype(np.object): + * warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) */ -#line 790 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES_NUMPY2ROOT); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES_NUMPY2ROOT); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 790 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyObject_GetItem(__pyx_t_1, __pyx_v_dtype); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#line 418 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyObject_GetItem(__pyx_t_1, __pyx_v_dtype); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if ((likely(PyTuple_CheckExact(__pyx_t_4))) || (PyList_CheckExact(__pyx_t_4))) { -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" PyObject* sequence = __pyx_t_4; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #else -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #endif -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (unlikely(size != 2)) { -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); -#line 790 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_5 = PyTuple_GET_ITEM(sequence, 1); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } else { -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_1 = PyList_GET_ITEM(sequence, 0); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_5 = PyList_GET_ITEM(sequence, 1); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_1); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_5); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #else -#line 790 "root_numpy/src/tree.pyx" - __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 790 "root_numpy/src/tree.pyx" - __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #endif -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } else { -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" Py_ssize_t index = -1; -#line 790 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_7 = Py_TYPE(__pyx_t_6)->tp_iternext; index = 0; __pyx_t_1 = __pyx_t_7(__pyx_t_6); if (unlikely(!__pyx_t_1)) -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" goto __pyx_L4_unpacking_failed; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); index = 1; __pyx_t_5 = __pyx_t_7(__pyx_t_6); if (unlikely(!__pyx_t_5)) -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" goto __pyx_L4_unpacking_failed; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 790 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 2) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" goto __pyx_L5_unpacking_done; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_L4_unpacking_failed:; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); -#line 790 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_L5_unpacking_done:; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_v_nbytes = __pyx_t_1; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_v_roottype = __pyx_t_5; -#line 790 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":791 + /* "root_numpy/src/tree.pyx":419 * if dtype in TYPES_NUMPY2ROOT: * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] * return new ScalarNP2CConverter(tree, name, roottype, nbytes) # <<<<<<<<<<<<<< - * elif dtype == np.dtype(np.object): - * warnings.warn("converter for %r not implemented yet (skipping)" % dtype) + * warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) + * return NULL */ -#line 791 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_convert_string_from_py_std__string(__pyx_v_name); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 791; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 419 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_convert_string_from_py_std__string(__pyx_v_name); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 419; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 791 "root_numpy/src/tree.pyx" - __pyx_t_9 = __pyx_convert_string_from_py_std__string(__pyx_v_roottype); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 791; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 419 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_convert_string_from_py_std__string(__pyx_v_roottype); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 419; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 791 "root_numpy/src/tree.pyx" - __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_v_nbytes); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 791; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 419 "root_numpy/src/tree.pyx" + __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_v_nbytes); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 419; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 791 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __pyx_r = new __pyx_t_13_librootnumpy_ScalarNP2CConverter(__pyx_v_tree, __pyx_t_8, __pyx_t_9, __pyx_t_10); -#line 791 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 791 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":792 + /* "root_numpy/src/tree.pyx":420 * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] * return new ScalarNP2CConverter(tree, name, roottype, nbytes) - * elif dtype == np.dtype(np.object): # <<<<<<<<<<<<<< - * warnings.warn("converter for %r not implemented yet (skipping)" % dtype) - * return NULL + * warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) # <<<<<<<<<<<<<< + * return NULL + * */ -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 792 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); - -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_object); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 792 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); - -#line 792 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 792 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); - -#line 792 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5); - -#line 792 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); - -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; - -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_warnings); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 792 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 792 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_warn); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_dtype, __pyx_t_5, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 792 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 792 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 792 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - -#line 792 "root_numpy/src/tree.pyx" - if (__pyx_t_3) { - - /* "root_numpy/src/tree.pyx":793 - * return new ScalarNP2CConverter(tree, name, roottype, nbytes) - * elif dtype == np.dtype(np.object): - * warnings.warn("converter for %r not implemented yet (skipping)" % dtype) # <<<<<<<<<<<<<< - * return NULL - * # let's peek - */ - -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_warnings); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); - -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_warn); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyString_Format(__pyx_kp_s_converter_for_r_not_implemented, __pyx_v_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_converter_for_r_is_not_implement, __pyx_n_s_format); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_6 = NULL; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 793 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_1))) { +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_11 = NULL; -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); +#line 420 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_6))) { -#line 793 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_6)) { +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_11 = PyMethod_GET_SELF(__pyx_t_6); -#line 793 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); +#line 420 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_11)) { -#line 793 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_6); +#line 420 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); -#line 793 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_11); -#line 793 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_1, function); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 793 "root_numpy/src/tree.pyx" - } +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_6, function); -#line 793 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 793 "root_numpy/src/tree.pyx" - if (!__pyx_t_6) { - -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); - -#line 793 "root_numpy/src/tree.pyx" - } else { - -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 420 "root_numpy/src/tree.pyx" + } -#line 793 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; +#line 420 "root_numpy/src/tree.pyx" + if (!__pyx_t_11) { -#line 793 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_t_5); +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_v_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 420 "root_numpy/src/tree.pyx" + } else { -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 793; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_12); -#line 793 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; +#line 420 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_11); __Pyx_GIVEREF(__pyx_t_11); __pyx_t_11 = NULL; -#line 793 "root_numpy/src/tree.pyx" - } +#line 420 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_dtype); -#line 793 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 420 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_12, 0+1, __pyx_v_dtype); -#line 793 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_dtype); - /* "root_numpy/src/tree.pyx":794 - * elif dtype == np.dtype(np.object): - * warnings.warn("converter for %r not implemented yet (skipping)" % dtype) - * return NULL # <<<<<<<<<<<<<< - * # let's peek - * """ - */ +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_12, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 794 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 794 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; -#line 794 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 794 "root_numpy/src/tree.pyx" - /*else*/ { - - /* "root_numpy/src/tree.pyx":803 - * """ - * else: - * warnings.warn("converter for %r not implemented yet (skipping)" % dtype) # <<<<<<<<<<<<<< - * return NULL - * - */ - -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_warnings); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_warn); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); - -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyString_Format(__pyx_kp_s_converter_for_r_not_implemented, __pyx_v_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 803 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_11))) { +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_6 = NULL; -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_11); +#line 420 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_1))) { -#line 803 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); -#line 803 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_11); +#line 420 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_6)) { -#line 803 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 420 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); -#line 803 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_6); -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_11, function); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 803 "root_numpy/src/tree.pyx" - } +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_1, function); -#line 803 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 803 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 420 "root_numpy/src/tree.pyx" + } -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_t_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/tree.pyx" + if (!__pyx_t_6) { -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 803 "root_numpy/src/tree.pyx" - } else { +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/tree.pyx" + } else { -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 803 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_12); -#line 803 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_1); +#line 420 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 420 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_12, 0+1, __pyx_t_5); -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_5); -#line 803 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 420 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_12, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 803 "root_numpy/src/tree.pyx" - } +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; +#line 420 "root_numpy/src/tree.pyx" + } -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 803 "root_numpy/src/tree.pyx" - } +#line 420 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "root_numpy/src/tree.pyx":804 - * else: - * warnings.warn("converter for %r not implemented yet (skipping)" % dtype) + /* "root_numpy/src/tree.pyx":421 + * return new ScalarNP2CConverter(tree, name, roottype, nbytes) + * warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) * return NULL # <<<<<<<<<<<<<< * * */ -#line 804 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 804 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":784 + /* "root_numpy/src/tree.pyx":413 * * - * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype, peekvalue=None): # <<<<<<<<<<<<<< + * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype): # <<<<<<<<<<<<<< * # TODO: - * # np.float16: #this needs special treatment root doesn't have 16 bit float? + * # np.float16 needs special treatment. ROOT doesn't support 16-bit floats. */ -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" /* function exit code */ -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_12); + +#line 413 "root_numpy/src/tree.pyx" __Pyx_WriteUnraisable("_librootnumpy.find_np2c_converter", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_nbytes); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_roottype); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" return __pyx_r; -#line 784 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":807 +/* "root_numpy/src/tree.pyx":424 * * - * cdef TTree* array2tree(np.ndarray arr, name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< - * # hmm how do I catch all python exception - * # and clean up before throwing ? + * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< + * cdef vector[NP2CConverter*] converters + * cdef vector[int] posarray */ -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, struct __pyx_opt_args_13_librootnumpy_array2tree *__pyx_optional_args) { -#line 807 "root_numpy/src/tree.pyx" - PyObject *__pyx_v_name = ((PyObject *)__pyx_n_s_tree); +#line 424 "root_numpy/src/tree.pyx" + std::string __pyx_v_name = __pyx_k__27; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" TTree *__pyx_v_tree = ((TTree *)NULL); - std::vector<__pyx_t_13_librootnumpy_NP2CConverter *> __pyx_v_conv_array -#line 807 "root_numpy/src/tree.pyx" + std::vector<__pyx_t_13_librootnumpy_NP2CConverter *> __pyx_v_converters +#line 424 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_posarray -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_roffsetarray -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; unsigned int __pyx_v_icv -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; int __pyx_v_icol -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; long __pyx_v_arr_len -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; long __pyx_v_idata -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; unsigned long __pyx_v_pos_len -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; unsigned long __pyx_v_ipos -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; void *__pyx_v_source -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; void *__pyx_v_thisrow -#line 807 "root_numpy/src/tree.pyx" -; - __pyx_t_13_librootnumpy_NP2CConverter *__pyx_v_tmpcv -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fieldnames = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fields = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fieldname = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_dtype = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_roffset = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; __pyx_t_13_librootnumpy_NP2CConverter *__pyx_v_cvt -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" TTree *__pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; int __pyx_t_4; - const char *__pyx_t_5; - const char *__pyx_t_6; - PyObject *__pyx_t_7 = NULL; - PyObject *__pyx_t_8 = NULL; - Py_ssize_t __pyx_t_9; - int __pyx_t_10; - PyObject *__pyx_t_11 = NULL; - PyObject *__pyx_t_12 = NULL; - PyObject *(*__pyx_t_13)(PyObject *); - __pyx_t_13_librootnumpy_NP2CConverter *__pyx_t_14; - struct __pyx_opt_args_13_librootnumpy_find_np2c_converter __pyx_t_15; - int __pyx_t_16; - long __pyx_t_17; - long __pyx_t_18; - unsigned long __pyx_t_19; - unsigned long __pyx_t_20; - size_t __pyx_t_21; - unsigned int __pyx_t_22; - char const *__pyx_t_23; - PyObject *__pyx_t_24 = NULL; - PyObject *__pyx_t_25 = NULL; - PyObject *__pyx_t_26 = NULL; + PyObject *__pyx_t_5 = NULL; + PyObject *__pyx_t_6 = NULL; + Py_ssize_t __pyx_t_7; + int __pyx_t_8; + PyObject *__pyx_t_9 = NULL; + PyObject *__pyx_t_10 = NULL; + PyObject *(*__pyx_t_11)(PyObject *); + int __pyx_t_12; + long __pyx_t_13; + long __pyx_t_14; + unsigned long __pyx_t_15; + unsigned long __pyx_t_16; + size_t __pyx_t_17; + unsigned int __pyx_t_18; + char const *__pyx_t_19; + PyObject *__pyx_t_20 = NULL; + PyObject *__pyx_t_21 = NULL; + PyObject *__pyx_t_22 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree", 0); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" if (__pyx_optional_args) { -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 0) { -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_v_name = __pyx_optional_args->name; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 1) { -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_v_tree = __pyx_optional_args->tree; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":816 + /* "root_numpy/src/tree.pyx":430 * cdef unsigned int icv * cdef int icol * cdef long arr_len = arr.shape[0] # <<<<<<<<<<<<<< @@ -17561,464 +19000,431 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * cdef unsigned long pos_len */ -#line 816 "root_numpy/src/tree.pyx" +#line 430 "root_numpy/src/tree.pyx" __pyx_v_arr_len = (__pyx_v_arr->dimensions[0]); - /* "root_numpy/src/tree.pyx":820 + /* "root_numpy/src/tree.pyx":434 * cdef unsigned long pos_len * cdef unsigned long ipos * cdef void* source = NULL # <<<<<<<<<<<<<< * cdef void* thisrow = NULL - * cdef NP2CConverter* tmpcv + * */ -#line 820 "root_numpy/src/tree.pyx" +#line 434 "root_numpy/src/tree.pyx" __pyx_v_source = NULL; - /* "root_numpy/src/tree.pyx":821 + /* "root_numpy/src/tree.pyx":435 * cdef unsigned long ipos * cdef void* source = NULL * cdef void* thisrow = NULL # <<<<<<<<<<<<<< - * cdef NP2CConverter* tmpcv * + * try: */ -#line 821 "root_numpy/src/tree.pyx" +#line 435 "root_numpy/src/tree.pyx" __pyx_v_thisrow = NULL; - /* "root_numpy/src/tree.pyx":824 - * cdef NP2CConverter* tmpcv + /* "root_numpy/src/tree.pyx":437 + * cdef void* thisrow = NULL * * try: # <<<<<<<<<<<<<< * if tree == NULL: - * tree = new TTree(name, name) + * tree = new TTree(name.c_str(), name.c_str()) */ -#line 824 "root_numpy/src/tree.pyx" +#line 437 "root_numpy/src/tree.pyx" /*try:*/ { -#line 824 "root_numpy/src/tree.pyx" +#line 437 "root_numpy/src/tree.pyx" { __Pyx_ExceptionSave(&__pyx_t_1, &__pyx_t_2, &__pyx_t_3); __Pyx_XGOTREF(__pyx_t_1); __Pyx_XGOTREF(__pyx_t_2); __Pyx_XGOTREF(__pyx_t_3); -#line 824 "root_numpy/src/tree.pyx" +#line 437 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":825 + /* "root_numpy/src/tree.pyx":438 * * try: * if tree == NULL: # <<<<<<<<<<<<<< - * tree = new TTree(name, name) + * tree = new TTree(name.c_str(), name.c_str()) * */ -#line 825 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/tree.pyx" __pyx_t_4 = ((__pyx_v_tree == NULL) != 0); -#line 825 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/tree.pyx" if (__pyx_t_4) { - /* "root_numpy/src/tree.pyx":826 + /* "root_numpy/src/tree.pyx":439 * try: * if tree == NULL: - * tree = new TTree(name, name) # <<<<<<<<<<<<<< + * tree = new TTree(name.c_str(), name.c_str()) # <<<<<<<<<<<<<< * * fieldnames = arr.dtype.names */ -#line 826 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_AsString(__pyx_v_name); if (unlikely((!__pyx_t_5) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L6_error;} - -#line 826 "root_numpy/src/tree.pyx" - __pyx_t_6 = __Pyx_PyObject_AsString(__pyx_v_name); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L6_error;} - -#line 826 "root_numpy/src/tree.pyx" - __pyx_v_tree = new TTree(__pyx_t_5, __pyx_t_6); +#line 439 "root_numpy/src/tree.pyx" + __pyx_v_tree = new TTree(__pyx_v_name.c_str(), __pyx_v_name.c_str()); -#line 826 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" goto __pyx_L14; -#line 826 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" } -#line 826 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" __pyx_L14:; - /* "root_numpy/src/tree.pyx":828 - * tree = new TTree(name, name) + /* "root_numpy/src/tree.pyx":441 + * tree = new TTree(name.c_str(), name.c_str()) * * fieldnames = arr.dtype.names # <<<<<<<<<<<<<< * fields = arr.dtype.fields * */ -#line 828 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_arr), __pyx_n_s_dtype); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 441 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_arr), __pyx_n_s_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 828 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 441 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 828 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_names); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 441 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_names); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 828 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 441 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 828 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 441 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 828 "root_numpy/src/tree.pyx" - __pyx_v_fieldnames = __pyx_t_8; +#line 441 "root_numpy/src/tree.pyx" + __pyx_v_fieldnames = __pyx_t_6; -#line 828 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 441 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; - /* "root_numpy/src/tree.pyx":829 + /* "root_numpy/src/tree.pyx":442 * * fieldnames = arr.dtype.names * fields = arr.dtype.fields # <<<<<<<<<<<<<< * - * # figure out the structure + * # determine the structure */ -#line 829 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_arr), __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 442 "root_numpy/src/tree.pyx" + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_arr), __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 829 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 442 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 829 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_fields); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 442 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_fields); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 829 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 442 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 829 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 442 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 829 "root_numpy/src/tree.pyx" - __pyx_v_fields = __pyx_t_7; +#line 442 "root_numpy/src/tree.pyx" + __pyx_v_fields = __pyx_t_5; -#line 829 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 442 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":832 + /* "root_numpy/src/tree.pyx":445 * - * # figure out the structure + * # determine the structure * for icol in range(len(fieldnames)): # <<<<<<<<<<<<<< * fieldname = fieldnames[icol] * # roffset is an offset of particular field in each record */ -#line 832 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyObject_Length(__pyx_v_fieldnames); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 445 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyObject_Length(__pyx_v_fieldnames); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 445; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 832 "root_numpy/src/tree.pyx" - for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) { +#line 445 "root_numpy/src/tree.pyx" + for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { -#line 832 "root_numpy/src/tree.pyx" - __pyx_v_icol = __pyx_t_10; +#line 445 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_8; - /* "root_numpy/src/tree.pyx":833 - * # figure out the structure + /* "root_numpy/src/tree.pyx":446 + * # determine the structure * for icol in range(len(fieldnames)): * fieldname = fieldnames[icol] # <<<<<<<<<<<<<< * # roffset is an offset of particular field in each record * dtype, roffset = fields[fieldname] */ -#line 833 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetItemInt(__pyx_v_fieldnames, __pyx_v_icol, int, 1, __Pyx_PyInt_From_int, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; +#line 446 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_GetItemInt(__pyx_v_fieldnames, __pyx_v_icol, int, 1, __Pyx_PyInt_From_int, 0, 1, 1); if (unlikely(__pyx_t_5 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 446; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; -#line 833 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 446 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 833 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_fieldname, __pyx_t_7); +#line 446 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_fieldname, __pyx_t_5); -#line 833 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 446 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":835 + /* "root_numpy/src/tree.pyx":448 * fieldname = fieldnames[icol] * # roffset is an offset of particular field in each record * dtype, roffset = fields[fieldname] # <<<<<<<<<<<<<< - * cvt = find_np2c_converter(tree, fieldname, dtype, arr[0][fieldname]) - * if cvt is not NULL: + * cvt = find_np2c_converter(tree, fieldname, dtype) + * if cvt != NULL: */ -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyObject_GetItem(__pyx_v_fields, __pyx_v_fieldname); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyObject_GetItem(__pyx_v_fields, __pyx_v_fieldname); if (unlikely(__pyx_t_5 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 835 "root_numpy/src/tree.pyx" - if ((likely(PyTuple_CheckExact(__pyx_t_7))) || (PyList_CheckExact(__pyx_t_7))) { +#line 448 "root_numpy/src/tree.pyx" + if ((likely(PyTuple_CheckExact(__pyx_t_5))) || (PyList_CheckExact(__pyx_t_5))) { -#line 835 "root_numpy/src/tree.pyx" - PyObject* sequence = __pyx_t_7; +#line 448 "root_numpy/src/tree.pyx" + PyObject* sequence = __pyx_t_5; -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #else -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #endif -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (unlikely(size != 2)) { -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); -#line 835 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 448 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_GET_ITEM(sequence, 0); +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_GET_ITEM(sequence, 0); -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_11 = PyTuple_GET_ITEM(sequence, 1); +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_GET_ITEM(sequence, 1); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } else { -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyList_GET_ITEM(sequence, 0); +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyList_GET_ITEM(sequence, 0); -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_11 = PyList_GET_ITEM(sequence, 1); +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyList_GET_ITEM(sequence, 1); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 835 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_8); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_6); -#line 835 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_11); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #else -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_8 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_6 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_11 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_9 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #endif -#line 835 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 448 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } else { -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" Py_ssize_t index = -1; -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_12 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_10 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_12); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); -#line 835 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 448 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_13 = Py_TYPE(__pyx_t_12)->tp_iternext; - index = 0; __pyx_t_8 = __pyx_t_13(__pyx_t_12); if (unlikely(!__pyx_t_8)) -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_11 = Py_TYPE(__pyx_t_10)->tp_iternext; + index = 0; __pyx_t_6 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_6)) +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L17_unpacking_failed; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); - index = 1; __pyx_t_11 = __pyx_t_13(__pyx_t_12); if (unlikely(!__pyx_t_11)) -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); + index = 1; __pyx_t_9 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_9)) +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L17_unpacking_failed; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 835 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_13(__pyx_t_12), 2) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 448 "root_numpy/src/tree.pyx" + if (__Pyx_IternextUnpackEndCheck(__pyx_t_11(__pyx_t_10), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_13 = NULL; +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_11 = NULL; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; +#line 448 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L18_unpacking_done; -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_L17_unpacking_failed:; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; +#line 448 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_13 = NULL; +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_11 = NULL; -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); -#line 835 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 448 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_L18_unpacking_done:; -#line 835 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 835 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_dtype, __pyx_t_8); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_dtype, __pyx_t_6); -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_roffset, __pyx_t_11); +#line 448 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_roffset, __pyx_t_9); -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_11 = 0; +#line 448 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":836 + /* "root_numpy/src/tree.pyx":449 * # roffset is an offset of particular field in each record * dtype, roffset = fields[fieldname] - * cvt = find_np2c_converter(tree, fieldname, dtype, arr[0][fieldname]) # <<<<<<<<<<<<<< - * if cvt is not NULL: + * cvt = find_np2c_converter(tree, fieldname, dtype) # <<<<<<<<<<<<<< + * if cvt != NULL: * roffsetarray.push_back(roffset) */ -#line 836 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetItemInt(((PyObject *)__pyx_v_arr), 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; - -#line 836 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); - -#line 836 "root_numpy/src/tree.pyx" - __pyx_t_11 = PyObject_GetItem(__pyx_t_7, __pyx_v_fieldname); if (unlikely(__pyx_t_11 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; - -#line 836 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); - -#line 836 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - -#line 836 "root_numpy/src/tree.pyx" - __pyx_t_15.__pyx_n = 1; - -#line 836 "root_numpy/src/tree.pyx" - __pyx_t_15.peekvalue = __pyx_t_11; - -#line 836 "root_numpy/src/tree.pyx" - __pyx_t_14 = __pyx_f_13_librootnumpy_find_np2c_converter(__pyx_v_tree, __pyx_v_fieldname, __pyx_v_dtype, &__pyx_t_15); - -#line 836 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; - -#line 836 "root_numpy/src/tree.pyx" - __pyx_v_cvt = __pyx_t_14; +#line 449 "root_numpy/src/tree.pyx" + __pyx_v_cvt = __pyx_f_13_librootnumpy_find_np2c_converter(__pyx_v_tree, __pyx_v_fieldname, __pyx_v_dtype); - /* "root_numpy/src/tree.pyx":837 + /* "root_numpy/src/tree.pyx":450 * dtype, roffset = fields[fieldname] - * cvt = find_np2c_converter(tree, fieldname, dtype, arr[0][fieldname]) - * if cvt is not NULL: # <<<<<<<<<<<<<< + * cvt = find_np2c_converter(tree, fieldname, dtype) + * if cvt != NULL: # <<<<<<<<<<<<<< * roffsetarray.push_back(roffset) - * conv_array.push_back(cvt) + * converters.push_back(cvt) */ -#line 837 "root_numpy/src/tree.pyx" +#line 450 "root_numpy/src/tree.pyx" __pyx_t_4 = ((__pyx_v_cvt != NULL) != 0); -#line 837 "root_numpy/src/tree.pyx" +#line 450 "root_numpy/src/tree.pyx" if (__pyx_t_4) { - /* "root_numpy/src/tree.pyx":838 - * cvt = find_np2c_converter(tree, fieldname, dtype, arr[0][fieldname]) - * if cvt is not NULL: + /* "root_numpy/src/tree.pyx":451 + * cvt = find_np2c_converter(tree, fieldname, dtype) + * if cvt != NULL: * roffsetarray.push_back(roffset) # <<<<<<<<<<<<<< - * conv_array.push_back(cvt) + * converters.push_back(cvt) * posarray.push_back(icol) */ -#line 838 "root_numpy/src/tree.pyx" - __pyx_t_16 = __Pyx_PyInt_As_int(__pyx_v_roffset); if (unlikely((__pyx_t_16 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 451 "root_numpy/src/tree.pyx" + __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_roffset); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 451; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 838 "root_numpy/src/tree.pyx" - __pyx_v_roffsetarray.push_back(__pyx_t_16); +#line 451 "root_numpy/src/tree.pyx" + __pyx_v_roffsetarray.push_back(__pyx_t_12); - /* "root_numpy/src/tree.pyx":839 - * if cvt is not NULL: + /* "root_numpy/src/tree.pyx":452 + * if cvt != NULL: * roffsetarray.push_back(roffset) - * conv_array.push_back(cvt) # <<<<<<<<<<<<<< + * converters.push_back(cvt) # <<<<<<<<<<<<<< * posarray.push_back(icol) * */ -#line 839 "root_numpy/src/tree.pyx" - __pyx_v_conv_array.push_back(__pyx_v_cvt); +#line 452 "root_numpy/src/tree.pyx" + __pyx_v_converters.push_back(__pyx_v_cvt); - /* "root_numpy/src/tree.pyx":840 + /* "root_numpy/src/tree.pyx":453 * roffsetarray.push_back(roffset) - * conv_array.push_back(cvt) + * converters.push_back(cvt) * posarray.push_back(icol) # <<<<<<<<<<<<<< * * # fill in data */ -#line 840 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" __pyx_v_posarray.push_back(__pyx_v_icol); -#line 840 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" goto __pyx_L19; -#line 840 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" } -#line 840 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" __pyx_L19:; -#line 840 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":843 + /* "root_numpy/src/tree.pyx":456 * * # fill in data * pos_len = posarray.size() # <<<<<<<<<<<<<< @@ -18026,10 +19432,10 @@ goto __pyx_L17_unpacking_failed; * thisrow = np.PyArray_GETPTR1(arr, idata) */ -#line 843 "root_numpy/src/tree.pyx" +#line 456 "root_numpy/src/tree.pyx" __pyx_v_pos_len = __pyx_v_posarray.size(); - /* "root_numpy/src/tree.pyx":844 + /* "root_numpy/src/tree.pyx":457 * # fill in data * pos_len = posarray.size() * for idata in range(arr_len): # <<<<<<<<<<<<<< @@ -18037,16 +19443,16 @@ goto __pyx_L17_unpacking_failed; * for ipos in range(pos_len): */ -#line 844 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_v_arr_len; +#line 457 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_v_arr_len; -#line 844 "root_numpy/src/tree.pyx" - for (__pyx_t_18 = 0; __pyx_t_18 < __pyx_t_17; __pyx_t_18+=1) { +#line 457 "root_numpy/src/tree.pyx" + for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 844 "root_numpy/src/tree.pyx" - __pyx_v_idata = __pyx_t_18; +#line 457 "root_numpy/src/tree.pyx" + __pyx_v_idata = __pyx_t_14; - /* "root_numpy/src/tree.pyx":845 + /* "root_numpy/src/tree.pyx":458 * pos_len = posarray.size() * for idata in range(arr_len): * thisrow = np.PyArray_GETPTR1(arr, idata) # <<<<<<<<<<<<<< @@ -18054,10 +19460,10 @@ goto __pyx_L17_unpacking_failed; * roffset = roffsetarray[ipos] */ -#line 845 "root_numpy/src/tree.pyx" +#line 458 "root_numpy/src/tree.pyx" __pyx_v_thisrow = PyArray_GETPTR1(__pyx_v_arr, __pyx_v_idata); - /* "root_numpy/src/tree.pyx":846 + /* "root_numpy/src/tree.pyx":459 * for idata in range(arr_len): * thisrow = np.PyArray_GETPTR1(arr, idata) * for ipos in range(pos_len): # <<<<<<<<<<<<<< @@ -18065,67 +19471,67 @@ goto __pyx_L17_unpacking_failed; * source = shift(thisrow, roffset) */ -#line 846 "root_numpy/src/tree.pyx" - __pyx_t_19 = __pyx_v_pos_len; +#line 459 "root_numpy/src/tree.pyx" + __pyx_t_15 = __pyx_v_pos_len; -#line 846 "root_numpy/src/tree.pyx" - for (__pyx_t_20 = 0; __pyx_t_20 < __pyx_t_19; __pyx_t_20+=1) { +#line 459 "root_numpy/src/tree.pyx" + for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { -#line 846 "root_numpy/src/tree.pyx" - __pyx_v_ipos = __pyx_t_20; +#line 459 "root_numpy/src/tree.pyx" + __pyx_v_ipos = __pyx_t_16; - /* "root_numpy/src/tree.pyx":847 + /* "root_numpy/src/tree.pyx":460 * thisrow = np.PyArray_GETPTR1(arr, idata) * for ipos in range(pos_len): * roffset = roffsetarray[ipos] # <<<<<<<<<<<<<< * source = shift(thisrow, roffset) - * conv_array[ipos].fill_from(source) + * converters[ipos].fill_from(source) */ -#line 847 "root_numpy/src/tree.pyx" - __pyx_t_11 = __Pyx_PyInt_From_int((__pyx_v_roffsetarray[__pyx_v_ipos])); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 460 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyInt_From_int((__pyx_v_roffsetarray[__pyx_v_ipos])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 460; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 847 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 460 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 847 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_roffset, __pyx_t_11); +#line 460 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_roffset, __pyx_t_5); -#line 847 "root_numpy/src/tree.pyx" - __pyx_t_11 = 0; +#line 460 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":848 + /* "root_numpy/src/tree.pyx":461 * for ipos in range(pos_len): * roffset = roffsetarray[ipos] * source = shift(thisrow, roffset) # <<<<<<<<<<<<<< - * conv_array[ipos].fill_from(source) + * converters[ipos].fill_from(source) * */ -#line 848 "root_numpy/src/tree.pyx" - __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_v_roffset); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L6_error;} +#line 461 "root_numpy/src/tree.pyx" + __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_v_roffset); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 461; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 848 "root_numpy/src/tree.pyx" - __pyx_v_source = shift(__pyx_v_thisrow, __pyx_t_10); +#line 461 "root_numpy/src/tree.pyx" + __pyx_v_source = shift(__pyx_v_thisrow, __pyx_t_8); - /* "root_numpy/src/tree.pyx":849 + /* "root_numpy/src/tree.pyx":462 * roffset = roffsetarray[ipos] * source = shift(thisrow, roffset) - * conv_array[ipos].fill_from(source) # <<<<<<<<<<<<<< + * converters[ipos].fill_from(source) # <<<<<<<<<<<<<< * * # need to update the number of entries in the tree to match */ -#line 849 "root_numpy/src/tree.pyx" - (__pyx_v_conv_array[__pyx_v_ipos])->fill_from(__pyx_v_source); +#line 462 "root_numpy/src/tree.pyx" + (__pyx_v_converters[__pyx_v_ipos])->fill_from(__pyx_v_source); -#line 849 "root_numpy/src/tree.pyx" +#line 462 "root_numpy/src/tree.pyx" } -#line 849 "root_numpy/src/tree.pyx" +#line 462 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":853 + /* "root_numpy/src/tree.pyx":466 * # need to update the number of entries in the tree to match * # the number in the branches since each branch is filled separately. * tree.SetEntries(-1) # <<<<<<<<<<<<<< @@ -18133,40 +19539,40 @@ goto __pyx_L17_unpacking_failed; * except: */ -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __pyx_v_tree->SetEntries(-1); -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" } -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" goto __pyx_L13_try_end; -#line 853 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __pyx_L6_error:; -#line 853 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; +#line 466 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 853 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 466 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 853 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 466 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 853 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; +#line 466 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":855 + /* "root_numpy/src/tree.pyx":468 * tree.SetEntries(-1) * * except: # <<<<<<<<<<<<<< @@ -18174,25 +19580,25 @@ goto __pyx_L17_unpacking_failed; * */ -#line 855 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" /*except:*/ { -#line 855 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 855 "root_numpy/src/tree.pyx" - if (__Pyx_GetException(&__pyx_t_11, &__pyx_t_7, &__pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 855; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} +#line 468 "root_numpy/src/tree.pyx" + if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_9, &__pyx_t_6) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} -#line 855 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 855 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 855 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); - /* "root_numpy/src/tree.pyx":856 + /* "root_numpy/src/tree.pyx":469 * * except: * raise # <<<<<<<<<<<<<< @@ -18200,329 +19606,307 @@ goto __pyx_L17_unpacking_failed; * finally: */ -#line 856 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_11); +#line 469 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_5); -#line 856 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_7); +#line 469 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 856 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_8); +#line 469 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_6); -#line 856 "root_numpy/src/tree.pyx" - __Pyx_ErrRestore(__pyx_t_11, __pyx_t_7, __pyx_t_8); - __pyx_t_11 = 0; __pyx_t_7 = 0; __pyx_t_8 = 0; -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" + __Pyx_ErrRestore(__pyx_t_5, __pyx_t_9, __pyx_t_6); + __pyx_t_5 = 0; __pyx_t_9 = 0; __pyx_t_6 = 0; +#line 469 "root_numpy/src/tree.pyx" -#line 856 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 856; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} +#line 469 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" } -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __pyx_L8_except_error:; -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_1); -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_2); -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_3); -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3); -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" goto __pyx_L4_error; -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __pyx_L13_try_end:; -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" } -#line 856 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":862 - * # root has some global funny memory management... - * # need to make sure no double free - * for icv in range(conv_array.size()): # <<<<<<<<<<<<<< - * tmpcv = conv_array[icv] - * del tmpcv + /* "root_numpy/src/tree.pyx":472 + * + * finally: + * for icv in range(converters.size()): # <<<<<<<<<<<<<< + * del converters[icv] + * # TODO: clean up tree */ -#line 862 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 862 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 862 "root_numpy/src/tree.pyx" - __pyx_t_21 = __pyx_v_conv_array.size(); - -#line 862 "root_numpy/src/tree.pyx" - for (__pyx_t_22 = 0; __pyx_t_22 < __pyx_t_21; __pyx_t_22+=1) { - -#line 862 "root_numpy/src/tree.pyx" - __pyx_v_icv = __pyx_t_22; +#line 472 "root_numpy/src/tree.pyx" + __pyx_t_17 = __pyx_v_converters.size(); - /* "root_numpy/src/tree.pyx":863 - * # need to make sure no double free - * for icv in range(conv_array.size()): - * tmpcv = conv_array[icv] # <<<<<<<<<<<<<< - * del tmpcv - * - */ +#line 472 "root_numpy/src/tree.pyx" + for (__pyx_t_18 = 0; __pyx_t_18 < __pyx_t_17; __pyx_t_18+=1) { -#line 863 "root_numpy/src/tree.pyx" - __pyx_v_tmpcv = (__pyx_v_conv_array[__pyx_v_icv]); +#line 472 "root_numpy/src/tree.pyx" + __pyx_v_icv = __pyx_t_18; - /* "root_numpy/src/tree.pyx":864 - * for icv in range(conv_array.size()): - * tmpcv = conv_array[icv] - * del tmpcv # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":473 + * finally: + * for icv in range(converters.size()): + * del converters[icv] # <<<<<<<<<<<<<< + * # TODO: clean up tree * - * return tree */ -#line 864 "root_numpy/src/tree.pyx" - delete __pyx_v_tmpcv; +#line 473 "root_numpy/src/tree.pyx" + delete (__pyx_v_converters[__pyx_v_icv]); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" goto __pyx_L5; -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __pyx_L4_error:; -#line 864 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; __pyx_t_24 = 0; __pyx_t_25 = 0; __pyx_t_26 = 0; +#line 473 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 864 "root_numpy/src/tree.pyx" - if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_24, &__pyx_t_25, &__pyx_t_26); +#line 473 "root_numpy/src/tree.pyx" + if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_3, &__pyx_t_2, &__pyx_t_1) < 0)) __Pyx_ErrFetch(&__pyx_t_3, &__pyx_t_2, &__pyx_t_1); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_3); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_2); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_1); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_24); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_20); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_25); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_21); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_26); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_22); -#line 864 "root_numpy/src/tree.pyx" - __pyx_t_10 = __pyx_lineno; __pyx_t_16 = __pyx_clineno; __pyx_t_23 = __pyx_filename; +#line 473 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_19 = __pyx_filename; -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" { - /* "root_numpy/src/tree.pyx":862 - * # root has some global funny memory management... - * # need to make sure no double free - * for icv in range(conv_array.size()): # <<<<<<<<<<<<<< - * tmpcv = conv_array[icv] - * del tmpcv + /* "root_numpy/src/tree.pyx":472 + * + * finally: + * for icv in range(converters.size()): # <<<<<<<<<<<<<< + * del converters[icv] + * # TODO: clean up tree */ -#line 862 "root_numpy/src/tree.pyx" - __pyx_t_21 = __pyx_v_conv_array.size(); - -#line 862 "root_numpy/src/tree.pyx" - for (__pyx_t_22 = 0; __pyx_t_22 < __pyx_t_21; __pyx_t_22+=1) { - -#line 862 "root_numpy/src/tree.pyx" - __pyx_v_icv = __pyx_t_22; +#line 472 "root_numpy/src/tree.pyx" + __pyx_t_17 = __pyx_v_converters.size(); - /* "root_numpy/src/tree.pyx":863 - * # need to make sure no double free - * for icv in range(conv_array.size()): - * tmpcv = conv_array[icv] # <<<<<<<<<<<<<< - * del tmpcv - * - */ +#line 472 "root_numpy/src/tree.pyx" + for (__pyx_t_18 = 0; __pyx_t_18 < __pyx_t_17; __pyx_t_18+=1) { -#line 863 "root_numpy/src/tree.pyx" - __pyx_v_tmpcv = (__pyx_v_conv_array[__pyx_v_icv]); +#line 472 "root_numpy/src/tree.pyx" + __pyx_v_icv = __pyx_t_18; - /* "root_numpy/src/tree.pyx":864 - * for icv in range(conv_array.size()): - * tmpcv = conv_array[icv] - * del tmpcv # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":473 + * finally: + * for icv in range(converters.size()): + * del converters[icv] # <<<<<<<<<<<<<< + * # TODO: clean up tree * - * return tree */ -#line 864 "root_numpy/src/tree.pyx" - delete __pyx_v_tmpcv; +#line 473 "root_numpy/src/tree.pyx" + delete (__pyx_v_converters[__pyx_v_icv]); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_24); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_20); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_25); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_21); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_26); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_22); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_ExceptionReset(__pyx_t_24, __pyx_t_25, __pyx_t_26); +#line 473 "root_numpy/src/tree.pyx" + __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_3); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_2); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_1); -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_ErrRestore(__pyx_t_3, __pyx_t_2, __pyx_t_1); -#line 864 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; __pyx_t_24 = 0; __pyx_t_25 = 0; __pyx_t_26 = 0; +#line 473 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; -#line 864 "root_numpy/src/tree.pyx" - __pyx_lineno = __pyx_t_10; __pyx_clineno = __pyx_t_16; __pyx_filename = __pyx_t_23; +#line 473 "root_numpy/src/tree.pyx" + __pyx_lineno = __pyx_t_8; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_19; -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __pyx_L5:; -#line 864 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":866 - * del tmpcv + /* "root_numpy/src/tree.pyx":476 + * # TODO: clean up tree * * return tree # <<<<<<<<<<<<<< * * */ -#line 866 "root_numpy/src/tree.pyx" +#line 476 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_tree; -#line 866 "root_numpy/src/tree.pyx" +#line 476 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":807 + /* "root_numpy/src/tree.pyx":424 * * - * cdef TTree* array2tree(np.ndarray arr, name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< - * # hmm how do I catch all python exception - * # and clean up before throwing ? + * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< + * cdef vector[NP2CConverter*] converters + * cdef vector[int] posarray */ -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" /* function exit code */ -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); +#line 424 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); +#line 424 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_11); +#line 424 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_12); +#line 424 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fieldnames); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fields); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fieldname); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_dtype); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_roffset); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" return __pyx_r; -#line 807 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":869 +/* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -18530,254 +19914,255 @@ goto __pyx_L17_unpacking_failed; * cdef TTree* outtree = NULL */ -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 869 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_11array2tree_toCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_11array2tree_toCObj = -#line 869 "root_numpy/src/tree.pyx" -{"array2tree_toCObj", (PyCFunction)__pyx_pw_13_librootnumpy_11array2tree_toCObj, METH_VARARGS|METH_KEYWORDS, 0}; +#line 479 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_13array2tree_toCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_13array2tree_toCObj = +#line 479 "root_numpy/src/tree.pyx" +{"array2tree_toCObj", (PyCFunction)__pyx_pw_13_librootnumpy_13array2tree_toCObj, METH_VARARGS|METH_KEYWORDS, 0}; -#line 869 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_11array2tree_toCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { +#line 479 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_13array2tree_toCObj(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_arr = 0 -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_name = 0 -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_tree = 0 -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree_toCObj (wrapper)", 0); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" { -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_arr,&__pyx_n_s_name,&__pyx_n_s_tree,0}; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject* values[3] = {0,0,0}; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[1] = ((PyObject *)__pyx_n_s_tree); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[2] = ((PyObject *)Py_None); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" switch (pos_args) { case 3: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 0: break; default: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 0: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_arr)) != 0)) kw_args--; else -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 1: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_name); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (value) { values[1] = value; kw_args--; } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 2: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (value) { values[2] = value; kw_args--; } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 869 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "array2tree_toCObj") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 479 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "array2tree_toCObj") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } else { -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 3: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" break; default: -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_arr = values[0]; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_name = values[1]; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_tree = values[2]; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("array2tree_toCObj", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); -#line 869 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 479 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree_toCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" return NULL; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 869 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_10array2tree_toCObj(__pyx_self, __pyx_v_arr, __pyx_v_name, __pyx_v_tree); +#line 479 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_12array2tree_toCObj(__pyx_self, __pyx_v_arr, __pyx_v_name, __pyx_v_tree); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" /* function exit code */ -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" return __pyx_r; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_name, PyObject *__pyx_v_tree) { +#line 479 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_name, PyObject *__pyx_v_tree) { TTree *__pyx_v_intree -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_outtree -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; int __pyx_t_2; - PyObject *__pyx_t_3 = NULL; - void *__pyx_t_4; + void *__pyx_t_3; + std::string __pyx_t_4; TTree *__pyx_t_5; struct __pyx_opt_args_13_librootnumpy_array2tree __pyx_t_6; + PyObject *__pyx_t_7 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree_toCObj", 0); - /* "root_numpy/src/tree.pyx":870 + /* "root_numpy/src/tree.pyx":480 * * def array2tree_toCObj(arr, name='tree', tree=None): * cdef TTree* intree = NULL # <<<<<<<<<<<<<< @@ -18785,127 +20170,90 @@ static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyOb * if tree is not None: */ -#line 870 "root_numpy/src/tree.pyx" +#line 480 "root_numpy/src/tree.pyx" __pyx_v_intree = NULL; - /* "root_numpy/src/tree.pyx":871 + /* "root_numpy/src/tree.pyx":481 * def array2tree_toCObj(arr, name='tree', tree=None): * cdef TTree* intree = NULL * cdef TTree* outtree = NULL # <<<<<<<<<<<<<< * if tree is not None: - * # this is not a safe method + * intree = PyCObject_AsVoidPtr(tree) */ -#line 871 "root_numpy/src/tree.pyx" +#line 481 "root_numpy/src/tree.pyx" __pyx_v_outtree = NULL; - /* "root_numpy/src/tree.pyx":872 + /* "root_numpy/src/tree.pyx":482 * cdef TTree* intree = NULL * cdef TTree* outtree = NULL * if tree is not None: # <<<<<<<<<<<<<< - * # this is not a safe method - * # provided here for convenience only + * intree = PyCObject_AsVoidPtr(tree) + * outtree = array2tree(arr, name=name, tree=intree) */ -#line 872 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_tree != Py_None); -#line 872 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/tree.pyx" __pyx_t_2 = (__pyx_t_1 != 0); -#line 872 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/tree.pyx" if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":876 - * # provided here for convenience only - * # typecheck should be implemented by the wrapper - * if not PyCObject_Check(tree): # <<<<<<<<<<<<<< - * raise ValueError("tree must be PyCObject") - * intree = PyCObject_AsVoidPtr(tree) - */ - -#line 876 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((!(PyCObject_Check(__pyx_v_tree) != 0)) != 0); - -#line 876 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { - - /* "root_numpy/src/tree.pyx":877 - * # typecheck should be implemented by the wrapper - * if not PyCObject_Check(tree): - * raise ValueError("tree must be PyCObject") # <<<<<<<<<<<<<< - * intree = PyCObject_AsVoidPtr(tree) - * outtree = array2tree(arr, name=name, tree=intree) - */ - -#line 877 "root_numpy/src/tree.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__21, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 877 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); - -#line 877 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); - -#line 877 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - -#line 877 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 877 "root_numpy/src/tree.pyx" - } - - /* "root_numpy/src/tree.pyx":878 - * if not PyCObject_Check(tree): - * raise ValueError("tree must be PyCObject") + /* "root_numpy/src/tree.pyx":483 + * cdef TTree* outtree = NULL + * if tree is not None: * intree = PyCObject_AsVoidPtr(tree) # <<<<<<<<<<<<<< * outtree = array2tree(arr, name=name, tree=intree) * return PyCObject_FromVoidPtr(outtree, NULL) */ -#line 878 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyCObject_AsVoidPtr(__pyx_v_tree); if (unlikely(__pyx_t_4 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 878; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 483 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyCObject_AsVoidPtr(__pyx_v_tree); if (unlikely(__pyx_t_3 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 878 "root_numpy/src/tree.pyx" - __pyx_v_intree = ((TTree *)__pyx_t_4); +#line 483 "root_numpy/src/tree.pyx" + __pyx_v_intree = ((TTree *)__pyx_t_3); -#line 878 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 878 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 878 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":879 - * raise ValueError("tree must be PyCObject") + /* "root_numpy/src/tree.pyx":484 + * if tree is not None: * intree = PyCObject_AsVoidPtr(tree) * outtree = array2tree(arr, name=name, tree=intree) # <<<<<<<<<<<<<< * return PyCObject_FromVoidPtr(outtree, NULL) * */ -#line 879 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_v_arr) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_arr, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 484 "root_numpy/src/tree.pyx" + if (!(likely(((__pyx_v_arr) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_arr, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 879 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" + __pyx_t_4 = __pyx_convert_string_from_py_std__string(__pyx_v_name); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 484 "root_numpy/src/tree.pyx" __pyx_t_6.__pyx_n = 2; -#line 879 "root_numpy/src/tree.pyx" - __pyx_t_6.name = __pyx_v_name; +#line 484 "root_numpy/src/tree.pyx" + __pyx_t_6.name = __pyx_t_4; -#line 879 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" __pyx_t_6.tree = __pyx_v_intree; -#line 879 "root_numpy/src/tree.pyx" - __pyx_t_5 = __pyx_f_13_librootnumpy_array2tree(((PyArrayObject *)__pyx_v_arr), &__pyx_t_6); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 484 "root_numpy/src/tree.pyx" + __pyx_t_5 = __pyx_f_13_librootnumpy_array2tree(((PyArrayObject *)__pyx_v_arr), &__pyx_t_6); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 879 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" __pyx_v_outtree = __pyx_t_5; - /* "root_numpy/src/tree.pyx":880 + /* "root_numpy/src/tree.pyx":485 * intree = PyCObject_AsVoidPtr(tree) * outtree = array2tree(arr, name=name, tree=intree) * return PyCObject_FromVoidPtr(outtree, NULL) # <<<<<<<<<<<<<< @@ -18913,25 +20261,25 @@ static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyOb * */ -#line 880 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 880 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyCObject_FromVoidPtr(__pyx_v_outtree, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 880; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 485 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCObject_FromVoidPtr(__pyx_v_outtree, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 880 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 485 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); -#line 880 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_3; +#line 485 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_7; -#line 880 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 485 "root_numpy/src/tree.pyx" + __pyx_t_7 = 0; -#line 880 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":869 + /* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -18939,306 +20287,306 @@ static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyOb * cdef TTree* outtree = NULL */ -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" /* function exit code */ -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 869 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 479 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_7); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree_toCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" return __pyx_r; -#line 869 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":883 +/* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< - * cdef TFile* file = Open(filename, mode) - * if file is NULL: + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: */ -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 883 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_13array2root(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_13array2root = -#line 883 "root_numpy/src/tree.pyx" -{"array2root", (PyCFunction)__pyx_pw_13_librootnumpy_13array2root, METH_VARARGS|METH_KEYWORDS, 0}; +#line 488 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_15array2root(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_13_librootnumpy_15array2root = +#line 488 "root_numpy/src/tree.pyx" +{"array2root", (PyCFunction)__pyx_pw_13_librootnumpy_15array2root, METH_VARARGS|METH_KEYWORDS, 0}; -#line 883 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_13array2root(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { +#line 488 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_15array2root(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_arr = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_filename = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_treename = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_mode = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2root (wrapper)", 0); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" { -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_arr,&__pyx_n_s_filename,&__pyx_n_s_treename,&__pyx_n_s_mode,0}; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* values[4] = {0,0,0,0}; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[2] = ((PyObject *)__pyx_n_s_tree); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[3] = ((PyObject *)__pyx_n_s_update); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" switch (pos_args) { case 4: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 0: break; default: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 0: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_arr)) != 0)) kw_args--; else -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 1: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_filename)) != 0)) kw_args--; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("array2root", 0, 2, 4, 1); -#line 883 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 488 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 2: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_treename); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (value) { values[2] = value; kw_args--; } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 3: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_mode); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (value) { values[3] = value; kw_args--; } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 883 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "array2root") < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 488 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "array2root") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } else { -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 4: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" break; default: -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_arr = values[0]; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_filename = values[1]; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_treename = values[2]; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_mode = values[3]; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("array2root", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); -#line 883 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 488 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2root", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" return NULL; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 883 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_12array2root(__pyx_self, __pyx_v_arr, __pyx_v_filename, __pyx_v_treename, __pyx_v_mode); +#line 488 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_14array2root(__pyx_self, __pyx_v_arr, __pyx_v_filename, __pyx_v_treename, __pyx_v_mode); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" /* function exit code */ -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" return __pyx_r; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_12array2root(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_filename, PyObject *__pyx_v_treename, PyObject *__pyx_v_mode) { - TFile *__pyx_v_file -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_arr, PyObject *__pyx_v_filename, PyObject *__pyx_v_treename, PyObject *__pyx_v_mode) { + TFile *__pyx_v_rfile +#line 488 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_tree -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations const char *__pyx_t_1; @@ -19248,586 +20596,442 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2root(CYTHON_UNUSED PyObject *_ PyObject *__pyx_t_5 = NULL; PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; - TTree *__pyx_t_8; - struct __pyx_opt_args_13_librootnumpy_array2tree __pyx_t_9; + std::string __pyx_t_8; + TTree *__pyx_t_9; + struct __pyx_opt_args_13_librootnumpy_array2tree __pyx_t_10; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2root", 0); - /* "root_numpy/src/tree.pyx":884 + /* "root_numpy/src/tree.pyx":489 * * def array2root(arr, filename, treename='tree', mode='update'): - * cdef TFile* file = Open(filename, mode) # <<<<<<<<<<<<<< - * if file is NULL: + * cdef TFile* rfile = Open(filename, mode) # <<<<<<<<<<<<<< + * if rfile == NULL: * raise IOError("cannot open file {0}".format(filename)) */ -#line 884 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_filename); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 884; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 489 "root_numpy/src/tree.pyx" + __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_filename); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 884 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_mode); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 884; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 489 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_mode); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 884 "root_numpy/src/tree.pyx" - __pyx_v_file = TFile::Open(__pyx_t_1, __pyx_t_2); +#line 489 "root_numpy/src/tree.pyx" + __pyx_v_rfile = TFile::Open(__pyx_t_1, __pyx_t_2); - /* "root_numpy/src/tree.pyx":885 + /* "root_numpy/src/tree.pyx":490 * def array2root(arr, filename, treename='tree', mode='update'): - * cdef TFile* file = Open(filename, mode) - * if file is NULL: # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: # <<<<<<<<<<<<<< * raise IOError("cannot open file {0}".format(filename)) - * if not file.IsWritable(): + * if not rfile.IsWritable(): */ -#line 885 "root_numpy/src/tree.pyx" - __pyx_t_3 = ((__pyx_v_file == NULL) != 0); +#line 490 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_rfile == NULL) != 0); -#line 885 "root_numpy/src/tree.pyx" +#line 490 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":886 - * cdef TFile* file = Open(filename, mode) - * if file is NULL: + /* "root_numpy/src/tree.pyx":491 + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: * raise IOError("cannot open file {0}".format(filename)) # <<<<<<<<<<<<<< - * if not file.IsWritable(): + * if not rfile.IsWritable(): * raise IOError("file {0} is not writable".format(filename)) */ -#line 886 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_open_file_0, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_cannot_open_file_0, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __pyx_t_6 = NULL; -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" if (likely(__pyx_t_6)) { -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_6); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" if (!__pyx_t_6) { -#line 886 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_filename); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_filename); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } else { -#line 886 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_filename); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_v_filename); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_filename); -#line 886 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 886 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 886 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 886 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 491 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":887 - * if file is NULL: + /* "root_numpy/src/tree.pyx":492 + * if rfile == NULL: * raise IOError("cannot open file {0}".format(filename)) - * if not file.IsWritable(): # <<<<<<<<<<<<<< + * if not rfile.IsWritable(): # <<<<<<<<<<<<<< * raise IOError("file {0} is not writable".format(filename)) - * + * # If a tree with that name exists, we want to update it */ -#line 887 "root_numpy/src/tree.pyx" - __pyx_t_3 = ((!(__pyx_v_file->IsWritable() != 0)) != 0); +#line 492 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((!(__pyx_v_rfile->IsWritable() != 0)) != 0); -#line 887 "root_numpy/src/tree.pyx" +#line 492 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":888 + /* "root_numpy/src/tree.pyx":493 * raise IOError("cannot open file {0}".format(filename)) - * if not file.IsWritable(): + * if not rfile.IsWritable(): * raise IOError("file {0} is not writable".format(filename)) # <<<<<<<<<<<<<< - * * # If a tree with that name exists, we want to update it + * cdef TTree* tree = rfile.Get(treename) */ -#line 888 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_file_0_is_not_writable, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_s_file_0_is_not_writable, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" if (!__pyx_t_7) { -#line 888 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_filename); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_filename); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } else { -#line 888 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7); __Pyx_GIVEREF(__pyx_t_7); __pyx_t_7 = NULL; -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_filename); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_filename); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_filename); -#line 888 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 888 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 888 "root_numpy/src/tree.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IOError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 888 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 888; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 493 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":891 - * + /* "root_numpy/src/tree.pyx":495 + * raise IOError("file {0} is not writable".format(filename)) * # If a tree with that name exists, we want to update it - * cdef TTree* tree = file.Get(treename) # <<<<<<<<<<<<<< + * cdef TTree* tree = rfile.Get(treename) # <<<<<<<<<<<<<< * tree = array2tree(arr, name=treename, tree=tree) * tree.Write(treename, 2) # TObject::kOverwrite */ -#line 891 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_treename); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 891; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 495 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_treename); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 891 "root_numpy/src/tree.pyx" - __pyx_v_tree = ((TTree *)__pyx_v_file->Get(__pyx_t_2)); +#line 495 "root_numpy/src/tree.pyx" + __pyx_v_tree = ((TTree *)__pyx_v_rfile->Get(__pyx_t_2)); - /* "root_numpy/src/tree.pyx":892 + /* "root_numpy/src/tree.pyx":496 * # If a tree with that name exists, we want to update it - * cdef TTree* tree = file.Get(treename) + * cdef TTree* tree = rfile.Get(treename) * tree = array2tree(arr, name=treename, tree=tree) # <<<<<<<<<<<<<< * tree.Write(treename, 2) # TObject::kOverwrite - * file.Close() + * rfile.Close() */ -#line 892 "root_numpy/src/tree.pyx" - if (!(likely(((__pyx_v_arr) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_arr, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 892; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 496 "root_numpy/src/tree.pyx" + if (!(likely(((__pyx_v_arr) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_arr, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 892 "root_numpy/src/tree.pyx" - __pyx_t_9.__pyx_n = 2; +#line 496 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_convert_string_from_py_std__string(__pyx_v_treename); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 496 "root_numpy/src/tree.pyx" + __pyx_t_10.__pyx_n = 2; -#line 892 "root_numpy/src/tree.pyx" - __pyx_t_9.name = __pyx_v_treename; +#line 496 "root_numpy/src/tree.pyx" + __pyx_t_10.name = __pyx_t_8; -#line 892 "root_numpy/src/tree.pyx" - __pyx_t_9.tree = __pyx_v_tree; +#line 496 "root_numpy/src/tree.pyx" + __pyx_t_10.tree = __pyx_v_tree; -#line 892 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_f_13_librootnumpy_array2tree(((PyArrayObject *)__pyx_v_arr), &__pyx_t_9); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 892; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 496 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_f_13_librootnumpy_array2tree(((PyArrayObject *)__pyx_v_arr), &__pyx_t_10); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 496; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 892 "root_numpy/src/tree.pyx" - __pyx_v_tree = __pyx_t_8; +#line 496 "root_numpy/src/tree.pyx" + __pyx_v_tree = __pyx_t_9; - /* "root_numpy/src/tree.pyx":893 - * cdef TTree* tree = file.Get(treename) + /* "root_numpy/src/tree.pyx":497 + * cdef TTree* tree = rfile.Get(treename) * tree = array2tree(arr, name=treename, tree=tree) * tree.Write(treename, 2) # TObject::kOverwrite # <<<<<<<<<<<<<< - * file.Close() - * # how to clean up TTree? Same question as above. + * rfile.Close() + * # TODO: clean up tree */ -#line 893 "root_numpy/src/tree.pyx" - __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_treename); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 893; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 497 "root_numpy/src/tree.pyx" + __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_treename); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 893 "root_numpy/src/tree.pyx" +#line 497 "root_numpy/src/tree.pyx" __pyx_v_tree->Write(__pyx_t_2, 2); - /* "root_numpy/src/tree.pyx":894 + /* "root_numpy/src/tree.pyx":498 * tree = array2tree(arr, name=treename, tree=tree) * tree.Write(treename, 2) # TObject::kOverwrite - * file.Close() # <<<<<<<<<<<<<< - * # how to clean up TTree? Same question as above. - * del file + * rfile.Close() # <<<<<<<<<<<<<< + * # TODO: clean up tree + * del rfile */ -#line 894 "root_numpy/src/tree.pyx" - __pyx_v_file->Close(); +#line 498 "root_numpy/src/tree.pyx" + __pyx_v_rfile->Close(); - /* "root_numpy/src/tree.pyx":896 - * file.Close() - * # how to clean up TTree? Same question as above. - * del file # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/tree.pyx":500 + * rfile.Close() + * # TODO: clean up tree + * del rfile # <<<<<<<<<<<<<< */ -#line 896 "root_numpy/src/tree.pyx" - delete __pyx_v_file; +#line 500 "root_numpy/src/tree.pyx" + delete __pyx_v_rfile; - /* "root_numpy/src/tree.pyx":883 + /* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< - * cdef TFile* file = Open(filename, mode) - * if file is NULL: + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: */ -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" /* function exit code */ -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2root", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 883 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 883 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); - -#line 883 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); - -#line 883 "root_numpy/src/tree.pyx" - return __pyx_r; - -#line 883 "root_numpy/src/tree.pyx" -} - -/* "root_numpy/src/tree.pyx":900 - * - * @atexit.register - * def cleanup(): # <<<<<<<<<<<<<< - * # delete all allocated converters - * it = CONVERTERS.begin() - */ - -#line 900 "root_numpy/src/tree.pyx" - - -#line 900 "root_numpy/src/tree.pyx" -/* Python wrapper */ - -#line 900 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_15cleanup(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyMethodDef __pyx_mdef_13_librootnumpy_15cleanup = -#line 900 "root_numpy/src/tree.pyx" -{"cleanup", (PyCFunction)__pyx_pw_13_librootnumpy_15cleanup, METH_NOARGS, 0}; - -#line 900 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pw_13_librootnumpy_15cleanup(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused) { - -#line 900 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = 0; - -#line 900 "root_numpy/src/tree.pyx" - __Pyx_RefNannyDeclarations - -#line 900 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("cleanup (wrapper)", 0); - __pyx_r = -#line 900 "root_numpy/src/tree.pyx" -__pyx_pf_13_librootnumpy_14cleanup(__pyx_self); - -#line 900 "root_numpy/src/tree.pyx" - - -#line 900 "root_numpy/src/tree.pyx" - /* function exit code */ - -#line 900 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); - -#line 900 "root_numpy/src/tree.pyx" - return __pyx_r; - -#line 900 "root_numpy/src/tree.pyx" -} - -#line 900 "root_numpy/src/tree.pyx" - - -#line 900 "root_numpy/src/tree.pyx" -static PyObject *__pyx_pf_13_librootnumpy_14cleanup(CYTHON_UNUSED PyObject *__pyx_self) { - std::map ::iterator __pyx_v_it -#line 900 "root_numpy/src/tree.pyx" -; - -#line 900 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations - int __pyx_t_1; - -#line 900 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("cleanup", 0); - - /* "root_numpy/src/tree.pyx":902 - * def cleanup(): - * # delete all allocated converters - * it = CONVERTERS.begin() # <<<<<<<<<<<<<< - * while it != CONVERTERS.end(): - * del deref(it).second - */ - -#line 902 "root_numpy/src/tree.pyx" - __pyx_v_it = __pyx_v_13_librootnumpy_CONVERTERS.begin(); - - /* "root_numpy/src/tree.pyx":903 - * # delete all allocated converters - * it = CONVERTERS.begin() - * while it != CONVERTERS.end(): # <<<<<<<<<<<<<< - * del deref(it).second - * inc(it) - */ - -#line 903 "root_numpy/src/tree.pyx" - while (1) { - -#line 903 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_it != __pyx_v_13_librootnumpy_CONVERTERS.end()) != 0); - -#line 903 "root_numpy/src/tree.pyx" - if (!__pyx_t_1) break; - - /* "root_numpy/src/tree.pyx":904 - * it = CONVERTERS.begin() - * while it != CONVERTERS.end(): - * del deref(it).second # <<<<<<<<<<<<<< - * inc(it) - */ - -#line 904 "root_numpy/src/tree.pyx" - delete (*__pyx_v_it).second; - - /* "root_numpy/src/tree.pyx":905 - * while it != CONVERTERS.end(): - * del deref(it).second - * inc(it) # <<<<<<<<<<<<<< - */ - -#line 905 "root_numpy/src/tree.pyx" - (++__pyx_v_it); - -#line 905 "root_numpy/src/tree.pyx" - } - - /* "root_numpy/src/tree.pyx":900 - * - * @atexit.register - * def cleanup(): # <<<<<<<<<<<<<< - * # delete all allocated converters - * it = CONVERTERS.begin() - */ - -#line 900 "root_numpy/src/tree.pyx" - - -#line 900 "root_numpy/src/tree.pyx" - /* function exit code */ - -#line 900 "root_numpy/src/tree.pyx" - __pyx_r = Py_None; __Pyx_INCREF(Py_None); - -#line 900 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 900 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 900 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" return __pyx_r; -#line 900 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } /* "root_numpy/src/array.pyx":4 @@ -19890,13 +21094,13 @@ __pyx_gilstate_save = PyGILState_Ensure(); __Pyx_XDECREF(((PyObject *)__pyx_r)); #line 7 "root_numpy/src/array.pyx" - __pyx_t_1 = PyArray_SimpleNewFromData(1, (&__pyx_v_dims), __pyx_v_dtype, __pyx_v_data); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyArray_SimpleNewFromData(1, (&__pyx_v_dims), __pyx_v_dtype, __pyx_v_data); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_1); #line 7 "root_numpy/src/array.pyx" - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/array.pyx" __pyx_r = ((PyArrayObject *)__pyx_t_1); @@ -20037,7 +21241,7 @@ static PyObject *__pyx_pf_13_librootnumpy_16array_d(CYTHON_UNUSED PyObject *__py */ #line 11 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 11 "root_numpy/src/array.pyx" __pyx_v__arr = ((TArrayD *)__pyx_t_1); @@ -20054,7 +21258,7 @@ static PyObject *__pyx_pf_13_librootnumpy_16array_d(CYTHON_UNUSED PyObject *__py __Pyx_XDECREF(__pyx_r); #line 12 "root_numpy/src/array.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_DOUBLE)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_DOUBLE)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 12 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -20189,7 +21393,7 @@ static PyObject *__pyx_pf_13_librootnumpy_18array_f(CYTHON_UNUSED PyObject *__py */ #line 16 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/array.pyx" __pyx_v__arr = ((TArrayF *)__pyx_t_1); @@ -20206,7 +21410,7 @@ static PyObject *__pyx_pf_13_librootnumpy_18array_f(CYTHON_UNUSED PyObject *__py __Pyx_XDECREF(__pyx_r); #line 17 "root_numpy/src/array.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_FLOAT32)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_FLOAT32)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 17 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -20341,7 +21545,7 @@ static PyObject *__pyx_pf_13_librootnumpy_20array_l(CYTHON_UNUSED PyObject *__py */ #line 21 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/array.pyx" __pyx_v__arr = ((TArrayL *)__pyx_t_1); @@ -20358,7 +21562,7 @@ static PyObject *__pyx_pf_13_librootnumpy_20array_l(CYTHON_UNUSED PyObject *__py __Pyx_XDECREF(__pyx_r); #line 22 "root_numpy/src/array.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_LONG)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_LONG)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 22 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -20493,7 +21697,7 @@ static PyObject *__pyx_pf_13_librootnumpy_22array_i(CYTHON_UNUSED PyObject *__py */ #line 26 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 26 "root_numpy/src/array.pyx" __pyx_v__arr = ((TArrayI *)__pyx_t_1); @@ -20510,7 +21714,7 @@ static PyObject *__pyx_pf_13_librootnumpy_22array_i(CYTHON_UNUSED PyObject *__py __Pyx_XDECREF(__pyx_r); #line 27 "root_numpy/src/array.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_INT)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_INT)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -20645,7 +21849,7 @@ static PyObject *__pyx_pf_13_librootnumpy_24array_s(CYTHON_UNUSED PyObject *__py */ #line 31 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/array.pyx" __pyx_v__arr = ((TArrayS *)__pyx_t_1); @@ -20662,7 +21866,7 @@ static PyObject *__pyx_pf_13_librootnumpy_24array_s(CYTHON_UNUSED PyObject *__py __Pyx_XDECREF(__pyx_r); #line 32 "root_numpy/src/array.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_SHORT)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_SHORT)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -20797,7 +22001,7 @@ static PyObject *__pyx_pf_13_librootnumpy_26array_c(CYTHON_UNUSED PyObject *__py */ #line 36 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_arr); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/array.pyx" __pyx_v__arr = ((TArrayC *)__pyx_t_1); @@ -20814,7 +22018,7 @@ static PyObject *__pyx_pf_13_librootnumpy_26array_c(CYTHON_UNUSED PyObject *__py __Pyx_XDECREF(__pyx_r); #line 37 "root_numpy/src/array.pyx" - __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 37 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -20953,7 +22157,7 @@ static PyObject *__pyx_pf_13_librootnumpy_28array_h1c(CYTHON_UNUSED PyObject *__ */ #line 41 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH1C *)__pyx_t_1); @@ -20979,7 +22183,7 @@ static PyObject *__pyx_pf_13_librootnumpy_28array_h1c(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 42 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/array.pyx" } @@ -20999,7 +22203,7 @@ static PyObject *__pyx_pf_13_librootnumpy_28array_h1c(CYTHON_UNUSED PyObject *__ __Pyx_XDECREF(__pyx_r); #line 43 "root_numpy/src/array.pyx" - __pyx_t_3 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 43 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -21138,7 +22342,7 @@ static PyObject *__pyx_pf_13_librootnumpy_30array_h2c(CYTHON_UNUSED PyObject *__ */ #line 47 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 47 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH2C *)__pyx_t_1); @@ -21164,7 +22368,7 @@ static PyObject *__pyx_pf_13_librootnumpy_30array_h2c(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 48 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/array.pyx" } @@ -21184,7 +22388,7 @@ static PyObject *__pyx_pf_13_librootnumpy_30array_h2c(CYTHON_UNUSED PyObject *__ __Pyx_XDECREF(__pyx_r); #line 49 "root_numpy/src/array.pyx" - __pyx_t_3 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 49 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -21323,7 +22527,7 @@ static PyObject *__pyx_pf_13_librootnumpy_32array_h3c(CYTHON_UNUSED PyObject *__ */ #line 53 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 53 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH3C *)__pyx_t_1); @@ -21349,7 +22553,7 @@ static PyObject *__pyx_pf_13_librootnumpy_32array_h3c(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 54 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 54 "root_numpy/src/array.pyx" } @@ -21369,7 +22573,7 @@ static PyObject *__pyx_pf_13_librootnumpy_32array_h3c(CYTHON_UNUSED PyObject *__ __Pyx_XDECREF(__pyx_r); #line 55 "root_numpy/src/array.pyx" - __pyx_t_3 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = ((PyObject *)__pyx_f_13_librootnumpy_tonumpyarray(__pyx_v__arr->GetArray(), __pyx_v__arr->GetSize(), NPY_BYTE)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 55 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -21526,7 +22730,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h1d_array", 1, 2, 2, 1); #line 62 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 62 "root_numpy/src/array.pyx" } @@ -21538,7 +22742,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 62 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1d_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1d_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 62 "root_numpy/src/array.pyx" } @@ -21577,7 +22781,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h1d_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 62 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 62 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -21595,7 +22799,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 62 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 62 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_34h1d_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -21677,7 +22881,7 @@ static PyObject *__pyx_pf_13_librootnumpy_34h1d_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 62 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 62 "root_numpy/src/array.pyx" } @@ -21694,7 +22898,7 @@ static PyObject *__pyx_pf_13_librootnumpy_34h1d_array(CYTHON_UNUSED PyObject *__ */ #line 63 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 63 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH1D *)__pyx_t_1); @@ -21720,7 +22924,7 @@ static PyObject *__pyx_pf_13_librootnumpy_34h1d_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 64 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/array.pyx" } @@ -21909,7 +23113,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h2d_array", 1, 2, 2, 1); #line 70 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 70 "root_numpy/src/array.pyx" } @@ -21921,7 +23125,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 70 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2d_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2d_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 70 "root_numpy/src/array.pyx" } @@ -21960,7 +23164,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h2d_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 70 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 70 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -21978,7 +23182,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 70 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 70 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_36h2d_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -22060,7 +23264,7 @@ static PyObject *__pyx_pf_13_librootnumpy_36h2d_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 70 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/array.pyx" } @@ -22077,7 +23281,7 @@ static PyObject *__pyx_pf_13_librootnumpy_36h2d_array(CYTHON_UNUSED PyObject *__ */ #line 71 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 71 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH2D *)__pyx_t_1); @@ -22103,7 +23307,7 @@ static PyObject *__pyx_pf_13_librootnumpy_36h2d_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 72 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/array.pyx" } @@ -22292,7 +23496,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h3d_array", 1, 2, 2, 1); #line 78 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 78 "root_numpy/src/array.pyx" } @@ -22304,7 +23508,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 78 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3d_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3d_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 78 "root_numpy/src/array.pyx" } @@ -22343,7 +23547,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h3d_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 78 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 78 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -22361,7 +23565,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 78 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 78 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_38h3d_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -22443,7 +23647,7 @@ static PyObject *__pyx_pf_13_librootnumpy_38h3d_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 78 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/array.pyx" } @@ -22460,7 +23664,7 @@ static PyObject *__pyx_pf_13_librootnumpy_38h3d_array(CYTHON_UNUSED PyObject *__ */ #line 79 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 79 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH3D *)__pyx_t_1); @@ -22486,7 +23690,7 @@ static PyObject *__pyx_pf_13_librootnumpy_38h3d_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 80 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 80 "root_numpy/src/array.pyx" } @@ -22675,7 +23879,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h1f_array", 1, 2, 2, 1); #line 86 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 86 "root_numpy/src/array.pyx" } @@ -22687,7 +23891,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 86 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1f_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1f_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 86 "root_numpy/src/array.pyx" } @@ -22726,7 +23930,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h1f_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 86 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 86 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -22744,7 +23948,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 86 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 86 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_40h1f_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -22826,7 +24030,7 @@ static PyObject *__pyx_pf_13_librootnumpy_40h1f_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 86 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 86 "root_numpy/src/array.pyx" } @@ -22843,7 +24047,7 @@ static PyObject *__pyx_pf_13_librootnumpy_40h1f_array(CYTHON_UNUSED PyObject *__ */ #line 87 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH1F *)__pyx_t_1); @@ -22869,7 +24073,7 @@ static PyObject *__pyx_pf_13_librootnumpy_40h1f_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 88 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 88 "root_numpy/src/array.pyx" } @@ -23058,7 +24262,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h2f_array", 1, 2, 2, 1); #line 94 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 94 "root_numpy/src/array.pyx" } @@ -23070,7 +24274,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 94 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2f_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2f_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 94 "root_numpy/src/array.pyx" } @@ -23109,7 +24313,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h2f_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 94 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 94 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -23127,7 +24331,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 94 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 94 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_42h2f_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -23209,7 +24413,7 @@ static PyObject *__pyx_pf_13_librootnumpy_42h2f_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 94 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/array.pyx" } @@ -23226,7 +24430,7 @@ static PyObject *__pyx_pf_13_librootnumpy_42h2f_array(CYTHON_UNUSED PyObject *__ */ #line 95 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH2F *)__pyx_t_1); @@ -23252,7 +24456,7 @@ static PyObject *__pyx_pf_13_librootnumpy_42h2f_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 96 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 96 "root_numpy/src/array.pyx" } @@ -23441,7 +24645,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h3f_array", 1, 2, 2, 1); #line 102 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 102 "root_numpy/src/array.pyx" } @@ -23453,7 +24657,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 102 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3f_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3f_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 102 "root_numpy/src/array.pyx" } @@ -23492,7 +24696,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h3f_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 102 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 102 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -23510,7 +24714,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 102 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 102 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_44h3f_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -23592,7 +24796,7 @@ static PyObject *__pyx_pf_13_librootnumpy_44h3f_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 102 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 102 "root_numpy/src/array.pyx" } @@ -23609,7 +24813,7 @@ static PyObject *__pyx_pf_13_librootnumpy_44h3f_array(CYTHON_UNUSED PyObject *__ */ #line 103 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 103 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH3F *)__pyx_t_1); @@ -23635,7 +24839,7 @@ static PyObject *__pyx_pf_13_librootnumpy_44h3f_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 104 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 104 "root_numpy/src/array.pyx" } @@ -23824,7 +25028,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h1i_array", 1, 2, 2, 1); #line 110 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 110 "root_numpy/src/array.pyx" } @@ -23836,7 +25040,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 110 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1i_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1i_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 110 "root_numpy/src/array.pyx" } @@ -23875,7 +25079,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h1i_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 110 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 110 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -23893,7 +25097,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 110 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 110 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_46h1i_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -23975,7 +25179,7 @@ static PyObject *__pyx_pf_13_librootnumpy_46h1i_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 110 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 110 "root_numpy/src/array.pyx" } @@ -23992,7 +25196,7 @@ static PyObject *__pyx_pf_13_librootnumpy_46h1i_array(CYTHON_UNUSED PyObject *__ */ #line 111 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH1I *)__pyx_t_1); @@ -24018,7 +25222,7 @@ static PyObject *__pyx_pf_13_librootnumpy_46h1i_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 112 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 112 "root_numpy/src/array.pyx" } @@ -24207,7 +25411,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h2i_array", 1, 2, 2, 1); #line 118 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 118 "root_numpy/src/array.pyx" } @@ -24219,7 +25423,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 118 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2i_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2i_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 118 "root_numpy/src/array.pyx" } @@ -24258,7 +25462,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h2i_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 118 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 118 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -24276,7 +25480,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 118 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 118 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_48h2i_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -24358,7 +25562,7 @@ static PyObject *__pyx_pf_13_librootnumpy_48h2i_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 118 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 118 "root_numpy/src/array.pyx" } @@ -24375,7 +25579,7 @@ static PyObject *__pyx_pf_13_librootnumpy_48h2i_array(CYTHON_UNUSED PyObject *__ */ #line 119 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 119 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH2I *)__pyx_t_1); @@ -24401,7 +25605,7 @@ static PyObject *__pyx_pf_13_librootnumpy_48h2i_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 120 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/array.pyx" } @@ -24590,7 +25794,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h3i_array", 1, 2, 2, 1); #line 126 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 126 "root_numpy/src/array.pyx" } @@ -24602,7 +25806,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 126 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3i_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3i_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 126 "root_numpy/src/array.pyx" } @@ -24641,7 +25845,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h3i_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 126 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 126 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -24659,7 +25863,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 126 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 126 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_50h3i_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -24741,7 +25945,7 @@ static PyObject *__pyx_pf_13_librootnumpy_50h3i_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 126 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/array.pyx" } @@ -24758,7 +25962,7 @@ static PyObject *__pyx_pf_13_librootnumpy_50h3i_array(CYTHON_UNUSED PyObject *__ */ #line 127 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 127 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH3I *)__pyx_t_1); @@ -24784,7 +25988,7 @@ static PyObject *__pyx_pf_13_librootnumpy_50h3i_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 128 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 128 "root_numpy/src/array.pyx" } @@ -24973,7 +26177,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h1s_array", 1, 2, 2, 1); #line 134 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 134 "root_numpy/src/array.pyx" } @@ -24985,7 +26189,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 134 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1s_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1s_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 134 "root_numpy/src/array.pyx" } @@ -25024,7 +26228,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h1s_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 134 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 134 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -25042,7 +26246,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 134 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 134 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_52h1s_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -25124,7 +26328,7 @@ static PyObject *__pyx_pf_13_librootnumpy_52h1s_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 134 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_short, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_short, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 134 "root_numpy/src/array.pyx" } @@ -25141,7 +26345,7 @@ static PyObject *__pyx_pf_13_librootnumpy_52h1s_array(CYTHON_UNUSED PyObject *__ */ #line 135 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 135 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH1S *)__pyx_t_1); @@ -25167,7 +26371,7 @@ static PyObject *__pyx_pf_13_librootnumpy_52h1s_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 136 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 136 "root_numpy/src/array.pyx" } @@ -25356,7 +26560,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h2s_array", 1, 2, 2, 1); #line 142 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 142 "root_numpy/src/array.pyx" } @@ -25368,7 +26572,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 142 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2s_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2s_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 142 "root_numpy/src/array.pyx" } @@ -25407,7 +26611,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h2s_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 142 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 142 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -25425,7 +26629,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 142 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 142 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_54h2s_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -25507,7 +26711,7 @@ static PyObject *__pyx_pf_13_librootnumpy_54h2s_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 142 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_short, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_short, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/array.pyx" } @@ -25524,7 +26728,7 @@ static PyObject *__pyx_pf_13_librootnumpy_54h2s_array(CYTHON_UNUSED PyObject *__ */ #line 143 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 143 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH2S *)__pyx_t_1); @@ -25550,7 +26754,7 @@ static PyObject *__pyx_pf_13_librootnumpy_54h2s_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 144 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 144 "root_numpy/src/array.pyx" } @@ -25739,7 +26943,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h3s_array", 1, 2, 2, 1); #line 150 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 150 "root_numpy/src/array.pyx" } @@ -25751,7 +26955,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 150 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3s_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3s_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 150 "root_numpy/src/array.pyx" } @@ -25790,7 +26994,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h3s_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 150 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 150 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -25808,7 +27012,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 150 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 150 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_56h3s_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -25890,7 +27094,7 @@ static PyObject *__pyx_pf_13_librootnumpy_56h3s_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 150 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_short, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_short, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/array.pyx" } @@ -25907,7 +27111,7 @@ static PyObject *__pyx_pf_13_librootnumpy_56h3s_array(CYTHON_UNUSED PyObject *__ */ #line 151 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 151 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH3S *)__pyx_t_1); @@ -25933,7 +27137,7 @@ static PyObject *__pyx_pf_13_librootnumpy_56h3s_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 152 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 152 "root_numpy/src/array.pyx" } @@ -26122,7 +27326,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h1c_array", 1, 2, 2, 1); #line 158 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 158 "root_numpy/src/array.pyx" } @@ -26134,7 +27338,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 158 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1c_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h1c_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 158 "root_numpy/src/array.pyx" } @@ -26173,7 +27377,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h1c_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 158 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 158 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -26191,7 +27395,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 158 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 158 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_58h1c_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -26273,7 +27477,7 @@ static PyObject *__pyx_pf_13_librootnumpy_58h1c_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 158 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int8_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int8_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 158 "root_numpy/src/array.pyx" } @@ -26290,7 +27494,7 @@ static PyObject *__pyx_pf_13_librootnumpy_58h1c_array(CYTHON_UNUSED PyObject *__ */ #line 159 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 159 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH1C *)__pyx_t_1); @@ -26316,7 +27520,7 @@ static PyObject *__pyx_pf_13_librootnumpy_58h1c_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 160 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/array.pyx" } @@ -26505,7 +27709,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h2c_array", 1, 2, 2, 1); #line 166 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 166 "root_numpy/src/array.pyx" } @@ -26517,7 +27721,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 166 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2c_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h2c_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 166 "root_numpy/src/array.pyx" } @@ -26556,7 +27760,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h2c_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 166 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 166 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -26574,7 +27778,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 166 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 166 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_60h2c_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -26656,7 +27860,7 @@ static PyObject *__pyx_pf_13_librootnumpy_60h2c_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 166 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int8_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int8_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 166 "root_numpy/src/array.pyx" } @@ -26673,7 +27877,7 @@ static PyObject *__pyx_pf_13_librootnumpy_60h2c_array(CYTHON_UNUSED PyObject *__ */ #line 167 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH2C *)__pyx_t_1); @@ -26699,7 +27903,7 @@ static PyObject *__pyx_pf_13_librootnumpy_60h2c_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 168 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 168 "root_numpy/src/array.pyx" } @@ -26888,7 +28092,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("h3c_array", 1, 2, 2, 1); #line 174 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 174 "root_numpy/src/array.pyx" } @@ -26900,7 +28104,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 174 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3c_array") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "h3c_array") < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 174 "root_numpy/src/array.pyx" } @@ -26939,7 +28143,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("h3c_array", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 174 "root_numpy/src/array.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 174 "root_numpy/src/array.pyx" __pyx_L3_error:; @@ -26957,7 +28161,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 174 "root_numpy/src/array.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 174 "root_numpy/src/array.pyx" __pyx_pf_13_librootnumpy_62h3c_array(__pyx_self, __pyx_v_root_hist, __pyx_v_array); @@ -27039,7 +28243,7 @@ static PyObject *__pyx_pf_13_librootnumpy_62h3c_array(CYTHON_UNUSED PyObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 174 "root_numpy/src/array.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int8_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int8_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 174 "root_numpy/src/array.pyx" } @@ -27056,7 +28260,7 @@ static PyObject *__pyx_pf_13_librootnumpy_62h3c_array(CYTHON_UNUSED PyObject *__ */ #line 175 "root_numpy/src/array.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 175 "root_numpy/src/array.pyx" __pyx_v__hist = ((TH3C *)__pyx_t_1); @@ -27081,7 +28285,7 @@ static PyObject *__pyx_pf_13_librootnumpy_62h3c_array(CYTHON_UNUSED PyObject *__ __Pyx_CppExn2PyErr(); #line 176 "root_numpy/src/array.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[3]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 176 "root_numpy/src/array.pyx" } @@ -27282,7 +28486,7 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p */ #line 7 "root_numpy/src/matrix.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_mat); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_mat); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/matrix.pyx" __pyx_v__mat = ((TMatrixDBase *)__pyx_t_1); @@ -27296,13 +28500,13 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p */ #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_2); #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -27311,19 +28515,19 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNrows()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNrows()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_2); #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNcols()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNcols()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_4); #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -27347,7 +28551,7 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p __pyx_t_4 = 0; #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -27362,19 +28566,19 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p __pyx_t_5 = 0; #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_5); #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_2); #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -27383,13 +28587,13 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 8 "root_numpy/src/matrix.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 8 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -27404,7 +28608,7 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 8 "root_numpy/src/matrix.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/matrix.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -27422,7 +28626,7 @@ static PyObject *__pyx_pf_13_librootnumpy_64matrix_d(CYTHON_UNUSED PyObject *__p __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 8 "root_numpy/src/matrix.pyx" - {__pyx_filename = __pyx_f[3]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 8 "root_numpy/src/matrix.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_arr.diminfo[1].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_arr.diminfo[1].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[1]; @@ -27505,13 +28709,13 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe __Pyx_XDECREF(__pyx_r); #line 14 "root_numpy/src/matrix.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_5); #line 14 "root_numpy/src/matrix.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_matrix); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_matrix); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -27553,7 +28757,7 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe if (!__pyx_t_5) { #line 14 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_4, ((PyObject *)__pyx_v_arr)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_4, ((PyObject *)__pyx_v_arr)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -27562,7 +28766,7 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe } else { #line 14 "root_numpy/src/matrix.pyx" - __pyx_t_3 = PyTuple_New(1+1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1+1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -27580,7 +28784,7 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe __Pyx_GIVEREF(((PyObject *)__pyx_v_arr)); #line 14 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -27796,7 +29000,7 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p */ #line 20 "root_numpy/src/matrix.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_mat); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_root_mat); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/matrix.pyx" __pyx_v__mat = ((TMatrixFBase *)__pyx_t_1); @@ -27810,13 +29014,13 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p */ #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_2); #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -27825,19 +29029,19 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNrows()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNrows()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_2); #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNcols()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v__mat->GetNcols()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_4); #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -27861,7 +29065,7 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p __pyx_t_4 = 0; #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -27876,19 +29080,19 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p __pyx_t_5 = 0; #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_5); #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_2); #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float32); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float32); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -27897,13 +29101,13 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 21 "root_numpy/src/matrix.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 21 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -27918,7 +29122,7 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 21 "root_numpy/src/matrix.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/matrix.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -27936,7 +29140,7 @@ static PyObject *__pyx_pf_13_librootnumpy_66matrix_f(CYTHON_UNUSED PyObject *__p __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 21 "root_numpy/src/matrix.pyx" - {__pyx_filename = __pyx_f[3]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 21 "root_numpy/src/matrix.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_arr.diminfo[1].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_arr.diminfo[1].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[1]; @@ -28016,13 +29220,13 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe __Pyx_XDECREF(__pyx_r); #line 27 "root_numpy/src/matrix.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_5); #line 27 "root_numpy/src/matrix.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_matrix); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_matrix); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -28064,7 +29268,7 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe if (!__pyx_t_5) { #line 27 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_4, ((PyObject *)__pyx_v_arr)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_4, ((PyObject *)__pyx_v_arr)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -28073,7 +29277,7 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe } else { #line 27 "root_numpy/src/matrix.pyx" - __pyx_t_3 = PyTuple_New(1+1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1+1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -28091,7 +29295,7 @@ __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffe __Pyx_GIVEREF(((PyObject *)__pyx_v_arr)); #line 27 "root_numpy/src/matrix.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -28293,7 +29497,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("sample_f1", 1, 2, 2, 1); #line 6 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 6 "root_numpy/src/sample.pyx" } @@ -28305,7 +29509,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 6 "root_numpy/src/sample.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_f1") < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_f1") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 6 "root_numpy/src/sample.pyx" } @@ -28332,7 +29536,7 @@ goto __pyx_L5_argtuple_error; __pyx_v_f1 = values[0]; #line 6 "root_numpy/src/sample.pyx" - __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 6 "root_numpy/src/sample.pyx" } @@ -28344,7 +29548,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("sample_f1", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 6 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 6 "root_numpy/src/sample.pyx" __pyx_L3_error:; @@ -28440,7 +29644,7 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ */ #line 7 "root_numpy/src/sample.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_f1); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_f1); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/sample.pyx" __pyx_v_f1_ = ((TF1 *)__pyx_t_1); @@ -28454,13 +29658,13 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ */ #line 9 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 9 "root_numpy/src/sample.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -28469,13 +29673,13 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 9 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 9 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -28490,19 +29694,19 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ __pyx_t_2 = 0; #line 9 "root_numpy/src/sample.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 9 "root_numpy/src/sample.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_5); #line 9 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -28511,13 +29715,13 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 9 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 9 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -28532,7 +29736,7 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 9 "root_numpy/src/sample.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 9 "root_numpy/src/sample.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -28550,7 +29754,7 @@ static PyObject *__pyx_pf_13_librootnumpy_68sample_f1(CYTHON_UNUSED PyObject *__ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 9 "root_numpy/src/sample.pyx" - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 9 "root_numpy/src/sample.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; @@ -28800,7 +30004,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("sample_h1", 1, 2, 2, 1); #line 17 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 17 "root_numpy/src/sample.pyx" } @@ -28812,7 +30016,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 17 "root_numpy/src/sample.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_h1") < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_h1") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 17 "root_numpy/src/sample.pyx" } @@ -28839,7 +30043,7 @@ goto __pyx_L5_argtuple_error; __pyx_v_h1 = values[0]; #line 17 "root_numpy/src/sample.pyx" - __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 17 "root_numpy/src/sample.pyx" } @@ -28851,7 +30055,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("sample_h1", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 17 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 17 "root_numpy/src/sample.pyx" __pyx_L3_error:; @@ -28947,7 +30151,7 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ */ #line 18 "root_numpy/src/sample.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_h1); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_h1); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 18 "root_numpy/src/sample.pyx" __pyx_v_h1_ = ((TH1 *)__pyx_t_1); @@ -28961,13 +30165,13 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ */ #line 20 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 20 "root_numpy/src/sample.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -28976,13 +30180,13 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 20 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 20 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -28997,19 +30201,19 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ __pyx_t_2 = 0; #line 20 "root_numpy/src/sample.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 20 "root_numpy/src/sample.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_5); #line 20 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -29018,13 +30222,13 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 20 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 20 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -29039,7 +30243,7 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 20 "root_numpy/src/sample.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/sample.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -29057,7 +30261,7 @@ static PyObject *__pyx_pf_13_librootnumpy_70sample_h1(CYTHON_UNUSED PyObject *__ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 20 "root_numpy/src/sample.pyx" - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 20 "root_numpy/src/sample.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; @@ -29307,7 +30511,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("sample_f2", 1, 2, 2, 1); #line 28 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 28 "root_numpy/src/sample.pyx" } @@ -29319,7 +30523,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 28 "root_numpy/src/sample.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_f2") < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_f2") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 28 "root_numpy/src/sample.pyx" } @@ -29346,7 +30550,7 @@ goto __pyx_L5_argtuple_error; __pyx_v_f2 = values[0]; #line 28 "root_numpy/src/sample.pyx" - __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 28 "root_numpy/src/sample.pyx" } @@ -29358,7 +30562,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("sample_f2", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 28 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 28 "root_numpy/src/sample.pyx" __pyx_L3_error:; @@ -29463,7 +30667,7 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ */ #line 29 "root_numpy/src/sample.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_f2); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_f2); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 29 "root_numpy/src/sample.pyx" __pyx_v_f2_ = ((TF2 *)__pyx_t_1); @@ -29499,13 +30703,13 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ */ #line 33 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 33 "root_numpy/src/sample.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -29514,13 +30718,13 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 33 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 33 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -29544,7 +30748,7 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ __pyx_t_2 = 0; #line 33 "root_numpy/src/sample.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -29559,19 +30763,19 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ __pyx_t_4 = 0; #line 33 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); #line 33 "root_numpy/src/sample.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_5); #line 33 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -29580,13 +30784,13 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 33 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 33 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -29601,7 +30805,7 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 33 "root_numpy/src/sample.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/sample.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -29619,7 +30823,7 @@ static PyObject *__pyx_pf_13_librootnumpy_72sample_f2(CYTHON_UNUSED PyObject *__ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 33 "root_numpy/src/sample.pyx" - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 33 "root_numpy/src/sample.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_arr.diminfo[1].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_arr.diminfo[1].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[1]; @@ -29900,7 +31104,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("sample_h2", 1, 2, 2, 1); #line 43 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 43 "root_numpy/src/sample.pyx" } @@ -29912,7 +31116,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 43 "root_numpy/src/sample.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_h2") < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_h2") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 43 "root_numpy/src/sample.pyx" } @@ -29939,7 +31143,7 @@ goto __pyx_L5_argtuple_error; __pyx_v_h2 = values[0]; #line 43 "root_numpy/src/sample.pyx" - __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 43 "root_numpy/src/sample.pyx" } @@ -29951,7 +31155,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("sample_h2", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 43 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 43 "root_numpy/src/sample.pyx" __pyx_L3_error:; @@ -30056,7 +31260,7 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ */ #line 44 "root_numpy/src/sample.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_h2); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_h2); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 44 "root_numpy/src/sample.pyx" __pyx_v_h2_ = ((TH2 *)__pyx_t_1); @@ -30092,13 +31296,13 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ */ #line 48 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 48 "root_numpy/src/sample.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -30107,13 +31311,13 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 48 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 48 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -30137,7 +31341,7 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ __pyx_t_2 = 0; #line 48 "root_numpy/src/sample.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -30152,19 +31356,19 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ __pyx_t_4 = 0; #line 48 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); #line 48 "root_numpy/src/sample.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_5); #line 48 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -30173,13 +31377,13 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 48 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 48 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -30194,7 +31398,7 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 48 "root_numpy/src/sample.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/sample.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -30212,7 +31416,7 @@ static PyObject *__pyx_pf_13_librootnumpy_74sample_h2(CYTHON_UNUSED PyObject *__ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 48 "root_numpy/src/sample.pyx" - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 48 "root_numpy/src/sample.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_arr.diminfo[1].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_arr.diminfo[1].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[1]; @@ -30493,7 +31697,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("sample_f3", 1, 2, 2, 1); #line 58 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 58 "root_numpy/src/sample.pyx" } @@ -30505,7 +31709,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 58 "root_numpy/src/sample.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_f3") < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_f3") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 58 "root_numpy/src/sample.pyx" } @@ -30532,7 +31736,7 @@ goto __pyx_L5_argtuple_error; __pyx_v_f3 = values[0]; #line 58 "root_numpy/src/sample.pyx" - __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 58 "root_numpy/src/sample.pyx" } @@ -30544,7 +31748,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("sample_f3", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 58 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 58 "root_numpy/src/sample.pyx" __pyx_L3_error:; @@ -30654,7 +31858,7 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ */ #line 59 "root_numpy/src/sample.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_f3); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_f3); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/sample.pyx" __pyx_v_f3_ = ((TF3 *)__pyx_t_1); @@ -30701,13 +31905,13 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ */ #line 64 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 64 "root_numpy/src/sample.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -30716,13 +31920,13 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 64 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 64 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -30746,7 +31950,7 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ __pyx_t_2 = 0; #line 64 "root_numpy/src/sample.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -30761,19 +31965,19 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ __pyx_t_4 = 0; #line 64 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); #line 64 "root_numpy/src/sample.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_5); #line 64 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -30782,13 +31986,13 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 64 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 64 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -30803,7 +32007,7 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 64 "root_numpy/src/sample.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/sample.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -30821,7 +32025,7 @@ static PyObject *__pyx_pf_13_librootnumpy_76sample_f3(CYTHON_UNUSED PyObject *__ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 64 "root_numpy/src/sample.pyx" - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 64 "root_numpy/src/sample.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_arr.diminfo[1].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_arr.diminfo[1].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[1]; @@ -31119,7 +32323,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("sample_h3", 1, 2, 2, 1); #line 75 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 75 "root_numpy/src/sample.pyx" } @@ -31131,7 +32335,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 75 "root_numpy/src/sample.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_h3") < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "sample_h3") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 75 "root_numpy/src/sample.pyx" } @@ -31158,7 +32362,7 @@ goto __pyx_L5_argtuple_error; __pyx_v_h3 = values[0]; #line 75 "root_numpy/src/sample.pyx" - __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_n_samples = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_n_samples == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 75 "root_numpy/src/sample.pyx" } @@ -31170,7 +32374,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("sample_h3", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 75 "root_numpy/src/sample.pyx" -{__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 75 "root_numpy/src/sample.pyx" __pyx_L3_error:; @@ -31280,7 +32484,7 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ */ #line 76 "root_numpy/src/sample.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_h3); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_h3); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 76 "root_numpy/src/sample.pyx" __pyx_v_h3_ = ((TH3 *)__pyx_t_1); @@ -31327,13 +32531,13 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ */ #line 81 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 81 "root_numpy/src/sample.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -31342,13 +32546,13 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 81 "root_numpy/src/sample.pyx" - __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_n_samples); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); #line 81 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -31372,7 +32576,7 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ __pyx_t_2 = 0; #line 81 "root_numpy/src/sample.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -31387,19 +32591,19 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ __pyx_t_4 = 0; #line 81 "root_numpy/src/sample.pyx" - __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_4); #line 81 "root_numpy/src/sample.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_5); #line 81 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -31408,13 +32612,13 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 81 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 81 "root_numpy/src/sample.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -31429,7 +32633,7 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 81 "root_numpy/src/sample.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/sample.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -31447,7 +32651,7 @@ static PyObject *__pyx_pf_13_librootnumpy_78sample_h3(CYTHON_UNUSED PyObject *__ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_arr.rcbuffer->pybuffer.buf = NULL; #line 81 "root_numpy/src/sample.pyx" - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 81 "root_numpy/src/sample.pyx" __pyx_pybuffernd_arr.diminfo[0].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_arr.diminfo[0].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_arr.diminfo[1].strides = __pyx_pybuffernd_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_arr.diminfo[1].shape = __pyx_pybuffernd_arr.rcbuffer->pybuffer.shape[1]; @@ -31765,7 +32969,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_h1", 0, 2, 4, 1); #line 5 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 5 "root_numpy/src/hist.pyx" } @@ -31807,7 +33011,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 5 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_h1") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_h1") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 5 "root_numpy/src/hist.pyx" } @@ -31855,7 +33059,7 @@ goto __pyx_L5_argtuple_error; if (values[3]) { #line 5 "root_numpy/src/hist.pyx" - __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 5 "root_numpy/src/hist.pyx" } else { @@ -31884,7 +33088,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_h1", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); #line 6 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 6 "root_numpy/src/hist.pyx" __pyx_L3_error:; @@ -31902,10 +33106,10 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 6 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 6 "root_numpy/src/hist.pyx" __pyx_pf_13_librootnumpy_80fill_h1(__pyx_self, __pyx_v_hist, __pyx_v_array, __pyx_v_weights, __pyx_v_return_indices); @@ -32056,7 +33260,7 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 3 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/hist.pyx" } @@ -32071,7 +33275,7 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 3 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/hist.pyx" } @@ -32088,7 +33292,7 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py */ #line 8 "root_numpy/src/hist.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 8 "root_numpy/src/hist.pyx" __pyx_v__hist = ((TH1 *)__pyx_t_1); @@ -32113,13 +33317,13 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py */ #line 10 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 10 "root_numpy/src/hist.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -32128,19 +33332,19 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 10 "root_numpy/src/hist.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 10 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 10 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -32149,13 +33353,13 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 10 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 10 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__22, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__28, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -32167,7 +33371,7 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 10 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_5); @@ -32185,7 +33389,7 @@ static PyObject *__pyx_pf_13_librootnumpy_80fill_h1(CYTHON_UNUSED PyObject *__py __pyx_v_idx = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf = NULL; #line 10 "root_numpy/src/hist.pyx" - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 10 "root_numpy/src/hist.pyx" __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; @@ -32228,13 +33432,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe */ #line 14 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 14 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -32243,13 +33447,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 14 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 14 "root_numpy/src/hist.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -32264,19 +33468,19 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_t_5 = 0; #line 14 "root_numpy/src/hist.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 14 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 14 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -32285,13 +33489,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 14 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 14 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -32306,7 +33510,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 14 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_8); @@ -32354,7 +33558,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; #line 14 "root_numpy/src/hist.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/hist.pyx" } @@ -32805,7 +34009,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_h2", 0, 2, 4, 1); #line 33 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 33 "root_numpy/src/hist.pyx" } @@ -32847,7 +34051,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 33 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_h2") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_h2") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 33 "root_numpy/src/hist.pyx" } @@ -32895,7 +34099,7 @@ goto __pyx_L5_argtuple_error; if (values[3]) { #line 33 "root_numpy/src/hist.pyx" - __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 33 "root_numpy/src/hist.pyx" } else { @@ -32924,7 +34128,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_h2", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); #line 34 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 34 "root_numpy/src/hist.pyx" __pyx_L3_error:; @@ -32942,10 +34146,10 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 34 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 34 "root_numpy/src/hist.pyx" __pyx_pf_13_librootnumpy_82fill_h2(__pyx_self, __pyx_v_hist, __pyx_v_array, __pyx_v_weights, __pyx_v_return_indices); @@ -33102,7 +34306,7 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 31 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/hist.pyx" } @@ -33117,7 +34321,7 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 31 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/hist.pyx" } @@ -33134,7 +34338,7 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py */ #line 36 "root_numpy/src/hist.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/hist.pyx" __pyx_v__hist = ((TH2 *)__pyx_t_1); @@ -33159,13 +34363,13 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py */ #line 38 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 38 "root_numpy/src/hist.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -33174,19 +34378,19 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 38 "root_numpy/src/hist.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 38 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 38 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -33195,13 +34399,13 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 38 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 38 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__23, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__29, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -33213,7 +34417,7 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 38 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_5); @@ -33231,7 +34435,7 @@ static PyObject *__pyx_pf_13_librootnumpy_82fill_h2(CYTHON_UNUSED PyObject *__py __pyx_v_idx = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf = NULL; #line 38 "root_numpy/src/hist.pyx" - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 38 "root_numpy/src/hist.pyx" __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; @@ -33274,13 +34478,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe */ #line 42 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 42 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -33289,13 +34493,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 42 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 42 "root_numpy/src/hist.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -33310,19 +34514,19 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_t_5 = 0; #line 42 "root_numpy/src/hist.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 42 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 42 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -33331,13 +34535,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 42 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 42 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -33352,7 +34556,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 42 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_8); @@ -33400,7 +34604,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; #line 42 "root_numpy/src/hist.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/hist.pyx" } @@ -33869,7 +35073,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_h3", 0, 2, 4, 1); #line 61 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 61 "root_numpy/src/hist.pyx" } @@ -33911,7 +35115,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 61 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_h3") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_h3") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 61 "root_numpy/src/hist.pyx" } @@ -33959,7 +35163,7 @@ goto __pyx_L5_argtuple_error; if (values[3]) { #line 61 "root_numpy/src/hist.pyx" - __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 61 "root_numpy/src/hist.pyx" } else { @@ -33988,7 +35192,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_h3", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); #line 62 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 62 "root_numpy/src/hist.pyx" __pyx_L3_error:; @@ -34006,10 +35210,10 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 62 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 62 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 62 "root_numpy/src/hist.pyx" __pyx_pf_13_librootnumpy_84fill_h3(__pyx_self, __pyx_v_hist, __pyx_v_array, __pyx_v_weights, __pyx_v_return_indices); @@ -34170,7 +35374,7 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 59 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/hist.pyx" } @@ -34185,7 +35389,7 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 59 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/hist.pyx" } @@ -34202,7 +35406,7 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py */ #line 64 "root_numpy/src/hist.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 64 "root_numpy/src/hist.pyx" __pyx_v__hist = ((TH3 *)__pyx_t_1); @@ -34227,13 +35431,13 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py */ #line 66 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 66 "root_numpy/src/hist.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -34242,19 +35446,19 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 66 "root_numpy/src/hist.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 66 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 66 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -34263,13 +35467,13 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 66 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 66 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__24, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__30, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -34281,7 +35485,7 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 66 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_5); @@ -34299,7 +35503,7 @@ static PyObject *__pyx_pf_13_librootnumpy_84fill_h3(CYTHON_UNUSED PyObject *__py __pyx_v_idx = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf = NULL; #line 66 "root_numpy/src/hist.pyx" - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 66 "root_numpy/src/hist.pyx" __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; @@ -34342,13 +35546,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe */ #line 70 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 70 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -34357,13 +35561,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 70 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 70 "root_numpy/src/hist.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -34378,19 +35582,19 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_t_5 = 0; #line 70 "root_numpy/src/hist.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 70 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 70 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -34399,13 +35603,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 70 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 70 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -34420,7 +35624,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 70 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_8); @@ -34468,7 +35672,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; #line 70 "root_numpy/src/hist.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/hist.pyx" } @@ -34949,7 +36153,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_p1", 0, 2, 4, 1); #line 89 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 89 "root_numpy/src/hist.pyx" } @@ -34991,7 +36195,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 89 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_p1") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_p1") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 89 "root_numpy/src/hist.pyx" } @@ -35039,7 +36243,7 @@ goto __pyx_L5_argtuple_error; if (values[3]) { #line 89 "root_numpy/src/hist.pyx" - __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 89 "root_numpy/src/hist.pyx" } else { @@ -35068,7 +36272,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_p1", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); #line 90 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 90 "root_numpy/src/hist.pyx" __pyx_L3_error:; @@ -35086,10 +36290,10 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 90 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 90 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 90 "root_numpy/src/hist.pyx" __pyx_pf_13_librootnumpy_86fill_p1(__pyx_self, __pyx_v_profile, __pyx_v_array, __pyx_v_weights, __pyx_v_return_indices); @@ -35246,7 +36450,7 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 87 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/hist.pyx" } @@ -35261,7 +36465,7 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 87 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/hist.pyx" } @@ -35278,7 +36482,7 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py */ #line 92 "root_numpy/src/hist.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_profile); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_profile); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 92 "root_numpy/src/hist.pyx" __pyx_v__profile = ((TProfile *)__pyx_t_1); @@ -35303,13 +36507,13 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py */ #line 94 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 94 "root_numpy/src/hist.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -35318,19 +36522,19 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 94 "root_numpy/src/hist.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 94 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 94 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -35339,13 +36543,13 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 94 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 94 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__25, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__31, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -35357,7 +36561,7 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 94 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_5); @@ -35375,7 +36579,7 @@ static PyObject *__pyx_pf_13_librootnumpy_86fill_p1(CYTHON_UNUSED PyObject *__py __pyx_v_idx = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf = NULL; #line 94 "root_numpy/src/hist.pyx" - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 94 "root_numpy/src/hist.pyx" __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; @@ -35418,13 +36622,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe */ #line 98 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 98 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -35433,13 +36637,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 98 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 98 "root_numpy/src/hist.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -35454,19 +36658,19 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_t_5 = 0; #line 98 "root_numpy/src/hist.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 98 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 98 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -35475,13 +36679,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 98 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 98 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -35496,7 +36700,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 98 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_8); @@ -35544,7 +36748,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; #line 98 "root_numpy/src/hist.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/hist.pyx" } @@ -36013,7 +37217,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_p2", 0, 2, 4, 1); #line 117 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 117 "root_numpy/src/hist.pyx" } @@ -36055,7 +37259,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 117 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_p2") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_p2") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 117 "root_numpy/src/hist.pyx" } @@ -36103,7 +37307,7 @@ goto __pyx_L5_argtuple_error; if (values[3]) { #line 117 "root_numpy/src/hist.pyx" - __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 117 "root_numpy/src/hist.pyx" } else { @@ -36132,7 +37336,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_p2", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); #line 118 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 118 "root_numpy/src/hist.pyx" __pyx_L3_error:; @@ -36150,10 +37354,10 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 118 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 118 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 118 "root_numpy/src/hist.pyx" __pyx_pf_13_librootnumpy_88fill_p2(__pyx_self, __pyx_v_profile, __pyx_v_array, __pyx_v_weights, __pyx_v_return_indices); @@ -36314,7 +37518,7 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 115 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 115 "root_numpy/src/hist.pyx" } @@ -36329,7 +37533,7 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 115 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 115 "root_numpy/src/hist.pyx" } @@ -36346,7 +37550,7 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py */ #line 120 "root_numpy/src/hist.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_profile); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_profile); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/hist.pyx" __pyx_v__profile = ((TProfile2D *)__pyx_t_1); @@ -36371,13 +37575,13 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py */ #line 122 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 122 "root_numpy/src/hist.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -36386,19 +37590,19 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 122 "root_numpy/src/hist.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 122 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 122 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -36407,13 +37611,13 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 122 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 122 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__26, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__32, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -36425,7 +37629,7 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 122 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_5); @@ -36443,7 +37647,7 @@ static PyObject *__pyx_pf_13_librootnumpy_88fill_p2(CYTHON_UNUSED PyObject *__py __pyx_v_idx = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf = NULL; #line 122 "root_numpy/src/hist.pyx" - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 122 "root_numpy/src/hist.pyx" __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; @@ -36486,13 +37690,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe */ #line 126 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 126 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -36501,13 +37705,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 126 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 126 "root_numpy/src/hist.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -36522,19 +37726,19 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_t_5 = 0; #line 126 "root_numpy/src/hist.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 126 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 126 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -36543,13 +37747,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 126 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 126 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -36564,7 +37768,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 126 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_8); @@ -36612,7 +37816,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; #line 126 "root_numpy/src/hist.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/hist.pyx" } @@ -37093,7 +38297,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_p3", 0, 2, 4, 1); #line 145 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 145 "root_numpy/src/hist.pyx" } @@ -37135,7 +38339,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 145 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_p3") < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_p3") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 145 "root_numpy/src/hist.pyx" } @@ -37183,7 +38387,7 @@ goto __pyx_L5_argtuple_error; if (values[3]) { #line 145 "root_numpy/src/hist.pyx" - __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + __pyx_v_return_indices = __Pyx_PyObject_IsTrue(values[3]); if (unlikely((__pyx_v_return_indices == (bool)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 145 "root_numpy/src/hist.pyx" } else { @@ -37212,7 +38416,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_p3", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); #line 146 "root_numpy/src/hist.pyx" -{__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 146 "root_numpy/src/hist.pyx" __pyx_L3_error:; @@ -37230,10 +38434,10 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 146 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 146 "root_numpy/src/hist.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_weights), __pyx_ptype_5numpy_ndarray, 1, "weights", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 146 "root_numpy/src/hist.pyx" __pyx_pf_13_librootnumpy_90fill_p3(__pyx_self, __pyx_v_profile, __pyx_v_array, __pyx_v_weights, __pyx_v_return_indices); @@ -37398,7 +38602,7 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 143 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 143 "root_numpy/src/hist.pyx" } @@ -37413,7 +38617,7 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 143 "root_numpy/src/hist.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_weights.rcbuffer->pybuffer, (PyObject*)__pyx_v_weights, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 143 "root_numpy/src/hist.pyx" } @@ -37430,7 +38634,7 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py */ #line 148 "root_numpy/src/hist.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_profile); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_profile); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 148 "root_numpy/src/hist.pyx" __pyx_v__profile = ((TProfile3D *)__pyx_t_1); @@ -37455,13 +38659,13 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py */ #line 150 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/hist.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -37470,19 +38674,19 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 150 "root_numpy/src/hist.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 150 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -37491,13 +38695,13 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 150 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 150 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__27, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__33, __pyx_t_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -37509,7 +38713,7 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 150 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_5); @@ -37527,7 +38731,7 @@ static PyObject *__pyx_pf_13_librootnumpy_90fill_p3(CYTHON_UNUSED PyObject *__py __pyx_v_idx = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_idx.rcbuffer->pybuffer.buf = NULL; #line 150 "root_numpy/src/hist.pyx" - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 150 "root_numpy/src/hist.pyx" __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; @@ -37570,13 +38774,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe */ #line 154 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 154 "root_numpy/src/hist.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -37585,13 +38789,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 154 "root_numpy/src/hist.pyx" - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 154 "root_numpy/src/hist.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -37606,19 +38810,19 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_t_5 = 0; #line 154 "root_numpy/src/hist.pyx" - __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_5); #line 154 "root_numpy/src/hist.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_4); #line 154 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -37627,13 +38831,13 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 154 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_dtype, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 154 "root_numpy/src/hist.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -37648,7 +38852,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 154 "root_numpy/src/hist.pyx" - if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_8) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_8, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" __pyx_t_6 = ((PyArrayObject *)__pyx_t_8); @@ -37696,7 +38900,7 @@ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffe __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0]; #line 154 "root_numpy/src/hist.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 154 "root_numpy/src/hist.pyx" } @@ -38163,7 +39367,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_g1", 1, 2, 2, 1); #line 3 "root_numpy/src/graph.pyx" -{__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 3 "root_numpy/src/graph.pyx" } @@ -38175,7 +39379,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 3 "root_numpy/src/graph.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_g1") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_g1") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 3 "root_numpy/src/graph.pyx" } @@ -38214,7 +39418,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_g1", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 3 "root_numpy/src/graph.pyx" -{__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 3 "root_numpy/src/graph.pyx" __pyx_L3_error:; @@ -38232,7 +39436,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 3 "root_numpy/src/graph.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 3 "root_numpy/src/graph.pyx" __pyx_pf_13_librootnumpy_92fill_g1(__pyx_self, __pyx_v_graph, __pyx_v_array); @@ -38320,7 +39524,7 @@ static PyObject *__pyx_pf_13_librootnumpy_92fill_g1(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 3 "root_numpy/src/graph.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/graph.pyx" } @@ -38337,7 +39541,7 @@ static PyObject *__pyx_pf_13_librootnumpy_92fill_g1(CYTHON_UNUSED PyObject *__py */ #line 6 "root_numpy/src/graph.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_graph); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_graph); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/graph.pyx" __pyx_v__graph = ((TGraph *)__pyx_t_1); @@ -38571,7 +39775,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("fill_g2", 1, 2, 2, 1); #line 16 "root_numpy/src/graph.pyx" -{__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 16 "root_numpy/src/graph.pyx" } @@ -38583,7 +39787,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 16 "root_numpy/src/graph.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_g2") < 0)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "fill_g2") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 16 "root_numpy/src/graph.pyx" } @@ -38622,7 +39826,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("fill_g2", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 16 "root_numpy/src/graph.pyx" -{__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 16 "root_numpy/src/graph.pyx" __pyx_L3_error:; @@ -38640,7 +39844,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 16 "root_numpy/src/graph.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 16 "root_numpy/src/graph.pyx" __pyx_pf_13_librootnumpy_94fill_g2(__pyx_self, __pyx_v_graph, __pyx_v_array); @@ -38730,7 +39934,7 @@ static PyObject *__pyx_pf_13_librootnumpy_94fill_g2(CYTHON_UNUSED PyObject *__py __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 16 "root_numpy/src/graph.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/graph.pyx" } @@ -38747,7 +39951,7 @@ static PyObject *__pyx_pf_13_librootnumpy_94fill_g2(CYTHON_UNUSED PyObject *__py */ #line 19 "root_numpy/src/graph.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_graph); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_graph); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 19 "root_numpy/src/graph.pyx" __pyx_v__graph = ((TGraph2D *)__pyx_t_1); @@ -38984,7 +40188,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_h1", 1, 2, 2, 1); #line 3 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 3 "root_numpy/src/evaluate.pyx" } @@ -38996,7 +40200,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 3 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_h1") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_h1") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 3 "root_numpy/src/evaluate.pyx" } @@ -39035,7 +40239,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_h1", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 3 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 3 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -39053,7 +40257,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 3 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 3 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_96evaluate_h1(__pyx_self, __pyx_v_hist, __pyx_v_array); @@ -39166,7 +40370,7 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 3 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/evaluate.pyx" } @@ -39183,7 +40387,7 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * */ #line 5 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 5 "root_numpy/src/evaluate.pyx" __pyx_v__hist = ((TH1 *)__pyx_t_1); @@ -39208,13 +40412,13 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * */ #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -39223,13 +40427,13 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -39244,19 +40448,19 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * __pyx_t_2 = 0; #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -39265,13 +40469,13 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 7 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 7 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -39286,7 +40490,7 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 7 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 7 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -39304,7 +40508,7 @@ static PyObject *__pyx_pf_13_librootnumpy_96evaluate_h1(CYTHON_UNUSED PyObject * __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 7 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 7 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -39563,7 +40767,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_h2", 1, 2, 2, 1); #line 16 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 16 "root_numpy/src/evaluate.pyx" } @@ -39575,7 +40779,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 16 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_h2") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_h2") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 16 "root_numpy/src/evaluate.pyx" } @@ -39614,7 +40818,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_h2", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 16 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 16 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -39632,7 +40836,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 16 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 16 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_98evaluate_h2(__pyx_self, __pyx_v_hist, __pyx_v_array); @@ -39748,7 +40952,7 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 16 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/evaluate.pyx" } @@ -39765,7 +40969,7 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * */ #line 18 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 18 "root_numpy/src/evaluate.pyx" __pyx_v__hist = ((TH2 *)__pyx_t_1); @@ -39790,13 +40994,13 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * */ #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -39805,13 +41009,13 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -39826,19 +41030,19 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * __pyx_t_2 = 0; #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -39847,13 +41051,13 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 20 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 20 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -39868,7 +41072,7 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 20 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -39886,7 +41090,7 @@ static PyObject *__pyx_pf_13_librootnumpy_98evaluate_h2(CYTHON_UNUSED PyObject * __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 20 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 20 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -40154,7 +41358,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_h3", 1, 2, 2, 1); #line 29 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 29 "root_numpy/src/evaluate.pyx" } @@ -40166,7 +41370,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 29 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_h3") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_h3") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 29 "root_numpy/src/evaluate.pyx" } @@ -40205,7 +41409,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_h3", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 29 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 29 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -40223,7 +41427,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 29 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 29 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_100evaluate_h3(__pyx_self, __pyx_v_hist, __pyx_v_array); @@ -40341,7 +41545,7 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 29 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 29 "root_numpy/src/evaluate.pyx" } @@ -40358,7 +41562,7 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject */ #line 31 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_hist); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/evaluate.pyx" __pyx_v__hist = ((TH3 *)__pyx_t_1); @@ -40383,13 +41587,13 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject */ #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -40398,13 +41602,13 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -40419,19 +41623,19 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject __pyx_t_2 = 0; #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -40440,13 +41644,13 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 33 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 33 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -40461,7 +41665,7 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 33 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 33 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -40479,7 +41683,7 @@ static PyObject *__pyx_pf_13_librootnumpy_100evaluate_h3(CYTHON_UNUSED PyObject __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 33 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 33 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -40753,7 +41957,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_f1", 1, 2, 2, 1); #line 42 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 42 "root_numpy/src/evaluate.pyx" } @@ -40765,7 +41969,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 42 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_f1") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_f1") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 42 "root_numpy/src/evaluate.pyx" } @@ -40804,7 +42008,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_f1", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 42 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 42 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -40822,7 +42026,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 42 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 42 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_102evaluate_f1(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -40935,7 +42139,7 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 42 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/evaluate.pyx" } @@ -40952,7 +42156,7 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject */ #line 44 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 44 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TF1 *)__pyx_t_1); @@ -40977,13 +42181,13 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject */ #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -40992,13 +42196,13 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -41013,19 +42217,19 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject __pyx_t_2 = 0; #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -41034,13 +42238,13 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 46 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 46 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -41055,7 +42259,7 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 46 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -41073,7 +42277,7 @@ static PyObject *__pyx_pf_13_librootnumpy_102evaluate_f1(CYTHON_UNUSED PyObject __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 46 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 46 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -41332,7 +42536,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_f2", 1, 2, 2, 1); #line 55 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 55 "root_numpy/src/evaluate.pyx" } @@ -41344,7 +42548,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 55 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_f2") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_f2") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 55 "root_numpy/src/evaluate.pyx" } @@ -41383,7 +42587,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_f2", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 55 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 55 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -41401,7 +42605,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 55 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 55 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_104evaluate_f2(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -41517,7 +42721,7 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 55 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 55 "root_numpy/src/evaluate.pyx" } @@ -41534,7 +42738,7 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject */ #line 57 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 57 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TF2 *)__pyx_t_1); @@ -41559,13 +42763,13 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject */ #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -41574,13 +42778,13 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -41595,19 +42799,19 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject __pyx_t_2 = 0; #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -41616,13 +42820,13 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 59 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 59 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -41637,7 +42841,7 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 59 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -41655,7 +42859,7 @@ static PyObject *__pyx_pf_13_librootnumpy_104evaluate_f2(CYTHON_UNUSED PyObject __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 59 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 59 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -41923,7 +43127,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_f3", 1, 2, 2, 1); #line 68 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 68 "root_numpy/src/evaluate.pyx" } @@ -41935,7 +43139,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 68 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_f3") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_f3") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 68 "root_numpy/src/evaluate.pyx" } @@ -41974,7 +43178,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_f3", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 68 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 68 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -41992,7 +43196,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 68 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 68 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_106evaluate_f3(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -42110,7 +43314,7 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 68 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 68 "root_numpy/src/evaluate.pyx" } @@ -42127,7 +43331,7 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject */ #line 70 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TF3 *)__pyx_t_1); @@ -42152,13 +43356,13 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject */ #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -42167,13 +43371,13 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -42188,19 +43392,19 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject __pyx_t_2 = 0; #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -42209,13 +43413,13 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 72 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 72 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -42230,7 +43434,7 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 72 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 72 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -42248,7 +43452,7 @@ static PyObject *__pyx_pf_13_librootnumpy_106evaluate_f3(CYTHON_UNUSED PyObject __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 72 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 72 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -42522,7 +43726,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_formula_1d", 1, 2, 2, 1); #line 81 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 81 "root_numpy/src/evaluate.pyx" } @@ -42534,7 +43738,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 81 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_1d") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_1d") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 81 "root_numpy/src/evaluate.pyx" } @@ -42573,7 +43777,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_formula_1d", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 81 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 81 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -42591,7 +43795,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 81 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 81 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_108evaluate_formula_1d(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -42704,7 +43908,7 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 81 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/evaluate.pyx" } @@ -42721,7 +43925,7 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P */ #line 83 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 83 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TFormula *)__pyx_t_1); @@ -42746,13 +43950,13 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P */ #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -42761,13 +43965,13 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -42782,19 +43986,19 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P __pyx_t_2 = 0; #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -42803,13 +44007,13 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 85 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 85 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -42824,7 +44028,7 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 85 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -42842,7 +44046,7 @@ static PyObject *__pyx_pf_13_librootnumpy_108evaluate_formula_1d(CYTHON_UNUSED P __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 85 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 85 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -43101,7 +44305,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_formula_2d", 1, 2, 2, 1); #line 94 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 94 "root_numpy/src/evaluate.pyx" } @@ -43113,7 +44317,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 94 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_2d") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_2d") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 94 "root_numpy/src/evaluate.pyx" } @@ -43152,7 +44356,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_formula_2d", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 94 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 94 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -43170,7 +44374,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 94 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 94 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_110evaluate_formula_2d(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -43286,7 +44490,7 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 94 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/evaluate.pyx" } @@ -43303,7 +44507,7 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P */ #line 96 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 96 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TFormula *)__pyx_t_1); @@ -43328,13 +44532,13 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P */ #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -43343,13 +44547,13 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -43364,19 +44568,19 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P __pyx_t_2 = 0; #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -43385,13 +44589,13 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 98 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 98 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -43406,7 +44610,7 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 98 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 98 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -43424,7 +44628,7 @@ static PyObject *__pyx_pf_13_librootnumpy_110evaluate_formula_2d(CYTHON_UNUSED P __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 98 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 98 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -43692,7 +44896,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_formula_3d", 1, 2, 2, 1); #line 107 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 107 "root_numpy/src/evaluate.pyx" } @@ -43704,7 +44908,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 107 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_3d") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_3d") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 107 "root_numpy/src/evaluate.pyx" } @@ -43743,7 +44947,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_formula_3d", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 107 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 107 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -43761,7 +44965,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 107 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 107 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_112evaluate_formula_3d(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -43879,7 +45083,7 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 107 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 107 "root_numpy/src/evaluate.pyx" } @@ -43896,7 +45100,7 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P */ #line 109 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 109 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TFormula *)__pyx_t_1); @@ -43921,13 +45125,13 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P */ #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -43936,13 +45140,13 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -43957,19 +45161,19 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P __pyx_t_2 = 0; #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -43978,13 +45182,13 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 111 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 111 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -43999,7 +45203,7 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 111 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 111 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -44017,7 +45221,7 @@ static PyObject *__pyx_pf_13_librootnumpy_112evaluate_formula_3d(CYTHON_UNUSED P __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 111 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 111 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -44291,7 +45495,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_formula_4d", 1, 2, 2, 1); #line 120 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 120 "root_numpy/src/evaluate.pyx" } @@ -44303,7 +45507,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 120 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_4d") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_formula_4d") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 120 "root_numpy/src/evaluate.pyx" } @@ -44342,7 +45546,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_formula_4d", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 120 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 120 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -44360,7 +45564,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 120 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 120 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_114evaluate_formula_4d(__pyx_self, __pyx_v_func, __pyx_v_array); @@ -44480,7 +45684,7 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 120 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/evaluate.pyx" } @@ -44497,7 +45701,7 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P */ #line 122 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_func); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/evaluate.pyx" __pyx_v__func = ((TFormula *)__pyx_t_1); @@ -44522,13 +45726,13 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P */ #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -44537,13 +45741,13 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -44558,19 +45762,19 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P __pyx_t_2 = 0; #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -44579,13 +45783,13 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 124 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 124 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -44600,7 +45804,7 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 124 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -44618,7 +45822,7 @@ static PyObject *__pyx_pf_13_librootnumpy_114evaluate_formula_4d(CYTHON_UNUSED P __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 124 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 124 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -44898,7 +46102,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_graph", 1, 2, 2, 1); #line 133 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 133 "root_numpy/src/evaluate.pyx" } @@ -44910,7 +46114,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 133 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_graph") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_graph") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 133 "root_numpy/src/evaluate.pyx" } @@ -44949,7 +46153,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_graph", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 133 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 133 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -44967,7 +46171,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 133 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 133 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_116evaluate_graph(__pyx_self, __pyx_v_graph, __pyx_v_array); @@ -45080,7 +46284,7 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 133 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 133 "root_numpy/src/evaluate.pyx" } @@ -45097,7 +46301,7 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje */ #line 135 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_graph); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_graph); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 135 "root_numpy/src/evaluate.pyx" __pyx_v__graph = ((TGraph *)__pyx_t_1); @@ -45122,13 +46326,13 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje */ #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -45137,13 +46341,13 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -45158,19 +46362,19 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje __pyx_t_2 = 0; #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -45179,13 +46383,13 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 137 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 137 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -45200,7 +46404,7 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 137 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -45218,7 +46422,7 @@ static PyObject *__pyx_pf_13_librootnumpy_116evaluate_graph(CYTHON_UNUSED PyObje __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 137 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 137 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -45477,7 +46681,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("evaluate_spline", 1, 2, 2, 1); #line 146 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 146 "root_numpy/src/evaluate.pyx" } @@ -45489,7 +46693,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 146 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_spline") < 0)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "evaluate_spline") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 146 "root_numpy/src/evaluate.pyx" } @@ -45528,7 +46732,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("evaluate_spline", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); #line 146 "root_numpy/src/evaluate.pyx" -{__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 146 "root_numpy/src/evaluate.pyx" __pyx_L3_error:; @@ -45546,7 +46750,7 @@ goto __pyx_L5_argtuple_error; __pyx_L4_argument_unpacking_done:; #line 146 "root_numpy/src/evaluate.pyx" - if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_array), __pyx_ptype_5numpy_ndarray, 1, "array", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} __pyx_r = #line 146 "root_numpy/src/evaluate.pyx" __pyx_pf_13_librootnumpy_118evaluate_spline(__pyx_self, __pyx_v_spline, __pyx_v_array); @@ -45659,7 +46863,7 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 146 "root_numpy/src/evaluate.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_array.rcbuffer->pybuffer, (PyObject*)__pyx_v_array, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 146 "root_numpy/src/evaluate.pyx" } @@ -45676,7 +46880,7 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj */ #line 148 "root_numpy/src/evaluate.pyx" - __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_spline); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyCObject_AsVoidPtr(__pyx_v_spline); if (unlikely(__pyx_t_1 == NULL && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 148 "root_numpy/src/evaluate.pyx" __pyx_v__spline = ((TSpline *)__pyx_t_1); @@ -45701,13 +46905,13 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj */ #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -45716,13 +46920,13 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_size); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -45737,19 +46941,19 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj __pyx_t_2 = 0; #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_5); #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -45758,13 +46962,13 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 150 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 150 "root_numpy/src/evaluate.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -45779,7 +46983,7 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 150 "root_numpy/src/evaluate.pyx" - if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/evaluate.pyx" __pyx_t_7 = ((PyArrayObject *)__pyx_t_6); @@ -45797,7 +47001,7 @@ static PyObject *__pyx_pf_13_librootnumpy_118evaluate_spline(CYTHON_UNUSED PyObj __pyx_v_values = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_values.rcbuffer->pybuffer.buf = NULL; #line 150 "root_numpy/src/evaluate.pyx" - {__pyx_filename = __pyx_f[7]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 150 "root_numpy/src/evaluate.pyx" __pyx_pybuffernd_values.diminfo[0].strides = __pyx_pybuffernd_values.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_values.diminfo[0].shape = __pyx_pybuffernd_values.rcbuffer->pybuffer.shape[0]; @@ -46097,13 +47301,13 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v */ #line 14 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_fk, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_fk, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); #line 14 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_n_s_O, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_n_s_O, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 14 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -46171,7 +47375,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v while (1) { #line 21 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = (__Pyx_PySequence_Contains(__pyx_v_fk_name, __pyx_v_left, Py_EQ)); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = (__Pyx_PySequence_Contains(__pyx_v_fk_name, __pyx_v_left, Py_EQ)); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/innerjoin.pyx" __pyx_t_5 = (__pyx_t_3 != 0); @@ -46192,7 +47396,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v } #line 21 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = (__Pyx_PySequence_Contains(__pyx_v_fk_name, __pyx_v_right, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = (__Pyx_PySequence_Contains(__pyx_v_fk_name, __pyx_v_right, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 21 "root_numpy/src/innerjoin.pyx" __pyx_t_3 = (__pyx_t_5 != 0); @@ -46215,7 +47419,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v */ #line 22 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyNumber_InPlaceAdd(__pyx_v_i_fk_name, __pyx_int_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyNumber_InPlaceAdd(__pyx_v_i_fk_name, __pyx_int_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 22 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -46235,7 +47439,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v */ #line 23 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyString_Format(__pyx_kp_s_fk_d, __pyx_v_i_fk_name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyString_Format(__pyx_kp_s_fk_d, __pyx_v_i_fk_name); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 23 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -46273,7 +47477,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v if ((__pyx_t_4 != 0)) { #line 25 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 25 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); @@ -46311,7 +47515,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v */ #line 27 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_scalar_mode); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_scalar_mode); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 27 "root_numpy/src/innerjoin.pyx" if (__pyx_t_4) { @@ -46325,7 +47529,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v */ #line 30 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyNumber_InPlaceAdd(__pyx_v_force_repeat, __pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyNumber_InPlaceAdd(__pyx_v_force_repeat, __pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 30 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -46354,7 +47558,7 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v */ #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -46372,13 +47576,13 @@ static PyObject *__pyx_f_13_librootnumpy__blockwise_inner_join(PyObject *__pyx_v } else { __pyx_t_6 = -1; #line 32 "root_numpy/src/innerjoin.pyx" -__pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" } @@ -46399,13 +47603,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" #else #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" #endif @@ -46420,13 +47624,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" #else #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" #endif @@ -46453,7 +47657,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 32 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" } @@ -46477,13 +47681,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __pyx_t_8 = 0; #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = PyObject_GetItem(__pyx_t_8, __pyx_v_c); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_9 = PyObject_GetItem(__pyx_t_8, __pyx_v_c); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 32 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); @@ -46492,7 +47696,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = (__Pyx_PyString_Equals(__pyx_t_9, __pyx_n_s_O, Py_NE)); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = (__Pyx_PyString_Equals(__pyx_t_9, __pyx_n_s_O, Py_NE)); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; @@ -46513,7 +47717,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil } #line 32 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_force_repeat, Py_EQ)); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_force_repeat, Py_EQ)); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" __pyx_t_5 = (__pyx_t_3 != 0); @@ -46528,7 +47732,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil if (__pyx_t_4) { #line 32 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_v_c))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_v_c))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "root_numpy/src/innerjoin.pyx" goto __pyx_L11; @@ -46560,13 +47764,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil */ #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_array); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_array); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); @@ -46575,7 +47779,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); @@ -46593,13 +47797,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyList_GET_ITEM(__pyx_t_8, __pyx_t_6); __Pyx_INCREF(__pyx_t_10); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PyList_GET_ITEM(__pyx_t_8, __pyx_t_6); __Pyx_INCREF(__pyx_t_10); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" #else #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PySequence_ITEM(__pyx_t_8, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PySequence_ITEM(__pyx_t_8, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" #endif @@ -46611,13 +47815,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __pyx_t_10 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_11); #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_names); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_names); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_12); @@ -46626,7 +47830,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_n_s_index); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_n_s_index); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_11); @@ -46668,7 +47872,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil if (!__pyx_t_12) { #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_v_x); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyObject_CallOneArg(__pyx_t_11, __pyx_v_x); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -46677,7 +47881,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil } else { #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_13 = PyTuple_New(1+1); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_13 = PyTuple_New(1+1); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_13); @@ -46695,7 +47899,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_GIVEREF(__pyx_v_x); #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_13, NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_13, NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -46710,7 +47914,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_10))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_10))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; @@ -46722,13 +47926,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_int); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_int); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -46773,7 +47977,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil } #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_11); @@ -46806,7 +48010,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __pyx_t_10 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_11, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_11, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -46818,7 +48022,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; #line 34 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 34 "root_numpy/src/innerjoin.pyx" __pyx_t_14 = ((PyArrayObject *)__pyx_t_2); @@ -46836,7 +48040,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_1)) {__pyx_fil __pyx_v_repeat_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer.buf = NULL; #line 34 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 34 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_repeat_indices.diminfo[0].strides = __pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_repeat_indices.diminfo[0].shape = __pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer.shape[0]; @@ -46865,7 +48069,7 @@ __pyx_pybuffernd_repeat_indices.diminfo[0].strides = __pyx_pybuffernd_repeat_ind */ #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -46883,13 +48087,13 @@ __pyx_pybuffernd_repeat_indices.diminfo[0].strides = __pyx_pybuffernd_repeat_ind } else { __pyx_t_6 = -1; #line 36 "root_numpy/src/innerjoin.pyx" -__pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = Py_TYPE(__pyx_t_9)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = Py_TYPE(__pyx_t_9)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" } @@ -46910,13 +48114,13 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = PyList_GET_ITEM(__pyx_t_9, __pyx_t_6); __Pyx_INCREF(__pyx_t_11); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = PyList_GET_ITEM(__pyx_t_9, __pyx_t_6); __Pyx_INCREF(__pyx_t_11); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" #else #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = PySequence_ITEM(__pyx_t_9, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = PySequence_ITEM(__pyx_t_9, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" #endif @@ -46931,13 +48135,13 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_9, __pyx_t_6); __Pyx_INCREF(__pyx_t_11); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = PyTuple_GET_ITEM(__pyx_t_9, __pyx_t_6); __Pyx_INCREF(__pyx_t_11); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" #else #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = PySequence_ITEM(__pyx_t_9, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = PySequence_ITEM(__pyx_t_9, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" #endif @@ -46964,7 +48168,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 36 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" } @@ -46988,7 +48192,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __pyx_t_11 = 0; #line 36 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_repeat_columns, Py_NE)); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_repeat_columns, Py_NE)); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" __pyx_t_5 = (__pyx_t_4 != 0); @@ -46997,7 +48201,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil if (__pyx_t_5) { #line 36 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_v_c))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_v_c))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 36 "root_numpy/src/innerjoin.pyx" goto __pyx_L18; @@ -47029,13 +48233,13 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil */ #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_array); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_array); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_11); @@ -47044,7 +48248,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = PyList_New(0); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = PyList_New(0); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); @@ -47062,13 +48266,13 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_6); __Pyx_INCREF(__pyx_t_1); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_10, __pyx_t_6); __Pyx_INCREF(__pyx_t_1); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" #else #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PySequence_ITEM(__pyx_t_10, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PySequence_ITEM(__pyx_t_10, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" #endif @@ -47080,13 +48284,13 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __pyx_t_1 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_names); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_names); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_13); @@ -47095,7 +48299,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_index); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_index); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -47137,7 +48341,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil if (!__pyx_t_13) { #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_v_x); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_v_x); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); @@ -47146,7 +48350,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil } else { #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_12); @@ -47164,7 +48368,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __Pyx_GIVEREF(__pyx_v_x); #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_12, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_12, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); @@ -47179,7 +48383,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_9, (PyObject*)__pyx_t_1))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_9, (PyObject*)__pyx_t_1))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -47191,13 +48395,13 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_int); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_int); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); @@ -47242,7 +48446,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil } #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -47275,7 +48479,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __pyx_t_1 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_t_8, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -47287,7 +48491,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; #line 38 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/innerjoin.pyx" __pyx_t_15 = ((PyArrayObject *)__pyx_t_2); @@ -47305,7 +48509,7 @@ __pyx_t_9 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_9)) {__pyx_fil __pyx_v_stretch_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer.buf = NULL; #line 38 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 38 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_stretch_indices.diminfo[0].strides = __pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_stretch_indices.diminfo[0].shape = __pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer.shape[0]; @@ -47334,13 +48538,13 @@ __pyx_pybuffernd_stretch_indices.diminfo[0].strides = __pyx_pybuffernd_stretch_i */ #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_11); #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_array); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_11, __pyx_n_s_array); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -47349,7 +48553,7 @@ __pyx_pybuffernd_stretch_indices.diminfo[0].strides = __pyx_pybuffernd_stretch_i __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_11 = PyList_New(0); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_11 = PyList_New(0); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_11); @@ -47367,13 +48571,13 @@ __pyx_pybuffernd_stretch_indices.diminfo[0].strides = __pyx_pybuffernd_stretch_i } else { __pyx_t_6 = -1; #line 41 "root_numpy/src/innerjoin.pyx" -__pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" } @@ -47394,13 +48598,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_9); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_9); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" #else #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" #endif @@ -47415,13 +48619,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_9); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_9); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" #else #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" #endif @@ -47448,7 +48652,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 41 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" } @@ -47472,13 +48676,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __pyx_t_9 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_names); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_names); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_12); @@ -47487,7 +48691,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_n_s_index); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_n_s_index); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -47529,7 +48733,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi if (!__pyx_t_12) { #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_PyObject_CallOneArg(__pyx_t_10, __pyx_v_x); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyObject_CallOneArg(__pyx_t_10, __pyx_v_x); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); @@ -47538,7 +48742,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi } else { #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_13 = PyTuple_New(1+1); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_13 = PyTuple_New(1+1); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_13); @@ -47556,7 +48760,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __Pyx_GIVEREF(__pyx_v_x); #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_10, __pyx_t_13, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_10, __pyx_t_13, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); @@ -47571,7 +48775,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_11, (PyObject*)__pyx_t_9))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_11, (PyObject*)__pyx_t_9))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; @@ -47583,13 +48787,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_int); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_int); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_9); @@ -47634,7 +48838,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi } #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PyTuple_New(2+__pyx_t_6); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -47667,7 +48871,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __pyx_t_9 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_10, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_10, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -47679,7 +48883,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 41 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 41 "root_numpy/src/innerjoin.pyx" __pyx_t_16 = ((PyArrayObject *)__pyx_t_2); @@ -47697,7 +48901,7 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_1)) {__pyx_fi __pyx_v_right_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_right_indices.rcbuffer->pybuffer.buf = NULL; #line 41 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 41 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_right_indices.diminfo[0].strides = __pyx_pybuffernd_right_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_right_indices.diminfo[0].shape = __pyx_pybuffernd_right_indices.rcbuffer->pybuffer.shape[0]; @@ -47726,7 +48930,7 @@ __pyx_pybuffernd_right_indices.diminfo[0].strides = __pyx_pybuffernd_right_indic */ #line 44 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 44 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -47758,13 +48962,13 @@ __pyx_pybuffernd_right_indices.diminfo[0].strides = __pyx_pybuffernd_right_indic } else { __pyx_t_6 = -1; #line 45 "root_numpy/src/innerjoin.pyx" -__pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 45 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" } @@ -47785,13 +48989,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 45 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" #else #line 45 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" #endif @@ -47806,13 +49010,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil #if CYTHON_COMPILING_IN_CPYTHON #line 45 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_8); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" #else #line 45 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" #endif @@ -47839,7 +49043,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 45 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 45 "root_numpy/src/innerjoin.pyx" } @@ -47871,7 +49075,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil */ #line 46 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_repeat_columns, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_repeat_columns, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/innerjoin.pyx" __pyx_t_4 = (__pyx_t_5 != 0); @@ -47888,13 +49092,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil */ #line 47 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 47 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); #line 47 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyObject_GetItem(__pyx_t_8, __pyx_v_c); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_10 = PyObject_GetItem(__pyx_t_8, __pyx_v_c); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 47 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -47903,7 +49107,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 47 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 47 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -47927,7 +49131,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil __pyx_t_10 = 0; #line 47 "root_numpy/src/innerjoin.pyx" - __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_8); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_8); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 47 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -47947,7 +49151,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil */ #line 48 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_stretch_columns, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = (__Pyx_PySequence_Contains(__pyx_v_c, __pyx_v_stretch_columns, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 48 "root_numpy/src/innerjoin.pyx" __pyx_t_5 = (__pyx_t_4 != 0); @@ -47964,13 +49168,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil */ #line 49 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyObject_GetItem(__pyx_v_data, __pyx_v_c); if (unlikely(__pyx_t_8 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_8 = PyObject_GetItem(__pyx_v_data, __pyx_v_c); if (unlikely(__pyx_t_8 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 49 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); #line 49 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_GetItemInt(__pyx_t_8, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_10 = __Pyx_GetItemInt(__pyx_t_8, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 49 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -47979,7 +49183,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 49 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_10, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 49 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -47988,7 +49192,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; #line 49 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 49 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -48012,7 +49216,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil __pyx_t_8 = 0; #line 49 "root_numpy/src/innerjoin.pyx" - __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_10); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_10); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 49 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; @@ -48061,13 +49265,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_left); if (unlikely(!__pyx_t_2)) {__pyx_fil } else { __pyx_t_6 = -1; #line 50 "root_numpy/src/innerjoin.pyx" -__pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 50 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" } @@ -48088,13 +49292,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 50 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_10); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_10); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" #else #line 50 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" #endif @@ -48109,13 +49313,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 50 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_10); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_6); __Pyx_INCREF(__pyx_t_10); __pyx_t_6++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" #else #line 50 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = PySequence_ITEM(__pyx_t_2, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" #endif @@ -48142,7 +49346,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 50 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "root_numpy/src/innerjoin.pyx" } @@ -48174,13 +49378,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 51 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = PyObject_GetItem(__pyx_v_data, __pyx_v_c); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_10 = PyObject_GetItem(__pyx_v_data, __pyx_v_c); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 51 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); #line 51 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_GetItemInt(__pyx_t_10, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_8 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_8 = __Pyx_GetItemInt(__pyx_t_10, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_8 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 51 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -48189,7 +49393,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; #line 51 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_dtype); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_dtype); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 51 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_10); @@ -48198,7 +49402,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; #line 51 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 51 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -48222,7 +49426,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi __pyx_t_10 = 0; #line 51 "root_numpy/src/innerjoin.pyx" - __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_8); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_8); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 51 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; @@ -48250,13 +49454,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 53 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_fk, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_fk, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 53 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 53 "root_numpy/src/innerjoin.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_dtype); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 53 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_8); @@ -48265,7 +49469,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 53 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 53 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -48289,7 +49493,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi __pyx_t_8 = 0; #line 53 "root_numpy/src/innerjoin.pyx" - __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_2); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_17 = __Pyx_PyList_Append(__pyx_v_new_dtype, __pyx_t_2); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 53 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -48317,7 +49521,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 56 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_scalar_mode); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_v_scalar_mode); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 56 "root_numpy/src/innerjoin.pyx" if (__pyx_t_5) { @@ -48331,10 +49535,10 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 58 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_v_data) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_data, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_v_data) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_data, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 58 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_v_fk) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_fk, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_v_fk) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_fk, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/innerjoin.pyx":57 * @@ -48345,7 +49549,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 57 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy__scalar_fk_inner_join(((PyArrayObject *)__pyx_v_data), __pyx_v_right, ((PyArrayObject *)__pyx_v_fk), __pyx_v_fk_name, __pyx_v_new_dtype, __pyx_v_repeat_columns, __pyx_v_stretch_columns, ((PyArrayObject *)__pyx_v_repeat_indices), ((PyArrayObject *)__pyx_v_stretch_indices), ((PyArrayObject *)__pyx_v_right_indices)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __pyx_f_13_librootnumpy__scalar_fk_inner_join(((PyArrayObject *)__pyx_v_data), __pyx_v_right, ((PyArrayObject *)__pyx_v_fk), __pyx_v_fk_name, __pyx_v_new_dtype, __pyx_v_repeat_columns, __pyx_v_stretch_columns, ((PyArrayObject *)__pyx_v_repeat_indices), ((PyArrayObject *)__pyx_v_stretch_indices), ((PyArrayObject *)__pyx_v_right_indices)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 57 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -48374,10 +49578,10 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 63 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_v_data) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_data, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_v_data) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_data, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 63 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_v_fk) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_fk, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_v_fk) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_fk, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/innerjoin.pyx":62 * repeat_indices, stretch_indices, right_indices) @@ -48388,7 +49592,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_2)) {__pyx_fi */ #line 62 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __pyx_f_13_librootnumpy__vector_fk_inner_join(((PyArrayObject *)__pyx_v_data), __pyx_v_right, ((PyArrayObject *)__pyx_v_fk), __pyx_v_fk_name, __pyx_v_new_dtype, __pyx_v_repeat_columns, __pyx_v_stretch_columns, ((PyArrayObject *)__pyx_v_repeat_indices), ((PyArrayObject *)__pyx_v_stretch_indices), ((PyArrayObject *)__pyx_v_right_indices)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __pyx_f_13_librootnumpy__vector_fk_inner_join(((PyArrayObject *)__pyx_v_data), __pyx_v_right, ((PyArrayObject *)__pyx_v_fk), __pyx_v_fk_name, __pyx_v_new_dtype, __pyx_v_repeat_columns, __pyx_v_stretch_columns, ((PyArrayObject *)__pyx_v_repeat_indices), ((PyArrayObject *)__pyx_v_stretch_indices), ((PyArrayObject *)__pyx_v_right_indices)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 62 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -48674,7 +49878,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("_blockwise_inner_join", 1, 6, 6, 1); #line 11 "root_numpy/src/innerjoin.pyx" -{__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" } @@ -48689,7 +49893,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("_blockwise_inner_join", 1, 6, 6, 2); #line 11 "root_numpy/src/innerjoin.pyx" -{__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" } @@ -48704,7 +49908,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("_blockwise_inner_join", 1, 6, 6, 3); #line 11 "root_numpy/src/innerjoin.pyx" -{__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" } @@ -48719,7 +49923,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("_blockwise_inner_join", 1, 6, 6, 4); #line 11 "root_numpy/src/innerjoin.pyx" -{__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" } @@ -48734,7 +49938,7 @@ goto __pyx_L5_argtuple_error; else { __Pyx_RaiseArgtupleInvalid("_blockwise_inner_join", 1, 6, 6, 5); #line 11 "root_numpy/src/innerjoin.pyx" -{__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" } @@ -48746,7 +49950,7 @@ goto __pyx_L5_argtuple_error; if (unlikely(kw_args > 0)) { #line 11 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "_blockwise_inner_join") < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "_blockwise_inner_join") < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" } @@ -48809,7 +50013,7 @@ goto __pyx_L5_argtuple_error; __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("_blockwise_inner_join", 1, 6, 6, PyTuple_GET_SIZE(__pyx_args)); #line 11 "root_numpy/src/innerjoin.pyx" -{__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +{__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;} #line 11 "root_numpy/src/innerjoin.pyx" __pyx_L3_error:; @@ -48865,7 +50069,7 @@ static PyObject *__pyx_pf_13_librootnumpy_120_blockwise_inner_join(CYTHON_UNUSED __Pyx_XDECREF(__pyx_r); #line 11 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = __pyx_f_13_librootnumpy__blockwise_inner_join(__pyx_v_data, __pyx_v_left, __pyx_v_fk, __pyx_v_right, __pyx_v_force_repeat, __pyx_v_fk_name, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __pyx_f_13_librootnumpy__blockwise_inner_join(__pyx_v_data, __pyx_v_left, __pyx_v_fk, __pyx_v_right, __pyx_v_force_repeat, __pyx_v_fk_name, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 11 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_1); @@ -49203,7 +50407,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 69 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_repeat_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_repeat_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 69 "root_numpy/src/innerjoin.pyx" } @@ -49218,7 +50422,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 69 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_stretch_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_stretch_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 69 "root_numpy/src/innerjoin.pyx" } @@ -49233,7 +50437,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 69 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_right_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_right_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_right_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_right_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 69 "root_numpy/src/innerjoin.pyx" } @@ -49250,7 +50454,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 76 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_data)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_data)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 76 "root_numpy/src/innerjoin.pyx" __pyx_v_ndata = __pyx_t_1; @@ -49264,13 +50468,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 77 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_right, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_right, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 77 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 77 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = PyObject_GetItem(((PyObject *)__pyx_v_data), __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = PyObject_GetItem(((PyObject *)__pyx_v_data), __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 77 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -49279,7 +50483,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 77 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 77 "root_numpy/src/innerjoin.pyx" __pyx_v_first_right = ((PyArrayObject *)__pyx_t_3); @@ -49296,13 +50500,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 78 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 78 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -49311,7 +50515,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 78 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_ndata); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_ndata); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -49353,7 +50557,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ } #line 78 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -49386,7 +50590,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __pyx_t_2 = 0; #line 78 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -49398,7 +50602,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 78 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/innerjoin.pyx" __pyx_v_good_fk_index = ((PyArrayObject *)__pyx_t_3); @@ -49451,13 +50655,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 85 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_first_right), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_first_right), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 85 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 85 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 85 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -49474,7 +50678,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 86 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 86 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -49494,13 +50698,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_flatnonzero); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_flatnonzero); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -49509,22 +50713,22 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_fks, __pyx_int_0, Py_GE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_fks, __pyx_int_0, Py_GE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_max_fks); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_max_fks); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyObject_RichCompare(__pyx_v_fks, __pyx_t_2, Py_LT); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyObject_RichCompare(__pyx_v_fks, __pyx_t_2, Py_LT); __Pyx_XGOTREF(__pyx_t_5); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyNumber_And(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyNumber_And(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -49569,7 +50773,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ if (!__pyx_t_5) { #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -49581,7 +50785,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ } else { #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -49599,7 +50803,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __pyx_t_2 = 0; #line 87 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -49614,7 +50818,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 87 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" __pyx_t_8 = ((PyArrayObject *)__pyx_t_3); @@ -49662,7 +50866,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __pyx_pybuffernd_good_index.diminfo[0].strides = __pyx_pybuffernd_good_index.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_good_index.diminfo[0].shape = __pyx_pybuffernd_good_index.rcbuffer->pybuffer.shape[0]; #line 87 "root_numpy/src/innerjoin.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/innerjoin.pyx" } @@ -49685,7 +50889,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 88 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_good_index)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_good_index)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 88 "root_numpy/src/innerjoin.pyx" __pyx_v_nresult = (__pyx_v_nresult + __pyx_t_1); @@ -49699,7 +50903,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 89 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_good_fk_index), __pyx_v_i_data, ((PyObject *)__pyx_v_good_index), long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_good_fk_index), __pyx_v_i_data, ((PyObject *)__pyx_v_good_index), long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 89 "root_numpy/src/innerjoin.pyx" } @@ -49713,13 +50917,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 91 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 91 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 91 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 91 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -49728,7 +50932,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 91 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyInt_From_long(__pyx_v_nresult); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyInt_From_long(__pyx_v_nresult); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 91 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -49770,7 +50974,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ } #line 91 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 91 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -49803,7 +51007,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __pyx_t_6 = 0; #line 91 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 91 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -49815,7 +51019,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 91 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 91 "root_numpy/src/innerjoin.pyx" __pyx_v_ret = ((PyArrayObject *)__pyx_t_3); @@ -49832,13 +51036,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ */ #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_array); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_array); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -49847,7 +51051,7 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -49865,13 +51069,13 @@ static PyObject *__pyx_f_13_librootnumpy__vector_fk_inner_join(PyArrayObject *__ } else { __pyx_t_1 = -1; #line 95 "root_numpy/src/innerjoin.pyx" -__pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_13 = Py_TYPE(__pyx_t_6)->tp_iternext; if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_13 = Py_TYPE(__pyx_t_6)->tp_iternext; if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" } @@ -49892,13 +51096,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) #if CYTHON_COMPILING_IN_CPYTHON #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" #else #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" #endif @@ -49913,13 +51117,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) #if CYTHON_COMPILING_IN_CPYTHON #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" #else #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" #endif @@ -49946,7 +51150,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 95 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" } @@ -49970,13 +51174,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __pyx_t_2 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_14); #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_14, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_14, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_15); @@ -49985,7 +51189,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_14); @@ -50027,7 +51231,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) if (!__pyx_t_15) { #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_14, __pyx_v_x); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_14, __pyx_v_x); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -50036,7 +51240,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) } else { #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_16); @@ -50054,7 +51258,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __Pyx_GIVEREF(__pyx_v_x); #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_16, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_16, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -50069,7 +51273,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_4, (PyObject*)__pyx_t_2))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_4, (PyObject*)__pyx_t_2))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -50081,13 +51285,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_int); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_int); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -50132,7 +51336,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) } #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_14); @@ -50165,7 +51369,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __pyx_t_2 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_14, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_14, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -50177,7 +51381,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 95 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 95 "root_numpy/src/innerjoin.pyx" __pyx_t_17 = ((PyArrayObject *)__pyx_t_3); @@ -50195,7 +51399,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_6)) __pyx_v_repeat_result_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_repeat_result_indices.rcbuffer->pybuffer.buf = NULL; #line 95 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 95 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_repeat_result_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_repeat_result_indices.diminfo[0].shape = __pyx_pybuffernd_repeat_result_indices.rcbuffer->pybuffer.shape[0]; @@ -50224,13 +51428,13 @@ __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_rep */ #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_array); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_array); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_14); @@ -50239,7 +51443,7 @@ __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_rep __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -50257,13 +51461,13 @@ __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_rep } else { __pyx_t_1 = -1; #line 97 "root_numpy/src/innerjoin.pyx" -__pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_13 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_13 = Py_TYPE(__pyx_t_2)->tp_iternext; if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" } @@ -50284,13 +51488,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) #if CYTHON_COMPILING_IN_CPYTHON #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" #else #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" #endif @@ -50305,13 +51509,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) #if CYTHON_COMPILING_IN_CPYTHON #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" #else #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" #endif @@ -50338,7 +51542,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 97 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" } @@ -50362,13 +51566,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __pyx_t_4 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_16 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_names); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_16 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_names); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_16); @@ -50377,7 +51581,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_n_s_index); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_n_s_index); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -50419,7 +51623,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) if (!__pyx_t_16) { #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_v_x); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_v_x); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -50428,7 +51632,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) } else { #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_15 = PyTuple_New(1+1); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_15 = PyTuple_New(1+1); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_15); @@ -50446,7 +51650,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __Pyx_GIVEREF(__pyx_v_x); #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_15, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_15, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -50461,7 +51665,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_4))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_4))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -50473,13 +51677,13 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -50524,7 +51728,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) } #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -50557,7 +51761,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __pyx_t_4 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -50569,7 +51773,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; #line 97 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 97 "root_numpy/src/innerjoin.pyx" __pyx_t_18 = ((PyArrayObject *)__pyx_t_3); @@ -50587,7 +51791,7 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_2)) __pyx_v_stretch_result_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_stretch_result_indices.rcbuffer->pybuffer.buf = NULL; #line 97 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 97 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_stretch_result_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_stretch_result_indices.diminfo[0].shape = __pyx_pybuffernd_stretch_result_indices.rcbuffer->pybuffer.shape[0]; @@ -50616,13 +51820,13 @@ __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_st */ #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_14); #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_14, __pyx_n_s_array); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_14, __pyx_n_s_array); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -50631,7 +51835,7 @@ __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_st __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = PyList_New(0); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = PyList_New(0); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_14); @@ -50649,13 +51853,13 @@ __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_st } else { __pyx_t_1 = -1; #line 99 "root_numpy/src/innerjoin.pyx" -__pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_13 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_13 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" } @@ -50676,13 +51880,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_5); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_5); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" #else #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" #endif @@ -50697,13 +51901,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_5); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_5); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" #else #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" #endif @@ -50730,7 +51934,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 99 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" } @@ -50754,13 +51958,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __pyx_t_5 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_15); @@ -50769,7 +51973,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -50811,7 +52015,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi if (!__pyx_t_15) { #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_x); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_x); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -50820,7 +52024,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi } else { #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_16); @@ -50838,7 +52042,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __Pyx_GIVEREF(__pyx_v_x); #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_16, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_16, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -50853,7 +52057,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_14, (PyObject*)__pyx_t_5))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_14, (PyObject*)__pyx_t_5))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -50865,13 +52069,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -50916,7 +52120,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi } #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -50949,7 +52153,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __pyx_t_5 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -50961,7 +52165,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 99 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 99 "root_numpy/src/innerjoin.pyx" __pyx_t_19 = ((PyArrayObject *)__pyx_t_3); @@ -50979,7 +52183,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_4)) {__pyx_fi __pyx_v_right_result_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_right_result_indices.rcbuffer->pybuffer.buf = NULL; #line 99 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 99 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_right_result_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_right_result_indices.diminfo[0].shape = __pyx_pybuffernd_right_result_indices.rcbuffer->pybuffer.shape[0]; @@ -51008,13 +52212,13 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_ret), __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_names); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_names); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -51023,7 +52227,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_index); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_index); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -51065,7 +52269,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ if (!__pyx_t_2) { #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_v_fk_name); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_v_fk_name); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -51074,7 +52278,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ } else { #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -51092,7 +52296,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __Pyx_GIVEREF(__pyx_v_fk_name); #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -51107,7 +52311,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 101 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 101 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -51124,7 +52328,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 102 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_repeat_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_repeat_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 102 "root_numpy/src/innerjoin.pyx" __pyx_v_nrepeat = __pyx_t_1; @@ -51138,7 +52342,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 103 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_stretch_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_stretch_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 103 "root_numpy/src/innerjoin.pyx" __pyx_v_nstretch = __pyx_t_1; @@ -51152,7 +52356,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 104 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_right_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_right_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 104 "root_numpy/src/innerjoin.pyx" __pyx_v_nright = __pyx_t_1; @@ -51290,13 +52494,13 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 119 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_good_fk_index), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_good_fk_index), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 119 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 119 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 119 "root_numpy/src/innerjoin.pyx" __pyx_t_20 = ((PyArrayObject *)__pyx_t_3); @@ -51344,7 +52548,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __pyx_pybuffernd_tmp_good_fk_index.diminfo[0].strides = __pyx_pybuffernd_tmp_good_fk_index.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_tmp_good_fk_index.diminfo[0].shape = __pyx_pybuffernd_tmp_good_fk_index.rcbuffer->pybuffer.shape[0]; #line 119 "root_numpy/src/innerjoin.pyx" - if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 119 "root_numpy/src/innerjoin.pyx" } @@ -51367,13 +52571,13 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 120 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 120 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 120 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/innerjoin.pyx" __Pyx_XDECREF_SET(__pyx_v_tmp_fk, ((PyArrayObject *)__pyx_t_3)); @@ -51390,7 +52594,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 121 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_tmp_good_fk_index)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_tmp_good_fk_index)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 121 "root_numpy/src/innerjoin.pyx" __pyx_v_this_n_good_fk = __pyx_t_1; @@ -51442,7 +52646,7 @@ if (unlikely(__pyx_t_22 >= __pyx_pybuffernd_tmp_good_fk_index.diminfo[0].shape)) __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 123 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 123 "root_numpy/src/innerjoin.pyx" } @@ -51459,13 +52663,13 @@ if (unlikely(__pyx_t_22 >= __pyx_pybuffernd_tmp_good_fk_index.diminfo[0].shape)) */ #line 124 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmp_fk), __pyx_v_left_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_tmp_fk), __pyx_v_left_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 124 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 124 "root_numpy/src/innerjoin.pyx" - __pyx_t_23 = __Pyx_PyInt_As_long(__pyx_t_3); if (unlikely((__pyx_t_23 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_23 = __Pyx_PyInt_As_long(__pyx_t_3); if (unlikely((__pyx_t_23 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 124 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -51520,7 +52724,7 @@ if (unlikely(__pyx_t_24 >= __pyx_pybuffernd_repeat_result_indices.diminfo[0].sha __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 126 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/innerjoin.pyx" } @@ -51561,7 +52765,7 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_repeat_indices.diminfo[0].shape)) __ __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 127 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 127 "root_numpy/src/innerjoin.pyx" } @@ -51578,13 +52782,13 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_repeat_indices.diminfo[0].shape)) __ */ #line 128 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 128 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 128 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 128 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -51593,13 +52797,13 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_repeat_indices.diminfo[0].shape)) __ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 128 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 128 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 128 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_6, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_6, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 128 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -51657,7 +52861,7 @@ if (unlikely(__pyx_t_26 >= __pyx_pybuffernd_stretch_result_indices.diminfo[0].sh __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 130 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 130 "root_numpy/src/innerjoin.pyx" } @@ -51698,7 +52902,7 @@ if (unlikely(__pyx_t_27 >= __pyx_pybuffernd_stretch_indices.diminfo[0].shape)) _ __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 131 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 131 "root_numpy/src/innerjoin.pyx" } @@ -51715,13 +52919,13 @@ if (unlikely(__pyx_t_27 >= __pyx_pybuffernd_stretch_indices.diminfo[0].shape)) _ */ #line 132 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_6 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 132 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 132 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_6, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_6, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 132 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -51730,7 +52934,7 @@ if (unlikely(__pyx_t_27 >= __pyx_pybuffernd_stretch_indices.diminfo[0].shape)) _ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 132 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_left_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_left_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 132 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -51739,13 +52943,13 @@ if (unlikely(__pyx_t_27 >= __pyx_pybuffernd_stretch_indices.diminfo[0].shape)) _ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 132 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 132 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 132 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_6, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_6, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 132 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -51803,7 +53007,7 @@ if (unlikely(__pyx_t_28 >= __pyx_pybuffernd_right_result_indices.diminfo[0].shap __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 134 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 134 "root_numpy/src/innerjoin.pyx" } @@ -51844,7 +53048,7 @@ if (unlikely(__pyx_t_29 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p __Pyx_RaiseBufferIndexError(__pyx_t_9); #line 135 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 135 "root_numpy/src/innerjoin.pyx" } @@ -51861,13 +53065,13 @@ if (unlikely(__pyx_t_29 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p */ #line 136 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_6 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 136 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 136 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_6, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_6, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 136 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -51876,7 +53080,7 @@ if (unlikely(__pyx_t_29 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 136 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_right_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_right_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 136 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -51885,13 +53089,13 @@ if (unlikely(__pyx_t_29 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 136 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 136 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 136 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_6, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_6, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 136 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -51911,19 +53115,19 @@ if (unlikely(__pyx_t_29 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p */ #line 137 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyInt_From_long(__pyx_v_right_good_index); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyInt_From_long(__pyx_v_right_good_index); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 137 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ret), __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 137 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 137 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_fk_result_index, __pyx_t_6, int, 1, __Pyx_PyInt_From_int, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_fk_result_index, __pyx_t_6, int, 1, __Pyx_PyInt_From_int, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 137 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -52371,7 +53575,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 142 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_repeat_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_repeat_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_repeat_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/innerjoin.pyx" } @@ -52386,7 +53590,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 142 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_stretch_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_stretch_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_stretch_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/innerjoin.pyx" } @@ -52401,7 +53605,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __Pyx_BufFmt_StackElem __pyx_stack[1]; #line 142 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_right_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_right_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_right_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_right_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/innerjoin.pyx" } @@ -52418,7 +53622,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ */ #line 148 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_data)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_data)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 148 "root_numpy/src/innerjoin.pyx" __pyx_v_ndata = __pyx_t_1; @@ -52432,13 +53636,13 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ */ #line 149 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_right, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_2 = __Pyx_GetItemInt(__pyx_v_right, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 149 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 149 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = PyObject_GetItem(((PyObject *)__pyx_v_data), __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = PyObject_GetItem(((PyObject *)__pyx_v_data), __pyx_t_2); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 149 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -52447,7 +53651,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 149 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 149 "root_numpy/src/innerjoin.pyx" __pyx_v_first_right = ((PyArrayObject *)__pyx_t_3); @@ -52464,13 +53668,13 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ */ #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -52479,19 +53683,19 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_ndata); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyInt_From_long(__pyx_v_ndata); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_int8); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_int8); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -52536,7 +53740,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ } #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -52569,7 +53773,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __pyx_t_6 = 0; #line 150 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -52581,7 +53785,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 150 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/innerjoin.pyx" __pyx_t_8 = ((PyArrayObject *)__pyx_t_3); @@ -52599,7 +53803,7 @@ static PyObject *__pyx_f_13_librootnumpy__scalar_fk_inner_join(PyArrayObject *__ __pyx_v_fk_index_good = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_fk_index_good.rcbuffer->pybuffer.buf = NULL; #line 150 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 150 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_fk_index_good.diminfo[0].strides = __pyx_pybuffernd_fk_index_good.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_fk_index_good.diminfo[0].shape = __pyx_pybuffernd_fk_index_good.rcbuffer->pybuffer.shape[0]; @@ -52664,13 +53868,13 @@ __pyx_pybuffernd_fk_index_good.diminfo[0].strides = __pyx_pybuffernd_fk_index_go */ #line 156 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_first_right), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_first_right), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 156 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 156 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 156 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -52687,13 +53891,13 @@ __pyx_pybuffernd_fk_index_good.diminfo[0].strides = __pyx_pybuffernd_fk_index_go */ #line 157 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 157 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 157 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 157 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -52761,7 +53965,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __Pyx_RaiseBufferIndexError(__pyx_t_10); #line 158 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 158 "root_numpy/src/innerjoin.pyx" } @@ -52781,13 +53985,13 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p */ #line 160 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 160 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_count_nonzero); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_count_nonzero); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -52829,7 +54033,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p if (!__pyx_t_4) { #line 160 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_7, ((PyObject *)__pyx_v_fk_index_good)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_7, ((PyObject *)__pyx_v_fk_index_good)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -52838,7 +54042,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p } else { #line 160 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -52856,7 +54060,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __Pyx_GIVEREF(((PyObject *)__pyx_v_fk_index_good)); #line 160 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -52871,7 +54075,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 160 "root_numpy/src/innerjoin.pyx" - __pyx_t_9 = __Pyx_PyInt_As_long(__pyx_t_3); if (unlikely((__pyx_t_9 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __Pyx_PyInt_As_long(__pyx_t_3); if (unlikely((__pyx_t_9 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 160 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -52888,13 +54092,13 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p */ #line 161 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 161 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 161 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_empty); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_empty); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 161 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -52903,7 +54107,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 161 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyInt_From_long(__pyx_v_nresult); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyInt_From_long(__pyx_v_nresult); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 161 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -52945,7 +54149,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p } #line 161 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 161 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -52978,7 +54182,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __pyx_t_7 = 0; #line 161 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 161 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -53004,13 +54208,13 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p */ #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_array); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_array); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -53019,7 +54223,7 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyList_New(0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -53037,13 +54241,13 @@ if (unlikely(__pyx_t_13 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p } else { __pyx_t_1 = -1; #line 165 "root_numpy/src/innerjoin.pyx" -__pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = Py_TYPE(__pyx_t_7)->tp_iternext; if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = Py_TYPE(__pyx_t_7)->tp_iternext; if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" } @@ -53064,13 +54268,13 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) #if CYTHON_COMPILING_IN_CPYTHON #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" #else #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PySequence_ITEM(__pyx_t_7, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PySequence_ITEM(__pyx_t_7, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" #endif @@ -53085,13 +54289,13 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) #if CYTHON_COMPILING_IN_CPYTHON #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_1); __Pyx_INCREF(__pyx_t_4); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" #else #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PySequence_ITEM(__pyx_t_7, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PySequence_ITEM(__pyx_t_7, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" #endif @@ -53118,7 +54322,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 165 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" } @@ -53142,13 +54346,13 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __pyx_t_4 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_15); @@ -53157,7 +54361,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -53199,7 +54403,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) if (!__pyx_t_15) { #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_x); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_x); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -53208,7 +54412,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) } else { #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_16); @@ -53226,7 +54430,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __Pyx_GIVEREF(__pyx_v_x); #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_16, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_16, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -53241,7 +54445,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_6, (PyObject*)__pyx_t_4))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_6, (PyObject*)__pyx_t_4))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -53253,13 +54457,13 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -53304,7 +54508,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) } #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -53337,7 +54541,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __pyx_t_4 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -53349,7 +54553,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 165 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 165 "root_numpy/src/innerjoin.pyx" __pyx_t_17 = ((PyArrayObject *)__pyx_t_3); @@ -53367,7 +54571,7 @@ __pyx_t_7 = PyObject_GetIter(__pyx_v_repeat_columns); if (unlikely(!__pyx_t_7)) __pyx_v_repeat_result_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_repeat_result_indices.rcbuffer->pybuffer.buf = NULL; #line 165 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 165 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_repeat_result_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_repeat_result_indices.diminfo[0].shape = __pyx_pybuffernd_repeat_result_indices.rcbuffer->pybuffer.shape[0]; @@ -53396,13 +54600,13 @@ __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_rep */ #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_array); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_array); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -53411,7 +54615,7 @@ __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_rep __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -53429,13 +54633,13 @@ __pyx_pybuffernd_repeat_result_indices.diminfo[0].strides = __pyx_pybuffernd_rep } else { __pyx_t_1 = -1; #line 167 "root_numpy/src/innerjoin.pyx" -__pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = Py_TYPE(__pyx_t_4)->tp_iternext; if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" } @@ -53456,13 +54660,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) #if CYTHON_COMPILING_IN_CPYTHON #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_6); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_6); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" #else #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" #endif @@ -53477,13 +54681,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) #if CYTHON_COMPILING_IN_CPYTHON #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_6); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_1); __Pyx_INCREF(__pyx_t_6); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" #else #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" #endif @@ -53510,7 +54714,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 167 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" } @@ -53534,13 +54738,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __pyx_t_6 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_16 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_names); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_16 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_names); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_16); @@ -53549,7 +54753,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_n_s_index); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_n_s_index); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -53591,7 +54795,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) if (!__pyx_t_16) { #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_v_x); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_v_x); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -53600,7 +54804,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) } else { #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_15 = PyTuple_New(1+1); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_15 = PyTuple_New(1+1); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_15); @@ -53618,7 +54822,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __Pyx_GIVEREF(__pyx_v_x); #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_15, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_15, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -53633,7 +54837,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; @@ -53645,13 +54849,13 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_int); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); @@ -53696,7 +54900,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) } #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -53729,7 +54933,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __pyx_t_6 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -53741,7 +54945,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 167 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 167 "root_numpy/src/innerjoin.pyx" __pyx_t_18 = ((PyArrayObject *)__pyx_t_3); @@ -53759,7 +54963,7 @@ __pyx_t_4 = PyObject_GetIter(__pyx_v_stretch_columns); if (unlikely(!__pyx_t_4)) __pyx_v_stretch_result_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_stretch_result_indices.rcbuffer->pybuffer.buf = NULL; #line 167 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 167 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_stretch_result_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_stretch_result_indices.diminfo[0].shape = __pyx_pybuffernd_stretch_result_indices.rcbuffer->pybuffer.shape[0]; @@ -53788,13 +54992,13 @@ __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_st */ #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_array); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_array); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -53803,7 +55007,7 @@ __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_st __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_5); @@ -53821,13 +55025,13 @@ __pyx_pybuffernd_stretch_result_indices.diminfo[0].strides = __pyx_pybuffernd_st } else { __pyx_t_1 = -1; #line 169 "root_numpy/src/innerjoin.pyx" -__pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +__pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_14 = Py_TYPE(__pyx_t_6)->tp_iternext; if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_14 = Py_TYPE(__pyx_t_6)->tp_iternext; if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" } @@ -53848,13 +55052,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyList_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyList_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" #else #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" #endif @@ -53869,13 +55073,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi #if CYTHON_COMPILING_IN_CPYTHON #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_6, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" #else #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PySequence_ITEM(__pyx_t_6, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" #endif @@ -53902,7 +55106,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); #line 169 "root_numpy/src/innerjoin.pyx" - else {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + else {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" } @@ -53926,13 +55130,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __pyx_t_2 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_names); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_15); @@ -53941,7 +55145,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_15, __pyx_n_s_index); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -53983,7 +55187,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi if (!__pyx_t_15) { #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_x); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_x); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -53992,7 +55196,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi } else { #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_16); @@ -54010,7 +55214,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __Pyx_GIVEREF(__pyx_v_x); #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_16, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_16, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -54025,7 +55229,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_2))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_2))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; @@ -54037,13 +55241,13 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_6); #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_int); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_int); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -54088,7 +55292,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi } #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(2+__pyx_t_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -54121,7 +55325,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __pyx_t_2 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -54133,7 +55337,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 169 "root_numpy/src/innerjoin.pyx" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 169 "root_numpy/src/innerjoin.pyx" __pyx_t_19 = ((PyArrayObject *)__pyx_t_3); @@ -54151,7 +55355,7 @@ __pyx_t_6 = PyObject_GetIter(__pyx_v_right); if (unlikely(!__pyx_t_6)) {__pyx_fi __pyx_v_right_result_indices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_right_result_indices.rcbuffer->pybuffer.buf = NULL; #line 169 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } else { #line 169 "root_numpy/src/innerjoin.pyx" __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_right_result_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_right_result_indices.diminfo[0].shape = __pyx_pybuffernd_right_result_indices.rcbuffer->pybuffer.shape[0]; @@ -54180,13 +55384,13 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_ret, __pyx_n_s_dtype); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_names); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_names); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_4); @@ -54195,7 +55399,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_index); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_index); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -54237,7 +55441,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ if (!__pyx_t_4) { #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_v_fk_name); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_v_fk_name); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -54246,7 +55450,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ } else { #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_2); @@ -54264,7 +55468,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __Pyx_GIVEREF(__pyx_v_fk_name); #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -54279,7 +55483,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 170 "root_numpy/src/innerjoin.pyx" - __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_10 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_10 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 170 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -54296,7 +55500,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 172 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_repeat_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_repeat_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 172 "root_numpy/src/innerjoin.pyx" __pyx_v_nrepeat = __pyx_t_1; @@ -54310,7 +55514,7 @@ __pyx_pybuffernd_right_result_indices.diminfo[0].strides = __pyx_pybuffernd_righ */ #line 173 "root_numpy/src/innerjoin.pyx" - __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_right_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_v_right_indices)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 173 "root_numpy/src/innerjoin.pyx" __pyx_v_nright = __pyx_t_1; @@ -54428,7 +55632,7 @@ if (unlikely(__pyx_t_20 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p __Pyx_RaiseBufferIndexError(__pyx_t_10); #line 182 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 182 "root_numpy/src/innerjoin.pyx" } @@ -54448,13 +55652,13 @@ if (unlikely(__pyx_t_20 >= __pyx_pybuffernd_fk_index_good.diminfo[0].shape)) __p */ #line 183 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_fk), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 183 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 183 "root_numpy/src/innerjoin.pyx" - __pyx_t_21 = __Pyx_PyInt_As_long(__pyx_t_3); if (unlikely((__pyx_t_21 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_21 = __Pyx_PyInt_As_long(__pyx_t_3); if (unlikely((__pyx_t_21 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 183 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -54509,7 +55713,7 @@ if (unlikely(__pyx_t_22 >= __pyx_pybuffernd_repeat_result_indices.diminfo[0].sha __Pyx_RaiseBufferIndexError(__pyx_t_10); #line 185 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 185 "root_numpy/src/innerjoin.pyx" } @@ -54550,7 +55754,7 @@ if (unlikely(__pyx_t_23 >= __pyx_pybuffernd_repeat_indices.diminfo[0].shape)) __ __Pyx_RaiseBufferIndexError(__pyx_t_10); #line 186 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 186 "root_numpy/src/innerjoin.pyx" } @@ -54567,13 +55771,13 @@ if (unlikely(__pyx_t_23 >= __pyx_pybuffernd_repeat_indices.diminfo[0].shape)) __ */ #line 187 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 187 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 187 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 187 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -54582,13 +55786,13 @@ if (unlikely(__pyx_t_23 >= __pyx_pybuffernd_repeat_indices.diminfo[0].shape)) __ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 187 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_ret, __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_ret, __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 187 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 187 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_7, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_7, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 187 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -54646,7 +55850,7 @@ if (unlikely(__pyx_t_24 >= __pyx_pybuffernd_right_result_indices.diminfo[0].shap __Pyx_RaiseBufferIndexError(__pyx_t_10); #line 189 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 189 "root_numpy/src/innerjoin.pyx" } @@ -54687,7 +55891,7 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p __Pyx_RaiseBufferIndexError(__pyx_t_10); #line 190 "root_numpy/src/innerjoin.pyx" - {__pyx_filename = __pyx_f[8]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[9]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 190 "root_numpy/src/innerjoin.pyx" } @@ -54704,13 +55908,13 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p */ #line 191 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_7 = __Pyx_GetItemInt(((PyObject *)__pyx_v_data), __pyx_v_i_data, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 191 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 191 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_7, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_7, __pyx_v_i_source, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 191 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); @@ -54719,7 +55923,7 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; #line 191 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_right_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_right_good_index, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 191 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); @@ -54728,13 +55932,13 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 191 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_ret, __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_ret, __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 191 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 191 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_7, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_i_land, __pyx_t_7, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 191 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -54754,19 +55958,19 @@ if (unlikely(__pyx_t_25 >= __pyx_pybuffernd_right_indices.diminfo[0].shape)) __p */ #line 192 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_PyInt_From_long(__pyx_v_right_good_index); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_PyInt_From_long(__pyx_v_right_good_index); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 192 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 192 "root_numpy/src/innerjoin.pyx" - __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_ret, __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_ret, __pyx_v_i_ret, long, 1, __Pyx_PyInt_From_long, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 192 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_3); #line 192 "root_numpy/src/innerjoin.pyx" - if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_fk_result_index, __pyx_t_7, int, 1, __Pyx_PyInt_From_int, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_SetItemInt(__pyx_t_3, __pyx_v_fk_result_index, __pyx_t_7, int, 1, __Pyx_PyInt_From_int, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 192 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -55044,7 +56248,7 @@ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_se */ #line 96 "array.pxd" - __pyx_t_1 = PyInt_FromSsize_t(Py_SIZE(((PyObject *)__pyx_v_self))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyInt_FromSsize_t(Py_SIZE(((PyObject *)__pyx_v_self))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 96 "array.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -55125,13 +56329,13 @@ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_se */ #line 103 "array.pxd" - __pyx_t_1 = PyInt_FromSsize_t(__pyx_v_info->itemsize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyInt_FromSsize_t(__pyx_v_info->itemsize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 103 "array.pxd" __Pyx_GOTREF(__pyx_t_1); #line 103 "array.pxd" - __pyx_t_4 = PyNumber_Multiply(__pyx_t_1, __pyx_v_item_count); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyNumber_Multiply(__pyx_t_1, __pyx_v_item_count); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 103 "array.pxd" __Pyx_GOTREF(__pyx_t_4); @@ -55140,7 +56344,7 @@ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_se __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; #line 103 "array.pxd" - __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_t_4); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_t_4); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 103 "array.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -55182,7 +56386,7 @@ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_se */ #line 107 "array.pxd" - PyErr_NoMemory(); {__pyx_filename = __pyx_f[9]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyErr_NoMemory(); {__pyx_filename = __pyx_f[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 107 "array.pxd" } @@ -55196,7 +56400,7 @@ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_se */ #line 108 "array.pxd" - __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_v_item_count); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_v_item_count); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 108 "array.pxd" (__pyx_v_info->shape[0]) = __pyx_t_5; @@ -55473,7 +56677,7 @@ static CYTHON_INLINE arrayobject *__pyx_f_7cpython_5array_clone(arrayobject *__p */ #line 132 "array.pxd" - __pyx_t_1 = ((PyObject *)newarrayobject(Py_TYPE(((PyObject *)__pyx_v_template)), __pyx_v_length, __pyx_v_template->ob_descr)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((PyObject *)newarrayobject(Py_TYPE(((PyObject *)__pyx_v_template)), __pyx_v_length, __pyx_v_template->ob_descr)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 132 "array.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -55646,7 +56850,7 @@ static CYTHON_INLINE arrayobject *__pyx_f_7cpython_5array_copy(arrayobject *__py */ #line 139 "array.pxd" - __pyx_t_1 = ((PyObject *)newarrayobject(Py_TYPE(((PyObject *)__pyx_v_self)), Py_SIZE(((PyObject *)__pyx_v_self)), __pyx_v_self->ob_descr)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = ((PyObject *)newarrayobject(Py_TYPE(((PyObject *)__pyx_v_self)), Py_SIZE(((PyObject *)__pyx_v_self)), __pyx_v_self->ob_descr)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 139 "array.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -55797,7 +57001,7 @@ static CYTHON_INLINE int __pyx_f_7cpython_5array_extend_buffer(arrayobject *__py */ #line 149 "array.pxd" - __pyx_t_1 = resize_smart(__pyx_v_self, (__pyx_v_origsize + __pyx_v_n)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = resize_smart(__pyx_v_self, (__pyx_v_origsize + __pyx_v_n)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "array.pxd":150 * cdef Py_ssize_t origsize = Py_SIZE(self) @@ -55908,7 +57112,7 @@ static CYTHON_INLINE int __pyx_f_7cpython_5array_extend(arrayobject *__pyx_v_sel */ #line 156 "array.pxd" - __pyx_t_2 = PyErr_BadArgument(); if (unlikely(__pyx_t_2 == 0)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = PyErr_BadArgument(); if (unlikely(__pyx_t_2 == 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 156 "array.pxd" goto __pyx_L3; @@ -55928,7 +57132,7 @@ static CYTHON_INLINE int __pyx_f_7cpython_5array_extend(arrayobject *__pyx_v_sel */ #line 157 "array.pxd" - __pyx_t_2 = __pyx_f_7cpython_5array_extend_buffer(__pyx_v_self, __pyx_v_other->data.as_chars, Py_SIZE(((PyObject *)__pyx_v_other))); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_2 = __pyx_f_7cpython_5array_extend_buffer(__pyx_v_self, __pyx_v_other->data.as_chars, Py_SIZE(((PyObject *)__pyx_v_other))); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 157 "array.pxd" __pyx_r = __pyx_t_2; @@ -56292,7 +57496,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P */ #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__28, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__34, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -56304,7 +57508,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -56364,7 +57568,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P */ #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__29, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__35, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -56376,7 +57580,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -56811,7 +58015,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P */ #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__30, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__36, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -56823,7 +58027,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -57140,13 +58344,13 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P */ #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = PyUnicode_Format(__pyx_kp_u_unknown_dtype_code_in_numpy_pxd, __pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = PyUnicode_Format(__pyx_kp_u_unknown_dtype_code_in_numpy_pxd, __pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_6); @@ -57155,7 +58359,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -57170,7 +58374,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P __pyx_t_6 = 0; #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_6); @@ -57185,7 +58389,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 276 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" break; @@ -57266,7 +58470,7 @@ static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyArrayObject *__pyx_v_self, P */ #line 283 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_7 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_7 == NULL)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 283 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __pyx_v_f = __pyx_t_7; @@ -57542,7 +58746,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ __Pyx_XDECREF(__pyx_r); #line 769 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 769; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 769; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 769 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -57634,7 +58838,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ __Pyx_XDECREF(__pyx_r); #line 772 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 772; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 772; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 772 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -57726,7 +58930,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ __Pyx_XDECREF(__pyx_r); #line 775 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 775; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 775; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 775 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -57818,7 +59022,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ __Pyx_XDECREF(__pyx_r); #line 778 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 778 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -57910,7 +59114,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ __Pyx_XDECREF(__pyx_r); #line 781 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 781; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 781; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 781 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_1); @@ -58056,7 +59260,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable"); #line 794 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 794 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -58074,13 +59278,13 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx #if CYTHON_COMPILING_IN_CPYTHON #line 794 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 794 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" #else #line 794 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 794; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 794 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" #endif @@ -58100,13 +59304,13 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 795 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; #line 795 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 795 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 795; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 795 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_XDECREF_SET(__pyx_v_fields, ((PyObject*)__pyx_t_3)); @@ -58153,7 +59357,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -58177,13 +59381,13 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx #else #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); @@ -58195,13 +59399,13 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx } else { #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_RaiseNoneNotIterableError(); {__pyx_filename = __pyx_f[10]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __Pyx_RaiseNoneNotIterableError(); {__pyx_filename = __pyx_f[11]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 796; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 796 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_XDECREF_SET(__pyx_v_child, ((PyArray_Descr *)__pyx_t_3)); @@ -58224,13 +59428,13 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 798 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = __Pyx_PyInt_From_int((__pyx_v_offset[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_From_int((__pyx_v_offset[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 798 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 798 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyNumber_Subtract(__pyx_v_new_offset, __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyNumber_Subtract(__pyx_v_new_offset, __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 798 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -58239,7 +59443,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 798 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_5 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 798 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58259,7 +59463,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__31, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__37, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -58271,7 +59475,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -58367,7 +59571,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__32, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__38, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -58379,7 +59583,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -58396,19 +59600,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx while (1) { #line 813 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_offset[0])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_offset[0])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 813 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 813 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_v_new_offset, Py_LT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_v_new_offset, Py_LT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 813 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 813 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 813 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -58492,7 +59696,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 821 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_child->type_num); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_child->type_num); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 821 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); @@ -58526,7 +59730,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__33, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_RuntimeError, __pyx_tuple__39, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); @@ -58538,7 +59742,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -58552,19 +59756,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 826 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_BYTE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_BYTE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 826 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 826 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 826 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 826 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 826 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58590,19 +59794,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 827 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_UBYTE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_UBYTE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 827 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 827 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 827 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 827 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 827 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -58628,19 +59832,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 828 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_SHORT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_SHORT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 828 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 828 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 828 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 828 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 828 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58666,19 +59870,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 829 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_USHORT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_USHORT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 829 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 829 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 829 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 829 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 829 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -58704,19 +59908,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 830 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_INT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_INT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 830 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 830 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 830 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 830 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 830 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58742,19 +59946,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 831 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_UINT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_UINT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 831 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 831 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 831 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 831 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 831 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -58780,19 +59984,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 832 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_LONG); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_LONG); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 832 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 832 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 832 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 832 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 832 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58818,19 +60022,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 833 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_ULONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_ULONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 833 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 833 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 833 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 833 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 833 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -58856,19 +60060,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 834 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 834 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 834 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 834 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 834 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 834 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58894,19 +60098,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 835 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 835 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 835 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 835 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 835 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 835 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -58932,19 +60136,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 836 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_FLOAT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_FLOAT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 836 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 836 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 836 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 836 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 836 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -58970,19 +60174,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 837 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_DOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_DOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 837 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 837 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 837 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 837 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 837 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -59008,19 +60212,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 838 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_LONGDOUBLE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_LONGDOUBLE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 838 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 838 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 838 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 838 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 838 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -59046,19 +60250,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 839 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_CFLOAT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_CFLOAT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 839 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 839 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 839 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 839 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 839; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 839 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -59090,19 +60294,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 840 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_CDOUBLE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_CDOUBLE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 840 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 840 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 840 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 840 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 840 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -59134,19 +60338,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 841 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyInt_FromLong(NPY_CLONGDOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyInt_FromLong(NPY_CLONGDOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 841 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 841 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 841 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 841 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 841 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -59178,19 +60382,19 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 842 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 842 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); #line 842 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_4, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 842 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; #line 842 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 842 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -59219,13 +60423,13 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = PyUnicode_Format(__pyx_kp_u_unknown_dtype_code_in_numpy_pxd, __pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = PyUnicode_Format(__pyx_kp_u_unknown_dtype_code_in_numpy_pxd, __pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_4); @@ -59240,7 +60444,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx __pyx_t_3 = 0; #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __Pyx_GOTREF(__pyx_t_3); @@ -59255,7 +60459,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - {__pyx_filename = __pyx_f[10]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 844 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" } @@ -59292,7 +60496,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx */ #line 849 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_child, __pyx_v_f, __pyx_v_end, __pyx_v_offset); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_child, __pyx_v_f, __pyx_v_end, __pyx_v_offset); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 849 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" __pyx_v_f = __pyx_t_9; @@ -59672,7 +60876,7 @@ static std::string __pyx_convert_string_from_py_std__string(PyObject *__pyx_v_o) */ #line 15 "string.from_py" - __pyx_t_1 = __Pyx_PyObject_AsStringAndSize(__pyx_v_o, (&__pyx_v_length)); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyObject_AsStringAndSize(__pyx_v_o, (&__pyx_v_length)); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 15 "string.from_py" __pyx_v_data = __pyx_t_1; @@ -59760,7 +60964,7 @@ static CYTHON_INLINE PyObject *__pyx_convert_PyObject_string_to_py_std__string(s __Pyx_XDECREF(__pyx_r); #line 32 "string.to_py" - __pyx_t_1 = __Pyx_PyObject_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyObject_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 32 "string.to_py" __Pyx_GOTREF(__pyx_t_1); @@ -59852,7 +61056,7 @@ static CYTHON_INLINE PyObject *__pyx_convert_PyUnicode_string_to_py_std__string( __Pyx_XDECREF(__pyx_r); #line 38 "string.to_py" - __pyx_t_1 = __Pyx_PyUnicode_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyUnicode_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "string.to_py" __Pyx_GOTREF(__pyx_t_1); @@ -59944,7 +61148,7 @@ static CYTHON_INLINE PyObject *__pyx_convert_PyStr_string_to_py_std__string(std: __Pyx_XDECREF(__pyx_r); #line 44 "string.to_py" - __pyx_t_1 = __Pyx_PyStr_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyStr_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 44 "string.to_py" __Pyx_GOTREF(__pyx_t_1); @@ -60036,7 +61240,7 @@ static CYTHON_INLINE PyObject *__pyx_convert_PyBytes_string_to_py_std__string(st __Pyx_XDECREF(__pyx_r); #line 50 "string.to_py" - __pyx_t_1 = __Pyx_PyBytes_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyBytes_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 50 "string.to_py" __Pyx_GOTREF(__pyx_t_1); @@ -60127,7 +61331,7 @@ static CYTHON_INLINE PyObject *__pyx_convert_PyByteArray_string_to_py_std__strin __Pyx_XDECREF(__pyx_r); #line 56 "string.to_py" - __pyx_t_1 = __Pyx_PyByteArray_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_1 = __Pyx_PyByteArray_FromStringAndSize(__pyx_v_s.data(), __pyx_v_s.size()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 56 "string.to_py" __Pyx_GOTREF(__pyx_t_1); @@ -60252,8 +61456,7 @@ static struct PyModuleDef __pyx_moduledef = { #endif static __Pyx_StringTabEntry __pyx_string_tab[] = { - {&__pyx_kp_s_, __pyx_k_, sizeof(__pyx_k_), 0, 0, 1, 0}, - {&__pyx_kp_s_0___1, __pyx_k_0___1, sizeof(__pyx_k_0___1), 0, 0, 1, 0}, + {&__pyx_n_s_AssertionError, __pyx_k_AssertionError, sizeof(__pyx_k_AssertionError), 0, 0, 1, 1}, {&__pyx_n_s_B, __pyx_k_B, sizeof(__pyx_k_B), 0, 0, 1, 1}, {&__pyx_n_s_D, __pyx_k_D, sizeof(__pyx_k_D), 0, 0, 1, 1}, {&__pyx_n_s_F, __pyx_k_F, sizeof(__pyx_k_F), 0, 0, 1, 1}, @@ -60264,6 +61467,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_ImportError, __pyx_k_ImportError, sizeof(__pyx_k_ImportError), 0, 0, 1, 1}, {&__pyx_n_s_IndexError, __pyx_k_IndexError, sizeof(__pyx_k_IndexError), 0, 0, 1, 1}, {&__pyx_n_s_L, __pyx_k_L, sizeof(__pyx_k_L), 0, 0, 1, 1}, + {&__pyx_n_s_LEAF_PATTERN, __pyx_k_LEAF_PATTERN, sizeof(__pyx_k_LEAF_PATTERN), 0, 0, 1, 1}, {&__pyx_n_s_Long64_t, __pyx_k_Long64_t, sizeof(__pyx_k_Long64_t), 0, 0, 1, 1}, {&__pyx_n_s_MemoryError, __pyx_k_MemoryError, sizeof(__pyx_k_MemoryError), 0, 0, 1, 1}, {&__pyx_kp_u_Non_native_byte_order_not_suppor, __pyx_k_Non_native_byte_order_not_suppor, sizeof(__pyx_k_Non_native_byte_order_not_suppor), 0, 1, 0, 0}, @@ -60280,7 +61484,12 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_TypeError, __pyx_k_TypeError, sizeof(__pyx_k_TypeError), 0, 0, 1, 1}, {&__pyx_n_s_ULong64_t, __pyx_k_ULong64_t, sizeof(__pyx_k_ULong64_t), 0, 0, 1, 1}, {&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1}, - {&__pyx_kp_s__19, __pyx_k__19, sizeof(__pyx_k__19), 0, 0, 1, 0}, + {&__pyx_kp_s__10, __pyx_k__10, sizeof(__pyx_k__10), 0, 0, 1, 0}, + {&__pyx_n_b__19, __pyx_k__19, sizeof(__pyx_k__19), 0, 0, 0, 1}, + {&__pyx_kp_s__24, __pyx_k__24, sizeof(__pyx_k__24), 0, 0, 1, 0}, + {&__pyx_kp_s__25, __pyx_k__25, sizeof(__pyx_k__25), 0, 0, 1, 0}, + {&__pyx_kp_s__6, __pyx_k__6, sizeof(__pyx_k__6), 0, 0, 1, 0}, + {&__pyx_kp_s__8, __pyx_k__8, sizeof(__pyx_k__8), 0, 0, 1, 0}, {&__pyx_n_s_arr, __pyx_k_arr, sizeof(__pyx_k_arr), 0, 0, 1, 1}, {&__pyx_n_s_arr_2, __pyx_k_arr_2, sizeof(__pyx_k_arr_2), 0, 0, 1, 1}, {&__pyx_n_s_array, __pyx_k_array, sizeof(__pyx_k_array), 0, 0, 1, 1}, @@ -60304,6 +61513,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_s_branches_is_an_empty_list, __pyx_k_branches_is_an_empty_list, sizeof(__pyx_k_branches_is_an_empty_list), 0, 0, 1, 0}, {&__pyx_kp_s_cannot_access_tree_in_current_fi, __pyx_k_cannot_access_tree_in_current_fi, sizeof(__pyx_k_cannot_access_tree_in_current_fi), 0, 0, 1, 0}, {&__pyx_kp_s_cannot_convert_leaf_0_of_branch, __pyx_k_cannot_convert_leaf_0_of_branch, sizeof(__pyx_k_cannot_convert_leaf_0_of_branch), 0, 0, 1, 0}, + {&__pyx_kp_s_cannot_convert_leaf_0_of_branch_2, __pyx_k_cannot_convert_leaf_0_of_branch_2, sizeof(__pyx_k_cannot_convert_leaf_0_of_branch_2), 0, 0, 1, 0}, {&__pyx_kp_s_cannot_open_current_file, __pyx_k_cannot_open_current_file, sizeof(__pyx_k_cannot_open_current_file), 0, 0, 1, 0}, {&__pyx_kp_s_cannot_open_file_0, __pyx_k_cannot_open_file_0, sizeof(__pyx_k_cannot_open_file_0), 0, 0, 1, 0}, {&__pyx_kp_s_cannot_read_0, __pyx_k_cannot_read_0, sizeof(__pyx_k_cannot_read_0), 0, 0, 1, 0}, @@ -60313,18 +61523,22 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_cleanup, __pyx_k_cleanup, sizeof(__pyx_k_cleanup), 0, 0, 1, 1}, {&__pyx_n_s_clsname, __pyx_k_clsname, sizeof(__pyx_k_clsname), 0, 0, 1, 1}, {&__pyx_n_s_collections, __pyx_k_collections, sizeof(__pyx_k_collections), 0, 0, 1, 1}, - {&__pyx_kp_s_converter_for_r_not_implemented, __pyx_k_converter_for_r_not_implemented, sizeof(__pyx_k_converter_for_r_not_implemented), 0, 0, 1, 0}, - {&__pyx_kp_s_could_not_compile_selection_form, __pyx_k_could_not_compile_selection_form, sizeof(__pyx_k_could_not_compile_selection_form), 0, 0, 1, 0}, + {&__pyx_n_s_compile, __pyx_k_compile, sizeof(__pyx_k_compile), 0, 0, 1, 1}, + {&__pyx_kp_s_converter_for_r_is_not_implement, __pyx_k_converter_for_r_is_not_implement, sizeof(__pyx_k_converter_for_r_is_not_implement), 0, 0, 1, 0}, + {&__pyx_kp_s_could_not_compile_selection_expr, __pyx_k_could_not_compile_selection_expr, sizeof(__pyx_k_could_not_compile_selection_expr), 0, 0, 1, 0}, + {&__pyx_kp_s_could_not_find_double_converter, __pyx_k_could_not_find_double_converter, sizeof(__pyx_k_could_not_find_double_converter), 0, 0, 1, 0}, {&__pyx_n_s_count_nonzero, __pyx_k_count_nonzero, sizeof(__pyx_k_count_nonzero), 0, 0, 1, 1}, {&__pyx_n_s_ctype, __pyx_k_ctype, sizeof(__pyx_k_ctype), 0, 0, 1, 1}, {&__pyx_n_s_ctypename, __pyx_k_ctypename, sizeof(__pyx_k_ctypename), 0, 0, 1, 1}, {&__pyx_n_s_d, __pyx_k_d, sizeof(__pyx_k_d), 0, 0, 1, 1}, {&__pyx_n_s_data, __pyx_k_data, sizeof(__pyx_k_data), 0, 0, 1, 1}, + {&__pyx_n_b_double, __pyx_k_double, sizeof(__pyx_k_double), 0, 0, 0, 1}, {&__pyx_n_s_double, __pyx_k_double, sizeof(__pyx_k_double), 0, 0, 1, 1}, {&__pyx_n_s_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 0, 0, 1, 1}, {&__pyx_n_s_dtypecode, __pyx_k_dtypecode, sizeof(__pyx_k_dtypecode), 0, 0, 1, 1}, {&__pyx_kp_s_duplicate_branches_requested, __pyx_k_duplicate_branches_requested, sizeof(__pyx_k_duplicate_branches_requested), 0, 0, 1, 0}, {&__pyx_n_s_empty, __pyx_k_empty, sizeof(__pyx_k_empty), 0, 0, 1, 1}, + {&__pyx_n_s_enumerate, __pyx_k_enumerate, sizeof(__pyx_k_enumerate), 0, 0, 1, 1}, {&__pyx_n_s_evaluate_f1, __pyx_k_evaluate_f1, sizeof(__pyx_k_evaluate_f1), 0, 0, 1, 1}, {&__pyx_n_s_evaluate_f2, __pyx_k_evaluate_f2, sizeof(__pyx_k_evaluate_f2), 0, 0, 1, 1}, {&__pyx_n_s_evaluate_f3, __pyx_k_evaluate_f3, sizeof(__pyx_k_evaluate_f3), 0, 0, 1, 1}, @@ -60338,7 +61552,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_evaluate_h3, __pyx_k_evaluate_h3, sizeof(__pyx_k_evaluate_h3), 0, 0, 1, 1}, {&__pyx_n_s_evaluate_spline, __pyx_k_evaluate_spline, sizeof(__pyx_k_evaluate_spline), 0, 0, 1, 1}, {&__pyx_n_s_extern_ordereddict, __pyx_k_extern_ordereddict, sizeof(__pyx_k_extern_ordereddict), 0, 0, 1, 1}, - {&__pyx_n_s_f, __pyx_k_f, sizeof(__pyx_k_f), 0, 0, 1, 1}, {&__pyx_n_s_f1, __pyx_k_f1, sizeof(__pyx_k_f1), 0, 0, 1, 1}, {&__pyx_n_s_f1_2, __pyx_k_f1_2, sizeof(__pyx_k_f1_2), 0, 0, 1, 1}, {&__pyx_n_s_f2, __pyx_k_f2, sizeof(__pyx_k_f2), 0, 0, 1, 1}, @@ -60347,7 +61560,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_f3_2, __pyx_k_f3_2, sizeof(__pyx_k_f3_2), 0, 0, 1, 1}, {&__pyx_kp_s_field_0_of_type_1_is_not_compati, __pyx_k_field_0_of_type_1_is_not_compati, sizeof(__pyx_k_field_0_of_type_1_is_not_compati), 0, 0, 1, 0}, {&__pyx_n_s_fields, __pyx_k_fields, sizeof(__pyx_k_fields), 0, 0, 1, 1}, - {&__pyx_n_s_file, __pyx_k_file, sizeof(__pyx_k_file), 0, 0, 1, 1}, {&__pyx_kp_s_file_0_is_not_writable, __pyx_k_file_0_is_not_writable, sizeof(__pyx_k_file_0_is_not_writable), 0, 0, 1, 0}, {&__pyx_n_s_filename, __pyx_k_filename, sizeof(__pyx_k_filename), 0, 0, 1, 1}, {&__pyx_n_s_fill_g1, __pyx_k_fill_g1, sizeof(__pyx_k_fill_g1), 0, 0, 1, 1}, @@ -60358,7 +61570,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_fill_p1, __pyx_k_fill_p1, sizeof(__pyx_k_fill_p1), 0, 0, 1, 1}, {&__pyx_n_s_fill_p2, __pyx_k_fill_p2, sizeof(__pyx_k_fill_p2), 0, 0, 1, 1}, {&__pyx_n_s_fill_p3, __pyx_k_fill_p3, sizeof(__pyx_k_fill_p3), 0, 0, 1, 1}, - {&__pyx_kp_s_fixed, __pyx_k_fixed, sizeof(__pyx_k_fixed), 0, 0, 1, 0}, {&__pyx_n_s_fk, __pyx_k_fk, sizeof(__pyx_k_fk), 0, 0, 1, 1}, {&__pyx_kp_s_fk_d, __pyx_k_fk_d, sizeof(__pyx_k_fk_d), 0, 0, 1, 0}, {&__pyx_n_s_fk_name, __pyx_k_fk_name, sizeof(__pyx_k_fk_name), 0, 0, 1, 1}, @@ -60376,6 +61587,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_get, __pyx_k_get, sizeof(__pyx_k_get), 0, 0, 1, 1}, {&__pyx_n_s_graph, __pyx_k_graph, sizeof(__pyx_k_graph), 0, 0, 1, 1}, {&__pyx_n_s_graph_2, __pyx_k_graph_2, sizeof(__pyx_k_graph_2), 0, 0, 1, 1}, + {&__pyx_n_s_group, __pyx_k_group, sizeof(__pyx_k_group), 0, 0, 1, 1}, {&__pyx_n_s_h1, __pyx_k_h1, sizeof(__pyx_k_h1), 0, 0, 1, 1}, {&__pyx_n_s_h1_2, __pyx_k_h1_2, sizeof(__pyx_k_h1_2), 0, 0, 1, 1}, {&__pyx_n_s_h1c_array, __pyx_k_h1c_array, sizeof(__pyx_k_h1c_array), 0, 0, 1, 1}, @@ -60406,6 +61618,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_k_home_endw_workspace_root_numpy_5, sizeof(__pyx_k_home_endw_workspace_root_numpy_5), 0, 0, 1, 0}, {&__pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_k_home_endw_workspace_root_numpy_6, sizeof(__pyx_k_home_endw_workspace_root_numpy_6), 0, 0, 1, 0}, {&__pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_k_home_endw_workspace_root_numpy_7, sizeof(__pyx_k_home_endw_workspace_root_numpy_7), 0, 0, 1, 0}, + {&__pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_k_home_endw_workspace_root_numpy_8, sizeof(__pyx_k_home_endw_workspace_root_numpy_8), 0, 0, 1, 0}, {&__pyx_n_s_i, __pyx_k_i, sizeof(__pyx_k_i), 0, 0, 1, 1}, {&__pyx_n_s_idx, __pyx_k_idx, sizeof(__pyx_k_idx), 0, 0, 1, 1}, {&__pyx_n_s_import, __pyx_k_import, sizeof(__pyx_k_import), 0, 0, 1, 1}, @@ -60437,30 +61650,33 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_longlong, __pyx_k_longlong, sizeof(__pyx_k_longlong), 0, 0, 1, 1}, {&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1}, {&__pyx_n_s_mat, __pyx_k_mat, sizeof(__pyx_k_mat), 0, 0, 1, 1}, + {&__pyx_n_s_match, __pyx_k_match, sizeof(__pyx_k_match), 0, 0, 1, 1}, {&__pyx_n_s_matrix, __pyx_k_matrix, sizeof(__pyx_k_matrix), 0, 0, 1, 1}, {&__pyx_n_s_matrix_d, __pyx_k_matrix_d, sizeof(__pyx_k_matrix_d), 0, 0, 1, 1}, {&__pyx_n_s_matrix_f, __pyx_k_matrix_f, sizeof(__pyx_k_matrix_f), 0, 0, 1, 1}, {&__pyx_n_s_mode, __pyx_k_mode, sizeof(__pyx_k_mode), 0, 0, 1, 1}, {&__pyx_kp_s_multiple_trees_found_0, __pyx_k_multiple_trees_found_0, sizeof(__pyx_k_multiple_trees_found_0), 0, 0, 1, 0}, - {&__pyx_n_s_n, __pyx_k_n, sizeof(__pyx_k_n), 0, 0, 1, 1}, {&__pyx_n_s_n_samples, __pyx_k_n_samples, sizeof(__pyx_k_n_samples), 0, 0, 1, 1}, {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1}, {&__pyx_n_s_names, __pyx_k_names, sizeof(__pyx_k_names), 0, 0, 1, 1}, {&__pyx_kp_u_ndarray_is_not_C_contiguous, __pyx_k_ndarray_is_not_C_contiguous, sizeof(__pyx_k_ndarray_is_not_C_contiguous), 0, 1, 0, 0}, {&__pyx_kp_u_ndarray_is_not_Fortran_contiguou, __pyx_k_ndarray_is_not_Fortran_contiguou, sizeof(__pyx_k_ndarray_is_not_Fortran_contiguou), 0, 1, 0, 0}, - {&__pyx_kp_s_no_converter_for_0, __pyx_k_no_converter_for_0, sizeof(__pyx_k_no_converter_for_0), 0, 0, 1, 0}, + {&__pyx_n_s_nkeys, __pyx_k_nkeys, sizeof(__pyx_k_nkeys), 0, 0, 1, 1}, {&__pyx_n_s_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 0, 1, 1}, {&__pyx_n_s_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 0, 0, 1, 1}, {&__pyx_n_s_object, __pyx_k_object, sizeof(__pyx_k_object), 0, 0, 1, 1}, {&__pyx_n_s_outtree, __pyx_k_outtree, sizeof(__pyx_k_outtree), 0, 0, 1, 1}, + {&__pyx_n_s_pop, __pyx_k_pop, sizeof(__pyx_k_pop), 0, 0, 1, 1}, {&__pyx_n_s_profile, __pyx_k_profile, sizeof(__pyx_k_profile), 0, 0, 1, 1}, {&__pyx_n_s_profile_2, __pyx_k_profile_2, sizeof(__pyx_k_profile_2), 0, 0, 1, 1}, {&__pyx_n_s_range, __pyx_k_range, sizeof(__pyx_k_range), 0, 0, 1, 1}, + {&__pyx_n_s_re, __pyx_k_re, sizeof(__pyx_k_re), 0, 0, 1, 1}, {&__pyx_kp_s_read_failure_in_current_tree, __pyx_k_read_failure_in_current_tree, sizeof(__pyx_k_read_failure_in_current_tree), 0, 0, 1, 0}, {&__pyx_n_s_register, __pyx_k_register, sizeof(__pyx_k_register), 0, 0, 1, 1}, {&__pyx_n_s_resize, __pyx_k_resize, sizeof(__pyx_k_resize), 0, 0, 1, 1}, {&__pyx_n_s_ret, __pyx_k_ret, sizeof(__pyx_k_ret), 0, 0, 1, 1}, {&__pyx_n_s_return_indices, __pyx_k_return_indices, sizeof(__pyx_k_return_indices), 0, 0, 1, 1}, + {&__pyx_n_s_rfile, __pyx_k_rfile, sizeof(__pyx_k_rfile), 0, 0, 1, 1}, {&__pyx_n_s_right, __pyx_k_right, sizeof(__pyx_k_right), 0, 0, 1, 1}, {&__pyx_n_s_root2array_fromCObj, __pyx_k_root2array_fromCObj, sizeof(__pyx_k_root2array_fromCObj), 0, 0, 1, 1}, {&__pyx_n_s_root2array_fromFname, __pyx_k_root2array_fromFname, sizeof(__pyx_k_root2array_fromFname), 0, 0, 1, 1}, @@ -60468,7 +61684,9 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_root_hist, __pyx_k_root_hist, sizeof(__pyx_k_root_hist), 0, 0, 1, 1}, {&__pyx_n_s_root_mat, __pyx_k_root_mat, sizeof(__pyx_k_root_mat), 0, 0, 1, 1}, {&__pyx_n_s_rpartition, __pyx_k_rpartition, sizeof(__pyx_k_rpartition), 0, 0, 1, 1}, + {&__pyx_n_s_rtree, __pyx_k_rtree, sizeof(__pyx_k_rtree), 0, 0, 1, 1}, {&__pyx_n_s_s, __pyx_k_s, sizeof(__pyx_k_s), 0, 0, 1, 1}, + {&__pyx_kp_s_s_0_9, __pyx_k_s_0_9, sizeof(__pyx_k_s_0_9), 0, 0, 1, 0}, {&__pyx_n_s_sample_f1, __pyx_k_sample_f1, sizeof(__pyx_k_sample_f1), 0, 0, 1, 1}, {&__pyx_n_s_sample_f2, __pyx_k_sample_f2, sizeof(__pyx_k_sample_f2), 0, 0, 1, 1}, {&__pyx_n_s_sample_f3, __pyx_k_sample_f3, sizeof(__pyx_k_sample_f3), 0, 0, 1, 1}, @@ -60480,19 +61698,21 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_size, __pyx_k_size, sizeof(__pyx_k_size), 0, 0, 1, 1}, {&__pyx_n_s_spline, __pyx_k_spline, sizeof(__pyx_k_spline), 0, 0, 1, 1}, {&__pyx_n_s_spline_2, __pyx_k_spline_2, sizeof(__pyx_k_spline_2), 0, 0, 1, 1}, + {&__pyx_n_s_split, __pyx_k_split, sizeof(__pyx_k_split), 0, 0, 1, 1}, {&__pyx_n_s_start, __pyx_k_start, sizeof(__pyx_k_start), 0, 0, 1, 1}, {&__pyx_n_s_step, __pyx_k_step, sizeof(__pyx_k_step), 0, 0, 1, 1}, {&__pyx_n_s_stop, __pyx_k_stop, sizeof(__pyx_k_stop), 0, 0, 1, 1}, {&__pyx_n_b_string, __pyx_k_string, sizeof(__pyx_k_string), 0, 0, 0, 1}, - {&__pyx_n_s_t, __pyx_k_t, sizeof(__pyx_k_t), 0, 0, 1, 1}, + {&__pyx_n_s_strip, __pyx_k_strip, sizeof(__pyx_k_strip), 0, 0, 1, 1}, + {&__pyx_n_s_structure, __pyx_k_structure, sizeof(__pyx_k_structure), 0, 0, 1, 1}, {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1}, {&__pyx_kp_s_the_branch_or_expression_0_is_no, __pyx_k_the_branch_or_expression_0_is_no, sizeof(__pyx_k_the_branch_or_expression_0_is_no), 0, 0, 1, 0}, {&__pyx_kp_s_the_chain_is_not_initialized, __pyx_k_the_chain_is_not_initialized, sizeof(__pyx_k_the_chain_is_not_initialized), 0, 0, 1, 0}, + {&__pyx_n_b_tree, __pyx_k_tree, sizeof(__pyx_k_tree), 0, 0, 0, 1}, {&__pyx_n_s_tree, __pyx_k_tree, sizeof(__pyx_k_tree), 0, 0, 1, 1}, {&__pyx_kp_s_tree_0_not_found_in_1, __pyx_k_tree_0_not_found_in_1, sizeof(__pyx_k_tree_0_not_found_in_1), 0, 0, 1, 0}, {&__pyx_kp_s_tree_has_no_branches, __pyx_k_tree_has_no_branches, sizeof(__pyx_k_tree_has_no_branches), 0, 0, 1, 0}, {&__pyx_kp_s_tree_index_in_chain_is_out_of_bo, __pyx_k_tree_index_in_chain_is_out_of_bo, sizeof(__pyx_k_tree_index_in_chain_is_out_of_bo), 0, 0, 1, 0}, - {&__pyx_kp_s_tree_must_be_PyCObject, __pyx_k_tree_must_be_PyCObject, sizeof(__pyx_k_tree_must_be_PyCObject), 0, 0, 1, 0}, {&__pyx_n_s_treename, __pyx_k_treename, sizeof(__pyx_k_treename), 0, 0, 1, 1}, {&__pyx_n_s_ttree, __pyx_k_ttree, sizeof(__pyx_k_ttree), 0, 0, 1, 1}, {&__pyx_n_s_uint16, __pyx_k_uint16, sizeof(__pyx_k_uint16), 0, 0, 1, 1}, @@ -60511,7 +61731,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_s_unsigned_short, __pyx_k_unsigned_short, sizeof(__pyx_k_unsigned_short), 0, 0, 1, 0}, {&__pyx_n_s_update, __pyx_k_update, sizeof(__pyx_k_update), 0, 0, 1, 1}, {&__pyx_n_s_values, __pyx_k_values, sizeof(__pyx_k_values), 0, 0, 1, 1}, - {&__pyx_kp_s_vary, __pyx_k_vary, sizeof(__pyx_k_vary), 0, 0, 1, 0}, {&__pyx_kp_b_vector_bool, __pyx_k_vector_bool, sizeof(__pyx_k_vector_bool), 0, 0, 0, 0}, {&__pyx_kp_b_vector_char, __pyx_k_vector_char, sizeof(__pyx_k_vector_char), 0, 0, 0, 0}, {&__pyx_kp_b_vector_double, __pyx_k_vector_double, sizeof(__pyx_k_vector_double), 0, 0, 0, 0}, @@ -60553,18 +61772,20 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { }; static int __Pyx_InitCachedBuiltins(void) { __pyx_builtin_ImportError = __Pyx_GetBuiltinName(__pyx_n_s_ImportError); if (!__pyx_builtin_ImportError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_IOError = __Pyx_GetBuiltinName(__pyx_n_s_IOError); if (!__pyx_builtin_IOError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_RuntimeError = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_n_s_IndexError); if (!__pyx_builtin_IndexError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_IOError = __Pyx_GetBuiltinName(__pyx_n_s_IOError); if (!__pyx_builtin_IOError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_RuntimeError = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_n_s_IndexError); if (!__pyx_builtin_IndexError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_AssertionError = __Pyx_GetBuiltinName(__pyx_n_s_AssertionError); if (!__pyx_builtin_AssertionError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #if PY_MAJOR_VERSION >= 3 - __pyx_builtin_xrange = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_xrange = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #else - __pyx_builtin_xrange = __Pyx_GetBuiltinName(__pyx_n_s_xrange); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_xrange = __Pyx_GetBuiltinName(__pyx_n_s_xrange); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #endif - __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; __pyx_L1_error:; return -1; @@ -60574,7 +61795,7 @@ static int __Pyx_InitCachedConstants(void) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "root_numpy/src/tree.pyx":166 + /* "root_numpy/src/converters.pyx":95 * cdef np.npy_intp dims[1] * dims[0] = numele; * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< @@ -60582,16 +61803,16 @@ static int __Pyx_InitCachedConstants(void) { * cdef PyObject* tmpobj = tmp # borrow ref */ -#line 166 "root_numpy/src/tree.pyx" - __pyx_tuple__2 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 95 "root_numpy/src/converters.pyx" + __pyx_tuple_ = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple_)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 166 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__2); +#line 95 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple_); -#line 166 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__2); +#line 95 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple_); - /* "root_numpy/src/tree.pyx":304 + /* "root_numpy/src/converters.pyx":239 * cdef T* fa * # these are defined solely for the outer array wrapper * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< @@ -60599,16 +61820,16 @@ static int __Pyx_InitCachedConstants(void) { * numele = tmp[0].size() */ -#line 304 "root_numpy/src/tree.pyx" - __pyx_tuple__3 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 304; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 239 "root_numpy/src/converters.pyx" + __pyx_tuple__2 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 304 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__3); +#line 239 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__2); -#line 304 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__3); +#line 239 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__2); - /* "root_numpy/src/tree.pyx":344 + /* "root_numpy/src/converters.pyx":279 * cdef unsigned long numele * # these are defined solely for the outer array wrapper * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< @@ -60616,16 +61837,16 @@ static int __Pyx_InitCachedConstants(void) { * numele = tmp[0].size() */ -#line 344 "root_numpy/src/tree.pyx" - __pyx_tuple__4 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 344; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 279 "root_numpy/src/converters.pyx" + __pyx_tuple__3 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 344 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__4); +#line 279 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__3); -#line 344 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__4); +#line 279 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__3); - /* "root_numpy/src/tree.pyx":392 + /* "root_numpy/src/converters.pyx":327 * cdef unsigned long numele * # these are defined solely for the outer array wrapper * cdef int objsize = np.dtype('O').itemsize # <<<<<<<<<<<<<< @@ -60633,33 +61854,59 @@ static int __Pyx_InitCachedConstants(void) { * numele = tmp[0].size() */ -#line 392 "root_numpy/src/tree.pyx" - __pyx_tuple__5 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 327 "root_numpy/src/converters.pyx" + __pyx_tuple__4 = PyTuple_Pack(1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 392 "root_numpy/src/tree.pyx" +#line 327 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__4); + +#line 327 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__4); + + /* "root_numpy/src/converters.pyx":455 + * match = re.match(LEAF_PATTERN, leaf_title) + * if match is not None: + * arraydef = match.group(1) # <<<<<<<<<<<<<< + * if arraydef is not None: + * arraytokens = arraydef.strip('[]').split('][') + */ + +#line 455 "root_numpy/src/converters.pyx" + __pyx_tuple__5 = PyTuple_Pack(1, __pyx_int_1); if (unlikely(!__pyx_tuple__5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 455 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_tuple__5); -#line 392 "root_numpy/src/tree.pyx" +#line 455 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_tuple__5); - /* "root_numpy/src/tree.pyx":546 - * cv.push_back(this_conv) - * if include_weight: - * nst.append((weight_name, np.dtype('d'))) # <<<<<<<<<<<<<< - * return np.empty(entries, dtype=nst) - * + /* "root_numpy/src/converters.pyx":457 + * arraydef = match.group(1) + * if arraydef is not None: + * arraytokens = arraydef.strip('[]').split('][') # <<<<<<<<<<<<<< + * shape = [] + * # First group might be the name of the length-leaf */ -#line 546 "root_numpy/src/tree.pyx" - __pyx_tuple__6 = PyTuple_Pack(1, __pyx_n_s_d); if (unlikely(!__pyx_tuple__6)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 546; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 457 "root_numpy/src/converters.pyx" + __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_s__6); if (unlikely(!__pyx_tuple__7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__7); + +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__7); + +#line 457 "root_numpy/src/converters.pyx" + __pyx_tuple__9 = PyTuple_Pack(1, __pyx_kp_s__8); if (unlikely(!__pyx_tuple__9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__6); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__9); -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__6); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__9); - /* "root_numpy/src/tree.pyx":554 + /* "root_numpy/src/tree.pyx":90 * return * if load == -1: * raise ValueError("chain is empty") # <<<<<<<<<<<<<< @@ -60667,16 +61914,16 @@ static int __Pyx_InitCachedConstants(void) { * if ignore_index: */ -#line 554 "root_numpy/src/tree.pyx" - __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_s_chain_is_empty); if (unlikely(!__pyx_tuple__7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 554; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 90 "root_numpy/src/tree.pyx" + __pyx_tuple__11 = PyTuple_Pack(1, __pyx_kp_s_chain_is_empty); if (unlikely(!__pyx_tuple__11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 554 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__7); +#line 90 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__11); -#line 554 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__7); +#line 90 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__11); - /* "root_numpy/src/tree.pyx":558 + /* "root_numpy/src/tree.pyx":94 * if ignore_index: * return * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< @@ -60684,16 +61931,16 @@ static int __Pyx_InitCachedConstants(void) { * raise IOError("cannot open current file") */ -#line 558 "root_numpy/src/tree.pyx" - __pyx_tuple__8 = PyTuple_Pack(1, __pyx_kp_s_tree_index_in_chain_is_out_of_bo); if (unlikely(!__pyx_tuple__8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 94 "root_numpy/src/tree.pyx" + __pyx_tuple__12 = PyTuple_Pack(1, __pyx_kp_s_tree_index_in_chain_is_out_of_bo); if (unlikely(!__pyx_tuple__12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 558 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__8); +#line 94 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__12); -#line 558 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__8); +#line 94 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__12); - /* "root_numpy/src/tree.pyx":560 + /* "root_numpy/src/tree.pyx":96 * raise IndexError("tree index in chain is out of bounds") * elif load == -3: * raise IOError("cannot open current file") # <<<<<<<<<<<<<< @@ -60701,16 +61948,16 @@ static int __Pyx_InitCachedConstants(void) { * raise IOError("cannot access tree in current file") */ -#line 560 "root_numpy/src/tree.pyx" - __pyx_tuple__9 = PyTuple_Pack(1, __pyx_kp_s_cannot_open_current_file); if (unlikely(!__pyx_tuple__9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 96 "root_numpy/src/tree.pyx" + __pyx_tuple__13 = PyTuple_Pack(1, __pyx_kp_s_cannot_open_current_file); if (unlikely(!__pyx_tuple__13)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 560 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__9); +#line 96 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__13); -#line 560 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__9); +#line 96 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__13); - /* "root_numpy/src/tree.pyx":562 + /* "root_numpy/src/tree.pyx":98 * raise IOError("cannot open current file") * elif load == -4: * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< @@ -60718,16 +61965,16 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 562 "root_numpy/src/tree.pyx" - __pyx_tuple__10 = PyTuple_Pack(1, __pyx_kp_s_cannot_access_tree_in_current_fi); if (unlikely(!__pyx_tuple__10)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 98 "root_numpy/src/tree.pyx" + __pyx_tuple__14 = PyTuple_Pack(1, __pyx_kp_s_cannot_access_tree_in_current_fi); if (unlikely(!__pyx_tuple__14)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 562 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__10); +#line 98 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__14); -#line 562 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__10); +#line 98 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__14); - /* "root_numpy/src/tree.pyx":563 + /* "root_numpy/src/tree.pyx":99 * elif load == -4: * raise IOError("cannot access tree in current file") * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< @@ -60735,135 +61982,135 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 563 "root_numpy/src/tree.pyx" - __pyx_tuple__11 = PyTuple_Pack(1, __pyx_kp_s_the_chain_is_not_initialized); if (unlikely(!__pyx_tuple__11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 99 "root_numpy/src/tree.pyx" + __pyx_tuple__15 = PyTuple_Pack(1, __pyx_kp_s_the_chain_is_not_initialized); if (unlikely(!__pyx_tuple__15)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 563 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__11); +#line 99 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__15); -#line 563 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__11); +#line 99 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__15); - /* "root_numpy/src/tree.pyx":571 + /* "root_numpy/src/tree.pyx":107 * * if tree.GetNbranches() == 0: * raise ValueError("tree has no branches") # <<<<<<<<<<<<<< * - * cdef vector[Column*] columns + * cdef int num_requested_branches = 0 */ -#line 571 "root_numpy/src/tree.pyx" - __pyx_tuple__12 = PyTuple_Pack(1, __pyx_kp_s_tree_has_no_branches); if (unlikely(!__pyx_tuple__12)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 107 "root_numpy/src/tree.pyx" + __pyx_tuple__16 = PyTuple_Pack(1, __pyx_kp_s_tree_has_no_branches); if (unlikely(!__pyx_tuple__16)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 571 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__12); +#line 107 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__16); -#line 571 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__12); +#line 107 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__16); - /* "root_numpy/src/tree.pyx":601 - * if selection_formula == NULL or selection_formula.GetNdim() == 0: - * del selection_formula - * raise ValueError("could not compile selection formula") # <<<<<<<<<<<<<< - * # The chain will take care of updating the formula leaves when - * # rolling over to the next tree. + /* "root_numpy/src/tree.pyx":113 + * num_requested_branches = len(branches) + * if num_requested_branches == 0: + * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< + * + * cdef int num_entries = tree.GetEntries() */ -#line 601 "root_numpy/src/tree.pyx" - __pyx_tuple__13 = PyTuple_Pack(1, __pyx_kp_s_could_not_compile_selection_form); if (unlikely(!__pyx_tuple__13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 113 "root_numpy/src/tree.pyx" + __pyx_tuple__17 = PyTuple_Pack(1, __pyx_kp_s_branches_is_an_empty_list); if (unlikely(!__pyx_tuple__17)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 601 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__13); +#line 113 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__17); -#line 601 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__13); +#line 113 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__17); - /* "root_numpy/src/tree.pyx":612 - * branches = structure.keys() - * elif len(branches) == 0: - * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< - * elif len(branches) != len(set(branches)): - * raise ValueError("duplicate branches requested") + /* "root_numpy/src/tree.pyx":179 + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + * if len(branch_dict) != num_requested_branches: + * raise ValueError("duplicate branches requested") # <<<<<<<<<<<<<< + * + * # Build vector of Converters for branches */ -#line 612 "root_numpy/src/tree.pyx" - __pyx_tuple__14 = PyTuple_Pack(1, __pyx_kp_s_branches_is_an_empty_list); if (unlikely(!__pyx_tuple__14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 612; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 179 "root_numpy/src/tree.pyx" + __pyx_tuple__18 = PyTuple_Pack(1, __pyx_kp_s_duplicate_branches_requested); if (unlikely(!__pyx_tuple__18)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 612 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__14); +#line 179 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__18); -#line 612 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__14); +#line 179 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__18); - /* "root_numpy/src/tree.pyx":614 - * raise ValueError("branches is an empty list") - * elif len(branches) != len(set(branches)): - * raise ValueError("duplicate branches requested") # <<<<<<<<<<<<<< - * else: - * user_branches = True + /* "root_numpy/src/tree.pyx":255 + * if conv == NULL: + * # Oops, this should never happen + * raise AssertionError( # <<<<<<<<<<<<<< + * "could not find double converter for formula") + * */ -#line 614 "root_numpy/src/tree.pyx" - __pyx_tuple__15 = PyTuple_Pack(1, __pyx_kp_s_duplicate_branches_requested); if (unlikely(!__pyx_tuple__15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 614; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 255 "root_numpy/src/tree.pyx" + __pyx_tuple__20 = PyTuple_Pack(1, __pyx_kp_s_could_not_find_double_converter); if (unlikely(!__pyx_tuple__20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 614 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__15); +#line 255 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__20); -#line 614 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__15); +#line 255 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__20); - /* "root_numpy/src/tree.pyx":652 + /* "root_numpy/src/tree.pyx":271 * - * if columns.size() == 0: + * elif columns.size() == 0: * raise RuntimeError("unable to convert any branches in this tree") # <<<<<<<<<<<<<< * * # Activate branches used by formulae and columns */ -#line 652 "root_numpy/src/tree.pyx" - __pyx_tuple__16 = PyTuple_Pack(1, __pyx_kp_s_unable_to_convert_any_branches_i); if (unlikely(!__pyx_tuple__16)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 271 "root_numpy/src/tree.pyx" + __pyx_tuple__21 = PyTuple_Pack(1, __pyx_kp_s_unable_to_convert_any_branches_i); if (unlikely(!__pyx_tuple__21)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 652 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__16); +#line 271 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__21); -#line 652 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__16); +#line 271 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__21); - /* "root_numpy/src/tree.pyx":670 - * handle_load(entry_size) - * if entry_size == 0: - * raise IOError("read failure in current tree") # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":285 + * dtype.append((this_col.name, this_conv.get_nptype())) + * if include_weight: + * dtype.append((weight_name, np.dtype('d'))) # <<<<<<<<<<<<<< * - * # Determine if this entry passes the selection, + * # Initialize the array */ -#line 670 "root_numpy/src/tree.pyx" - __pyx_tuple__17 = PyTuple_Pack(1, __pyx_kp_s_read_failure_in_current_tree); if (unlikely(!__pyx_tuple__17)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 670; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 285 "root_numpy/src/tree.pyx" + __pyx_tuple__22 = PyTuple_Pack(1, __pyx_n_s_d); if (unlikely(!__pyx_tuple__22)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 670 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__17); +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__22); -#line 670 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__17); +#line 285 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__22); - /* "root_numpy/src/tree.pyx":728 - * # typecheck should be implemented by the wrapper - * if not PyCObject_Check(tree): - * raise ValueError("tree must be PyCObject") # <<<<<<<<<<<<<< - * cdef TTree* chain = PyCObject_AsVoidPtr(tree) - * return tree2array( + /* "root_numpy/src/tree.pyx":299 + * handle_load(entry_size) + * if entry_size == 0: + * raise IOError("read failure in current tree") # <<<<<<<<<<<<<< + * + * # Determine if this entry passes the selection, */ -#line 728 "root_numpy/src/tree.pyx" - __pyx_tuple__18 = PyTuple_Pack(1, __pyx_kp_s_tree_must_be_PyCObject); if (unlikely(!__pyx_tuple__18)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 728; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 299 "root_numpy/src/tree.pyx" + __pyx_tuple__23 = PyTuple_Pack(1, __pyx_kp_s_read_failure_in_current_tree); if (unlikely(!__pyx_tuple__23)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 728 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__18); +#line 299 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__23); -#line 728 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__18); +#line 299 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__23); - /* "root_numpy/src/tree.pyx":767 + /* "root_numpy/src/tree.pyx":396 * else: * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] # <<<<<<<<<<<<<< @@ -60871,31 +62118,14 @@ static int __Pyx_InitCachedConstants(void) { * raise TypeError( */ -#line 767 "root_numpy/src/tree.pyx" - __pyx_tuple__20 = PyTuple_Pack(1, __pyx_kp_s__19); if (unlikely(!__pyx_tuple__20)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 767 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__20); - -#line 767 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__20); - - /* "root_numpy/src/tree.pyx":877 - * # typecheck should be implemented by the wrapper - * if not PyCObject_Check(tree): - * raise ValueError("tree must be PyCObject") # <<<<<<<<<<<<<< - * intree = PyCObject_AsVoidPtr(tree) - * outtree = array2tree(arr, name=name, tree=intree) - */ - -#line 877 "root_numpy/src/tree.pyx" - __pyx_tuple__21 = PyTuple_Pack(1, __pyx_kp_s_tree_must_be_PyCObject); if (unlikely(!__pyx_tuple__21)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 396 "root_numpy/src/tree.pyx" + __pyx_tuple__26 = PyTuple_Pack(1, __pyx_kp_s__25); if (unlikely(!__pyx_tuple__26)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 877 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__21); +#line 396 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__26); -#line 877 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__21); +#line 396 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__26); /* "root_numpy/src/hist.pyx":10 * cdef TH1* _hist = PyCObject_AsVoidPtr(hist) @@ -60906,13 +62136,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 10 "root_numpy/src/hist.pyx" - __pyx_tuple__22 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__22)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__28 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__28)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__22); + __Pyx_GOTREF(__pyx_tuple__28); #line 10 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__22); + __Pyx_GIVEREF(__pyx_tuple__28); /* "root_numpy/src/hist.pyx":38 * cdef TH2* _hist = PyCObject_AsVoidPtr(hist) @@ -60923,13 +62153,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 38 "root_numpy/src/hist.pyx" - __pyx_tuple__23 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__23)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__29 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__29)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 38 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__23); + __Pyx_GOTREF(__pyx_tuple__29); #line 38 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__23); + __Pyx_GIVEREF(__pyx_tuple__29); /* "root_numpy/src/hist.pyx":66 * cdef TH3* _hist = PyCObject_AsVoidPtr(hist) @@ -60940,13 +62170,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 66 "root_numpy/src/hist.pyx" - __pyx_tuple__24 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__24)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__30 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__30)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 66 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__24); + __Pyx_GOTREF(__pyx_tuple__30); #line 66 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__24); + __Pyx_GIVEREF(__pyx_tuple__30); /* "root_numpy/src/hist.pyx":94 * cdef TProfile* _profile = PyCObject_AsVoidPtr(profile) @@ -60957,13 +62187,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 94 "root_numpy/src/hist.pyx" - __pyx_tuple__25 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__25)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__31 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__31)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__25); + __Pyx_GOTREF(__pyx_tuple__31); #line 94 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__25); + __Pyx_GIVEREF(__pyx_tuple__31); /* "root_numpy/src/hist.pyx":122 * cdef TProfile2D* _profile = PyCObject_AsVoidPtr(profile) @@ -60974,13 +62204,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 122 "root_numpy/src/hist.pyx" - __pyx_tuple__26 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__26)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__32 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__32)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 122 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__26); + __Pyx_GOTREF(__pyx_tuple__32); #line 122 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__26); + __Pyx_GIVEREF(__pyx_tuple__32); /* "root_numpy/src/hist.pyx":150 * cdef TProfile3D* _profile = PyCObject_AsVoidPtr(profile) @@ -60991,13 +62221,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 150 "root_numpy/src/hist.pyx" - __pyx_tuple__27 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__27)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__33 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__33)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__27); + __Pyx_GOTREF(__pyx_tuple__33); #line 150 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__27); + __Pyx_GIVEREF(__pyx_tuple__33); /* "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd":215 * if ((flags & pybuf.PyBUF_C_CONTIGUOUS == pybuf.PyBUF_C_CONTIGUOUS) @@ -61008,13 +62238,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_tuple__28 = PyTuple_Pack(1, __pyx_kp_u_ndarray_is_not_C_contiguous); if (unlikely(!__pyx_tuple__28)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__34 = PyTuple_Pack(1, __pyx_kp_u_ndarray_is_not_C_contiguous); if (unlikely(!__pyx_tuple__34)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GOTREF(__pyx_tuple__28); + __Pyx_GOTREF(__pyx_tuple__34); #line 215 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GIVEREF(__pyx_tuple__28); + __Pyx_GIVEREF(__pyx_tuple__34); /* "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd":219 * if ((flags & pybuf.PyBUF_F_CONTIGUOUS == pybuf.PyBUF_F_CONTIGUOUS) @@ -61025,13 +62255,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_tuple__29 = PyTuple_Pack(1, __pyx_kp_u_ndarray_is_not_Fortran_contiguou); if (unlikely(!__pyx_tuple__29)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__35 = PyTuple_Pack(1, __pyx_kp_u_ndarray_is_not_Fortran_contiguou); if (unlikely(!__pyx_tuple__35)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GOTREF(__pyx_tuple__29); + __Pyx_GOTREF(__pyx_tuple__35); #line 219 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GIVEREF(__pyx_tuple__29); + __Pyx_GIVEREF(__pyx_tuple__35); /* "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd":257 * if ((descr.byteorder == c'>' and little_endian) or @@ -61042,13 +62272,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_tuple__30 = PyTuple_Pack(1, __pyx_kp_u_Non_native_byte_order_not_suppor); if (unlikely(!__pyx_tuple__30)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__36 = PyTuple_Pack(1, __pyx_kp_u_Non_native_byte_order_not_suppor); if (unlikely(!__pyx_tuple__36)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GOTREF(__pyx_tuple__30); + __Pyx_GOTREF(__pyx_tuple__36); #line 257 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GIVEREF(__pyx_tuple__30); + __Pyx_GIVEREF(__pyx_tuple__36); /* "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd":799 * @@ -61059,13 +62289,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_tuple__31 = PyTuple_Pack(1, __pyx_kp_u_Format_string_allocated_too_shor); if (unlikely(!__pyx_tuple__31)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__37 = PyTuple_Pack(1, __pyx_kp_u_Format_string_allocated_too_shor); if (unlikely(!__pyx_tuple__37)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 799; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GOTREF(__pyx_tuple__31); + __Pyx_GOTREF(__pyx_tuple__37); #line 799 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GIVEREF(__pyx_tuple__31); + __Pyx_GIVEREF(__pyx_tuple__37); /* "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd":803 * if ((child.byteorder == c'>' and little_endian) or @@ -61076,13 +62306,13 @@ static int __Pyx_InitCachedConstants(void) { */ #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_tuple__32 = PyTuple_Pack(1, __pyx_kp_u_Non_native_byte_order_not_suppor); if (unlikely(!__pyx_tuple__32)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__38 = PyTuple_Pack(1, __pyx_kp_u_Non_native_byte_order_not_suppor); if (unlikely(!__pyx_tuple__38)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GOTREF(__pyx_tuple__32); + __Pyx_GOTREF(__pyx_tuple__38); #line 803 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GIVEREF(__pyx_tuple__32); + __Pyx_GIVEREF(__pyx_tuple__38); /* "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd":823 * t = child.type_num @@ -61093,15 +62323,32 @@ static int __Pyx_InitCachedConstants(void) { */ #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __pyx_tuple__33 = PyTuple_Pack(1, __pyx_kp_u_Format_string_allocated_too_shor_2); if (unlikely(!__pyx_tuple__33)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__39 = PyTuple_Pack(1, __pyx_kp_u_Format_string_allocated_too_shor_2); if (unlikely(!__pyx_tuple__39)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GOTREF(__pyx_tuple__33); + __Pyx_GOTREF(__pyx_tuple__39); #line 823 "../../.local/lib/python2.7/site-packages/Cython/Includes/numpy/__init__.pxd" - __Pyx_GIVEREF(__pyx_tuple__33); + __Pyx_GIVEREF(__pyx_tuple__39); + + /* "root_numpy/src/converters.pyx":4 + * + * # match leaf_name[length_leaf][N][M]... + * LEAF_PATTERN = re.compile('^[^\[]+((?:\[[^\s\]]+\])(?:\[[0-9]+\])*)?$') # <<<<<<<<<<<<<< + * + * TYPES = { + */ + +#line 4 "root_numpy/src/converters.pyx" + __pyx_tuple__40 = PyTuple_Pack(1, __pyx_kp_s_s_0_9); if (unlikely(!__pyx_tuple__40)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__40); + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__40); - /* "root_numpy/src/tree.pyx":18 + /* "root_numpy/src/converters.pyx":23 * * TYPES_NUMPY2ROOT = { * np.dtype(np.bool): (1, 'O'), # <<<<<<<<<<<<<< @@ -61109,16 +62356,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.int16): (2, 'S'), */ -#line 18 "root_numpy/src/tree.pyx" - __pyx_tuple__34 = PyTuple_Pack(2, __pyx_int_1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__34)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 23 "root_numpy/src/converters.pyx" + __pyx_tuple__41 = PyTuple_Pack(2, __pyx_int_1, __pyx_n_s_O); if (unlikely(!__pyx_tuple__41)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 18 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__34); +#line 23 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__41); -#line 18 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__34); +#line 23 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__41); - /* "root_numpy/src/tree.pyx":19 + /* "root_numpy/src/converters.pyx":24 * TYPES_NUMPY2ROOT = { * np.dtype(np.bool): (1, 'O'), * np.dtype(np.int8): (1, 'B'), # <<<<<<<<<<<<<< @@ -61126,16 +62373,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.int32): (4, 'I'), */ -#line 19 "root_numpy/src/tree.pyx" - __pyx_tuple__35 = PyTuple_Pack(2, __pyx_int_1, __pyx_n_s_B); if (unlikely(!__pyx_tuple__35)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/converters.pyx" + __pyx_tuple__42 = PyTuple_Pack(2, __pyx_int_1, __pyx_n_s_B); if (unlikely(!__pyx_tuple__42)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 19 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__35); +#line 24 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__42); -#line 19 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__35); +#line 24 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__42); - /* "root_numpy/src/tree.pyx":20 + /* "root_numpy/src/converters.pyx":25 * np.dtype(np.bool): (1, 'O'), * np.dtype(np.int8): (1, 'B'), * np.dtype(np.int16): (2, 'S'), # <<<<<<<<<<<<<< @@ -61143,16 +62390,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.int64): (8, 'L'), */ -#line 20 "root_numpy/src/tree.pyx" - __pyx_tuple__36 = PyTuple_Pack(2, __pyx_int_2, __pyx_n_s_S); if (unlikely(!__pyx_tuple__36)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 25 "root_numpy/src/converters.pyx" + __pyx_tuple__43 = PyTuple_Pack(2, __pyx_int_2, __pyx_n_s_S); if (unlikely(!__pyx_tuple__43)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 20 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__36); +#line 25 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__43); -#line 20 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__36); +#line 25 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__43); - /* "root_numpy/src/tree.pyx":21 + /* "root_numpy/src/converters.pyx":26 * np.dtype(np.int8): (1, 'B'), * np.dtype(np.int16): (2, 'S'), * np.dtype(np.int32): (4, 'I'), # <<<<<<<<<<<<<< @@ -61160,16 +62407,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.uint8): (1, 'b'), */ -#line 21 "root_numpy/src/tree.pyx" - __pyx_tuple__37 = PyTuple_Pack(2, __pyx_int_4, __pyx_n_s_I); if (unlikely(!__pyx_tuple__37)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 26 "root_numpy/src/converters.pyx" + __pyx_tuple__44 = PyTuple_Pack(2, __pyx_int_4, __pyx_n_s_I); if (unlikely(!__pyx_tuple__44)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 21 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__37); +#line 26 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__44); -#line 21 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__37); +#line 26 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__44); - /* "root_numpy/src/tree.pyx":22 + /* "root_numpy/src/converters.pyx":27 * np.dtype(np.int16): (2, 'S'), * np.dtype(np.int32): (4, 'I'), * np.dtype(np.int64): (8, 'L'), # <<<<<<<<<<<<<< @@ -61177,16 +62424,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.uint16): (2, 's'), */ -#line 22 "root_numpy/src/tree.pyx" - __pyx_tuple__38 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_L); if (unlikely(!__pyx_tuple__38)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/converters.pyx" + __pyx_tuple__45 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_L); if (unlikely(!__pyx_tuple__45)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 22 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__38); +#line 27 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__45); -#line 22 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__38); +#line 27 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__45); - /* "root_numpy/src/tree.pyx":23 + /* "root_numpy/src/converters.pyx":28 * np.dtype(np.int32): (4, 'I'), * np.dtype(np.int64): (8, 'L'), * np.dtype(np.uint8): (1, 'b'), # <<<<<<<<<<<<<< @@ -61194,16 +62441,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.uint32): (4, 'i'), */ -#line 23 "root_numpy/src/tree.pyx" - __pyx_tuple__39 = PyTuple_Pack(2, __pyx_int_1, __pyx_n_s_b); if (unlikely(!__pyx_tuple__39)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 28 "root_numpy/src/converters.pyx" + __pyx_tuple__46 = PyTuple_Pack(2, __pyx_int_1, __pyx_n_s_b); if (unlikely(!__pyx_tuple__46)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 23 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__39); +#line 28 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__46); -#line 23 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__39); +#line 28 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__46); - /* "root_numpy/src/tree.pyx":24 + /* "root_numpy/src/converters.pyx":29 * np.dtype(np.int64): (8, 'L'), * np.dtype(np.uint8): (1, 'b'), * np.dtype(np.uint16): (2, 's'), # <<<<<<<<<<<<<< @@ -61211,16 +62458,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.uint64): (8, 'l'), */ -#line 24 "root_numpy/src/tree.pyx" - __pyx_tuple__40 = PyTuple_Pack(2, __pyx_int_2, __pyx_n_s_s); if (unlikely(!__pyx_tuple__40)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/converters.pyx" + __pyx_tuple__47 = PyTuple_Pack(2, __pyx_int_2, __pyx_n_s_s); if (unlikely(!__pyx_tuple__47)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 24 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__40); +#line 29 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__47); -#line 24 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__40); +#line 29 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__47); - /* "root_numpy/src/tree.pyx":25 + /* "root_numpy/src/converters.pyx":30 * np.dtype(np.uint8): (1, 'b'), * np.dtype(np.uint16): (2, 's'), * np.dtype(np.uint32): (4, 'i'), # <<<<<<<<<<<<<< @@ -61228,16 +62475,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.float): (8, 'D'), */ -#line 25 "root_numpy/src/tree.pyx" - __pyx_tuple__41 = PyTuple_Pack(2, __pyx_int_4, __pyx_n_s_i); if (unlikely(!__pyx_tuple__41)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 30 "root_numpy/src/converters.pyx" + __pyx_tuple__48 = PyTuple_Pack(2, __pyx_int_4, __pyx_n_s_i); if (unlikely(!__pyx_tuple__48)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 25 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__41); +#line 30 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__48); -#line 25 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__41); +#line 30 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__48); - /* "root_numpy/src/tree.pyx":26 + /* "root_numpy/src/converters.pyx":31 * np.dtype(np.uint16): (2, 's'), * np.dtype(np.uint32): (4, 'i'), * np.dtype(np.uint64): (8, 'l'), # <<<<<<<<<<<<<< @@ -61245,16 +62492,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.float32): (4, 'F'), */ -#line 26 "root_numpy/src/tree.pyx" - __pyx_tuple__42 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_l); if (unlikely(!__pyx_tuple__42)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 31 "root_numpy/src/converters.pyx" + __pyx_tuple__49 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_l); if (unlikely(!__pyx_tuple__49)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 26 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__42); +#line 31 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__49); -#line 26 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__42); +#line 31 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__49); - /* "root_numpy/src/tree.pyx":27 + /* "root_numpy/src/converters.pyx":32 * np.dtype(np.uint32): (4, 'i'), * np.dtype(np.uint64): (8, 'l'), * np.dtype(np.float): (8, 'D'), # <<<<<<<<<<<<<< @@ -61262,16 +62509,16 @@ static int __Pyx_InitCachedConstants(void) { * np.dtype(np.float64): (8, 'D'), */ -#line 27 "root_numpy/src/tree.pyx" - __pyx_tuple__43 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_D); if (unlikely(!__pyx_tuple__43)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 32 "root_numpy/src/converters.pyx" + __pyx_tuple__50 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_D); if (unlikely(!__pyx_tuple__50)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__43); +#line 32 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__50); -#line 27 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__43); +#line 32 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__50); - /* "root_numpy/src/tree.pyx":28 + /* "root_numpy/src/converters.pyx":33 * np.dtype(np.uint64): (8, 'l'), * np.dtype(np.float): (8, 'D'), * np.dtype(np.float32): (4, 'F'), # <<<<<<<<<<<<<< @@ -61279,16 +62526,16 @@ static int __Pyx_InitCachedConstants(void) { * } */ -#line 28 "root_numpy/src/tree.pyx" - __pyx_tuple__44 = PyTuple_Pack(2, __pyx_int_4, __pyx_n_s_F); if (unlikely(!__pyx_tuple__44)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/converters.pyx" + __pyx_tuple__51 = PyTuple_Pack(2, __pyx_int_4, __pyx_n_s_F); if (unlikely(!__pyx_tuple__51)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 28 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__44); +#line 33 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__51); -#line 28 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__44); +#line 33 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__51); - /* "root_numpy/src/tree.pyx":29 + /* "root_numpy/src/converters.pyx":34 * np.dtype(np.float): (8, 'D'), * np.dtype(np.float32): (4, 'F'), * np.dtype(np.float64): (8, 'D'), # <<<<<<<<<<<<<< @@ -61296,56 +62543,76 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 29 "root_numpy/src/tree.pyx" - __pyx_tuple__45 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_D); if (unlikely(!__pyx_tuple__45)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + __pyx_tuple__52 = PyTuple_Pack(2, __pyx_int_8, __pyx_n_s_D); if (unlikely(!__pyx_tuple__52)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__45); +#line 34 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__52); -#line 29 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__45); +#line 34 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__52); + + /* "root_numpy/src/converters.pyx":502 + * + * @atexit.register + * def cleanup(): # <<<<<<<<<<<<<< + * # Delete all converters when module is town down + * it = CONVERTERS.begin() + */ + +#line 502 "root_numpy/src/converters.pyx" + __pyx_tuple__53 = PyTuple_Pack(1, __pyx_n_s_it); if (unlikely(!__pyx_tuple__53)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 502 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__53); + +#line 502 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__53); - /* "root_numpy/src/tree.pyx":45 +#line 502 "root_numpy/src/converters.pyx" + __pyx_codeobj__54 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__53, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_cleanup, 502, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__54)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + + /* "root_numpy/src/tree.pyx":4 * * * def list_trees(fname): # <<<<<<<<<<<<<< - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: */ -#line 45 "root_numpy/src/tree.pyx" - __pyx_tuple__46 = PyTuple_Pack(8, __pyx_n_s_fname, __pyx_n_s_f, __pyx_n_s_keys, __pyx_n_s_ret, __pyx_n_s_n, __pyx_n_s_key, __pyx_n_s_i, __pyx_n_s_clsname); if (unlikely(!__pyx_tuple__46)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 4 "root_numpy/src/tree.pyx" + __pyx_tuple__55 = PyTuple_Pack(8, __pyx_n_s_fname, __pyx_n_s_rfile, __pyx_n_s_keys, __pyx_n_s_ret, __pyx_n_s_nkeys, __pyx_n_s_key, __pyx_n_s_i, __pyx_n_s_clsname); if (unlikely(!__pyx_tuple__55)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 45 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__46); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__55); -#line 45 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__46); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__55); -#line 45 "root_numpy/src/tree.pyx" - __pyx_codeobj__47 = (PyObject*)__Pyx_PyCode_New(1, 0, 8, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__46, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_list_trees, 45, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__47)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 4 "root_numpy/src/tree.pyx" + __pyx_codeobj__56 = (PyObject*)__Pyx_PyCode_New(1, 0, 8, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__55, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_list_trees, 4, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__56)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":63 + /* "root_numpy/src/tree.pyx":24 * * * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< - * if tree is None: + * if tree == None: * # automatically select single tree */ -#line 63 "root_numpy/src/tree.pyx" - __pyx_tuple__48 = PyTuple_Pack(4, __pyx_n_s_fname, __pyx_n_s_tree, __pyx_n_s_f, __pyx_n_s_t); if (unlikely(!__pyx_tuple__48)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/tree.pyx" + __pyx_tuple__57 = PyTuple_Pack(5, __pyx_n_s_fname, __pyx_n_s_tree, __pyx_n_s_rfile, __pyx_n_s_rtree, __pyx_n_s_structure); if (unlikely(!__pyx_tuple__57)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 63 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__48); +#line 24 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__57); -#line 63 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__48); +#line 24 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__57); -#line 63 "root_numpy/src/tree.pyx" - __pyx_codeobj__49 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__48, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_list_structures, 63, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__49)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/tree.pyx" + __pyx_codeobj__58 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__57, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_list_structures, 24, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__58)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":80 + /* "root_numpy/src/tree.pyx":43 * * * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< @@ -61353,59 +62620,59 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 80 "root_numpy/src/tree.pyx" - __pyx_tuple__50 = PyTuple_Pack(2, __pyx_n_s_fname, __pyx_n_s_tree); if (unlikely(!__pyx_tuple__50)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 43 "root_numpy/src/tree.pyx" + __pyx_tuple__59 = PyTuple_Pack(2, __pyx_n_s_fname, __pyx_n_s_tree); if (unlikely(!__pyx_tuple__59)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 80 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__50); +#line 43 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__59); -#line 80 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__50); +#line 43 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__59); -#line 80 "root_numpy/src/tree.pyx" - __pyx_codeobj__51 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__50, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_list_branches, 80, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__51)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 43 "root_numpy/src/tree.pyx" + __pyx_codeobj__60 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__59, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_list_branches, 43, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__60)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":702 + /* "root_numpy/src/tree.pyx":335 * * - * def root2array_fromFname(fnames, treename, branches, # <<<<<<<<<<<<<< + * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< * selection, start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 702 "root_numpy/src/tree.pyx" - __pyx_tuple__52 = PyTuple_Pack(12, __pyx_n_s_fnames, __pyx_n_s_treename, __pyx_n_s_branches, __pyx_n_s_selection, __pyx_n_s_start, __pyx_n_s_stop, __pyx_n_s_step, __pyx_n_s_include_weight, __pyx_n_s_weight_name, __pyx_n_s_ttree, __pyx_n_s_fn, __pyx_n_s_ret); if (unlikely(!__pyx_tuple__52)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 335 "root_numpy/src/tree.pyx" + __pyx_tuple__61 = PyTuple_Pack(12, __pyx_n_s_fnames, __pyx_n_s_treename, __pyx_n_s_branches, __pyx_n_s_selection, __pyx_n_s_start, __pyx_n_s_stop, __pyx_n_s_step, __pyx_n_s_include_weight, __pyx_n_s_weight_name, __pyx_n_s_ttree, __pyx_n_s_fn, __pyx_n_s_ret); if (unlikely(!__pyx_tuple__61)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 702 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__52); +#line 335 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__61); -#line 702 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__52); +#line 335 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__61); -#line 702 "root_numpy/src/tree.pyx" - __pyx_codeobj__53 = (PyObject*)__Pyx_PyCode_New(9, 0, 12, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__52, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_root2array_fromFname, 702, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__53)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 335 "root_numpy/src/tree.pyx" + __pyx_codeobj__62 = (PyObject*)__Pyx_PyCode_New(9, 0, 12, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__61, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_root2array_fromFname, 335, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__62)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":721 + /* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< * start, stop, step, - * include_weight, weight_name): + * bool include_weight, string weight_name): */ -#line 721 "root_numpy/src/tree.pyx" - __pyx_tuple__54 = PyTuple_Pack(9, __pyx_n_s_tree, __pyx_n_s_branches, __pyx_n_s_selection, __pyx_n_s_start, __pyx_n_s_stop, __pyx_n_s_step, __pyx_n_s_include_weight, __pyx_n_s_weight_name, __pyx_n_s_chain); if (unlikely(!__pyx_tuple__54)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 354 "root_numpy/src/tree.pyx" + __pyx_tuple__63 = PyTuple_Pack(9, __pyx_n_s_tree, __pyx_n_s_branches, __pyx_n_s_selection, __pyx_n_s_start, __pyx_n_s_stop, __pyx_n_s_step, __pyx_n_s_include_weight, __pyx_n_s_weight_name, __pyx_n_s_chain); if (unlikely(!__pyx_tuple__63)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 721 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__54); +#line 354 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__63); -#line 721 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__54); +#line 354 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__63); -#line 721 "root_numpy/src/tree.pyx" - __pyx_codeobj__55 = (PyObject*)__Pyx_PyCode_New(8, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__54, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_root2array_fromCObj, 721, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__55)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 354 "root_numpy/src/tree.pyx" + __pyx_codeobj__64 = (PyObject*)__Pyx_PyCode_New(8, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__63, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_root2array_fromCObj, 354, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__64)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":869 + /* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -61413,57 +62680,37 @@ static int __Pyx_InitCachedConstants(void) { * cdef TTree* outtree = NULL */ -#line 869 "root_numpy/src/tree.pyx" - __pyx_tuple__56 = PyTuple_Pack(5, __pyx_n_s_arr, __pyx_n_s_name, __pyx_n_s_tree, __pyx_n_s_intree, __pyx_n_s_outtree); if (unlikely(!__pyx_tuple__56)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 479 "root_numpy/src/tree.pyx" + __pyx_tuple__65 = PyTuple_Pack(5, __pyx_n_s_arr, __pyx_n_s_name, __pyx_n_s_tree, __pyx_n_s_intree, __pyx_n_s_outtree); if (unlikely(!__pyx_tuple__65)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 869 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__56); +#line 479 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__65); -#line 869 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__56); +#line 479 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__65); -#line 869 "root_numpy/src/tree.pyx" - __pyx_codeobj__57 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__56, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_array2tree_toCObj, 869, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__57)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 479 "root_numpy/src/tree.pyx" + __pyx_codeobj__66 = (PyObject*)__Pyx_PyCode_New(3, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__65, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array2tree_toCObj, 479, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__66)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":883 + /* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< - * cdef TFile* file = Open(filename, mode) - * if file is NULL: - */ - -#line 883 "root_numpy/src/tree.pyx" - __pyx_tuple__58 = PyTuple_Pack(6, __pyx_n_s_arr, __pyx_n_s_filename, __pyx_n_s_treename, __pyx_n_s_mode, __pyx_n_s_file, __pyx_n_s_tree); if (unlikely(!__pyx_tuple__58)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 883 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__58); - -#line 883 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__58); - -#line 883 "root_numpy/src/tree.pyx" - __pyx_codeobj__59 = (PyObject*)__Pyx_PyCode_New(4, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__58, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_array2root, 883, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__59)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - - /* "root_numpy/src/tree.pyx":900 - * - * @atexit.register - * def cleanup(): # <<<<<<<<<<<<<< - * # delete all allocated converters - * it = CONVERTERS.begin() + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: */ -#line 900 "root_numpy/src/tree.pyx" - __pyx_tuple__60 = PyTuple_Pack(1, __pyx_n_s_it); if (unlikely(!__pyx_tuple__60)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 488 "root_numpy/src/tree.pyx" + __pyx_tuple__67 = PyTuple_Pack(6, __pyx_n_s_arr, __pyx_n_s_filename, __pyx_n_s_treename, __pyx_n_s_mode, __pyx_n_s_rfile, __pyx_n_s_tree); if (unlikely(!__pyx_tuple__67)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__60); +#line 488 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__67); -#line 900 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__60); +#line 488 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__67); -#line 900 "root_numpy/src/tree.pyx" - __pyx_codeobj__61 = (PyObject*)__Pyx_PyCode_New(0, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__60, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy, __pyx_n_s_cleanup, 900, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__61)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 488 "root_numpy/src/tree.pyx" + __pyx_codeobj__68 = (PyObject*)__Pyx_PyCode_New(4, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__67, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array2root, 488, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__68)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":10 * @@ -61474,16 +62721,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 10 "root_numpy/src/array.pyx" - __pyx_tuple__62 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__62)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__69 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__69)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__62); + __Pyx_GOTREF(__pyx_tuple__69); #line 10 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__62); + __Pyx_GIVEREF(__pyx_tuple__69); #line 10 "root_numpy/src/array.pyx" - __pyx_codeobj__63 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__62, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_d, 10, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__63)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__70 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__69, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_d, 10, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__70)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":15 * @@ -61494,16 +62741,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 15 "root_numpy/src/array.pyx" - __pyx_tuple__64 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__64)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__71 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__71)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 15 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__64); + __Pyx_GOTREF(__pyx_tuple__71); #line 15 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__64); + __Pyx_GIVEREF(__pyx_tuple__71); #line 15 "root_numpy/src/array.pyx" - __pyx_codeobj__65 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__64, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_f, 15, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__65)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__72 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__71, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_f, 15, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__72)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":20 * @@ -61514,16 +62761,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 20 "root_numpy/src/array.pyx" - __pyx_tuple__66 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__66)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__73 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__73)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__66); + __Pyx_GOTREF(__pyx_tuple__73); #line 20 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__66); + __Pyx_GIVEREF(__pyx_tuple__73); #line 20 "root_numpy/src/array.pyx" - __pyx_codeobj__67 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__66, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_l, 20, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__67)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__74 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__73, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_l, 20, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__74)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":25 * @@ -61534,16 +62781,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 25 "root_numpy/src/array.pyx" - __pyx_tuple__68 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__68)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__75 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__75)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 25 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__68); + __Pyx_GOTREF(__pyx_tuple__75); #line 25 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__68); + __Pyx_GIVEREF(__pyx_tuple__75); #line 25 "root_numpy/src/array.pyx" - __pyx_codeobj__69 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__68, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_i, 25, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__69)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__76 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__75, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_i, 25, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__76)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":30 * @@ -61554,16 +62801,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 30 "root_numpy/src/array.pyx" - __pyx_tuple__70 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__70)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__77 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__77)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 30 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__70); + __Pyx_GOTREF(__pyx_tuple__77); #line 30 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__70); + __Pyx_GIVEREF(__pyx_tuple__77); #line 30 "root_numpy/src/array.pyx" - __pyx_codeobj__71 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__70, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_s, 30, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__71)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__78 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__77, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_s, 30, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__78)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":35 * @@ -61574,16 +62821,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 35 "root_numpy/src/array.pyx" - __pyx_tuple__72 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__72)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__79 = PyTuple_Pack(2, __pyx_n_s_root_arr, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__79)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 35 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__72); + __Pyx_GOTREF(__pyx_tuple__79); #line 35 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__72); + __Pyx_GIVEREF(__pyx_tuple__79); #line 35 "root_numpy/src/array.pyx" - __pyx_codeobj__73 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__72, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_c, 35, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__73)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__80 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__79, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_c, 35, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__80)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":40 * @@ -61594,16 +62841,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 40 "root_numpy/src/array.pyx" - __pyx_tuple__74 = PyTuple_Pack(3, __pyx_n_s_root_hist, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__74)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__81 = PyTuple_Pack(3, __pyx_n_s_root_hist, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__81)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 40 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__74); + __Pyx_GOTREF(__pyx_tuple__81); #line 40 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__74); + __Pyx_GIVEREF(__pyx_tuple__81); #line 40 "root_numpy/src/array.pyx" - __pyx_codeobj__75 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__74, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_h1c, 40, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__75)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__82 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__81, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_h1c, 40, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__82)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":46 * @@ -61614,16 +62861,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 46 "root_numpy/src/array.pyx" - __pyx_tuple__76 = PyTuple_Pack(3, __pyx_n_s_root_hist, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__76)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__83 = PyTuple_Pack(3, __pyx_n_s_root_hist, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__83)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__76); + __Pyx_GOTREF(__pyx_tuple__83); #line 46 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__76); + __Pyx_GIVEREF(__pyx_tuple__83); #line 46 "root_numpy/src/array.pyx" - __pyx_codeobj__77 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__76, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_h2c, 46, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__77)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__84 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__83, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_h2c, 46, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__84)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":52 * @@ -61634,16 +62881,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 52 "root_numpy/src/array.pyx" - __pyx_tuple__78 = PyTuple_Pack(3, __pyx_n_s_root_hist, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__78)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__85 = PyTuple_Pack(3, __pyx_n_s_root_hist, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__85)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 52 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__78); + __Pyx_GOTREF(__pyx_tuple__85); #line 52 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__78); + __Pyx_GIVEREF(__pyx_tuple__85); #line 52 "root_numpy/src/array.pyx" - __pyx_codeobj__79 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__78, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_array_h3c, 52, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__79)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__86 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__85, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_array_h3c, 52, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__86)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":62 * @cython.boundscheck(False) @@ -61654,16 +62901,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 62 "root_numpy/src/array.pyx" - __pyx_tuple__80 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__80)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__87 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__87)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 62 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__80); + __Pyx_GOTREF(__pyx_tuple__87); #line 62 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__80); + __Pyx_GIVEREF(__pyx_tuple__87); #line 62 "root_numpy/src/array.pyx" - __pyx_codeobj__81 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__80, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h1d_array, 62, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__81)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__88 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__87, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h1d_array, 62, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__88)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":70 * @cython.boundscheck(False) @@ -61674,16 +62921,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 70 "root_numpy/src/array.pyx" - __pyx_tuple__82 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__82)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__89 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__89)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__82); + __Pyx_GOTREF(__pyx_tuple__89); #line 70 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__82); + __Pyx_GIVEREF(__pyx_tuple__89); #line 70 "root_numpy/src/array.pyx" - __pyx_codeobj__83 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__82, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h2d_array, 70, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__83)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__90 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__89, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h2d_array, 70, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__90)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":78 * @cython.boundscheck(False) @@ -61694,16 +62941,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 78 "root_numpy/src/array.pyx" - __pyx_tuple__84 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__84)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__91 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__91)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__84); + __Pyx_GOTREF(__pyx_tuple__91); #line 78 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__84); + __Pyx_GIVEREF(__pyx_tuple__91); #line 78 "root_numpy/src/array.pyx" - __pyx_codeobj__85 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__84, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h3d_array, 78, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__85)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__92 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__91, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h3d_array, 78, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__92)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":86 * @cython.boundscheck(False) @@ -61714,16 +62961,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 86 "root_numpy/src/array.pyx" - __pyx_tuple__86 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__86)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__93 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__93)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 86 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__86); + __Pyx_GOTREF(__pyx_tuple__93); #line 86 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__86); + __Pyx_GIVEREF(__pyx_tuple__93); #line 86 "root_numpy/src/array.pyx" - __pyx_codeobj__87 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__86, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h1f_array, 86, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__87)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__94 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__93, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h1f_array, 86, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__94)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":94 * @cython.boundscheck(False) @@ -61734,16 +62981,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 94 "root_numpy/src/array.pyx" - __pyx_tuple__88 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__88)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__95 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__95)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__88); + __Pyx_GOTREF(__pyx_tuple__95); #line 94 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__88); + __Pyx_GIVEREF(__pyx_tuple__95); #line 94 "root_numpy/src/array.pyx" - __pyx_codeobj__89 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__88, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h2f_array, 94, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__89)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__96 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__95, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h2f_array, 94, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__96)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":102 * @cython.boundscheck(False) @@ -61754,16 +63001,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 102 "root_numpy/src/array.pyx" - __pyx_tuple__90 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__90)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__97 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__97)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 102 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__90); + __Pyx_GOTREF(__pyx_tuple__97); #line 102 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__90); + __Pyx_GIVEREF(__pyx_tuple__97); #line 102 "root_numpy/src/array.pyx" - __pyx_codeobj__91 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__90, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h3f_array, 102, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__91)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__98 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__97, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h3f_array, 102, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__98)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":110 * @cython.boundscheck(False) @@ -61774,16 +63021,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 110 "root_numpy/src/array.pyx" - __pyx_tuple__92 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__92)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__99 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__99)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 110 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__92); + __Pyx_GOTREF(__pyx_tuple__99); #line 110 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__92); + __Pyx_GIVEREF(__pyx_tuple__99); #line 110 "root_numpy/src/array.pyx" - __pyx_codeobj__93 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__92, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h1i_array, 110, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__93)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__100 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__99, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h1i_array, 110, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__100)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":118 * @cython.boundscheck(False) @@ -61794,16 +63041,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 118 "root_numpy/src/array.pyx" - __pyx_tuple__94 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__94)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__101 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__101)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 118 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__94); + __Pyx_GOTREF(__pyx_tuple__101); #line 118 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__94); + __Pyx_GIVEREF(__pyx_tuple__101); #line 118 "root_numpy/src/array.pyx" - __pyx_codeobj__95 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__94, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h2i_array, 118, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__95)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__102 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__101, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h2i_array, 118, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__102)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":126 * @cython.boundscheck(False) @@ -61814,16 +63061,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 126 "root_numpy/src/array.pyx" - __pyx_tuple__96 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__96)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__103 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__103)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__96); + __Pyx_GOTREF(__pyx_tuple__103); #line 126 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__96); + __Pyx_GIVEREF(__pyx_tuple__103); #line 126 "root_numpy/src/array.pyx" - __pyx_codeobj__97 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__96, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h3i_array, 126, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__97)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__104 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__103, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h3i_array, 126, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__104)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":134 * @cython.boundscheck(False) @@ -61834,16 +63081,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 134 "root_numpy/src/array.pyx" - __pyx_tuple__98 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__98)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__105 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__105)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 134 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__98); + __Pyx_GOTREF(__pyx_tuple__105); #line 134 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__98); + __Pyx_GIVEREF(__pyx_tuple__105); #line 134 "root_numpy/src/array.pyx" - __pyx_codeobj__99 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__98, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h1s_array, 134, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__99)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__106 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__105, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h1s_array, 134, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__106)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":142 * @cython.boundscheck(False) @@ -61854,16 +63101,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 142 "root_numpy/src/array.pyx" - __pyx_tuple__100 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__100)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__107 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__107)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__100); + __Pyx_GOTREF(__pyx_tuple__107); #line 142 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__100); + __Pyx_GIVEREF(__pyx_tuple__107); #line 142 "root_numpy/src/array.pyx" - __pyx_codeobj__101 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__100, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h2s_array, 142, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__101)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__108 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__107, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h2s_array, 142, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__108)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":150 * @cython.boundscheck(False) @@ -61874,16 +63121,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 150 "root_numpy/src/array.pyx" - __pyx_tuple__102 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__102)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__109 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__109)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__102); + __Pyx_GOTREF(__pyx_tuple__109); #line 150 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__102); + __Pyx_GIVEREF(__pyx_tuple__109); #line 150 "root_numpy/src/array.pyx" - __pyx_codeobj__103 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__102, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h3s_array, 150, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__103)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__110 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__109, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h3s_array, 150, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__110)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":158 * @cython.boundscheck(False) @@ -61894,16 +63141,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 158 "root_numpy/src/array.pyx" - __pyx_tuple__104 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__104)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__111 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__111)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 158 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__104); + __Pyx_GOTREF(__pyx_tuple__111); #line 158 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__104); + __Pyx_GIVEREF(__pyx_tuple__111); #line 158 "root_numpy/src/array.pyx" - __pyx_codeobj__105 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__104, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h1c_array, 158, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__105)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__112 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__111, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h1c_array, 158, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__112)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":166 * @cython.boundscheck(False) @@ -61914,16 +63161,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 166 "root_numpy/src/array.pyx" - __pyx_tuple__106 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__106)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__113 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__113)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 166 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__106); + __Pyx_GOTREF(__pyx_tuple__113); #line 166 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__106); + __Pyx_GIVEREF(__pyx_tuple__113); #line 166 "root_numpy/src/array.pyx" - __pyx_codeobj__107 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__106, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h2c_array, 166, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__107)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__114 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__113, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h2c_array, 166, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__114)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":174 * @cython.boundscheck(False) @@ -61934,16 +63181,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 174 "root_numpy/src/array.pyx" - __pyx_tuple__108 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__108)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__115 = PyTuple_Pack(4, __pyx_n_s_root_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_arr_2); if (unlikely(!__pyx_tuple__115)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 174 "root_numpy/src/array.pyx" - __Pyx_GOTREF(__pyx_tuple__108); + __Pyx_GOTREF(__pyx_tuple__115); #line 174 "root_numpy/src/array.pyx" - __Pyx_GIVEREF(__pyx_tuple__108); + __Pyx_GIVEREF(__pyx_tuple__115); #line 174 "root_numpy/src/array.pyx" - __pyx_codeobj__109 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__108, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_2, __pyx_n_s_h3c_array, 174, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__109)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__116 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__115, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_h3c_array, 174, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__116)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/matrix.pyx":6 * @cython.boundscheck(False) @@ -61954,16 +63201,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 6 "root_numpy/src/matrix.pyx" - __pyx_tuple__110 = PyTuple_Pack(5, __pyx_n_s_root_mat, __pyx_n_s_mat, __pyx_n_s_arr, __pyx_n_s_i, __pyx_n_s_j); if (unlikely(!__pyx_tuple__110)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__117 = PyTuple_Pack(5, __pyx_n_s_root_mat, __pyx_n_s_mat, __pyx_n_s_arr, __pyx_n_s_i, __pyx_n_s_j); if (unlikely(!__pyx_tuple__117)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/matrix.pyx" - __Pyx_GOTREF(__pyx_tuple__110); + __Pyx_GOTREF(__pyx_tuple__117); #line 6 "root_numpy/src/matrix.pyx" - __Pyx_GIVEREF(__pyx_tuple__110); + __Pyx_GIVEREF(__pyx_tuple__117); #line 6 "root_numpy/src/matrix.pyx" - __pyx_codeobj__111 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__110, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_matrix_d, 6, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__111)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__118 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__117, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_matrix_d, 6, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__118)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/matrix.pyx":19 * @cython.boundscheck(False) @@ -61974,16 +63221,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 19 "root_numpy/src/matrix.pyx" - __pyx_tuple__112 = PyTuple_Pack(5, __pyx_n_s_root_mat, __pyx_n_s_mat, __pyx_n_s_arr, __pyx_n_s_i, __pyx_n_s_j); if (unlikely(!__pyx_tuple__112)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__119 = PyTuple_Pack(5, __pyx_n_s_root_mat, __pyx_n_s_mat, __pyx_n_s_arr, __pyx_n_s_i, __pyx_n_s_j); if (unlikely(!__pyx_tuple__119)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 19 "root_numpy/src/matrix.pyx" - __Pyx_GOTREF(__pyx_tuple__112); + __Pyx_GOTREF(__pyx_tuple__119); #line 19 "root_numpy/src/matrix.pyx" - __Pyx_GIVEREF(__pyx_tuple__112); + __Pyx_GIVEREF(__pyx_tuple__119); #line 19 "root_numpy/src/matrix.pyx" - __pyx_codeobj__113 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__112, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_3, __pyx_n_s_matrix_f, 19, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__113)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__120 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__119, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_matrix_f, 19, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__120)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/sample.pyx":6 * @cython.boundscheck(False) @@ -61994,16 +63241,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 6 "root_numpy/src/sample.pyx" - __pyx_tuple__114 = PyTuple_Pack(5, __pyx_n_s_f1, __pyx_n_s_n_samples, __pyx_n_s_f1_2, __pyx_n_s_i, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__114)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__121 = PyTuple_Pack(5, __pyx_n_s_f1, __pyx_n_s_n_samples, __pyx_n_s_f1_2, __pyx_n_s_i, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__121)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/sample.pyx" - __Pyx_GOTREF(__pyx_tuple__114); + __Pyx_GOTREF(__pyx_tuple__121); #line 6 "root_numpy/src/sample.pyx" - __Pyx_GIVEREF(__pyx_tuple__114); + __Pyx_GIVEREF(__pyx_tuple__121); #line 6 "root_numpy/src/sample.pyx" - __pyx_codeobj__115 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__114, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_sample_f1, 6, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__115)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__122 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__121, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_sample_f1, 6, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__122)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/sample.pyx":17 * @cython.boundscheck(False) @@ -62014,16 +63261,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 17 "root_numpy/src/sample.pyx" - __pyx_tuple__116 = PyTuple_Pack(5, __pyx_n_s_h1, __pyx_n_s_n_samples, __pyx_n_s_h1_2, __pyx_n_s_i, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__116)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__123 = PyTuple_Pack(5, __pyx_n_s_h1, __pyx_n_s_n_samples, __pyx_n_s_h1_2, __pyx_n_s_i, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__123)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 17 "root_numpy/src/sample.pyx" - __Pyx_GOTREF(__pyx_tuple__116); + __Pyx_GOTREF(__pyx_tuple__123); #line 17 "root_numpy/src/sample.pyx" - __Pyx_GIVEREF(__pyx_tuple__116); + __Pyx_GIVEREF(__pyx_tuple__123); #line 17 "root_numpy/src/sample.pyx" - __pyx_codeobj__117 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__116, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_sample_h1, 17, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__117)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__124 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__123, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_sample_h1, 17, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__124)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/sample.pyx":28 * @cython.boundscheck(False) @@ -62034,16 +63281,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 28 "root_numpy/src/sample.pyx" - __pyx_tuple__118 = PyTuple_Pack(7, __pyx_n_s_f2, __pyx_n_s_n_samples, __pyx_n_s_f2_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__118)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__125 = PyTuple_Pack(7, __pyx_n_s_f2, __pyx_n_s_n_samples, __pyx_n_s_f2_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__125)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 28 "root_numpy/src/sample.pyx" - __Pyx_GOTREF(__pyx_tuple__118); + __Pyx_GOTREF(__pyx_tuple__125); #line 28 "root_numpy/src/sample.pyx" - __Pyx_GIVEREF(__pyx_tuple__118); + __Pyx_GIVEREF(__pyx_tuple__125); #line 28 "root_numpy/src/sample.pyx" - __pyx_codeobj__119 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__118, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_sample_f2, 28, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__119)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__126 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__125, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_sample_f2, 28, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__126)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/sample.pyx":43 * @cython.boundscheck(False) @@ -62054,16 +63301,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 43 "root_numpy/src/sample.pyx" - __pyx_tuple__120 = PyTuple_Pack(7, __pyx_n_s_h2, __pyx_n_s_n_samples, __pyx_n_s_h2_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__120)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__127 = PyTuple_Pack(7, __pyx_n_s_h2, __pyx_n_s_n_samples, __pyx_n_s_h2_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__127)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 43 "root_numpy/src/sample.pyx" - __Pyx_GOTREF(__pyx_tuple__120); + __Pyx_GOTREF(__pyx_tuple__127); #line 43 "root_numpy/src/sample.pyx" - __Pyx_GIVEREF(__pyx_tuple__120); + __Pyx_GIVEREF(__pyx_tuple__127); #line 43 "root_numpy/src/sample.pyx" - __pyx_codeobj__121 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__120, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_sample_h2, 43, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__121)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__128 = (PyObject*)__Pyx_PyCode_New(2, 0, 7, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__127, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_sample_h2, 43, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__128)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/sample.pyx":58 * @cython.boundscheck(False) @@ -62074,16 +63321,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 58 "root_numpy/src/sample.pyx" - __pyx_tuple__122 = PyTuple_Pack(8, __pyx_n_s_f3, __pyx_n_s_n_samples, __pyx_n_s_f3_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__122)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__129 = PyTuple_Pack(8, __pyx_n_s_f3, __pyx_n_s_n_samples, __pyx_n_s_f3_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__129)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 58 "root_numpy/src/sample.pyx" - __Pyx_GOTREF(__pyx_tuple__122); + __Pyx_GOTREF(__pyx_tuple__129); #line 58 "root_numpy/src/sample.pyx" - __Pyx_GIVEREF(__pyx_tuple__122); + __Pyx_GIVEREF(__pyx_tuple__129); #line 58 "root_numpy/src/sample.pyx" - __pyx_codeobj__123 = (PyObject*)__Pyx_PyCode_New(2, 0, 8, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__122, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_sample_f3, 58, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__123)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__130 = (PyObject*)__Pyx_PyCode_New(2, 0, 8, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__129, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_sample_f3, 58, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__130)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/sample.pyx":75 * @cython.boundscheck(False) @@ -62094,16 +63341,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 75 "root_numpy/src/sample.pyx" - __pyx_tuple__124 = PyTuple_Pack(8, __pyx_n_s_h3, __pyx_n_s_n_samples, __pyx_n_s_h3_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__124)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__131 = PyTuple_Pack(8, __pyx_n_s_h3, __pyx_n_s_n_samples, __pyx_n_s_h3_2, __pyx_n_s_i, __pyx_n_s_x, __pyx_n_s_y, __pyx_n_s_z, __pyx_n_s_arr); if (unlikely(!__pyx_tuple__131)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 75 "root_numpy/src/sample.pyx" - __Pyx_GOTREF(__pyx_tuple__124); + __Pyx_GOTREF(__pyx_tuple__131); #line 75 "root_numpy/src/sample.pyx" - __Pyx_GIVEREF(__pyx_tuple__124); + __Pyx_GIVEREF(__pyx_tuple__131); #line 75 "root_numpy/src/sample.pyx" - __pyx_codeobj__125 = (PyObject*)__Pyx_PyCode_New(2, 0, 8, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__124, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_4, __pyx_n_s_sample_h3, 75, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__125)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__132 = (PyObject*)__Pyx_PyCode_New(2, 0, 8, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__131, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_sample_h3, 75, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__132)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/hist.pyx":3 * @cython.boundscheck(False) @@ -62114,16 +63361,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 3 "root_numpy/src/hist.pyx" - __pyx_tuple__126 = PyTuple_Pack(9, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__126)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__133 = PyTuple_Pack(9, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__133)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__126); + __Pyx_GOTREF(__pyx_tuple__133); #line 3 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__126); + __Pyx_GIVEREF(__pyx_tuple__133); #line 3 "root_numpy/src/hist.pyx" - __pyx_codeobj__127 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__126, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_fill_h1, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__127)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__134 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__133, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_h1, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__134)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/hist.pyx":31 * @cython.boundscheck(False) @@ -62134,16 +63381,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 31 "root_numpy/src/hist.pyx" - __pyx_tuple__128 = PyTuple_Pack(9, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__128)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__135 = PyTuple_Pack(9, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__135)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__128); + __Pyx_GOTREF(__pyx_tuple__135); #line 31 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__128); + __Pyx_GIVEREF(__pyx_tuple__135); #line 31 "root_numpy/src/hist.pyx" - __pyx_codeobj__129 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__128, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_fill_h2, 31, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__129)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__136 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__135, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_h2, 31, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__136)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/hist.pyx":59 * @cython.boundscheck(False) @@ -62154,16 +63401,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 59 "root_numpy/src/hist.pyx" - __pyx_tuple__130 = PyTuple_Pack(9, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__130)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__137 = PyTuple_Pack(9, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__137)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__130); + __Pyx_GOTREF(__pyx_tuple__137); #line 59 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__130); + __Pyx_GIVEREF(__pyx_tuple__137); #line 59 "root_numpy/src/hist.pyx" - __pyx_codeobj__131 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__130, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_fill_h3, 59, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__131)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__138 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__137, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_h3, 59, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__138)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/hist.pyx":87 * @cython.boundscheck(False) @@ -62174,16 +63421,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 87 "root_numpy/src/hist.pyx" - __pyx_tuple__132 = PyTuple_Pack(9, __pyx_n_s_profile, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_profile_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__132)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__139 = PyTuple_Pack(9, __pyx_n_s_profile, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_profile_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__139)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__132); + __Pyx_GOTREF(__pyx_tuple__139); #line 87 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__132); + __Pyx_GIVEREF(__pyx_tuple__139); #line 87 "root_numpy/src/hist.pyx" - __pyx_codeobj__133 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__132, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_fill_p1, 87, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__133)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__140 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__139, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_p1, 87, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__140)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/hist.pyx":115 * @cython.boundscheck(False) @@ -62194,16 +63441,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 115 "root_numpy/src/hist.pyx" - __pyx_tuple__134 = PyTuple_Pack(9, __pyx_n_s_profile, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_profile_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__134)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__141 = PyTuple_Pack(9, __pyx_n_s_profile, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_profile_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__141)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 115 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__134); + __Pyx_GOTREF(__pyx_tuple__141); #line 115 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__134); + __Pyx_GIVEREF(__pyx_tuple__141); #line 115 "root_numpy/src/hist.pyx" - __pyx_codeobj__135 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__134, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_fill_p2, 115, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__135)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__142 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__141, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_p2, 115, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__142)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/hist.pyx":143 * @cython.boundscheck(False) @@ -62214,16 +63461,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 143 "root_numpy/src/hist.pyx" - __pyx_tuple__136 = PyTuple_Pack(9, __pyx_n_s_profile, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_profile_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__136)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__143 = PyTuple_Pack(9, __pyx_n_s_profile, __pyx_n_s_array, __pyx_n_s_weights, __pyx_n_s_return_indices, __pyx_n_s_profile_2, __pyx_n_s_size, __pyx_n_s_idx, __pyx_n_s_i, __pyx_n_s_bin_idx); if (unlikely(!__pyx_tuple__143)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 143 "root_numpy/src/hist.pyx" - __Pyx_GOTREF(__pyx_tuple__136); + __Pyx_GOTREF(__pyx_tuple__143); #line 143 "root_numpy/src/hist.pyx" - __Pyx_GIVEREF(__pyx_tuple__136); + __Pyx_GIVEREF(__pyx_tuple__143); #line 143 "root_numpy/src/hist.pyx" - __pyx_codeobj__137 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__136, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_5, __pyx_n_s_fill_p3, 143, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__137)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__144 = (PyObject*)__Pyx_PyCode_New(4, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__143, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_p3, 143, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__144)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/graph.pyx":3 * @cython.boundscheck(False) @@ -62234,16 +63481,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 3 "root_numpy/src/graph.pyx" - __pyx_tuple__138 = PyTuple_Pack(5, __pyx_n_s_graph, __pyx_n_s_array, __pyx_n_s_graph_2, __pyx_n_s_size, __pyx_n_s_i); if (unlikely(!__pyx_tuple__138)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__145 = PyTuple_Pack(5, __pyx_n_s_graph, __pyx_n_s_array, __pyx_n_s_graph_2, __pyx_n_s_size, __pyx_n_s_i); if (unlikely(!__pyx_tuple__145)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/graph.pyx" - __Pyx_GOTREF(__pyx_tuple__138); + __Pyx_GOTREF(__pyx_tuple__145); #line 3 "root_numpy/src/graph.pyx" - __Pyx_GIVEREF(__pyx_tuple__138); + __Pyx_GIVEREF(__pyx_tuple__145); #line 3 "root_numpy/src/graph.pyx" - __pyx_codeobj__139 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__138, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_g1, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__139)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__146 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__145, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_fill_g1, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__146)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/graph.pyx":16 * @cython.boundscheck(False) @@ -62254,16 +63501,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 16 "root_numpy/src/graph.pyx" - __pyx_tuple__140 = PyTuple_Pack(5, __pyx_n_s_graph, __pyx_n_s_array, __pyx_n_s_graph_2, __pyx_n_s_size, __pyx_n_s_i); if (unlikely(!__pyx_tuple__140)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__147 = PyTuple_Pack(5, __pyx_n_s_graph, __pyx_n_s_array, __pyx_n_s_graph_2, __pyx_n_s_size, __pyx_n_s_i); if (unlikely(!__pyx_tuple__147)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/graph.pyx" - __Pyx_GOTREF(__pyx_tuple__140); + __Pyx_GOTREF(__pyx_tuple__147); #line 16 "root_numpy/src/graph.pyx" - __Pyx_GIVEREF(__pyx_tuple__140); + __Pyx_GIVEREF(__pyx_tuple__147); #line 16 "root_numpy/src/graph.pyx" - __pyx_codeobj__141 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__140, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_6, __pyx_n_s_fill_g2, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__141)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__148 = (PyObject*)__Pyx_PyCode_New(2, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__147, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_fill_g2, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__148)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":3 * @cython.boundscheck(False) @@ -62274,16 +63521,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 3 "root_numpy/src/evaluate.pyx" - __pyx_tuple__142 = PyTuple_Pack(6, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__142)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__149 = PyTuple_Pack(6, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__149)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__142); + __Pyx_GOTREF(__pyx_tuple__149); #line 3 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__142); + __Pyx_GIVEREF(__pyx_tuple__149); #line 3 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__143 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__142, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_h1, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__143)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__150 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__149, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_h1, 3, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__150)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":16 * @cython.boundscheck(False) @@ -62294,16 +63541,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 16 "root_numpy/src/evaluate.pyx" - __pyx_tuple__144 = PyTuple_Pack(6, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__144)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__151 = PyTuple_Pack(6, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__151)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__144); + __Pyx_GOTREF(__pyx_tuple__151); #line 16 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__144); + __Pyx_GIVEREF(__pyx_tuple__151); #line 16 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__145 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__144, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_h2, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__145)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__152 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__151, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_h2, 16, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__152)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":29 * @cython.boundscheck(False) @@ -62314,16 +63561,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 29 "root_numpy/src/evaluate.pyx" - __pyx_tuple__146 = PyTuple_Pack(6, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__146)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__153 = PyTuple_Pack(6, __pyx_n_s_hist, __pyx_n_s_array, __pyx_n_s_hist_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__153)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 29 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__146); + __Pyx_GOTREF(__pyx_tuple__153); #line 29 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__146); + __Pyx_GIVEREF(__pyx_tuple__153); #line 29 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__147 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__146, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_h3, 29, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__147)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__154 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__153, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_h3, 29, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__154)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":42 * @cython.boundscheck(False) @@ -62334,16 +63581,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 42 "root_numpy/src/evaluate.pyx" - __pyx_tuple__148 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__148)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__155 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__155)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__148); + __Pyx_GOTREF(__pyx_tuple__155); #line 42 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__148); + __Pyx_GIVEREF(__pyx_tuple__155); #line 42 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__149 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__148, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_f1, 42, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__149)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__156 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__155, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_f1, 42, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__156)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":55 * @cython.boundscheck(False) @@ -62354,16 +63601,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 55 "root_numpy/src/evaluate.pyx" - __pyx_tuple__150 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__150)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__157 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__157)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 55 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__150); + __Pyx_GOTREF(__pyx_tuple__157); #line 55 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__150); + __Pyx_GIVEREF(__pyx_tuple__157); #line 55 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__151 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__150, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_f2, 55, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__151)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__158 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__157, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_f2, 55, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__158)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":68 * @cython.boundscheck(False) @@ -62374,16 +63621,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 68 "root_numpy/src/evaluate.pyx" - __pyx_tuple__152 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__152)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__159 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__159)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 68 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__152); + __Pyx_GOTREF(__pyx_tuple__159); #line 68 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__152); + __Pyx_GIVEREF(__pyx_tuple__159); #line 68 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__153 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__152, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_f3, 68, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__153)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__160 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__159, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_f3, 68, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__160)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":81 * @cython.boundscheck(False) @@ -62394,16 +63641,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 81 "root_numpy/src/evaluate.pyx" - __pyx_tuple__154 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__154)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__161 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__161)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__154); + __Pyx_GOTREF(__pyx_tuple__161); #line 81 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__154); + __Pyx_GIVEREF(__pyx_tuple__161); #line 81 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__155 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__154, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_formula_1d, 81, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__155)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__162 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__161, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_formula_1d, 81, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__162)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":94 * @cython.boundscheck(False) @@ -62414,16 +63661,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 94 "root_numpy/src/evaluate.pyx" - __pyx_tuple__156 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__156)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__163 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__163)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__156); + __Pyx_GOTREF(__pyx_tuple__163); #line 94 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__156); + __Pyx_GIVEREF(__pyx_tuple__163); #line 94 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__157 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__156, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_formula_2d, 94, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__157)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__164 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__163, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_formula_2d, 94, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__164)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":107 * @cython.boundscheck(False) @@ -62434,16 +63681,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 107 "root_numpy/src/evaluate.pyx" - __pyx_tuple__158 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__158)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__165 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__165)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 107 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__158); + __Pyx_GOTREF(__pyx_tuple__165); #line 107 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__158); + __Pyx_GIVEREF(__pyx_tuple__165); #line 107 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__159 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__158, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_formula_3d, 107, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__159)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__166 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__165, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_formula_3d, 107, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__166)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":120 * @cython.boundscheck(False) @@ -62454,16 +63701,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 120 "root_numpy/src/evaluate.pyx" - __pyx_tuple__160 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__160)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__167 = PyTuple_Pack(6, __pyx_n_s_func, __pyx_n_s_array, __pyx_n_s_func_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__167)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__160); + __Pyx_GOTREF(__pyx_tuple__167); #line 120 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__160); + __Pyx_GIVEREF(__pyx_tuple__167); #line 120 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__161 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__160, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_formula_4d, 120, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__161)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__168 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__167, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_formula_4d, 120, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__168)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":133 * @cython.boundscheck(False) @@ -62474,16 +63721,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 133 "root_numpy/src/evaluate.pyx" - __pyx_tuple__162 = PyTuple_Pack(6, __pyx_n_s_graph, __pyx_n_s_array, __pyx_n_s_graph_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__162)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__169 = PyTuple_Pack(6, __pyx_n_s_graph, __pyx_n_s_array, __pyx_n_s_graph_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__169)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 133 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__162); + __Pyx_GOTREF(__pyx_tuple__169); #line 133 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__162); + __Pyx_GIVEREF(__pyx_tuple__169); #line 133 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__163 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__162, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_graph, 133, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__163)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__170 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__169, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_graph, 133, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__170)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/evaluate.pyx":146 * @cython.boundscheck(False) @@ -62494,16 +63741,16 @@ static int __Pyx_InitCachedConstants(void) { */ #line 146 "root_numpy/src/evaluate.pyx" - __pyx_tuple__164 = PyTuple_Pack(6, __pyx_n_s_spline, __pyx_n_s_array, __pyx_n_s_spline_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__164)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_tuple__171 = PyTuple_Pack(6, __pyx_n_s_spline, __pyx_n_s_array, __pyx_n_s_spline_2, __pyx_n_s_size, __pyx_n_s_values, __pyx_n_s_i); if (unlikely(!__pyx_tuple__171)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 146 "root_numpy/src/evaluate.pyx" - __Pyx_GOTREF(__pyx_tuple__164); + __Pyx_GOTREF(__pyx_tuple__171); #line 146 "root_numpy/src/evaluate.pyx" - __Pyx_GIVEREF(__pyx_tuple__164); + __Pyx_GIVEREF(__pyx_tuple__171); #line 146 "root_numpy/src/evaluate.pyx" - __pyx_codeobj__165 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__164, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_7, __pyx_n_s_evaluate_spline, 146, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__165)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_codeobj__172 = (PyObject*)__Pyx_PyCode_New(2, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__171, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_endw_workspace_root_numpy_8, __pyx_n_s_evaluate_spline, 146, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__172)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 146 "root_numpy/src/evaluate.pyx" __Pyx_RefNannyFinishContext(); @@ -62524,13 +63771,14 @@ static int __Pyx_InitCachedConstants(void) { } static int __Pyx_InitGlobals(void) { - if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; - __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_int_8 = PyInt_FromLong(8); if (unlikely(!__pyx_int_8)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_int_8 = PyInt_FromLong(8); if (unlikely(!__pyx_int_8)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; __pyx_L1_error:; return -1; @@ -62582,17 +63830,17 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) } #endif __Pyx_RefNannySetupContext("PyMODINIT_FUNC PyInit__librootnumpy(void)", 0); - if ( __Pyx_check_binary_version() < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if ( __Pyx_check_binary_version() < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_empty_bytes = PyBytes_FromStringAndSize("", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #ifdef __Pyx_CyFunction_USED - if (__Pyx_CyFunction_init() < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_CyFunction_init() < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #endif #ifdef __Pyx_FusedFunction_USED - if (__pyx_FusedFunction_init() < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__pyx_FusedFunction_init() < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #endif #ifdef __Pyx_Generator_USED - if (__pyx_Generator_init() < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__pyx_Generator_init() < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #endif /*--- Library function declarations ---*/ /*--- Threads initialization code ---*/ @@ -62607,34 +63855,34 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) #else __pyx_m = PyModule_Create(&__pyx_moduledef); #endif - if (unlikely(!__pyx_m)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(!__pyx_m)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} Py_INCREF(__pyx_d); - __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME); if (unlikely(!__pyx_b)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #if CYTHON_COMPILING_IN_PYPY Py_INCREF(__pyx_b); #endif - if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; /*--- Initialize various global constants etc. ---*/ - if (unlikely(__Pyx_InitGlobals() < 0)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_InitGlobals() < 0)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT) - if (__Pyx_init_sys_getdefaultencoding_params() < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (__Pyx_init_sys_getdefaultencoding_params() < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #endif if (__pyx_module_is_main__librootnumpy) { - if (PyObject_SetAttrString(__pyx_m, "__name__", __pyx_n_s_main) < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + if (PyObject_SetAttrString(__pyx_m, "__name__", __pyx_n_s_main) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; } #if PY_MAJOR_VERSION >= 3 { - PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} if (!PyDict_GetItemString(modules, "_librootnumpy")) { - if (unlikely(PyDict_SetItemString(modules, "_librootnumpy", __pyx_m) < 0)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(PyDict_SetItemString(modules, "_librootnumpy", __pyx_m) < 0)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} } } #endif /*--- Builtin init code ---*/ - if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Constants init code ---*/ - if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Global init code ---*/ /*--- Variable export code ---*/ /*--- Function export code ---*/ @@ -62646,15 +63894,15 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) #else sizeof(PyHeapTypeObject), #endif - 0); if (unlikely(!__pyx_ptype_7cpython_4type_type)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_5numpy_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_5numpy_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_flatiter)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_5numpy_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_5numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_5numpy_ufunc = __Pyx_ImportType("numpy", "ufunc", sizeof(PyUFuncObject), 0); if (unlikely(!__pyx_ptype_5numpy_ufunc)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 861; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_7cpython_4bool_bool = __Pyx_ImportType(__Pyx_BUILTIN_MODULE_NAME, "bool", sizeof(PyBoolObject), 0); if (unlikely(!__pyx_ptype_7cpython_4bool_bool)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_7cpython_7complex_complex = __Pyx_ImportType(__Pyx_BUILTIN_MODULE_NAME, "complex", sizeof(PyComplexObject), 0); if (unlikely(!__pyx_ptype_7cpython_7complex_complex)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - __pyx_ptype_7cpython_5array_array = __Pyx_ImportType("array", "array", sizeof(arrayobject), 0); if (unlikely(!__pyx_ptype_7cpython_5array_array)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + 0); if (unlikely(!__pyx_ptype_7cpython_4type_type)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_5numpy_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_5numpy_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_flatiter)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_5numpy_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_5numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_5numpy_ufunc = __Pyx_ImportType("numpy", "ufunc", sizeof(PyUFuncObject), 0); if (unlikely(!__pyx_ptype_5numpy_ufunc)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 861; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_7cpython_4bool_bool = __Pyx_ImportType(__Pyx_BUILTIN_MODULE_NAME, "bool", sizeof(PyBoolObject), 0); if (unlikely(!__pyx_ptype_7cpython_4bool_bool)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_7cpython_7complex_complex = __Pyx_ImportType(__Pyx_BUILTIN_MODULE_NAME, "complex", sizeof(PyComplexObject), 0); if (unlikely(!__pyx_ptype_7cpython_7complex_complex)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_ptype_7cpython_5array_array = __Pyx_ImportType("array", "array", sizeof(arrayobject), 0); if (unlikely(!__pyx_ptype_7cpython_5array_array)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /*--- Variable import code ---*/ /*--- Function import code ---*/ /*--- Execution code ---*/ @@ -62999,119 +64247,178 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) #line 35 "root_numpy/src/setup.pxi" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":1 + /* "root_numpy/src/converters.pyx":1 + * import re # <<<<<<<<<<<<<< + * + * # match leaf_name[length_leaf][N][M]... + */ + +#line 1 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_Import(__pyx_n_s_re, 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 1 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 1 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_re, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 1 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "root_numpy/src/converters.pyx":4 + * + * # match leaf_name[length_leaf][N][M]... + * LEAF_PATTERN = re.compile('^[^\[]+((?:\[[^\s\]]+\])(?:\[[0-9]+\])*)?$') # <<<<<<<<<<<<<< + * + * TYPES = { + */ + +#line 4 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_re); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 4 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_compile); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 4 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_tuple__40, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +#line 4 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_LEAF_PATTERN, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "root_numpy/src/converters.pyx":6 + * LEAF_PATTERN = re.compile('^[^\[]+((?:\[[^\s\]]+\])(?:\[[0-9]+\])*)?$') + * * TYPES = { # <<<<<<<<<<<<<< * TypeName[bool]().name: ('bool', np.dtype(np.bool), np.NPY_BOOL), * TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), */ -#line 1 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 6 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 1 "root_numpy/src/tree.pyx" +#line 6 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":2 + /* "root_numpy/src/converters.pyx":7 + * * TYPES = { * TypeName[bool]().name: ('bool', np.dtype(np.bool), np.NPY_BOOL), # <<<<<<<<<<<<<< * TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), * TypeName[unsigned_char]().name: ('unsigned char', np.dtype(np.uint8), np.NPY_UINT8), */ -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_bool); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_bool); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_9); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyInt_FromLong(NPY_BOOL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyInt_FromLong(NPY_BOOL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 2 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 2; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_bool); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_n_s_bool); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_bool); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_9); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_t_5); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 2 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 7 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 2 "root_numpy/src/tree.pyx" +#line 7 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":3 + /* "root_numpy/src/converters.pyx":8 * TYPES = { * TypeName[bool]().name: ('bool', np.dtype(np.bool), np.NPY_BOOL), * TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), # <<<<<<<<<<<<<< @@ -63119,100 +64426,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[short]().name: ('short', np.dtype(np.int16), np.NPY_INT16), */ -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int8); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int8); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyInt_FromLong(NPY_INT8); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyInt_FromLong(NPY_INT8); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 3 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_char); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_n_s_char); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_char); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_t_5); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 2, __pyx_t_7); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 3 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 8 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 3 "root_numpy/src/tree.pyx" +#line 8 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":4 + /* "root_numpy/src/converters.pyx":9 * TypeName[bool]().name: ('bool', np.dtype(np.bool), np.NPY_BOOL), * TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), * TypeName[unsigned_char]().name: ('unsigned char', np.dtype(np.uint8), np.NPY_UINT8), # <<<<<<<<<<<<<< @@ -63220,100 +64527,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[unsigned_short]().name: ('unsigned short', np.dtype(np.uint16), np.NPY_UINT16), */ -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_char> ().name); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_char> ().name); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint8); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint8); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyInt_FromLong(NPY_UINT8); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyInt_FromLong(NPY_UINT8); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 4 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_kp_s_unsigned_char); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_s_unsigned_char); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_kp_s_unsigned_char); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_7); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_t_8); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 4 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_9, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 9 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_9, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 4 "root_numpy/src/tree.pyx" +#line 9 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":5 + /* "root_numpy/src/converters.pyx":10 * TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), * TypeName[unsigned_char]().name: ('unsigned char', np.dtype(np.uint8), np.NPY_UINT8), * TypeName[short]().name: ('short', np.dtype(np.int16), np.NPY_INT16), # <<<<<<<<<<<<<< @@ -63321,100 +64628,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[int]().name: ('int', np.dtype(np.int32), np.NPY_INT32), */ -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_int16); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_int16); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_8); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyInt_FromLong(NPY_INT16); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyInt_FromLong(NPY_INT16); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 5 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_short); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_n_s_short); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_short); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_8); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_9); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 5 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_5, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_5, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 5 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":6 + /* "root_numpy/src/converters.pyx":11 * TypeName[unsigned_char]().name: ('unsigned char', np.dtype(np.uint8), np.NPY_UINT8), * TypeName[short]().name: ('short', np.dtype(np.int16), np.NPY_INT16), * TypeName[unsigned_short]().name: ('unsigned short', np.dtype(np.uint16), np.NPY_UINT16), # <<<<<<<<<<<<<< @@ -63422,100 +64729,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[unsigned_int]().name: ('unsigned int', np.dtype(np.uint32), np.NPY_UINT32), */ -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_short> ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_short> ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_uint16); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_uint16); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_9); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyInt_FromLong(NPY_UINT16); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyInt_FromLong(NPY_UINT16); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 6 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_kp_s_unsigned_short); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_kp_s_unsigned_short); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_kp_s_unsigned_short); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_9); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_t_5); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 6 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 11 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 6 "root_numpy/src/tree.pyx" +#line 11 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":7 + /* "root_numpy/src/converters.pyx":12 * TypeName[short]().name: ('short', np.dtype(np.int16), np.NPY_INT16), * TypeName[unsigned_short]().name: ('unsigned short', np.dtype(np.uint16), np.NPY_UINT16), * TypeName[int]().name: ('int', np.dtype(np.int32), np.NPY_INT32), # <<<<<<<<<<<<<< @@ -63523,100 +64830,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[long]().name: ('long', np.dtype(np.int64), np.NPY_INT64), */ -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int32); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int32); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyInt_FromLong(NPY_INT32); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyInt_FromLong(NPY_INT32); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 7 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_int); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_n_s_int); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_int); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_t_5); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 2, __pyx_t_7); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 7 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 12 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 7 "root_numpy/src/tree.pyx" +#line 12 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":8 + /* "root_numpy/src/converters.pyx":13 * TypeName[unsigned_short]().name: ('unsigned short', np.dtype(np.uint16), np.NPY_UINT16), * TypeName[int]().name: ('int', np.dtype(np.int32), np.NPY_INT32), * TypeName[unsigned_int]().name: ('unsigned int', np.dtype(np.uint32), np.NPY_UINT32), # <<<<<<<<<<<<<< @@ -63624,100 +64931,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[unsigned_long]().name: ('unsigned long', np.dtype(np.uint64), np.NPY_UINT64), */ -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_int> ().name); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_int> ().name); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint32); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint32); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyInt_FromLong(NPY_UINT32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyInt_FromLong(NPY_UINT32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 8 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_kp_s_unsigned_int); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_s_unsigned_int); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_kp_s_unsigned_int); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_7); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_t_8); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 8 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_9, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 13 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_9, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 8 "root_numpy/src/tree.pyx" +#line 13 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":9 + /* "root_numpy/src/converters.pyx":14 * TypeName[int]().name: ('int', np.dtype(np.int32), np.NPY_INT32), * TypeName[unsigned_int]().name: ('unsigned int', np.dtype(np.uint32), np.NPY_UINT32), * TypeName[long]().name: ('long', np.dtype(np.int64), np.NPY_INT64), # <<<<<<<<<<<<<< @@ -63725,100 +65032,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[long_long]().name: ('long long', np.dtype(np.longlong), np.NPY_LONGLONG), */ -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_int64); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_int64); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_8); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyInt_FromLong(NPY_INT64); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyInt_FromLong(NPY_INT64); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 9 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_long); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_n_s_long); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_long); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_8); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_9); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 9 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_5, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 14 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_5, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 9 "root_numpy/src/tree.pyx" +#line 14 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":10 + /* "root_numpy/src/converters.pyx":15 * TypeName[unsigned_int]().name: ('unsigned int', np.dtype(np.uint32), np.NPY_UINT32), * TypeName[long]().name: ('long', np.dtype(np.int64), np.NPY_INT64), * TypeName[unsigned_long]().name: ('unsigned long', np.dtype(np.uint64), np.NPY_UINT64), # <<<<<<<<<<<<<< @@ -63826,100 +65133,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[unsigned_long_long]().name: ('unsigned long long', np.dtype(np.ulonglong), np.NPY_ULONGLONG), */ -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_long> ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_long> ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_uint64); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_uint64); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_9); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyInt_FromLong(NPY_UINT64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyInt_FromLong(NPY_UINT64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 10 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_kp_s_unsigned_long); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_kp_s_unsigned_long); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_kp_s_unsigned_long); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_9); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_t_5); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 10 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 15 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 10 "root_numpy/src/tree.pyx" +#line 15 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":11 + /* "root_numpy/src/converters.pyx":16 * TypeName[long]().name: ('long', np.dtype(np.int64), np.NPY_INT64), * TypeName[unsigned_long]().name: ('unsigned long', np.dtype(np.uint64), np.NPY_UINT64), * TypeName[long_long]().name: ('long long', np.dtype(np.longlong), np.NPY_LONGLONG), # <<<<<<<<<<<<<< @@ -63927,100 +65234,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[float]().name: ('float', np.dtype(np.float32), np.NPY_FLOAT32), */ -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_long_long> ().name); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_long_long> ().name); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_longlong); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_longlong); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_5); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 11 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyTuple_New(3); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_kp_s_long_long); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_kp_s_long_long); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_kp_s_long_long); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_t_5); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 2, __pyx_t_7); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 11 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 16 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 11 "root_numpy/src/tree.pyx" +#line 16 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":12 + /* "root_numpy/src/converters.pyx":17 * TypeName[unsigned_long]().name: ('unsigned long', np.dtype(np.uint64), np.NPY_UINT64), * TypeName[long_long]().name: ('long long', np.dtype(np.longlong), np.NPY_LONGLONG), * TypeName[unsigned_long_long]().name: ('unsigned long long', np.dtype(np.ulonglong), np.NPY_ULONGLONG), # <<<<<<<<<<<<<< @@ -64028,100 +65335,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * TypeName[double]().name: ('double', np.dtype(np.float64), np.NPY_FLOAT64), */ -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_long_long> ().name); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyStr_FromString(TypeName<__pyx_t_13_librootnumpy_unsigned_long_long> ().name); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_ulonglong); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_ulonglong); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 12 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_kp_s_unsigned_long_long); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_s_unsigned_long_long); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_kp_s_unsigned_long_long); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_7); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_t_8); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 12 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_9, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 17 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_9, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 12 "root_numpy/src/tree.pyx" +#line 17 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":13 + /* "root_numpy/src/converters.pyx":18 * TypeName[long_long]().name: ('long long', np.dtype(np.longlong), np.NPY_LONGLONG), * TypeName[unsigned_long_long]().name: ('unsigned long long', np.dtype(np.ulonglong), np.NPY_ULONGLONG), * TypeName[float]().name: ('float', np.dtype(np.float32), np.NPY_FLOAT32), # <<<<<<<<<<<<<< @@ -64129,100 +65436,100 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * } */ -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_float32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_float32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_8); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_9, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyInt_FromLong(NPY_FLOAT32); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyInt_FromLong(NPY_FLOAT32); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 13 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_float); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_n_s_float); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_float); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_8); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_9); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 13 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_5, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 18 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_5, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 13 "root_numpy/src/tree.pyx" +#line 18 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":14 + /* "root_numpy/src/converters.pyx":19 * TypeName[unsigned_long_long]().name: ('unsigned long long', np.dtype(np.ulonglong), np.NPY_ULONGLONG), * TypeName[float]().name: ('float', np.dtype(np.float32), np.NPY_FLOAT32), * TypeName[double]().name: ('double', np.dtype(np.float64), np.NPY_FLOAT64), # <<<<<<<<<<<<<< @@ -64230,106 +65537,106 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * */ -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyStr_FromString(TypeName ().name); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_float64); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_float64); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_9); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_9 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyInt_FromLong(NPY_FLOAT64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_5 = PyInt_FromLong(NPY_FLOAT64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 14 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_n_s_double); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_n_s_double); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_n_s_double); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_9); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_t_5); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __pyx_t_9 = 0; -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __pyx_t_5 = 0; -#line 14 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 14 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_TYPES, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 19 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_TYPES, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 14 "root_numpy/src/tree.pyx" +#line 19 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":17 + /* "root_numpy/src/converters.pyx":22 * } * * TYPES_NUMPY2ROOT = { # <<<<<<<<<<<<<< @@ -64337,13 +65644,13 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.int8): (1, 'B'), */ -#line 17 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 22 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 17 "root_numpy/src/tree.pyx" +#line 22 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":18 + /* "root_numpy/src/converters.pyx":23 * * TYPES_NUMPY2ROOT = { * np.dtype(np.bool): (1, 'O'), # <<<<<<<<<<<<<< @@ -64351,52 +65658,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.int16): (2, 'S'), */ -#line 18 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 23 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 18 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_bool); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 23 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_bool); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 18 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 23 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 18 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 23 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 18 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__34) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 23 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__41) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 18 "root_numpy/src/tree.pyx" +#line 23 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":19 + /* "root_numpy/src/converters.pyx":24 * TYPES_NUMPY2ROOT = { * np.dtype(np.bool): (1, 'O'), * np.dtype(np.int8): (1, 'B'), # <<<<<<<<<<<<<< @@ -64404,52 +65711,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.int32): (4, 'I'), */ -#line 19 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 19 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int8); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int8); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 19 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 19 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 19 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__35) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 24 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__42) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 19 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":20 + /* "root_numpy/src/converters.pyx":25 * np.dtype(np.bool): (1, 'O'), * np.dtype(np.int8): (1, 'B'), * np.dtype(np.int16): (2, 'S'), # <<<<<<<<<<<<<< @@ -64457,52 +65764,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.int64): (8, 'L'), */ -#line 20 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 25 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 20 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_int16); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 25 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_int16); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 20 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 25 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 20 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 25 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 20 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__36) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 25 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__43) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 20 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":21 + /* "root_numpy/src/converters.pyx":26 * np.dtype(np.int8): (1, 'B'), * np.dtype(np.int16): (2, 'S'), * np.dtype(np.int32): (4, 'I'), # <<<<<<<<<<<<<< @@ -64510,52 +65817,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.uint8): (1, 'b'), */ -#line 21 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 26 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 21 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 26 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_int32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 21 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 26 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 21 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 26 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 21 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__37) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 26 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__44) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 21 "root_numpy/src/tree.pyx" +#line 26 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":22 + /* "root_numpy/src/converters.pyx":27 * np.dtype(np.int16): (2, 'S'), * np.dtype(np.int32): (4, 'I'), * np.dtype(np.int64): (8, 'L'), # <<<<<<<<<<<<<< @@ -64563,52 +65870,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.uint16): (2, 's'), */ -#line 22 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 22 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_int64); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_int64); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 22 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 22 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 22 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__38) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 27 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__45) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 22 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":23 + /* "root_numpy/src/converters.pyx":28 * np.dtype(np.int32): (4, 'I'), * np.dtype(np.int64): (8, 'L'), * np.dtype(np.uint8): (1, 'b'), # <<<<<<<<<<<<<< @@ -64616,52 +65923,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.uint32): (4, 'i'), */ -#line 23 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 28 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 23 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_uint8); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 28 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_uint8); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 23 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 28 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 23 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 28 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 23 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__39) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 28 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__46) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 23 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":24 + /* "root_numpy/src/converters.pyx":29 * np.dtype(np.int64): (8, 'L'), * np.dtype(np.uint8): (1, 'b'), * np.dtype(np.uint16): (2, 's'), # <<<<<<<<<<<<<< @@ -64669,52 +65976,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.uint64): (8, 'l'), */ -#line 24 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 24 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint16); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint16); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 24 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 24 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 24 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__40) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__47) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 24 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":25 + /* "root_numpy/src/converters.pyx":30 * np.dtype(np.uint8): (1, 'b'), * np.dtype(np.uint16): (2, 's'), * np.dtype(np.uint32): (4, 'i'), # <<<<<<<<<<<<<< @@ -64722,52 +66029,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.float): (8, 'D'), */ -#line 25 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 30 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 25 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_uint32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 30 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_uint32); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 25 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 30 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 25 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 30 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 25 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__41) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 30 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__48) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 25 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":26 + /* "root_numpy/src/converters.pyx":31 * np.dtype(np.uint16): (2, 's'), * np.dtype(np.uint32): (4, 'i'), * np.dtype(np.uint64): (8, 'l'), # <<<<<<<<<<<<<< @@ -64775,52 +66082,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.float32): (4, 'F'), */ -#line 26 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 31 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 26 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint64); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 31 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_uint64); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 26 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 31 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 26 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 31 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 26 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__42) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 31 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__49) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 26 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":27 + /* "root_numpy/src/converters.pyx":32 * np.dtype(np.uint32): (4, 'i'), * np.dtype(np.uint64): (8, 'l'), * np.dtype(np.float): (8, 'D'), # <<<<<<<<<<<<<< @@ -64828,52 +66135,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * np.dtype(np.float64): (8, 'D'), */ -#line 27 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 32 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 27 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 32 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 27 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 32 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 27 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 32 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 27 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__43) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 32 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__50) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":28 + /* "root_numpy/src/converters.pyx":33 * np.dtype(np.uint64): (8, 'l'), * np.dtype(np.float): (8, 'D'), * np.dtype(np.float32): (4, 'F'), # <<<<<<<<<<<<<< @@ -64881,52 +66188,52 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * } */ -#line 28 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 28 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_float32); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_float32); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 28 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/converters.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_7); -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __pyx_t_7 = 0; -#line 28 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_8, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 28 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__44) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_7, __pyx_tuple__51) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 28 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":29 + /* "root_numpy/src/converters.pyx":34 * np.dtype(np.float): (8, 'D'), * np.dtype(np.float32): (4, 'F'), * np.dtype(np.float64): (8, 'D'), # <<<<<<<<<<<<<< @@ -64934,58 +66241,58 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * */ -#line 29 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 29 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 29 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __pyx_t_8 = 0; -#line 29 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 29 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__45) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_t_8, __pyx_tuple__52) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 29 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_TYPES_NUMPY2ROOT, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 34 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_TYPES_NUMPY2ROOT, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 29 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":32 + /* "root_numpy/src/converters.pyx":37 * } * * SPECIAL_TYPEDEFS = { # <<<<<<<<<<<<<< @@ -64993,85 +66300,25 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * 'ULong64_t': 'unsigned long long', */ -#line 32 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 32 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 32 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_Long64_t, __pyx_kp_s_long_long) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 32 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_ULong64_t, __pyx_kp_s_unsigned_long_long) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 32 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_SPECIAL_TYPEDEFS, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 32 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - - /* "root_numpy/src/tree.pyx":45 - * - * - * def list_trees(fname): # <<<<<<<<<<<<<< - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: - */ - -#line 45 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_1list_trees, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 37 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 45 "root_numpy/src/tree.pyx" +#line 37 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 45 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_list_trees, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 45 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 37 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_Long64_t, __pyx_kp_s_long_long) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":63 - * - * - * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< - * if tree is None: - * # automatically select single tree - */ - -#line 63 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_3list_structures, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 63 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 37 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_ULong64_t, __pyx_kp_s_unsigned_long_long) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 63 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_list_structures, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 37 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_SPECIAL_TYPEDEFS, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 63 "root_numpy/src/tree.pyx" +#line 37 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":80 - * - * - * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< - * return list(list_structures(fname, tree).keys()) - * - */ - -#line 80 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_5list_branches, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 80 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 80 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_list_branches, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 80 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - - /* "root_numpy/src/tree.pyx":420 + /* "root_numpy/src/converters.pyx":355 * * # basic type converters * for ctypename, (ctype, dtype, dtypecode) in TYPES.items(): # <<<<<<<<<<<<<< @@ -65079,535 +66326,535 @@ PyMODINIT_FUNC PyInit__librootnumpy(void) * ctype, new BasicConverter( */ -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_TYPES); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_items); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_items); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_8 = NULL; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_7))) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_7); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(__pyx_t_8)) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_8); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(function); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF_SET(__pyx_t_7, function); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (__pyx_t_8) { -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_8); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_8); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_7); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_7); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(PyList_CheckExact(__pyx_t_1)) || PyTuple_CheckExact(__pyx_t_1)) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_7 = __pyx_t_1; __Pyx_INCREF(__pyx_t_7); __pyx_t_10 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_11 = NULL; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { __pyx_t_10 = -1; -#line 420 "root_numpy/src/tree.pyx" -__pyx_t_7 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" +__pyx_t_7 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_11 = Py_TYPE(__pyx_t_7)->tp_iternext; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_11 = Py_TYPE(__pyx_t_7)->tp_iternext; if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" for (;;) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(!__pyx_t_11)) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(PyList_CheckExact(__pyx_t_7))) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (__pyx_t_10 >= PyList_GET_SIZE(__pyx_t_7)) break; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_10); __Pyx_INCREF(__pyx_t_1); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_10); __Pyx_INCREF(__pyx_t_1); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #else -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_1 = PySequence_ITEM(__pyx_t_7, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_1 = PySequence_ITEM(__pyx_t_7, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #endif -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (__pyx_t_10 >= PyTuple_GET_SIZE(__pyx_t_7)) break; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_10); __Pyx_INCREF(__pyx_t_1); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_10); __Pyx_INCREF(__pyx_t_1); __pyx_t_10++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #else -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_1 = PySequence_ITEM(__pyx_t_7, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_1 = PySequence_ITEM(__pyx_t_7, __pyx_t_10); __pyx_t_10++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #endif -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } } else -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_1 = __pyx_t_11(__pyx_t_7); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (unlikely(!__pyx_t_1)) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (exc_type) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 420 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" break; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" PyObject* sequence = __pyx_t_1; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #else -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #endif -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (unlikely(size != 2)) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); -#line 420 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_8 = PyTuple_GET_ITEM(sequence, 0); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_5 = PyTuple_GET_ITEM(sequence, 1); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_8 = PyList_GET_ITEM(sequence, 0); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_5 = PyList_GET_ITEM(sequence, 1); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_8); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_5); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #else -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_8 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_8 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #endif -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" Py_ssize_t index = -1; -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_9 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_12 = Py_TYPE(__pyx_t_9)->tp_iternext; index = 0; __pyx_t_8 = __pyx_t_12(__pyx_t_9); if (unlikely(!__pyx_t_8)) -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L14_unpacking_failed; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_8); index = 1; __pyx_t_5 = __pyx_t_12(__pyx_t_9); if (unlikely(!__pyx_t_5)) -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L14_unpacking_failed; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 420 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_9), 2) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_9), 2) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_12 = NULL; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L15_unpacking_done; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_L14_unpacking_failed:; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_12 = NULL; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); -#line 420 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_L15_unpacking_done:; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_ctypename, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_ctypename, __pyx_t_8) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if ((likely(PyTuple_CheckExact(__pyx_t_5))) || (PyList_CheckExact(__pyx_t_5))) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" PyObject* sequence = __pyx_t_5; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #else -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #endif -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (unlikely(size != 3)) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (size > 3) __Pyx_RaiseTooManyValuesError(3); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); -#line 420 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_9 = PyTuple_GET_ITEM(sequence, 0); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_13 = PyTuple_GET_ITEM(sequence, 1); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_14 = PyTuple_GET_ITEM(sequence, 2); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_9 = PyList_GET_ITEM(sequence, 0); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_13 = PyList_GET_ITEM(sequence, 1); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_14 = PyList_GET_ITEM(sequence, 2); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_9); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_13); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_14); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #else -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_9 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_9 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_13 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_13 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_13); -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_14 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_14 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_14); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" #endif -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } else { -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" Py_ssize_t index = -1; -#line 420 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + __pyx_t_15 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_15); -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_12 = Py_TYPE(__pyx_t_15)->tp_iternext; index = 0; __pyx_t_9 = __pyx_t_12(__pyx_t_15); if (unlikely(!__pyx_t_9)) -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L16_unpacking_failed; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_9); index = 1; __pyx_t_13 = __pyx_t_12(__pyx_t_15); if (unlikely(!__pyx_t_13)) -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L16_unpacking_failed; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_13); index = 2; __pyx_t_14 = __pyx_t_12(__pyx_t_15); if (unlikely(!__pyx_t_14)) -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L16_unpacking_failed; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_14); -#line 420 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_15), 3) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + if (__Pyx_IternextUnpackEndCheck(__pyx_t_12(__pyx_t_15), 3) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_12 = NULL; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" goto __pyx_L17_unpacking_done; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_L16_unpacking_failed:; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_t_12 = NULL; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); -#line 420 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __pyx_L17_unpacking_done:; -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_ctype, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_ctype, __pyx_t_9) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 420 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dtype, __pyx_t_13) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dtype, __pyx_t_13) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; -#line 420 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_dtypecode, __pyx_t_14) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_dtypecode, __pyx_t_14) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "root_numpy/src/tree.pyx":422 + /* "root_numpy/src/converters.pyx":357 * for ctypename, (ctype, dtype, dtypecode) in TYPES.items(): * CONVERTERS.insert(CONVERTERS_ITEM( * ctype, new BasicConverter( # <<<<<<<<<<<<<< @@ -65615,81 +66862,81 @@ goto __pyx_L16_unpacking_failed; * */ -#line 422 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_ctype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 357 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_ctype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 422 "root_numpy/src/tree.pyx" +#line 357 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 422 "root_numpy/src/tree.pyx" - __pyx_t_16 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 357 "root_numpy/src/converters.pyx" + __pyx_t_16 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 422 "root_numpy/src/tree.pyx" +#line 357 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":423 + /* "root_numpy/src/converters.pyx":358 * CONVERTERS.insert(CONVERTERS_ITEM( * ctype, new BasicConverter( * dtype.itemsize, dtype.name, dtypecode))) # <<<<<<<<<<<<<< * - * + * # vector<> converters */ -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_itemsize); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_name); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_name); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_dtypecode); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_dtypecode); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 423 "root_numpy/src/tree.pyx" - __pyx_t_18 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_18 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 358 "root_numpy/src/converters.pyx" + __pyx_t_18 = __Pyx_PyInt_As_int(__pyx_t_1); if (unlikely((__pyx_t_18 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 423 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":421 + /* "root_numpy/src/converters.pyx":356 * # basic type converters * for ctypename, (ctype, dtype, dtypecode) in TYPES.items(): * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65697,28 +66944,28 @@ goto __pyx_L16_unpacking_failed; * dtype.itemsize, dtype.name, dtypecode))) */ -#line 421 "root_numpy/src/tree.pyx" +#line 356 "root_numpy/src/converters.pyx" try { -#line 421 "root_numpy/src/tree.pyx" +#line 356 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_16, new __pyx_t_13_librootnumpy_BasicConverter(__pyx_t_6, __pyx_t_17, __pyx_t_18)); -#line 421 "root_numpy/src/tree.pyx" +#line 356 "root_numpy/src/converters.pyx" } catch(...) { -#line 421 "root_numpy/src/tree.pyx" +#line 356 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 421 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 356 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 421 "root_numpy/src/tree.pyx" +#line 356 "root_numpy/src/converters.pyx" } -#line 421 "root_numpy/src/tree.pyx" +#line 356 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":420 + /* "root_numpy/src/converters.pyx":355 * * # basic type converters * for ctypename, (ctype, dtype, dtypecode) in TYPES.items(): # <<<<<<<<<<<<<< @@ -65726,13 +66973,13 @@ goto __pyx_L16_unpacking_failed; * ctype, new BasicConverter( */ -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" } -#line 420 "root_numpy/src/tree.pyx" +#line 355 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":428 + /* "root_numpy/src/converters.pyx":362 * # vector<> converters * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorBoolConverter())) # <<<<<<<<<<<<<< @@ -65740,28 +66987,28 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[char]())) */ -#line 428 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_bool); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 362 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_bool); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 362; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 428 "root_numpy/src/tree.pyx" +#line 362 "root_numpy/src/converters.pyx" try { -#line 428 "root_numpy/src/tree.pyx" +#line 362 "root_numpy/src/converters.pyx" __pyx_t_20 = new __pyx_t_13_librootnumpy_VectorBoolConverter(); -#line 428 "root_numpy/src/tree.pyx" +#line 362 "root_numpy/src/converters.pyx" } catch(...) { -#line 428 "root_numpy/src/tree.pyx" +#line 362 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 428 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 362 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 362; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 428 "root_numpy/src/tree.pyx" +#line 362 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":427 + /* "root_numpy/src/converters.pyx":361 * * # vector<> converters * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65769,28 +67016,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 427 "root_numpy/src/tree.pyx" +#line 361 "root_numpy/src/converters.pyx" try { -#line 427 "root_numpy/src/tree.pyx" +#line 361 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, __pyx_t_20); -#line 427 "root_numpy/src/tree.pyx" +#line 361 "root_numpy/src/converters.pyx" } catch(...) { -#line 427 "root_numpy/src/tree.pyx" +#line 361 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 427 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 361 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 427 "root_numpy/src/tree.pyx" +#line 361 "root_numpy/src/converters.pyx" } -#line 427 "root_numpy/src/tree.pyx" +#line 361 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":430 + /* "root_numpy/src/converters.pyx":364 * 'vector', new VectorBoolConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[char]())) # <<<<<<<<<<<<<< @@ -65798,10 +67045,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[unsigned_char]())) */ -#line 430 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 364 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":429 + /* "root_numpy/src/converters.pyx":363 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorBoolConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65809,28 +67056,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 429 "root_numpy/src/tree.pyx" +#line 363 "root_numpy/src/converters.pyx" try { -#line 429 "root_numpy/src/tree.pyx" +#line 363 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter ()); -#line 429 "root_numpy/src/tree.pyx" +#line 363 "root_numpy/src/converters.pyx" } catch(...) { -#line 429 "root_numpy/src/tree.pyx" +#line 363 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 429 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 363 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 363; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 429 "root_numpy/src/tree.pyx" +#line 363 "root_numpy/src/converters.pyx" } -#line 429 "root_numpy/src/tree.pyx" +#line 363 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":432 + /* "root_numpy/src/converters.pyx":366 * 'vector', new VectorConverter[char]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_char]())) # <<<<<<<<<<<<<< @@ -65838,10 +67085,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[short]())) */ -#line 432 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 432; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 366 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 366; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":431 + /* "root_numpy/src/converters.pyx":365 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[char]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65849,28 +67096,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 431 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/converters.pyx" try { -#line 431 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter<__pyx_t_13_librootnumpy_unsigned_char> ()); -#line 431 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/converters.pyx" } catch(...) { -#line 431 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 431 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 431; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 365 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 365; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 431 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/converters.pyx" } -#line 431 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":434 + /* "root_numpy/src/converters.pyx":368 * 'vector', new VectorConverter[unsigned_char]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[short]())) # <<<<<<<<<<<<<< @@ -65878,10 +67125,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[unsigned_short]())) */ -#line 434 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 434; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 368 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 368; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":433 + /* "root_numpy/src/converters.pyx":367 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_char]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65889,28 +67136,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 433 "root_numpy/src/tree.pyx" +#line 367 "root_numpy/src/converters.pyx" try { -#line 433 "root_numpy/src/tree.pyx" +#line 367 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter ()); -#line 433 "root_numpy/src/tree.pyx" +#line 367 "root_numpy/src/converters.pyx" } catch(...) { -#line 433 "root_numpy/src/tree.pyx" +#line 367 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 433 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 433; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 367 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 367; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 433 "root_numpy/src/tree.pyx" +#line 367 "root_numpy/src/converters.pyx" } -#line 433 "root_numpy/src/tree.pyx" +#line 367 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":436 + /* "root_numpy/src/converters.pyx":370 * 'vector', new VectorConverter[short]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_short]())) # <<<<<<<<<<<<<< @@ -65918,10 +67165,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[int]())) */ -#line 436 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 370 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 370; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":435 + /* "root_numpy/src/converters.pyx":369 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[short]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65929,28 +67176,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 435 "root_numpy/src/tree.pyx" +#line 369 "root_numpy/src/converters.pyx" try { -#line 435 "root_numpy/src/tree.pyx" +#line 369 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter<__pyx_t_13_librootnumpy_unsigned_short> ()); -#line 435 "root_numpy/src/tree.pyx" +#line 369 "root_numpy/src/converters.pyx" } catch(...) { -#line 435 "root_numpy/src/tree.pyx" +#line 369 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 435 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 435; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 369 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 369; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 435 "root_numpy/src/tree.pyx" +#line 369 "root_numpy/src/converters.pyx" } -#line 435 "root_numpy/src/tree.pyx" +#line 369 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":438 + /* "root_numpy/src/converters.pyx":372 * 'vector', new VectorConverter[unsigned_short]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[int]())) # <<<<<<<<<<<<<< @@ -65958,10 +67205,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[unsigned_int]())) */ -#line 438 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 438; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 372 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 372; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":437 + /* "root_numpy/src/converters.pyx":371 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_short]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -65969,28 +67216,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 437 "root_numpy/src/tree.pyx" +#line 371 "root_numpy/src/converters.pyx" try { -#line 437 "root_numpy/src/tree.pyx" +#line 371 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter ()); -#line 437 "root_numpy/src/tree.pyx" +#line 371 "root_numpy/src/converters.pyx" } catch(...) { -#line 437 "root_numpy/src/tree.pyx" +#line 371 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 437 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 371 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 371; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 437 "root_numpy/src/tree.pyx" +#line 371 "root_numpy/src/converters.pyx" } -#line 437 "root_numpy/src/tree.pyx" +#line 371 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":440 + /* "root_numpy/src/converters.pyx":374 * 'vector', new VectorConverter[int]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_int]())) # <<<<<<<<<<<<<< @@ -65998,10 +67245,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[long]())) */ -#line 440 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 374 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 374; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":439 + /* "root_numpy/src/converters.pyx":373 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[int]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66009,28 +67256,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 439 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/converters.pyx" try { -#line 439 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter<__pyx_t_13_librootnumpy_unsigned_int> ()); -#line 439 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/converters.pyx" } catch(...) { -#line 439 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 439 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 439; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 373 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 373; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 439 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/converters.pyx" } -#line 439 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":442 + /* "root_numpy/src/converters.pyx":376 * 'vector', new VectorConverter[unsigned_int]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[long]())) # <<<<<<<<<<<<<< @@ -66038,10 +67285,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[unsigned_long]())) */ -#line 442 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 376 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":441 + /* "root_numpy/src/converters.pyx":375 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_int]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66049,28 +67296,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 441 "root_numpy/src/tree.pyx" +#line 375 "root_numpy/src/converters.pyx" try { -#line 441 "root_numpy/src/tree.pyx" +#line 375 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter ()); -#line 441 "root_numpy/src/tree.pyx" +#line 375 "root_numpy/src/converters.pyx" } catch(...) { -#line 441 "root_numpy/src/tree.pyx" +#line 375 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 441 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 375 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 441 "root_numpy/src/tree.pyx" +#line 375 "root_numpy/src/converters.pyx" } -#line 441 "root_numpy/src/tree.pyx" +#line 375 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":444 + /* "root_numpy/src/converters.pyx":378 * 'vector', new VectorConverter[long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_long]())) # <<<<<<<<<<<<<< @@ -66078,10 +67325,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[long_long]())) */ -#line 444 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 444; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 378 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 378; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":443 + /* "root_numpy/src/converters.pyx":377 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66089,28 +67336,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 443 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/converters.pyx" try { -#line 443 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter<__pyx_t_13_librootnumpy_unsigned_long> ()); -#line 443 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/converters.pyx" } catch(...) { -#line 443 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 443 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 377 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 377; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 443 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/converters.pyx" } -#line 443 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":446 + /* "root_numpy/src/converters.pyx":380 * 'vector', new VectorConverter[unsigned_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[long_long]())) # <<<<<<<<<<<<<< @@ -66118,10 +67365,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[unsigned_long_long]())) */ -#line 446 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 446; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 380 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 380; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":445 + /* "root_numpy/src/converters.pyx":379 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66129,28 +67376,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 445 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/converters.pyx" try { -#line 445 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter<__pyx_t_13_librootnumpy_long_long> ()); -#line 445 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/converters.pyx" } catch(...) { -#line 445 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 445 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 445; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 379 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 379; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 445 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/converters.pyx" } -#line 445 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":448 + /* "root_numpy/src/converters.pyx":382 * 'vector', new VectorConverter[long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_long_long]())) # <<<<<<<<<<<<<< @@ -66158,10 +67405,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[float]())) */ -#line 448 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 448; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 382 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_unsigned_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":447 + /* "root_numpy/src/converters.pyx":381 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66169,28 +67416,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 447 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/converters.pyx" try { -#line 447 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter<__pyx_t_13_librootnumpy_unsigned_long_long> ()); -#line 447 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/converters.pyx" } catch(...) { -#line 447 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 447 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 381 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 447 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/converters.pyx" } -#line 447 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":450 + /* "root_numpy/src/converters.pyx":384 * 'vector', new VectorConverter[unsigned_long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[float]())) # <<<<<<<<<<<<<< @@ -66198,10 +67445,10 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorConverter[double]())) */ -#line 450 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_float); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 450; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 384 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_float); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":449 + /* "root_numpy/src/converters.pyx":383 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[unsigned_long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66209,68 +67456,68 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 449 "root_numpy/src/tree.pyx" +#line 383 "root_numpy/src/converters.pyx" try { -#line 449 "root_numpy/src/tree.pyx" +#line 383 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter ()); -#line 449 "root_numpy/src/tree.pyx" +#line 383 "root_numpy/src/converters.pyx" } catch(...) { -#line 449 "root_numpy/src/tree.pyx" +#line 383 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 449 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 449; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 383 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 383; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 449 "root_numpy/src/tree.pyx" +#line 383 "root_numpy/src/converters.pyx" } -#line 449 "root_numpy/src/tree.pyx" +#line 383 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":452 + /* "root_numpy/src/converters.pyx":386 * 'vector', new VectorConverter[float]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[double]())) # <<<<<<<<<<<<<< + * * # vector > converters - * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 452 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_double); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 452; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 386 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_double); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 386; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":451 + /* "root_numpy/src/converters.pyx":385 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorConverter[float]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< * 'vector', new VectorConverter[double]())) - * # vector > converters + * */ -#line 451 "root_numpy/src/tree.pyx" +#line 385 "root_numpy/src/converters.pyx" try { -#line 451 "root_numpy/src/tree.pyx" +#line 385 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorConverter ()); -#line 451 "root_numpy/src/tree.pyx" +#line 385 "root_numpy/src/converters.pyx" } catch(...) { -#line 451 "root_numpy/src/tree.pyx" +#line 385 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 451 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 451; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 385 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 385; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 451 "root_numpy/src/tree.pyx" +#line 385 "root_numpy/src/converters.pyx" } -#line 451 "root_numpy/src/tree.pyx" +#line 385 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":455 + /* "root_numpy/src/converters.pyx":390 * # vector > converters * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorBoolConverter())) # <<<<<<<<<<<<<< @@ -66278,57 +67525,57 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[char]())) */ -#line 455 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_bool); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 390 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_bool); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 390; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 455 "root_numpy/src/tree.pyx" +#line 390 "root_numpy/src/converters.pyx" try { -#line 455 "root_numpy/src/tree.pyx" +#line 390 "root_numpy/src/converters.pyx" __pyx_t_21 = new __pyx_t_13_librootnumpy_VectorVectorBoolConverter(); -#line 455 "root_numpy/src/tree.pyx" +#line 390 "root_numpy/src/converters.pyx" } catch(...) { -#line 455 "root_numpy/src/tree.pyx" +#line 390 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 455 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 390 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 390; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 455 "root_numpy/src/tree.pyx" +#line 390 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":454 - * 'vector', new VectorConverter[double]())) + /* "root_numpy/src/converters.pyx":389 + * * # vector > converters * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< * 'vector >', new VectorVectorBoolConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 454 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/converters.pyx" try { -#line 454 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, __pyx_t_21); -#line 454 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/converters.pyx" } catch(...) { -#line 454 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 454 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 389 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 389; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 454 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/converters.pyx" } -#line 454 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":457 + /* "root_numpy/src/converters.pyx":392 * 'vector >', new VectorVectorBoolConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[char]())) # <<<<<<<<<<<<<< @@ -66336,10 +67583,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[unsigned_char]())) */ -#line 457 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 457; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 392 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":456 + /* "root_numpy/src/converters.pyx":391 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorBoolConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66347,28 +67594,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 456 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/converters.pyx" try { -#line 456 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter ()); -#line 456 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/converters.pyx" } catch(...) { -#line 456 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 456 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 456; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 391 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 456 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/converters.pyx" } -#line 456 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":459 + /* "root_numpy/src/converters.pyx":394 * 'vector >', new VectorVectorConverter[char]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_char]())) # <<<<<<<<<<<<<< @@ -66376,10 +67623,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[short]())) */ -#line 459 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 394 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_char); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":458 + /* "root_numpy/src/converters.pyx":393 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[char]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66387,28 +67634,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 458 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/converters.pyx" try { -#line 458 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter<__pyx_t_13_librootnumpy_unsigned_char> ()); -#line 458 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/converters.pyx" } catch(...) { -#line 458 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 458 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 393 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 458 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/converters.pyx" } -#line 458 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":461 + /* "root_numpy/src/converters.pyx":396 * 'vector >', new VectorVectorConverter[unsigned_char]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[short]())) # <<<<<<<<<<<<<< @@ -66416,10 +67663,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[unsigned_short]())) */ -#line 461 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 461; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 396 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":460 + /* "root_numpy/src/converters.pyx":395 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_char]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66427,28 +67674,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 460 "root_numpy/src/tree.pyx" +#line 395 "root_numpy/src/converters.pyx" try { -#line 460 "root_numpy/src/tree.pyx" +#line 395 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter ()); -#line 460 "root_numpy/src/tree.pyx" +#line 395 "root_numpy/src/converters.pyx" } catch(...) { -#line 460 "root_numpy/src/tree.pyx" +#line 395 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 460 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 460; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 395 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 395; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 460 "root_numpy/src/tree.pyx" +#line 395 "root_numpy/src/converters.pyx" } -#line 460 "root_numpy/src/tree.pyx" +#line 395 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":463 + /* "root_numpy/src/converters.pyx":398 * 'vector >', new VectorVectorConverter[short]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_short]())) # <<<<<<<<<<<<<< @@ -66456,10 +67703,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[int]())) */ -#line 463 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 463; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 398 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_short); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 398; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":462 + /* "root_numpy/src/converters.pyx":397 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[short]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66467,28 +67714,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 462 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/converters.pyx" try { -#line 462 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter<__pyx_t_13_librootnumpy_unsigned_short> ()); -#line 462 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/converters.pyx" } catch(...) { -#line 462 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 462 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 397 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 462 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/converters.pyx" } -#line 462 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":465 + /* "root_numpy/src/converters.pyx":400 * 'vector >', new VectorVectorConverter[unsigned_short]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[int]())) # <<<<<<<<<<<<<< @@ -66496,10 +67743,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[unsigned_int]())) */ -#line 465 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 400 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":464 + /* "root_numpy/src/converters.pyx":399 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_short]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66507,28 +67754,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 464 "root_numpy/src/tree.pyx" +#line 399 "root_numpy/src/converters.pyx" try { -#line 464 "root_numpy/src/tree.pyx" +#line 399 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter ()); -#line 464 "root_numpy/src/tree.pyx" +#line 399 "root_numpy/src/converters.pyx" } catch(...) { -#line 464 "root_numpy/src/tree.pyx" +#line 399 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 464 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 464; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 399 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 399; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 464 "root_numpy/src/tree.pyx" +#line 399 "root_numpy/src/converters.pyx" } -#line 464 "root_numpy/src/tree.pyx" +#line 399 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":467 + /* "root_numpy/src/converters.pyx":402 * 'vector >', new VectorVectorConverter[int]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_int]())) # <<<<<<<<<<<<<< @@ -66536,10 +67783,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[long]())) */ -#line 467 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 467; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 402 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_int); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 402; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":466 + /* "root_numpy/src/converters.pyx":401 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[int]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66547,28 +67794,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 466 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/converters.pyx" try { -#line 466 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter<__pyx_t_13_librootnumpy_unsigned_int> ()); -#line 466 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/converters.pyx" } catch(...) { -#line 466 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 466 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 401 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 401; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 466 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/converters.pyx" } -#line 466 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":469 + /* "root_numpy/src/converters.pyx":404 * 'vector >', new VectorVectorConverter[unsigned_int]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[long]())) # <<<<<<<<<<<<<< @@ -66576,10 +67823,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[unsigned_long]())) */ -#line 469 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 404 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":468 + /* "root_numpy/src/converters.pyx":403 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_int]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66587,28 +67834,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 468 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/converters.pyx" try { -#line 468 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter ()); -#line 468 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/converters.pyx" } catch(...) { -#line 468 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 468 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 403 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 403; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 468 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/converters.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":471 + /* "root_numpy/src/converters.pyx":406 * 'vector >', new VectorVectorConverter[long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_long]())) # <<<<<<<<<<<<<< @@ -66616,10 +67863,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[long_long]())) */ -#line 471 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 406 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 406; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":470 + /* "root_numpy/src/converters.pyx":405 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66627,28 +67874,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 470 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/converters.pyx" try { -#line 470 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter<__pyx_t_13_librootnumpy_unsigned_long> ()); -#line 470 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/converters.pyx" } catch(...) { -#line 470 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 470 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 405 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 405; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 470 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/converters.pyx" } -#line 470 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":473 + /* "root_numpy/src/converters.pyx":408 * 'vector >', new VectorVectorConverter[unsigned_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[long_long]())) # <<<<<<<<<<<<<< @@ -66656,10 +67903,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[unsigned_long_long]())) */ -#line 473 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 408 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 408; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":472 + /* "root_numpy/src/converters.pyx":407 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66667,28 +67914,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 472 "root_numpy/src/tree.pyx" +#line 407 "root_numpy/src/converters.pyx" try { -#line 472 "root_numpy/src/tree.pyx" +#line 407 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter<__pyx_t_13_librootnumpy_long_long> ()); -#line 472 "root_numpy/src/tree.pyx" +#line 407 "root_numpy/src/converters.pyx" } catch(...) { -#line 472 "root_numpy/src/tree.pyx" +#line 407 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 472 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 472; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 407 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 407; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 472 "root_numpy/src/tree.pyx" +#line 407 "root_numpy/src/converters.pyx" } -#line 472 "root_numpy/src/tree.pyx" +#line 407 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":475 + /* "root_numpy/src/converters.pyx":410 * 'vector >', new VectorVectorConverter[long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_long_long]())) # <<<<<<<<<<<<<< @@ -66696,10 +67943,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[float]())) */ -#line 475 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 475; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 410 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_unsigned_long_long); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":474 + /* "root_numpy/src/converters.pyx":409 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66707,28 +67954,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 474 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/converters.pyx" try { -#line 474 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter<__pyx_t_13_librootnumpy_unsigned_long_long> ()); -#line 474 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/converters.pyx" } catch(...) { -#line 474 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 474 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 409 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 409; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 474 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/converters.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 409 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":477 + /* "root_numpy/src/converters.pyx":412 * 'vector >', new VectorVectorConverter[unsigned_long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[float]())) # <<<<<<<<<<<<<< @@ -66736,10 +67983,10 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorConverter[double]())) */ -#line 477 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_float); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 477; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 412 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_float); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 412; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":476 + /* "root_numpy/src/converters.pyx":411 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[unsigned_long_long]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66747,68 +67994,68 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 476 "root_numpy/src/tree.pyx" +#line 411 "root_numpy/src/converters.pyx" try { -#line 476 "root_numpy/src/tree.pyx" +#line 411 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter ()); -#line 476 "root_numpy/src/tree.pyx" +#line 411 "root_numpy/src/converters.pyx" } catch(...) { -#line 476 "root_numpy/src/tree.pyx" +#line 411 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 476 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 476; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 411 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 476 "root_numpy/src/tree.pyx" +#line 411 "root_numpy/src/converters.pyx" } -#line 476 "root_numpy/src/tree.pyx" +#line 411 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":479 + /* "root_numpy/src/converters.pyx":414 * 'vector >', new VectorVectorConverter[float]())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[double]())) # <<<<<<<<<<<<<< + * * # string converters - * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 479 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_double); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 414 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_double); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":478 + /* "root_numpy/src/converters.pyx":413 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorConverter[float]())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< * 'vector >', new VectorVectorConverter[double]())) - * # string converters + * */ -#line 478 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/converters.pyx" try { -#line 478 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, new __pyx_t_13_librootnumpy_VectorVectorConverter ()); -#line 478 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/converters.pyx" } catch(...) { -#line 478 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 478 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 478; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 413 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 478 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/converters.pyx" } -#line 478 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":482 + /* "root_numpy/src/converters.pyx":418 * # string converters * CONVERTERS.insert(CONVERTERS_ITEM( * 'string', new StringConverter())) # <<<<<<<<<<<<<< @@ -66816,57 +68063,57 @@ goto __pyx_L16_unpacking_failed; * 'vector', new VectorStringConverter())) */ -#line 482 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_n_b_string); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_n_b_string); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 482 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/converters.pyx" try { -#line 482 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/converters.pyx" __pyx_t_22 = new __pyx_t_13_librootnumpy_StringConverter(); -#line 482 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/converters.pyx" } catch(...) { -#line 482 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 482 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 418 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 482 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":481 - * 'vector >', new VectorVectorConverter[double]())) + /* "root_numpy/src/converters.pyx":417 + * * # string converters * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< * 'string', new StringConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 481 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/converters.pyx" try { -#line 481 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, __pyx_t_22); -#line 481 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/converters.pyx" } catch(...) { -#line 481 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 481 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 481; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 417 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 417; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 481 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/converters.pyx" } -#line 481 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":484 + /* "root_numpy/src/converters.pyx":420 * 'string', new StringConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorStringConverter())) # <<<<<<<<<<<<<< @@ -66874,28 +68121,28 @@ goto __pyx_L16_unpacking_failed; * 'vector >', new VectorVectorStringConverter())) */ -#line 484 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_string); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_string); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 484 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/converters.pyx" try { -#line 484 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/converters.pyx" __pyx_t_23 = new __pyx_t_13_librootnumpy_VectorStringConverter(); -#line 484 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/converters.pyx" } catch(...) { -#line 484 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 484 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 420 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 484 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":483 + /* "root_numpy/src/converters.pyx":419 * CONVERTERS.insert(CONVERTERS_ITEM( * 'string', new StringConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66903,28 +68150,28 @@ goto __pyx_L16_unpacking_failed; * CONVERTERS.insert(CONVERTERS_ITEM( */ -#line 483 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/converters.pyx" try { -#line 483 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, __pyx_t_23); -#line 483 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/converters.pyx" } catch(...) { -#line 483 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 483 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 419 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 419; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 483 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/converters.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":486 + /* "root_numpy/src/converters.pyx":422 * 'vector', new VectorStringConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector >', new VectorVectorStringConverter())) # <<<<<<<<<<<<<< @@ -66932,28 +68179,28 @@ goto __pyx_L16_unpacking_failed; * */ -#line 486 "root_numpy/src/tree.pyx" - __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_string); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 422 "root_numpy/src/converters.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_kp_b_vector_vector_string); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 486 "root_numpy/src/tree.pyx" +#line 422 "root_numpy/src/converters.pyx" try { -#line 486 "root_numpy/src/tree.pyx" +#line 422 "root_numpy/src/converters.pyx" __pyx_t_24 = new __pyx_t_13_librootnumpy_VectorVectorStringConverter(); -#line 486 "root_numpy/src/tree.pyx" +#line 422 "root_numpy/src/converters.pyx" } catch(...) { -#line 486 "root_numpy/src/tree.pyx" +#line 422 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 486 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 422 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 486 "root_numpy/src/tree.pyx" +#line 422 "root_numpy/src/converters.pyx" } - /* "root_numpy/src/tree.pyx":485 + /* "root_numpy/src/converters.pyx":421 * CONVERTERS.insert(CONVERTERS_ITEM( * 'vector', new VectorStringConverter())) * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< @@ -66961,226 +68208,300 @@ goto __pyx_L16_unpacking_failed; * */ -#line 485 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/converters.pyx" try { -#line 485 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/converters.pyx" __pyx_t_19 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_17, __pyx_t_24); -#line 485 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/converters.pyx" } catch(...) { -#line 485 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/converters.pyx" __Pyx_CppExn2PyErr(); -#line 485 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 421 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 485 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/converters.pyx" } -#line 485 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/converters.pyx" __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_19); - /* "root_numpy/src/tree.pyx":702 - * - * - * def root2array_fromFname(fnames, treename, branches, # <<<<<<<<<<<<<< - * selection, start, stop, step, - * include_weight, weight_name): - */ - -#line 702 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_7root2array_fromFname, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 702 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); - -#line 702 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_root2array_fromFname, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 702 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - - /* "root_numpy/src/tree.pyx":721 - * - * - * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< - * start, stop, step, - * include_weight, weight_name): - */ - -#line 721 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_9root2array_fromCObj, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 721 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); - -#line 721 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_root2array_fromCObj, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 721; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 721 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - - /* "root_numpy/src/tree.pyx":869 - * - * - * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< - * cdef TTree* intree = NULL - * cdef TTree* outtree = NULL - */ - -#line 869 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_11array2tree_toCObj, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 869 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); - -#line 869 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array2tree_toCObj, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 869 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - - /* "root_numpy/src/tree.pyx":883 - * - * - * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< - * cdef TFile* file = Open(filename, mode) - * if file is NULL: - */ - -#line 883 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_13array2root, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 883 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); - -#line 883 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array2root, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 883; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 883 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - - /* "root_numpy/src/tree.pyx":899 + /* "root_numpy/src/converters.pyx":501 * * * @atexit.register # <<<<<<<<<<<<<< * def cleanup(): - * # delete all allocated converters + * # Delete all converters when module is town down */ -#line 899 "root_numpy/src/tree.pyx" - __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_atexit); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 501 "root_numpy/src/converters.pyx" + __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_atexit); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 899 "root_numpy/src/tree.pyx" +#line 501 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 899 "root_numpy/src/tree.pyx" - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_register); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 501 "root_numpy/src/converters.pyx" + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_register); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 899 "root_numpy/src/tree.pyx" +#line 501 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 899 "root_numpy/src/tree.pyx" +#line 501 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":900 + /* "root_numpy/src/converters.pyx":502 * * @atexit.register * def cleanup(): # <<<<<<<<<<<<<< - * # delete all allocated converters + * # Delete all converters when module is town down * it = CONVERTERS.begin() */ -#line 900 "root_numpy/src/tree.pyx" - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_15cleanup, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 502 "root_numpy/src/converters.pyx" + __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_1cleanup, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __pyx_t_8 = NULL; -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_5))) { -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_5); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" if (likely(__pyx_t_8)) { -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_INCREF(__pyx_t_8); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_INCREF(function); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" } -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" } -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" if (!__pyx_t_8) { -#line 900 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 502 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" } else { -#line 900 "root_numpy/src/tree.pyx" - __pyx_t_14 = PyTuple_New(1+1); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 502 "root_numpy/src/converters.pyx" + __pyx_t_14 = PyTuple_New(1+1); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_14); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_8); __Pyx_GIVEREF(__pyx_t_8); __pyx_t_8 = NULL; -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" PyTuple_SET_ITEM(__pyx_t_14, 0+1, __pyx_t_1); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_t_1); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __pyx_t_1 = 0; -#line 900 "root_numpy/src/tree.pyx" - __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_14, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 502 "root_numpy/src/converters.pyx" + __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_14, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" } -#line 900 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 900 "root_numpy/src/tree.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_cleanup, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 502 "root_numpy/src/converters.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_cleanup, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 502 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":4 + * + * + * def list_trees(fname): # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(fname, 'read') + * if rfile == NULL: + */ + +#line 4 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_3list_trees, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 4 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_list_trees, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":24 + * + * + * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< + * if tree == None: + * # automatically select single tree + */ + +#line 24 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_5list_structures, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 24 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_list_structures, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 24 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":43 + * + * + * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< + * return list(list_structures(fname, tree).keys()) + * + */ + +#line 43 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_7list_branches, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 43 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 43 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_list_branches, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 43 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":335 + * + * + * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< + * selection, start, stop, step, + * bool include_weight, string weight_name): + */ + +#line 335 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_9root2array_fromFname, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 335 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 335 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_root2array_fromFname, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 335 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":354 + * + * + * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< + * start, stop, step, + * bool include_weight, string weight_name): + */ + +#line 354 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_11root2array_fromCObj, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 354 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 354 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_root2array_fromCObj, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 354 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":424 + * + * + * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< + * cdef vector[NP2CConverter*] converters + * cdef vector[int] posarray + */ + +#line 424 "root_numpy/src/tree.pyx" + __pyx_t_17 = __pyx_convert_string_from_py_std__string(__pyx_n_b_tree); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 424 "root_numpy/src/tree.pyx" + __pyx_k__27 = __pyx_t_17; + + /* "root_numpy/src/tree.pyx":479 + * + * + * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< + * cdef TTree* intree = NULL + * cdef TTree* outtree = NULL + */ + +#line 479 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_13array2tree_toCObj, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 479 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 479 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array2tree_toCObj, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 479 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":488 + * + * + * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: + */ + +#line 488 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_15array2root, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 488 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 488 "root_numpy/src/tree.pyx" + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array2root, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; /* "root_numpy/src/array.pyx":10 @@ -67192,13 +68513,13 @@ goto __pyx_L16_unpacking_failed; */ #line 10 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_17array_d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_17array_d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 10 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 10 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67212,13 +68533,13 @@ goto __pyx_L16_unpacking_failed; */ #line 15 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_19array_f, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_19array_f, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 15 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 15 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_f, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_f, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 15 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67232,13 +68553,13 @@ goto __pyx_L16_unpacking_failed; */ #line 20 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_21array_l, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_21array_l, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 20 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_l, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_l, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 20 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67252,13 +68573,13 @@ goto __pyx_L16_unpacking_failed; */ #line 25 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_23array_i, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_23array_i, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 25 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 25 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_i, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_i, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 25 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67272,13 +68593,13 @@ goto __pyx_L16_unpacking_failed; */ #line 30 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_25array_s, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_25array_s, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 30 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 30 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_s, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_s, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 30 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67292,13 +68613,13 @@ goto __pyx_L16_unpacking_failed; */ #line 35 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_27array_c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_27array_c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 35 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 35 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 35 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67312,13 +68633,13 @@ goto __pyx_L16_unpacking_failed; */ #line 40 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_29array_h1c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_29array_h1c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 40 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 40 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_h1c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_h1c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 40 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67332,13 +68653,13 @@ goto __pyx_L16_unpacking_failed; */ #line 46 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_31array_h2c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_31array_h2c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 46 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_h2c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_h2c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 46 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67352,13 +68673,13 @@ goto __pyx_L16_unpacking_failed; */ #line 52 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_33array_h3c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_33array_h3c, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 52 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 52 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_h3c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_array_h3c, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 52 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67372,13 +68693,13 @@ goto __pyx_L16_unpacking_failed; */ #line 62 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_35h1d_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_35h1d_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 62 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 62 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1d_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1d_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 62 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67392,13 +68713,13 @@ goto __pyx_L16_unpacking_failed; */ #line 70 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_37h2d_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_37h2d_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 70 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2d_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2d_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 70 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67412,13 +68733,13 @@ goto __pyx_L16_unpacking_failed; */ #line 78 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_39h3d_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_39h3d_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 78 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3d_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3d_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 78 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67432,13 +68753,13 @@ goto __pyx_L16_unpacking_failed; */ #line 86 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_41h1f_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_41h1f_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 86 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 86 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1f_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1f_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 86 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67452,13 +68773,13 @@ goto __pyx_L16_unpacking_failed; */ #line 94 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_43h2f_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_43h2f_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 94 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2f_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2f_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67472,13 +68793,13 @@ goto __pyx_L16_unpacking_failed; */ #line 102 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_45h3f_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_45h3f_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 102 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 102 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3f_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3f_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 102 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67492,13 +68813,13 @@ goto __pyx_L16_unpacking_failed; */ #line 110 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_47h1i_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_47h1i_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 110 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 110 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1i_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1i_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 110 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67512,13 +68833,13 @@ goto __pyx_L16_unpacking_failed; */ #line 118 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_49h2i_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_49h2i_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 118 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 118 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2i_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2i_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 118 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67532,13 +68853,13 @@ goto __pyx_L16_unpacking_failed; */ #line 126 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_51h3i_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_51h3i_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 126 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3i_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3i_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 126 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67552,13 +68873,13 @@ goto __pyx_L16_unpacking_failed; */ #line 134 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_53h1s_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_53h1s_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 134 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 134 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1s_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1s_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 134 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67572,13 +68893,13 @@ goto __pyx_L16_unpacking_failed; */ #line 142 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_55h2s_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_55h2s_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 142 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2s_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2s_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67592,13 +68913,13 @@ goto __pyx_L16_unpacking_failed; */ #line 150 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_57h3s_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_57h3s_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 150 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3s_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3s_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 150 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67612,13 +68933,13 @@ goto __pyx_L16_unpacking_failed; */ #line 158 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_59h1c_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_59h1c_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 158 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 158 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1c_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h1c_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 158 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67632,13 +68953,13 @@ goto __pyx_L16_unpacking_failed; */ #line 166 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_61h2c_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_61h2c_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 166 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 166 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2c_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h2c_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 166 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67652,13 +68973,13 @@ goto __pyx_L16_unpacking_failed; */ #line 174 "root_numpy/src/array.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_63h3c_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_63h3c_array, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 174 "root_numpy/src/array.pyx" __Pyx_GOTREF(__pyx_t_7); #line 174 "root_numpy/src/array.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3c_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_h3c_array, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 174 "root_numpy/src/array.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67672,13 +68993,13 @@ goto __pyx_L16_unpacking_failed; */ #line 6 "root_numpy/src/matrix.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_65matrix_d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_65matrix_d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_7); #line 6 "root_numpy/src/matrix.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_matrix_d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_matrix_d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/matrix.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67692,13 +69013,13 @@ goto __pyx_L16_unpacking_failed; */ #line 19 "root_numpy/src/matrix.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_67matrix_f, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_67matrix_f, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 19 "root_numpy/src/matrix.pyx" __Pyx_GOTREF(__pyx_t_7); #line 19 "root_numpy/src/matrix.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_matrix_f, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_matrix_f, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 19 "root_numpy/src/matrix.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67712,13 +69033,13 @@ goto __pyx_L16_unpacking_failed; */ #line 6 "root_numpy/src/sample.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_69sample_f1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_69sample_f1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_7); #line 6 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_f1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_f1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 6 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67732,13 +69053,13 @@ goto __pyx_L16_unpacking_failed; */ #line 17 "root_numpy/src/sample.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_71sample_h1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_71sample_h1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 17 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_7); #line 17 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_h1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_h1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 17 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67752,13 +69073,13 @@ goto __pyx_L16_unpacking_failed; */ #line 28 "root_numpy/src/sample.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_73sample_f2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_73sample_f2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 28 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_7); #line 28 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_f2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_f2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 28 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67772,13 +69093,13 @@ goto __pyx_L16_unpacking_failed; */ #line 43 "root_numpy/src/sample.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_75sample_h2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_75sample_h2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 43 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_7); #line 43 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_h2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_h2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 43 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67792,13 +69113,13 @@ goto __pyx_L16_unpacking_failed; */ #line 58 "root_numpy/src/sample.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_77sample_f3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_77sample_f3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 58 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_7); #line 58 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_f3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_f3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 58 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67812,13 +69133,13 @@ goto __pyx_L16_unpacking_failed; */ #line 75 "root_numpy/src/sample.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_79sample_h3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_79sample_h3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 75 "root_numpy/src/sample.pyx" __Pyx_GOTREF(__pyx_t_7); #line 75 "root_numpy/src/sample.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_h3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_sample_h3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 75 "root_numpy/src/sample.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67832,13 +69153,13 @@ goto __pyx_L16_unpacking_failed; */ #line 3 "root_numpy/src/hist.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_81fill_h1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_81fill_h1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_7); #line 3 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_h1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_h1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67852,13 +69173,13 @@ goto __pyx_L16_unpacking_failed; */ #line 31 "root_numpy/src/hist.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_83fill_h2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_83fill_h2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_7); #line 31 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_h2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_h2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 31 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67872,13 +69193,13 @@ goto __pyx_L16_unpacking_failed; */ #line 59 "root_numpy/src/hist.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_85fill_h3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_85fill_h3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_7); #line 59 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_h3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_h3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 59 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67892,13 +69213,13 @@ goto __pyx_L16_unpacking_failed; */ #line 87 "root_numpy/src/hist.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_87fill_p1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_87fill_p1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_7); #line 87 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_p1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_p1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 87 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67912,13 +69233,13 @@ goto __pyx_L16_unpacking_failed; */ #line 115 "root_numpy/src/hist.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_89fill_p2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_89fill_p2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 115 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_7); #line 115 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_p2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_p2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 115 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67932,13 +69253,13 @@ goto __pyx_L16_unpacking_failed; */ #line 143 "root_numpy/src/hist.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_91fill_p3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_91fill_p3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 143 "root_numpy/src/hist.pyx" __Pyx_GOTREF(__pyx_t_7); #line 143 "root_numpy/src/hist.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_p3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_p3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 143 "root_numpy/src/hist.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67952,13 +69273,13 @@ goto __pyx_L16_unpacking_failed; */ #line 3 "root_numpy/src/graph.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_93fill_g1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_93fill_g1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/graph.pyx" __Pyx_GOTREF(__pyx_t_7); #line 3 "root_numpy/src/graph.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_g1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_g1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/graph.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67972,13 +69293,13 @@ goto __pyx_L16_unpacking_failed; */ #line 16 "root_numpy/src/graph.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_95fill_g2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_95fill_g2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/graph.pyx" __Pyx_GOTREF(__pyx_t_7); #line 16 "root_numpy/src/graph.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_g2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_fill_g2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/graph.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -67992,13 +69313,13 @@ goto __pyx_L16_unpacking_failed; */ #line 3 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_97evaluate_h1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_97evaluate_h1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 3 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_h1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_h1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 3 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68012,13 +69333,13 @@ goto __pyx_L16_unpacking_failed; */ #line 16 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_99evaluate_h2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_99evaluate_h2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 16 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_h2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_h2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 16 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68032,13 +69353,13 @@ goto __pyx_L16_unpacking_failed; */ #line 29 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_101evaluate_h3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_101evaluate_h3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 29 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 29 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_h3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_h3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 29 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68052,13 +69373,13 @@ goto __pyx_L16_unpacking_failed; */ #line 42 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_103evaluate_f1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_103evaluate_f1, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 42 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_f1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_f1, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 42 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68072,13 +69393,13 @@ goto __pyx_L16_unpacking_failed; */ #line 55 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_105evaluate_f2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_105evaluate_f2, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 55 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 55 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_f2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_f2, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 55 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68092,13 +69413,13 @@ goto __pyx_L16_unpacking_failed; */ #line 68 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_107evaluate_f3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_107evaluate_f3, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 68 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 68 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_f3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_f3, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 68 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68112,13 +69433,13 @@ goto __pyx_L16_unpacking_failed; */ #line 81 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_109evaluate_formula_1d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_109evaluate_formula_1d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 81 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_1d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_1d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 81 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68132,13 +69453,13 @@ goto __pyx_L16_unpacking_failed; */ #line 94 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_111evaluate_formula_2d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_111evaluate_formula_2d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 94 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_2d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_2d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 94 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68152,13 +69473,13 @@ goto __pyx_L16_unpacking_failed; */ #line 107 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_113evaluate_formula_3d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_113evaluate_formula_3d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 107 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 107 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_3d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_3d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 107 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68172,13 +69493,13 @@ goto __pyx_L16_unpacking_failed; */ #line 120 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_115evaluate_formula_4d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_115evaluate_formula_4d, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 120 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_4d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_formula_4d, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 120 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68192,13 +69513,13 @@ goto __pyx_L16_unpacking_failed; */ #line 133 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_117evaluate_graph, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_117evaluate_graph, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 133 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 133 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_graph, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_graph, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 133 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68212,13 +69533,13 @@ goto __pyx_L16_unpacking_failed; */ #line 146 "root_numpy/src/evaluate.pyx" - __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_119evaluate_spline, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyCFunction_NewEx(&__pyx_mdef_13_librootnumpy_119evaluate_spline, NULL, __pyx_n_s_librootnumpy); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 146 "root_numpy/src/evaluate.pyx" __Pyx_GOTREF(__pyx_t_7); #line 146 "root_numpy/src/evaluate.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_spline, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_evaluate_spline, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 146 "root_numpy/src/evaluate.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68230,13 +69551,13 @@ goto __pyx_L16_unpacking_failed; */ #line 1 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 1 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 1 "root_numpy/src/innerjoin.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 1 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68250,13 +69571,13 @@ goto __pyx_L16_unpacking_failed; */ #line 142 "root_numpy/src/innerjoin.pyx" - __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/innerjoin.pyx" __Pyx_GOTREF(__pyx_t_7); #line 142 "root_numpy/src/innerjoin.pyx" - if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_7) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;} #line 142 "root_numpy/src/innerjoin.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; @@ -68424,6 +69745,202 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg } #endif +static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { + if (unlikely(!type)) { + PyErr_SetString(PyExc_SystemError, "Missing type object"); + return 0; + } + if (likely(PyObject_TypeCheck(obj, type))) + return 1; + PyErr_Format(PyExc_TypeError, "Cannot convert %.200s to %.200s", + Py_TYPE(obj)->tp_name, type->tp_name); + return 0; +} + +static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) { +#if CYTHON_COMPILING_IN_CPYTHON + PyObject *tmp_type, *tmp_value, *tmp_tb; + PyThreadState *tstate = PyThreadState_GET(); + tmp_type = tstate->curexc_type; + tmp_value = tstate->curexc_value; + tmp_tb = tstate->curexc_traceback; + tstate->curexc_type = type; + tstate->curexc_value = value; + tstate->curexc_traceback = tb; + Py_XDECREF(tmp_type); + Py_XDECREF(tmp_value); + Py_XDECREF(tmp_tb); +#else + PyErr_Restore(type, value, tb); +#endif +} +static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) { +#if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); + *type = tstate->curexc_type; + *value = tstate->curexc_value; + *tb = tstate->curexc_traceback; + tstate->curexc_type = 0; + tstate->curexc_value = 0; + tstate->curexc_traceback = 0; +#else + PyErr_Fetch(type, value, tb); +#endif +} + +static void __Pyx_WriteUnraisable(const char *name, CYTHON_UNUSED int clineno, + CYTHON_UNUSED int lineno, CYTHON_UNUSED const char *filename, + int full_traceback) { + PyObject *old_exc, *old_val, *old_tb; + PyObject *ctx; + __Pyx_ErrFetch(&old_exc, &old_val, &old_tb); + if (full_traceback) { + Py_XINCREF(old_exc); + Py_XINCREF(old_val); + Py_XINCREF(old_tb); + __Pyx_ErrRestore(old_exc, old_val, old_tb); + PyErr_PrintEx(1); + } + #if PY_MAJOR_VERSION < 3 + ctx = PyString_FromString(name); + #else + ctx = PyUnicode_FromString(name); + #endif + __Pyx_ErrRestore(old_exc, old_val, old_tb); + if (!ctx) { + PyErr_WriteUnraisable(Py_None); + } else { + PyErr_WriteUnraisable(ctx); + Py_DECREF(ctx); + } +} + +static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v) { + int r; + if (!j) return -1; + r = PyObject_SetItem(o, j, v); + Py_DECREF(j); + return r; +} +static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, + int is_list, int wraparound, int boundscheck) { +#if CYTHON_COMPILING_IN_CPYTHON + if (is_list || PyList_CheckExact(o)) { + Py_ssize_t n = (!wraparound) ? i : ((likely(i >= 0)) ? i : i + PyList_GET_SIZE(o)); + if ((!boundscheck) || likely((n >= 0) & (n < PyList_GET_SIZE(o)))) { + PyObject* old = PyList_GET_ITEM(o, n); + Py_INCREF(v); + PyList_SET_ITEM(o, n, v); + Py_DECREF(old); + return 1; + } + } else { + PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence; + if (likely(m && m->sq_ass_item)) { + if (wraparound && unlikely(i < 0) && likely(m->sq_length)) { + Py_ssize_t l = m->sq_length(o); + if (likely(l >= 0)) { + i += l; + } else { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) + PyErr_Clear(); + else + return -1; + } + } + return m->sq_ass_item(o, i, v); + } + } +#else +#if CYTHON_COMPILING_IN_PYPY + if (is_list || (PySequence_Check(o) && !PyDict_Check(o))) { +#else + if (is_list || PySequence_Check(o)) { +#endif + return PySequence_SetItem(o, i, v); + } +#endif + return __Pyx_SetItemInt_Generic(o, PyInt_FromSsize_t(i), v); +} + +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) { + PyObject *r; + if (!j) return NULL; + r = PyObject_GetItem(o, j); + Py_DECREF(j); + return r; +} +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, + int wraparound, int boundscheck) { +#if CYTHON_COMPILING_IN_CPYTHON + if (wraparound & unlikely(i < 0)) i += PyList_GET_SIZE(o); + if ((!boundscheck) || likely((0 <= i) & (i < PyList_GET_SIZE(o)))) { + PyObject *r = PyList_GET_ITEM(o, i); + Py_INCREF(r); + return r; + } + return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i)); +#else + return PySequence_GetItem(o, i); +#endif +} +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, + int wraparound, int boundscheck) { +#if CYTHON_COMPILING_IN_CPYTHON + if (wraparound & unlikely(i < 0)) i += PyTuple_GET_SIZE(o); + if ((!boundscheck) || likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) { + PyObject *r = PyTuple_GET_ITEM(o, i); + Py_INCREF(r); + return r; + } + return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i)); +#else + return PySequence_GetItem(o, i); +#endif +} +static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, + int is_list, int wraparound, int boundscheck) { +#if CYTHON_COMPILING_IN_CPYTHON + if (is_list || PyList_CheckExact(o)) { + Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyList_GET_SIZE(o); + if ((!boundscheck) || (likely((n >= 0) & (n < PyList_GET_SIZE(o))))) { + PyObject *r = PyList_GET_ITEM(o, n); + Py_INCREF(r); + return r; + } + } + else if (PyTuple_CheckExact(o)) { + Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyTuple_GET_SIZE(o); + if ((!boundscheck) || likely((n >= 0) & (n < PyTuple_GET_SIZE(o)))) { + PyObject *r = PyTuple_GET_ITEM(o, n); + Py_INCREF(r); + return r; + } + } else { + PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence; + if (likely(m && m->sq_item)) { + if (wraparound && unlikely(i < 0) && likely(m->sq_length)) { + Py_ssize_t l = m->sq_length(o); + if (likely(l >= 0)) { + i += l; + } else { + if (PyErr_ExceptionMatches(PyExc_OverflowError)) + PyErr_Clear(); + else + return NULL; + } + } + return m->sq_item(o, i); + } + } +#else + if (is_list || PySequence_Check(o)) { + return PySequence_GetItem(o, i); + } +#endif + return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i)); +} + #if CYTHON_COMPILING_IN_CPYTHON static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) { PyObject *self, *result; @@ -68473,35 +69990,66 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObjec } #endif -static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) { +static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg) { + PyObject *method, *result = NULL; + method = __Pyx_PyObject_GetAttrStr(obj, method_name); + if (unlikely(!method)) goto bad; #if CYTHON_COMPILING_IN_CPYTHON - PyObject *tmp_type, *tmp_value, *tmp_tb; - PyThreadState *tstate = PyThreadState_GET(); - tmp_type = tstate->curexc_type; - tmp_value = tstate->curexc_value; - tmp_tb = tstate->curexc_traceback; - tstate->curexc_type = type; - tstate->curexc_value = value; - tstate->curexc_traceback = tb; - Py_XDECREF(tmp_type); - Py_XDECREF(tmp_value); - Py_XDECREF(tmp_tb); -#else - PyErr_Restore(type, value, tb); + if (likely(PyMethod_Check(method))) { + PyObject *self = PyMethod_GET_SELF(method); + if (likely(self)) { + PyObject *args; + PyObject *function = PyMethod_GET_FUNCTION(method); + args = PyTuple_New(2); + if (unlikely(!args)) goto bad; + Py_INCREF(self); + PyTuple_SET_ITEM(args, 0, self); + Py_INCREF(arg); + PyTuple_SET_ITEM(args, 1, arg); + Py_INCREF(function); + Py_DECREF(method); method = NULL; + result = __Pyx_PyObject_Call(function, args, NULL); + Py_DECREF(args); + Py_DECREF(function); + return result; + } + } #endif + result = __Pyx_PyObject_CallOneArg(method, arg); +bad: + Py_XDECREF(method); + return result; } -static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) { + +static PyObject* __Pyx__PyObject_PopIndex(PyObject* L, PyObject* py_ix) { + PyObject *r; + if (unlikely(!py_ix)) return NULL; + r = __Pyx_PyObject_CallMethod1(L, __pyx_n_s_pop, py_ix); + Py_DECREF(py_ix); + return r; +} +static PyObject* __Pyx__PyList_PopIndex(PyObject* L, Py_ssize_t ix) { #if CYTHON_COMPILING_IN_CPYTHON - PyThreadState *tstate = PyThreadState_GET(); - *type = tstate->curexc_type; - *value = tstate->curexc_value; - *tb = tstate->curexc_traceback; - tstate->curexc_type = 0; - tstate->curexc_value = 0; - tstate->curexc_traceback = 0; -#else - PyErr_Fetch(type, value, tb); + Py_ssize_t size = PyList_GET_SIZE(L); + if (likely(size > (((PyListObject*)L)->allocated >> 1))) { + Py_ssize_t cix = ix; + if (cix < 0) { + cix += size; + } + if (likely(0 <= cix && cix < size)) { + PyObject* v = PyList_GET_ITEM(L, cix); + Py_SIZE(L) -= 1; + size -= 1; + memmove(&PyList_GET_ITEM(L, cix), &PyList_GET_ITEM(L, cix+1), (size_t)(size-cix)*sizeof(PyObject*)); + return v; + } + } #endif + return __Pyx__PyObject_PopIndex(L, PyInt_FromSsize_t(ix)); +} + +static CYTHON_INLINE void __Pyx_RaiseUnboundLocalError(const char *varname) { + PyErr_Format(PyExc_UnboundLocalError, "local variable '%s' referenced before assignment", varname); } #if PY_MAJOR_VERSION < 3 @@ -68781,37 +70329,6 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int #endif } -static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg) { - PyObject *method, *result = NULL; - method = __Pyx_PyObject_GetAttrStr(obj, method_name); - if (unlikely(!method)) goto bad; -#if CYTHON_COMPILING_IN_CPYTHON - if (likely(PyMethod_Check(method))) { - PyObject *self = PyMethod_GET_SELF(method); - if (likely(self)) { - PyObject *args; - PyObject *function = PyMethod_GET_FUNCTION(method); - args = PyTuple_New(2); - if (unlikely(!args)) goto bad; - Py_INCREF(self); - PyTuple_SET_ITEM(args, 0, self); - Py_INCREF(arg); - PyTuple_SET_ITEM(args, 1, arg); - Py_INCREF(function); - Py_DECREF(method); method = NULL; - result = __Pyx_PyObject_Call(function, args, NULL); - Py_DECREF(args); - Py_DECREF(function); - return result; - } - } -#endif - result = __Pyx_PyObject_CallOneArg(method, arg); -bad: - Py_XDECREF(method); - return result; -} - static CYTHON_INLINE PyObject* __Pyx_PyDict_Keys(PyObject* d) { if (PY_MAJOR_VERSION >= 3) return __Pyx_PyObject_CallMethod1((PyObject*)&PyDict_Type, __pyx_n_s_keys, d); @@ -68964,84 +70481,6 @@ static CYTHON_INLINE PyObject* __Pyx_PyBytes_Join(PyObject* sep, PyObject* value } #endif -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) { - PyObject *r; - if (!j) return NULL; - r = PyObject_GetItem(o, j); - Py_DECREF(j); - return r; -} -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, - int wraparound, int boundscheck) { -#if CYTHON_COMPILING_IN_CPYTHON - if (wraparound & unlikely(i < 0)) i += PyList_GET_SIZE(o); - if ((!boundscheck) || likely((0 <= i) & (i < PyList_GET_SIZE(o)))) { - PyObject *r = PyList_GET_ITEM(o, i); - Py_INCREF(r); - return r; - } - return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i)); -#else - return PySequence_GetItem(o, i); -#endif -} -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, - int wraparound, int boundscheck) { -#if CYTHON_COMPILING_IN_CPYTHON - if (wraparound & unlikely(i < 0)) i += PyTuple_GET_SIZE(o); - if ((!boundscheck) || likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) { - PyObject *r = PyTuple_GET_ITEM(o, i); - Py_INCREF(r); - return r; - } - return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i)); -#else - return PySequence_GetItem(o, i); -#endif -} -static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, - int is_list, int wraparound, int boundscheck) { -#if CYTHON_COMPILING_IN_CPYTHON - if (is_list || PyList_CheckExact(o)) { - Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyList_GET_SIZE(o); - if ((!boundscheck) || (likely((n >= 0) & (n < PyList_GET_SIZE(o))))) { - PyObject *r = PyList_GET_ITEM(o, n); - Py_INCREF(r); - return r; - } - } - else if (PyTuple_CheckExact(o)) { - Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyTuple_GET_SIZE(o); - if ((!boundscheck) || likely((n >= 0) & (n < PyTuple_GET_SIZE(o)))) { - PyObject *r = PyTuple_GET_ITEM(o, n); - Py_INCREF(r); - return r; - } - } else { - PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence; - if (likely(m && m->sq_item)) { - if (wraparound && unlikely(i < 0) && likely(m->sq_length)) { - Py_ssize_t l = m->sq_length(o); - if (likely(l >= 0)) { - i += l; - } else { - if (PyErr_ExceptionMatches(PyExc_OverflowError)) - PyErr_Clear(); - else - return NULL; - } - } - return m->sq_item(o, i); - } - } -#else - if (is_list || PySequence_Check(o)) { - return PySequence_GetItem(o, i); - } -#endif - return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i)); -} - #if CYTHON_COMPILING_IN_CPYTHON static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) { #ifdef __Pyx_CyFunction_USED @@ -69057,149 +70496,6 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) { } #endif -static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { - if (unlikely(!type)) { - PyErr_SetString(PyExc_SystemError, "Missing type object"); - return 0; - } - if (likely(PyObject_TypeCheck(obj, type))) - return 1; - PyErr_Format(PyExc_TypeError, "Cannot convert %.200s to %.200s", - Py_TYPE(obj)->tp_name, type->tp_name); - return 0; -} - -static void __Pyx_WriteUnraisable(const char *name, CYTHON_UNUSED int clineno, - CYTHON_UNUSED int lineno, CYTHON_UNUSED const char *filename, - int full_traceback) { - PyObject *old_exc, *old_val, *old_tb; - PyObject *ctx; - __Pyx_ErrFetch(&old_exc, &old_val, &old_tb); - if (full_traceback) { - Py_XINCREF(old_exc); - Py_XINCREF(old_val); - Py_XINCREF(old_tb); - __Pyx_ErrRestore(old_exc, old_val, old_tb); - PyErr_PrintEx(1); - } - #if PY_MAJOR_VERSION < 3 - ctx = PyString_FromString(name); - #else - ctx = PyUnicode_FromString(name); - #endif - __Pyx_ErrRestore(old_exc, old_val, old_tb); - if (!ctx) { - PyErr_WriteUnraisable(Py_None); - } else { - PyErr_WriteUnraisable(ctx); - Py_DECREF(ctx); - } -} - -static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v) { - int r; - if (!j) return -1; - r = PyObject_SetItem(o, j, v); - Py_DECREF(j); - return r; -} -static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, - int is_list, int wraparound, int boundscheck) { -#if CYTHON_COMPILING_IN_CPYTHON - if (is_list || PyList_CheckExact(o)) { - Py_ssize_t n = (!wraparound) ? i : ((likely(i >= 0)) ? i : i + PyList_GET_SIZE(o)); - if ((!boundscheck) || likely((n >= 0) & (n < PyList_GET_SIZE(o)))) { - PyObject* old = PyList_GET_ITEM(o, n); - Py_INCREF(v); - PyList_SET_ITEM(o, n, v); - Py_DECREF(old); - return 1; - } - } else { - PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence; - if (likely(m && m->sq_ass_item)) { - if (wraparound && unlikely(i < 0) && likely(m->sq_length)) { - Py_ssize_t l = m->sq_length(o); - if (likely(l >= 0)) { - i += l; - } else { - if (PyErr_ExceptionMatches(PyExc_OverflowError)) - PyErr_Clear(); - else - return -1; - } - } - return m->sq_ass_item(o, i, v); - } - } -#else -#if CYTHON_COMPILING_IN_PYPY - if (is_list || (PySequence_Check(o) && !PyDict_Check(o))) { -#else - if (is_list || PySequence_Check(o)) { -#endif - return PySequence_SetItem(o, i, v); - } -#endif - return __Pyx_SetItemInt_Generic(o, PyInt_FromSsize_t(i), v); -} - -static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) { - PyErr_Format(PyExc_ValueError, - "too many values to unpack (expected %" CYTHON_FORMAT_SSIZE_T "d)", expected); -} - -static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) { - PyErr_Format(PyExc_ValueError, - "need more than %" CYTHON_FORMAT_SSIZE_T "d value%.1s to unpack", - index, (index == 1) ? "" : "s"); -} - -static CYTHON_INLINE int __Pyx_IterFinish(void) { -#if CYTHON_COMPILING_IN_CPYTHON - PyThreadState *tstate = PyThreadState_GET(); - PyObject* exc_type = tstate->curexc_type; - if (unlikely(exc_type)) { - if (likely(exc_type == PyExc_StopIteration) || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)) { - PyObject *exc_value, *exc_tb; - exc_value = tstate->curexc_value; - exc_tb = tstate->curexc_traceback; - tstate->curexc_type = 0; - tstate->curexc_value = 0; - tstate->curexc_traceback = 0; - Py_DECREF(exc_type); - Py_XDECREF(exc_value); - Py_XDECREF(exc_tb); - return 0; - } else { - return -1; - } - } - return 0; -#else - if (unlikely(PyErr_Occurred())) { - if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) { - PyErr_Clear(); - return 0; - } else { - return -1; - } - } - return 0; -#endif -} - -static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) { - if (unlikely(retval)) { - Py_DECREF(retval); - __Pyx_RaiseTooManyValuesError(expected); - return -1; - } else { - return __Pyx_IterFinish(); - } - return 0; -} - static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) { PyObject *local_type, *local_value, *local_tb; #if CYTHON_COMPILING_IN_CPYTHON @@ -69307,6 +70603,62 @@ static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) #endif } +static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) { + PyErr_Format(PyExc_ValueError, + "too many values to unpack (expected %" CYTHON_FORMAT_SSIZE_T "d)", expected); +} + +static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) { + PyErr_Format(PyExc_ValueError, + "need more than %" CYTHON_FORMAT_SSIZE_T "d value%.1s to unpack", + index, (index == 1) ? "" : "s"); +} + +static CYTHON_INLINE int __Pyx_IterFinish(void) { +#if CYTHON_COMPILING_IN_CPYTHON + PyThreadState *tstate = PyThreadState_GET(); + PyObject* exc_type = tstate->curexc_type; + if (unlikely(exc_type)) { + if (likely(exc_type == PyExc_StopIteration) || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)) { + PyObject *exc_value, *exc_tb; + exc_value = tstate->curexc_value; + exc_tb = tstate->curexc_traceback; + tstate->curexc_type = 0; + tstate->curexc_value = 0; + tstate->curexc_traceback = 0; + Py_DECREF(exc_type); + Py_XDECREF(exc_value); + Py_XDECREF(exc_tb); + return 0; + } else { + return -1; + } + } + return 0; +#else + if (unlikely(PyErr_Occurred())) { + if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) { + PyErr_Clear(); + return 0; + } else { + return -1; + } + } + return 0; +#endif +} + +static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) { + if (unlikely(retval)) { + Py_DECREF(retval); + __Pyx_RaiseTooManyValuesError(expected); + return -1; + } else { + return __Pyx_IterFinish(); + } + return 0; +} + static void __Pyx_RaiseArgumentTypeInvalid(const char* name, PyObject *obj, PyTypeObject *type) { PyErr_Format(PyExc_TypeError, "Argument '%.200s' has incorrect type (expected %.200s, got %.200s)", @@ -70375,58 +71727,6 @@ static CYTHON_INLINE unsigned int __Pyx_PyInt_As_unsigned_int(PyObject *x) { return (unsigned int) -1; } -static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) { - const int neg_one = (int) -1, const_zero = 0; - const int is_unsigned = neg_one > const_zero; - if (is_unsigned) { - if (sizeof(int) < sizeof(long)) { - return PyInt_FromLong((long) value); - } else if (sizeof(int) <= sizeof(unsigned long)) { - return PyLong_FromUnsignedLong((unsigned long) value); - } else if (sizeof(int) <= sizeof(unsigned long long)) { - return PyLong_FromUnsignedLongLong((unsigned long long) value); - } - } else { - if (sizeof(int) <= sizeof(long)) { - return PyInt_FromLong((long) value); - } else if (sizeof(int) <= sizeof(long long)) { - return PyLong_FromLongLong((long long) value); - } - } - { - int one = 1; int little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&value; - return _PyLong_FromByteArray(bytes, sizeof(int), - little, !is_unsigned); - } -} - -static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) { - const long neg_one = (long) -1, const_zero = 0; - const int is_unsigned = neg_one > const_zero; - if (is_unsigned) { - if (sizeof(long) < sizeof(long)) { - return PyInt_FromLong((long) value); - } else if (sizeof(long) <= sizeof(unsigned long)) { - return PyLong_FromUnsignedLong((unsigned long) value); - } else if (sizeof(long) <= sizeof(unsigned long long)) { - return PyLong_FromUnsignedLongLong((unsigned long long) value); - } - } else { - if (sizeof(long) <= sizeof(long)) { - return PyInt_FromLong((long) value); - } else if (sizeof(long) <= sizeof(long long)) { - return PyLong_FromLongLong((long long) value); - } - } - { - int one = 1; int little = (int)*(unsigned char *)&one; - unsigned char *bytes = (unsigned char *)&value; - return _PyLong_FromByteArray(bytes, sizeof(long), - little, !is_unsigned); - } -} - static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_long(unsigned long value) { const unsigned long neg_one = (unsigned long) -1, const_zero = 0; const int is_unsigned = neg_one > const_zero; @@ -70548,19 +71848,45 @@ static CYTHON_INLINE unsigned long __Pyx_PyInt_As_unsigned_long(PyObject *x) { return (unsigned long) -1; } -static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { +static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) { const long neg_one = (long) -1, const_zero = 0; const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(long) < sizeof(long)) { + return PyInt_FromLong((long) value); + } else if (sizeof(long) <= sizeof(unsigned long)) { + return PyLong_FromUnsignedLong((unsigned long) value); + } else if (sizeof(long) <= sizeof(unsigned long long)) { + return PyLong_FromUnsignedLongLong((unsigned long long) value); + } + } else { + if (sizeof(long) <= sizeof(long)) { + return PyInt_FromLong((long) value); + } else if (sizeof(long) <= sizeof(long long)) { + return PyLong_FromLongLong((long long) value); + } + } + { + int one = 1; int little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&value; + return _PyLong_FromByteArray(bytes, sizeof(long), + little, !is_unsigned); + } +} + +static CYTHON_INLINE Py_intptr_t __Pyx_PyInt_As_Py_intptr_t(PyObject *x) { + const Py_intptr_t neg_one = (Py_intptr_t) -1, const_zero = 0; + const int is_unsigned = neg_one > const_zero; #if PY_MAJOR_VERSION < 3 if (likely(PyInt_Check(x))) { - if (sizeof(long) < sizeof(long)) { - __PYX_VERIFY_RETURN_INT(long, long, PyInt_AS_LONG(x)) + if (sizeof(Py_intptr_t) < sizeof(long)) { + __PYX_VERIFY_RETURN_INT(Py_intptr_t, long, PyInt_AS_LONG(x)) } else { long val = PyInt_AS_LONG(x); if (is_unsigned && unlikely(val < 0)) { goto raise_neg_overflow; } - return (long) val; + return (Py_intptr_t) val; } } else #endif @@ -70570,32 +71896,32 @@ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { #if CYTHON_USE_PYLONG_INTERNALS switch (Py_SIZE(x)) { case 0: return 0; - case 1: __PYX_VERIFY_RETURN_INT(long, digit, ((PyLongObject*)x)->ob_digit[0]); + case 1: __PYX_VERIFY_RETURN_INT(Py_intptr_t, digit, ((PyLongObject*)x)->ob_digit[0]); } #endif #endif if (unlikely(Py_SIZE(x) < 0)) { goto raise_neg_overflow; } - if (sizeof(long) <= sizeof(unsigned long)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long, PyLong_AsUnsignedLong(x)) - } else if (sizeof(long) <= sizeof(unsigned long long)) { - __PYX_VERIFY_RETURN_INT(long, unsigned long long, PyLong_AsUnsignedLongLong(x)) + if (sizeof(Py_intptr_t) <= sizeof(unsigned long)) { + __PYX_VERIFY_RETURN_INT(Py_intptr_t, unsigned long, PyLong_AsUnsignedLong(x)) + } else if (sizeof(Py_intptr_t) <= sizeof(unsigned long long)) { + __PYX_VERIFY_RETURN_INT(Py_intptr_t, unsigned long long, PyLong_AsUnsignedLongLong(x)) } } else { #if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 #if CYTHON_USE_PYLONG_INTERNALS switch (Py_SIZE(x)) { case 0: return 0; - case 1: __PYX_VERIFY_RETURN_INT(long, digit, +(((PyLongObject*)x)->ob_digit[0])); - case -1: __PYX_VERIFY_RETURN_INT(long, sdigit, -(sdigit) ((PyLongObject*)x)->ob_digit[0]); + case 1: __PYX_VERIFY_RETURN_INT(Py_intptr_t, digit, +(((PyLongObject*)x)->ob_digit[0])); + case -1: __PYX_VERIFY_RETURN_INT(Py_intptr_t, sdigit, -(sdigit) ((PyLongObject*)x)->ob_digit[0]); } #endif #endif - if (sizeof(long) <= sizeof(long)) { - __PYX_VERIFY_RETURN_INT(long, long, PyLong_AsLong(x)) - } else if (sizeof(long) <= sizeof(long long)) { - __PYX_VERIFY_RETURN_INT(long, long long, PyLong_AsLongLong(x)) + if (sizeof(Py_intptr_t) <= sizeof(long)) { + __PYX_VERIFY_RETURN_INT(Py_intptr_t, long, PyLong_AsLong(x)) + } else if (sizeof(Py_intptr_t) <= sizeof(long long)) { + __PYX_VERIFY_RETURN_INT(Py_intptr_t, long long, PyLong_AsLongLong(x)) } } { @@ -70603,7 +71929,7 @@ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { PyErr_SetString(PyExc_RuntimeError, "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers"); #else - long val; + Py_intptr_t val; PyObject *v = __Pyx_PyNumber_Int(x); #if PY_MAJOR_VERSION < 3 if (likely(v) && !PyLong_Check(v)) { @@ -70623,24 +71949,50 @@ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { return val; } #endif - return (long) -1; + return (Py_intptr_t) -1; } } else { - long val; + Py_intptr_t val; PyObject *tmp = __Pyx_PyNumber_Int(x); - if (!tmp) return (long) -1; - val = __Pyx_PyInt_As_long(tmp); + if (!tmp) return (Py_intptr_t) -1; + val = __Pyx_PyInt_As_Py_intptr_t(tmp); Py_DECREF(tmp); return val; } raise_overflow: PyErr_SetString(PyExc_OverflowError, - "value too large to convert to long"); - return (long) -1; + "value too large to convert to Py_intptr_t"); + return (Py_intptr_t) -1; raise_neg_overflow: PyErr_SetString(PyExc_OverflowError, - "can't convert negative value to long"); - return (long) -1; + "can't convert negative value to Py_intptr_t"); + return (Py_intptr_t) -1; +} + +static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) { + const int neg_one = (int) -1, const_zero = 0; + const int is_unsigned = neg_one > const_zero; + if (is_unsigned) { + if (sizeof(int) < sizeof(long)) { + return PyInt_FromLong((long) value); + } else if (sizeof(int) <= sizeof(unsigned long)) { + return PyLong_FromUnsignedLong((unsigned long) value); + } else if (sizeof(int) <= sizeof(unsigned long long)) { + return PyLong_FromUnsignedLongLong((unsigned long long) value); + } + } else { + if (sizeof(int) <= sizeof(long)) { + return PyInt_FromLong((long) value); + } else if (sizeof(int) <= sizeof(long long)) { + return PyLong_FromLongLong((long long) value); + } + } + { + int one = 1; int little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&value; + return _PyLong_FromByteArray(bytes, sizeof(int), + little, !is_unsigned); + } } static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) { @@ -70669,6 +72021,101 @@ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) } } +static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) { + const long neg_one = (long) -1, const_zero = 0; + const int is_unsigned = neg_one > const_zero; +#if PY_MAJOR_VERSION < 3 + if (likely(PyInt_Check(x))) { + if (sizeof(long) < sizeof(long)) { + __PYX_VERIFY_RETURN_INT(long, long, PyInt_AS_LONG(x)) + } else { + long val = PyInt_AS_LONG(x); + if (is_unsigned && unlikely(val < 0)) { + goto raise_neg_overflow; + } + return (long) val; + } + } else +#endif + if (likely(PyLong_Check(x))) { + if (is_unsigned) { +#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 + #if CYTHON_USE_PYLONG_INTERNALS + switch (Py_SIZE(x)) { + case 0: return 0; + case 1: __PYX_VERIFY_RETURN_INT(long, digit, ((PyLongObject*)x)->ob_digit[0]); + } + #endif +#endif + if (unlikely(Py_SIZE(x) < 0)) { + goto raise_neg_overflow; + } + if (sizeof(long) <= sizeof(unsigned long)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long, PyLong_AsUnsignedLong(x)) + } else if (sizeof(long) <= sizeof(unsigned long long)) { + __PYX_VERIFY_RETURN_INT(long, unsigned long long, PyLong_AsUnsignedLongLong(x)) + } + } else { +#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3 + #if CYTHON_USE_PYLONG_INTERNALS + switch (Py_SIZE(x)) { + case 0: return 0; + case 1: __PYX_VERIFY_RETURN_INT(long, digit, +(((PyLongObject*)x)->ob_digit[0])); + case -1: __PYX_VERIFY_RETURN_INT(long, sdigit, -(sdigit) ((PyLongObject*)x)->ob_digit[0]); + } + #endif +#endif + if (sizeof(long) <= sizeof(long)) { + __PYX_VERIFY_RETURN_INT(long, long, PyLong_AsLong(x)) + } else if (sizeof(long) <= sizeof(long long)) { + __PYX_VERIFY_RETURN_INT(long, long long, PyLong_AsLongLong(x)) + } + } + { +#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray) + PyErr_SetString(PyExc_RuntimeError, + "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers"); +#else + long val; + PyObject *v = __Pyx_PyNumber_Int(x); + #if PY_MAJOR_VERSION < 3 + if (likely(v) && !PyLong_Check(v)) { + PyObject *tmp = v; + v = PyNumber_Long(tmp); + Py_DECREF(tmp); + } + #endif + if (likely(v)) { + int one = 1; int is_little = (int)*(unsigned char *)&one; + unsigned char *bytes = (unsigned char *)&val; + int ret = _PyLong_AsByteArray((PyLongObject *)v, + bytes, sizeof(val), + is_little, !is_unsigned); + Py_DECREF(v); + if (likely(!ret)) + return val; + } +#endif + return (long) -1; + } + } else { + long val; + PyObject *tmp = __Pyx_PyNumber_Int(x); + if (!tmp) return (long) -1; + val = __Pyx_PyInt_As_long(tmp); + Py_DECREF(tmp); + return val; + } +raise_overflow: + PyErr_SetString(PyExc_OverflowError, + "value too large to convert to long"); + return (long) -1; +raise_neg_overflow: + PyErr_SetString(PyExc_OverflowError, + "can't convert negative value to long"); + return (long) -1; +} + #if CYTHON_CCOMPLEX #ifdef __cplusplus static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float x, float y) { diff --git a/root_numpy/src/converters.pyx b/root_numpy/src/converters.pyx new file mode 100644 index 0000000..c816344 --- /dev/null +++ b/root_numpy/src/converters.pyx @@ -0,0 +1,507 @@ +import re + +# match leaf_name[length_leaf][N][M]... +LEAF_PATTERN = re.compile('^[^\[]+((?:\[[^\s\]]+\])(?:\[[0-9]+\])*)?$') + +TYPES = { + TypeName[bool]().name: ('bool', np.dtype(np.bool), np.NPY_BOOL), + TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), + TypeName[unsigned_char]().name: ('unsigned char', np.dtype(np.uint8), np.NPY_UINT8), + TypeName[short]().name: ('short', np.dtype(np.int16), np.NPY_INT16), + TypeName[unsigned_short]().name: ('unsigned short', np.dtype(np.uint16), np.NPY_UINT16), + TypeName[int]().name: ('int', np.dtype(np.int32), np.NPY_INT32), + TypeName[unsigned_int]().name: ('unsigned int', np.dtype(np.uint32), np.NPY_UINT32), + TypeName[long]().name: ('long', np.dtype(np.int64), np.NPY_INT64), + TypeName[unsigned_long]().name: ('unsigned long', np.dtype(np.uint64), np.NPY_UINT64), + TypeName[long_long]().name: ('long long', np.dtype(np.longlong), np.NPY_LONGLONG), + TypeName[unsigned_long_long]().name: ('unsigned long long', np.dtype(np.ulonglong), np.NPY_ULONGLONG), + TypeName[float]().name: ('float', np.dtype(np.float32), np.NPY_FLOAT32), + TypeName[double]().name: ('double', np.dtype(np.float64), np.NPY_FLOAT64), +} + +TYPES_NUMPY2ROOT = { + np.dtype(np.bool): (1, 'O'), + np.dtype(np.int8): (1, 'B'), + np.dtype(np.int16): (2, 'S'), + np.dtype(np.int32): (4, 'I'), + np.dtype(np.int64): (8, 'L'), + np.dtype(np.uint8): (1, 'b'), + np.dtype(np.uint16): (2, 's'), + np.dtype(np.uint32): (4, 'i'), + np.dtype(np.uint64): (8, 'l'), + np.dtype(np.float): (8, 'D'), + np.dtype(np.float32): (4, 'F'), + np.dtype(np.float64): (8, 'D'), +} + +SPECIAL_TYPEDEFS = { + 'Long64_t': 'long long', + 'ULong64_t': 'unsigned long long', +} + + +cdef inline unicode resolve_type(const char* typename): + # resolve Float_t -> float, vector -> vector, ... + resolvedtype = ResolveTypedef(typename, True).c_str() + resolvedtype = SPECIAL_TYPEDEFS.get(resolvedtype, resolvedtype) + return resolvedtype + + +# create numpy array of given type code with +# given numelement and size of each element +# and write it to buffer +cdef inline int create_numpyarray(void* buffer, void* src, int typecode, + unsigned long numele, int elesize, + int ndim = 1, np.npy_intp* dims = NULL): + cdef np.npy_intp* _dims = dims + cdef np.npy_intp default_dims[1] + if dims == NULL: + _dims = default_dims + _dims[0] = numele; + cdef np.ndarray tmp = np.PyArray_EMPTY(ndim, _dims, typecode, 0) + cdef PyObject* tmpobj = tmp # borrow ref + # incref since we are placing in buffer directly + Py_INCREF(tmp) + # copy to tmp.data + cdef unsigned long nbytes = numele * elesize + memcpy(tmp.data, src, nbytes) + # now write PyObject* to buffer + memcpy(buffer, &tmpobj, sizeof(PyObject*)) + return sizeof(tmpobj) + + +# special treatment for vector +cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): + cdef unsigned long numele = src.size() + cdef np.npy_intp dims[1] + dims[0] = numele; + cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) + cdef PyObject* tmpobj = tmp # borrow ref + # incref since we are placing in buffer directly + Py_INCREF(tmp) + # can't use memcpy here... + cdef unsigned long i + for i in range(numele): + tmp[i] = src.at(i) + # now write PyObject* to buffer + memcpy(buffer, &tmpobj, sizeof(PyObject*)) + return sizeof(tmpobj) + + +cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): + cdef unsigned long numele = src.size() + cdef np.npy_intp dims[1] + dims[0] = numele; + cdef int objsize = np.dtype('O').itemsize + cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) + cdef PyObject* tmpobj = tmp # borrow ref + # incref since we are placing in buffer directly + Py_INCREF(tmp) + cdef PyObject* tmpstrobj + cdef char* dataptr = tmp.data + # can't use memcpy here... + cdef unsigned long i + for i in range(numele): + py_bytes = str(src.at(i)) + Py_INCREF(py_bytes) + tmpstrobj = py_bytes + memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) + # now write PyObject* to buffer + memcpy(buffer, &tmpobj, sizeof(PyObject*)) + return sizeof(tmpobj) + + +cdef cppclass Converter: + + int write(Column* col, void* buffer): + pass + + object get_nptype(): + pass + + +cdef cppclass BasicConverter(Converter): + int size + int nptypecode + string nptype + + __init__(int size, string nptype, int nptypecode): + this.size = size + this.nptypecode = nptypecode + this.nptype = nptype + + int write(Column* col, void* buffer): + cdef void* src = col.GetValuePointer() + memcpy(buffer, src, this.size) + return this.size + + object get_nptype(): + return np.dtype(this.nptype) + + int get_nptypecode(): + return this.nptypecode + + +cdef cppclass ObjectConverterBase(Converter): + + object get_nptype(): + return np.object + + object get_nptypecode(): + return np.NPY_OBJECT + + +cdef cppclass VaryArrayConverter(ObjectConverterBase): + BasicConverter* conv # converter for single element + np.npy_intp* dims + int ndim + int typecode + int elesize + + __init__(BasicConverter* conv, int ndim, np.npy_intp* dims): + this.conv = conv + this.dims = dims + this.ndim = ndim + this.typecode = conv.get_nptypecode() + this.elesize = conv.size + + __dealloc__(): + free(this.dims) + + int write(Column* col, void* buffer): + this.dims[0] = col.GetCountLen() + return create_numpyarray(buffer, col.GetValuePointer(), + this.typecode, col.GetLen(), this.elesize, + this.ndim, this.dims) + + +cdef cppclass FixedArrayConverter(Converter): + BasicConverter* conv # converter for single element + PyObject* shape + + __init__(BasicConverter* conv, PyObject* shape): + Py_INCREF( shape) + this.conv = conv + this.shape = shape + + __dealloc__(): + Py_XDECREF(this.shape) + + int write(Column* col, void* buffer): + cdef int nbytes = col.GetSize() + memcpy(buffer, col.GetValuePointer(), nbytes) + return nbytes + + object get_nptype(): + return (np.dtype(this.conv.nptype), this.shape) + + int get_nptypecode(): + return this.conv.nptypecode + + +cdef cppclass VectorConverter[T](ObjectConverterBase): + int elesize + int nptypecode + Vector2Array[T] v2a + + __init__(): + cdef TypeName[T] ast = TypeName[T]() + info = TYPES[ast.name] + this.elesize = info[1].itemsize + this.nptypecode = info[2] + + int write(Column* col, void* buffer): + cdef vector[T]* tmp = col.GetValuePointer() + cdef unsigned long numele = tmp.size() + # check cython auto-generated code + # if it really does &((*tmp)[0]) + cdef T* fa = this.v2a.convert(tmp) + return create_numpyarray(buffer, fa, this.nptypecode, numele, this.elesize) + + +cdef cppclass VectorVectorConverter[T](ObjectConverterBase): + int elesize + int nptypecode + Vector2Array[T] v2a + + __init__(): + cdef TypeName[T] ast = TypeName[T]() + info = TYPES[ast.name] + this.elesize = info[1].itemsize + this.nptypecode = info[2] + + int write(Column* col, void* buffer): + cdef vector[vector[T]]* tmp = col.GetValuePointer() + # this will hold number of subvectors + cdef unsigned long numele + cdef T* fa + # these are defined solely for the outer array wrapper + cdef int objsize = np.dtype('O').itemsize + cdef int objtypecode = np.NPY_OBJECT + numele = tmp[0].size() + # create an outer array container that dataptr points to, + # containing pointers from create_numpyarray(). + # define an (numele)-dimensional outer array to hold our subvectors fa + cdef np.npy_intp dims[1] + dims[0] = numele + cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + cdef PyObject* outerobj = outer # borrow ref + # increase one since we are putting in buffer directly + Py_INCREF(outer) + # now write PyObject* to buffer + memcpy(buffer, &outerobj, sizeof(PyObject*)) + # build a dataptr pointing to outer, so we can shift and write each + # of the subvectors + cdef char* dataptr = outer.data + # loop through all subvectors + cdef unsigned long i + for i in range(numele): + fa = this.v2a.convert(&tmp[0][i]) + create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, + tmp[0][i].size(), this.elesize) + return sizeof(outerobj) + + +cdef cppclass VectorBoolConverter(ObjectConverterBase): + # Requires special treament since vector stores contents as bits... + int write(Column* col, void* buffer): + cdef vector[bool]* tmp = col.GetValuePointer() + return create_numpyarray_vectorbool(buffer, tmp) + + +cdef cppclass VectorVectorBoolConverter(ObjectConverterBase): + # Requires special treament since vector stores contents as bits... + int write(Column* col, void* buffer): + cdef vector[vector[bool]]* tmp = col.GetValuePointer() + # this will hold number of subvectors + cdef unsigned long numele + # these are defined solely for the outer array wrapper + cdef int objsize = np.dtype('O').itemsize + cdef int objtypecode = np.NPY_OBJECT + numele = tmp[0].size() + # create an outer array container that dataptr points to, + # containing pointers from create_numpyarray(). + # define an (numele)-dimensional outer array to hold our subvectors fa + cdef np.npy_intp dims[1] + dims[0] = numele + cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + cdef PyObject* outerobj = outer # borrow ref + # increase one since we are putting in buffer directly + Py_INCREF(outer) + # now write PyObject* to buffer + memcpy(buffer, &outerobj, sizeof(PyObject*)) + # build a dataptr pointing to outer, so we can shift and write each + # of the subvectors + cdef char* dataptr = outer.data + # loop through all subvectors + cdef unsigned long i + for i in range(numele): + create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) + return sizeof(outerobj) + + +cdef cppclass StringConverter(ObjectConverterBase): + int write(Column* col, void* buffer): + cdef string* s = col.GetValuePointer() + py_bytes = str(s[0]) + cdef PyObject* tmpobj = py_bytes # borrow ref + # increase one since we are putting in buffer directly + Py_INCREF(py_bytes) + # now write PyObject* to buffer + memcpy(buffer, &tmpobj, sizeof(PyObject*)) + return sizeof(tmpobj) + + +cdef cppclass VectorStringConverter(ObjectConverterBase): + int write(Column* col, void* buffer): + cdef vector[string]* tmp = col.GetValuePointer() + return create_numpyarray_vectorstring(buffer, tmp) + + +cdef cppclass VectorVectorStringConverter(ObjectConverterBase): + int write(Column* col, void* buffer): + cdef vector[vector[string]]* tmp = col.GetValuePointer() + # this will hold number of subvectors + cdef unsigned long numele + # these are defined solely for the outer array wrapper + cdef int objsize = np.dtype('O').itemsize + cdef int objtypecode = np.NPY_OBJECT + numele = tmp[0].size() + # create an outer array container that dataptr points to, + # containing pointers from create_numpyarray(). + # define an (numele)-dimensional outer array to hold our subvectors fa + cdef np.npy_intp dims[1] + dims[0] = numele + cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) + cdef PyObject* outerobj = outer # borrow ref + # increase one since we are putting in buffer directly + Py_INCREF(outer) + # now write PyObject* to buffer + memcpy(buffer, &outerobj, sizeof(PyObject*)) + # build a dataptr pointing to outer, so we can shift and write each + # of the subvectors + cdef char* dataptr = outer.data + # loop through all subvectors + cdef unsigned long i + for i in range(numele): + create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) + return sizeof(outerobj) + + +cdef cpp_map[string, Converter*] CONVERTERS +ctypedef pair[string, Converter*] CONVERTERS_ITEM + +# basic type converters +for ctypename, (ctype, dtype, dtypecode) in TYPES.items(): + CONVERTERS.insert(CONVERTERS_ITEM( + ctype, new BasicConverter( + dtype.itemsize, dtype.name, dtypecode))) + +# vector<> converters +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorBoolConverter())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[char]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[unsigned_char]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[short]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[unsigned_short]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[int]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[unsigned_int]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[unsigned_long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[long_long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[unsigned_long_long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[float]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorConverter[double]())) + +# vector > converters +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorBoolConverter())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[char]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[unsigned_char]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[short]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[unsigned_short]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[int]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[unsigned_int]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[unsigned_long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[long_long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[unsigned_long_long]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[float]())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorConverter[double]())) + +# string converters +CONVERTERS.insert(CONVERTERS_ITEM( + 'string', new StringConverter())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector', new VectorStringConverter())) +CONVERTERS.insert(CONVERTERS_ITEM( + 'vector >', new VectorVectorStringConverter())) + + +cdef Converter* find_converter_by_typename(string typename): + it = CONVERTERS.find(typename) + if it == CONVERTERS.end(): + return NULL + return deref(it).second + + +cdef enum LeafShapeType: + SINGLE_VALUE = 1 + VARIABLE_LENGTH_ARRAY = 2 + FIXED_LENGTH_ARRAY = 3 + + +cdef Converter* get_converter(TLeaf* leaf): + # Find existing converter or attempt to create a new one + cdef Converter* conv + cdef Converter* basic_conv + cdef TLeaf* leaf_count = leaf.GetLeafCount() + cdef LeafShapeType leaf_shape_type = SINGLE_VALUE + cdef SIZE_t* dims + cdef int ndim, idim + + leaf_name = leaf.GetName() + leaf_title = leaf.GetTitle() + leaf_type = resolve_type(leaf.GetTypeName()) + leaf_shape = () + + # Determine shape of this leaf + match = re.match(LEAF_PATTERN, leaf_title) + if match is not None: + arraydef = match.group(1) + if arraydef is not None: + arraytokens = arraydef.strip('[]').split('][') + shape = [] + # First group might be the name of the length-leaf + if leaf_count != NULL: + # Ignore leaf name token + arraytokens.pop(0) + leaf_shape_type = VARIABLE_LENGTH_ARRAY + else: + leaf_shape_type = FIXED_LENGTH_ARRAY + shape.extend([int(token) for token in arraytokens]) + leaf_shape = tuple(shape) + + if leaf_shape_type == SINGLE_VALUE: + return find_converter_by_typename(leaf_type) + + if leaf_shape_type == VARIABLE_LENGTH_ARRAY: + conv = find_converter_by_typename(leaf_type + arraydef) + if conv == NULL: + # Create new converter on demand + basic_conv = find_converter_by_typename(leaf_type) + if basic_conv == NULL: + return NULL + ndim = len(leaf_shape) + 1 + dims = malloc(ndim * sizeof(SIZE_t)) + for idim from 1 <= idim < ndim: + dims[idim] = leaf_shape[idim - 1] + conv = new VaryArrayConverter( + basic_conv, ndim, dims) + CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + return conv + + # Fixed-length array + conv = find_converter_by_typename(leaf_type + arraydef) + if conv == NULL: + # Create new converter on demand + basic_conv = find_converter_by_typename(leaf_type) + if basic_conv == NULL: + return NULL + conv = new FixedArrayConverter( + basic_conv, leaf_shape) + CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + return conv + + +@atexit.register +def cleanup(): + # Delete all converters when module is town down + it = CONVERTERS.begin() + while it != CONVERTERS.end(): + del deref(it).second + inc(it) diff --git a/root_numpy/src/root_numpy.pxi b/root_numpy/src/root_numpy.pxi index db3d005..05ff9da 100644 --- a/root_numpy/src/root_numpy.pxi +++ b/root_numpy/src/root_numpy.pxi @@ -8,11 +8,9 @@ cdef extern from "util.h": cdef cppclass TypeName[T]: TypeName() const_char* name - -cdef extern from "Vector2Array.h": cdef cppclass Vector2Array[T]: T* convert(vector[T]* v) - + cdef extern from "" namespace "std": cdef cppclass auto_ptr[T]: auto_ptr() @@ -21,26 +19,30 @@ cdef extern from "" namespace "std": T* get() cdef extern from "Column.h": - cdef enum ColumnType: - SINGLE, FIXED, VARY cdef cppclass Column: - bool skipped - ColumnType coltype - string colname - int countval - string rttype + string name + string type int GetLen() + int GetCountLen() int GetSize() void* GetValuePointer() const_char* GetTypeName() + cdef cppclass FormulaColumn(Column): FormulaColumn(string, TTreeFormula*) - bool skipped - ColumnType coltype - string colname - int countval - string rttype + string name + string type + int GetLen() + int GetSize() + void* GetValuePointer() + const_char* GetTypeName() + + cdef cppclass BranchColumn(Column): + BranchColumn(string, TLeaf*) + string name + string type int GetLen() + int GetCountLen() int GetSize() void* GetValuePointer() const_char* GetTypeName() @@ -50,10 +52,8 @@ cdef extern from "TreeChain.h": TreeChain(TTree*) long Prepare() int Next() - Column* MakeColumn(string bname, string lname, string colname) - int GetEntries() + void AddColumn(string bname, string lname, BranchColumn* column) int GetEntry(int i) - double GetWeight() TTree* fChain void AddFormula(TTreeFormula* formula) void InitBranches() diff --git a/root_numpy/src/setup.pxi b/root_numpy/src/setup.pxi index ffbb7eb..c5eeabf 100644 --- a/root_numpy/src/setup.pxi +++ b/root_numpy/src/setup.pxi @@ -40,6 +40,7 @@ ctypedef unsigned int unsigned_int ctypedef unsigned long unsigned_long ctypedef long long long_long ctypedef unsigned long long unsigned_long_long +ctypedef np.npy_intp SIZE_t include "ROOT.pxi" include "root_numpy.pxi" diff --git a/root_numpy/src/tree.pyx b/root_numpy/src/tree.pyx index 2e6d9c6..83a2485 100644 --- a/root_numpy/src/tree.pyx +++ b/root_numpy/src/tree.pyx @@ -1,552 +1,88 @@ -TYPES = { - TypeName[bool]().name: ('bool', np.dtype(np.bool), np.NPY_BOOL), - TypeName[char]().name: ('char', np.dtype(np.int8), np.NPY_INT8), - TypeName[unsigned_char]().name: ('unsigned char', np.dtype(np.uint8), np.NPY_UINT8), - TypeName[short]().name: ('short', np.dtype(np.int16), np.NPY_INT16), - TypeName[unsigned_short]().name: ('unsigned short', np.dtype(np.uint16), np.NPY_UINT16), - TypeName[int]().name: ('int', np.dtype(np.int32), np.NPY_INT32), - TypeName[unsigned_int]().name: ('unsigned int', np.dtype(np.uint32), np.NPY_UINT32), - TypeName[long]().name: ('long', np.dtype(np.int64), np.NPY_INT64), - TypeName[unsigned_long]().name: ('unsigned long', np.dtype(np.uint64), np.NPY_UINT64), - TypeName[long_long]().name: ('long long', np.dtype(np.longlong), np.NPY_LONGLONG), - TypeName[unsigned_long_long]().name: ('unsigned long long', np.dtype(np.ulonglong), np.NPY_ULONGLONG), - TypeName[float]().name: ('float', np.dtype(np.float32), np.NPY_FLOAT32), - TypeName[double]().name: ('double', np.dtype(np.float64), np.NPY_FLOAT64), -} - -TYPES_NUMPY2ROOT = { - np.dtype(np.bool): (1, 'O'), - np.dtype(np.int8): (1, 'B'), - np.dtype(np.int16): (2, 'S'), - np.dtype(np.int32): (4, 'I'), - np.dtype(np.int64): (8, 'L'), - np.dtype(np.uint8): (1, 'b'), - np.dtype(np.uint16): (2, 's'), - np.dtype(np.uint32): (4, 'i'), - np.dtype(np.uint64): (8, 'l'), - np.dtype(np.float): (8, 'D'), - np.dtype(np.float32): (4, 'F'), - np.dtype(np.float64): (8, 'D'), -} - -SPECIAL_TYPEDEFS = { - 'Long64_t': 'long long', - 'ULong64_t': 'unsigned long long', -} - - -cdef inline unicode resolve_type(const char* typename): - # resolve Float_t -> float, vector -> vector, ... - resolvedtype = ResolveTypedef(typename, True).c_str() - resolvedtype = SPECIAL_TYPEDEFS.get(resolvedtype, resolvedtype) - return resolvedtype +include "converters.pyx" def list_trees(fname): - cdef TFile* f = Open(fname, 'read') - if f is NULL: + cdef TFile* rfile = Open(fname, 'read') + if rfile == NULL: raise IOError("cannot read {0}".format(fname)) - cdef TList* keys = f.GetListOfKeys() - if keys is NULL: + cdef TList* keys = rfile.GetListOfKeys() + if keys == NULL: raise IOError("unable to get keys in {0}".format(fname)) ret = dict() - cdef int n = keys.GetEntries() + cdef int nkeys = keys.GetEntries() cdef TKey* key - for i in range(n): + for i in range(nkeys): key = keys.At(i) clsname = str(key.GetClassName()) if clsname == 'TTree' or clsname == 'TNtuple': ret[str(key.GetName())] = None + rfile.Close() + del rfile return list(ret.keys()) def list_structures(fname, tree=None): - if tree is None: + if tree == None: # automatically select single tree tree = list_trees(fname) if len(tree) != 1: raise ValueError("multiple trees found: {0}".format(', '.join(tree))) - else: - tree = tree[0] - cdef TFile* f = Open(fname, 'read') - if f is NULL: + tree = tree[0] + cdef TFile* rfile = Open(fname, 'read') + if rfile == NULL: raise IOError("cannot read {0}".format(fname)) - cdef TTree* t = f.Get(tree) - if t is NULL: - raise IOError("tree {0} not found in {1}".format(tree, fname)) - return parse_tree_structure(t) + cdef TTree* rtree = rfile.Get(tree) + if rtree == NULL: + raise IOError("tree '{0}' not found in {1}".format(tree, fname)) + structure = get_tree_structure(rtree) + rfile.Close() + del rfile + return structure def list_branches(fname, tree=None): return list(list_structures(fname, tree).keys()) -cdef parse_branch_structure(TBranch* branch): +cdef get_branch_structure(TBranch* branch): cdef TObjArray* leaves cdef TLeaf* leaf cdef int ileaf leaves = branch.GetListOfLeaves() - if leaves is NULL: - raise RuntimeError("branch {0} has no leaves".format(branch.GetName())) + if leaves == NULL: + raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) leaflist = [] for ileaf in range(leaves.GetEntries()): leaf = leaves.At(ileaf) - lname = leaf.GetName() - ltype = resolve_type(leaf.GetTypeName()) - leaflist.append((lname, ltype)) + leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) if not leaflist: raise RuntimeError( - "leaf list for branch {0} is empty".format( + "leaf list for branch '{0}' is empty".format( branch.GetName())) return leaflist -cdef parse_tree_structure(TTree* tree, branches=None): +cdef get_tree_structure(TTree* tree, branches=None): cdef int ibranch cdef TBranch* branch ret = OrderedDict() if branches is not None: for branch_name in branches: - branch = tree.GetBranch(branch_name) - if branch is NULL: + branch = tree.GetBranch(branch_name) + if branch == NULL: continue - ret[branch.GetName()] = parse_branch_structure(branch) + ret[branch.GetName()] = get_branch_structure(branch) return ret # all branches cdef TObjArray* all_branches = tree.GetListOfBranches() - if all_branches is NULL: + if all_branches == NULL: return ret for ibranch in range(all_branches.GetEntries()): branch = (all_branches.At(ibranch)) - ret[branch.GetName()] = parse_branch_structure(branch) + ret[branch.GetName()] = get_branch_structure(branch) return ret -# create numpy array of given type code with -# given numelement and size of each element -# and write it to buffer -cdef inline int create_numpyarray(void* buffer, void* src, int typecode, - unsigned long numele, int elesize): - cdef np.npy_intp dims[1] - dims[0] = numele; - cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, typecode, 0) - cdef PyObject* tmpobj = tmp # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(tmp) - # copy to tmp.data - cdef unsigned long nbytes = numele * elesize - memcpy(tmp.data, src, nbytes) - # now write PyObject* to buffer - memcpy(buffer, &tmpobj, sizeof(PyObject*)) - return sizeof(tmpobj) - - -# special treatment for vector -cdef inline int create_numpyarray_vectorbool(void* buffer, vector[bool]* src): - cdef unsigned long numele = src.size() - cdef np.npy_intp dims[1] - dims[0] = numele; - cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_BOOL, 0) - cdef PyObject* tmpobj = tmp # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(tmp) - # can't use memcpy here... - cdef unsigned long i - for i in range(numele): - tmp[i] = src.at(i) - # now write PyObject* to buffer - memcpy(buffer, &tmpobj, sizeof(PyObject*)) - return sizeof(tmpobj) - - -cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): - cdef unsigned long numele = src.size() - cdef np.npy_intp dims[1] - dims[0] = numele; - cdef int objsize = np.dtype('O').itemsize - cdef np.ndarray tmp = np.PyArray_EMPTY(1, dims, np.NPY_OBJECT, 0) - cdef PyObject* tmpobj = tmp # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(tmp) - cdef PyObject* tmpstrobj - cdef char* dataptr = tmp.data - # can't use memcpy here... - cdef unsigned long i - for i in range(numele): - py_bytes = str(src.at(i)) - Py_INCREF(py_bytes) - tmpstrobj = py_bytes - memcpy(&dataptr[i*objsize], &tmpstrobj, sizeof(PyObject*)) - # now write PyObject* to buffer - memcpy(buffer, &tmpobj, sizeof(PyObject*)) - return sizeof(tmpobj) - - -cdef cppclass Converter: - __init__(): - pass - - __dealloc__(): - pass - - int write(Column* col, void* buffer): - pass - - object get_nptype(): - pass - - -cdef cppclass BasicConverter(Converter): - # cdef string rtype - int size - int nptypecode - string nptype - - __init__(int size, string nptype, int nptypecode): - this.size = size - this.nptypecode = nptypecode - this.nptype = nptype - - int write(Column* col, void* buffer): - cdef void* src = col.GetValuePointer() - memcpy(buffer, src, this.size) - return this.size - - object get_nptype(): - return np.dtype(this.nptype) - - int get_nptypecode(): - return this.nptypecode - - -cdef cppclass ObjectConverterBase(Converter): - object get_nptype(): - return np.object - - object get_nptypecode(): - return np.NPY_OBJECT - - -cdef cppclass VaryArrayConverter(ObjectConverterBase): - BasicConverter* conv # converter for single element - int typecode - int elesize - - __init__(BasicConverter* conv): - this.conv = conv - this.typecode = conv.get_nptypecode() - this.elesize = conv.size - - int write(Column* col, void* buffer): - cdef int numele = col.GetLen() - cdef void* src = col.GetValuePointer() - return create_numpyarray(buffer, src, this.typecode, numele, this.elesize) - - -cdef cppclass FixedArrayConverter(Converter): - BasicConverter* conv # converter for single element - int L # numele - - __init__(BasicConverter* conv, int L): - this.conv = conv - this.L = L - - int write(Column* col, void* buffer): - cdef void* src = col.GetValuePointer() - cdef int nbytes = col.GetSize() - memcpy(buffer, src, nbytes) - return nbytes - - object get_nptype(): - return (np.dtype(this.conv.nptype), this.L) - - int get_nptypecode(): - return this.conv.nptypecode - - -cdef cppclass VectorConverter[T](ObjectConverterBase): - int elesize - int nptypecode - Vector2Array[T] v2a - - __init__(): - cdef TypeName[T] ast = TypeName[T]() - info = TYPES[ast.name] - this.elesize = info[1].itemsize - this.nptypecode = info[2] - - int write(Column* col, void* buffer): - cdef vector[T]* tmp = col.GetValuePointer() - cdef unsigned long numele = tmp.size() - # check cython auto-generated code - # if it really does &((*tmp)[0]) - cdef T* fa = this.v2a.convert(tmp) - return create_numpyarray(buffer, fa, this.nptypecode, numele, this.elesize) - - -cdef cppclass VectorVectorConverter[T](ObjectConverterBase): - int elesize - int nptypecode - Vector2Array[T] v2a - - __init__(): - cdef TypeName[T] ast = TypeName[T]() - info = TYPES[ast.name] - this.elesize = info[1].itemsize - this.nptypecode = info[2] - - int write(Column* col, void* buffer): - cdef vector[vector[T]]* tmp = col.GetValuePointer() - # this will hold number of subvectors - cdef unsigned long numele - cdef T* fa - # these are defined solely for the outer array wrapper - cdef int objsize = np.dtype('O').itemsize - cdef int objtypecode = np.NPY_OBJECT - numele = tmp[0].size() - # create an outer array container that dataptr points to, - # containing pointers from create_numpyarray(). - # define an (numele)-dimensional outer array to hold our subvectors fa - cdef np.npy_intp dims[1] - dims[0] = numele - cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - cdef PyObject* outerobj = outer # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(outer) - # now write PyObject* to buffer - memcpy(buffer, &outerobj, sizeof(PyObject*)) - # build a dataptr pointing to outer, so we can shift and write each - # of the subvectors - cdef char* dataptr = outer.data - # loop through all subvectors - cdef unsigned long i - for i in range(numele): - fa = this.v2a.convert(&tmp[0][i]) - create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, - tmp[0][i].size(), this.elesize) - return sizeof(outerobj) - - -cdef cppclass VectorBoolConverter(ObjectConverterBase): - # Requires special treament since vector stores contents as bits... - int write(Column* col, void* buffer): - cdef vector[bool]* tmp = col.GetValuePointer() - return create_numpyarray_vectorbool(buffer, tmp) - - -cdef cppclass VectorVectorBoolConverter(ObjectConverterBase): - # Requires special treament since vector stores contents as bits... - int write(Column* col, void* buffer): - cdef vector[vector[bool]]* tmp = col.GetValuePointer() - # this will hold number of subvectors - cdef unsigned long numele - # these are defined solely for the outer array wrapper - cdef int objsize = np.dtype('O').itemsize - cdef int objtypecode = np.NPY_OBJECT - numele = tmp[0].size() - # create an outer array container that dataptr points to, - # containing pointers from create_numpyarray(). - # define an (numele)-dimensional outer array to hold our subvectors fa - cdef np.npy_intp dims[1] - dims[0] = numele - cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - cdef PyObject* outerobj = outer # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(outer) - # now write PyObject* to buffer - memcpy(buffer, &outerobj, sizeof(PyObject*)) - # build a dataptr pointing to outer, so we can shift and write each - # of the subvectors - cdef char* dataptr = outer.data - # loop through all subvectors - cdef unsigned long i - for i in range(numele): - create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) - return sizeof(outerobj) - - -cdef cppclass StringConverter(ObjectConverterBase): - int write(Column* col, void* buffer): - cdef string* s = col.GetValuePointer() - py_bytes = str(s[0]) - cdef PyObject* tmpobj = py_bytes # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(py_bytes) - # now write PyObject* to buffer - memcpy(buffer, &tmpobj, sizeof(PyObject*)) - return sizeof(tmpobj) - - -cdef cppclass VectorStringConverter(ObjectConverterBase): - int write(Column* col, void* buffer): - cdef vector[string]* tmp = col.GetValuePointer() - return create_numpyarray_vectorstring(buffer, tmp) - - -cdef cppclass VectorVectorStringConverter(ObjectConverterBase): - int write(Column* col, void* buffer): - cdef vector[vector[string]]* tmp = col.GetValuePointer() - # this will hold number of subvectors - cdef unsigned long numele - # these are defined solely for the outer array wrapper - cdef int objsize = np.dtype('O').itemsize - cdef int objtypecode = np.NPY_OBJECT - numele = tmp[0].size() - # create an outer array container that dataptr points to, - # containing pointers from create_numpyarray(). - # define an (numele)-dimensional outer array to hold our subvectors fa - cdef np.npy_intp dims[1] - dims[0] = numele - cdef np.ndarray outer = np.PyArray_EMPTY(1, dims, objtypecode, 0) - cdef PyObject* outerobj = outer # borrow ref - # increase one since we are putting in buffer directly - Py_INCREF(outer) - # now write PyObject* to buffer - memcpy(buffer, &outerobj, sizeof(PyObject*)) - # build a dataptr pointing to outer, so we can shift and write each - # of the subvectors - cdef char* dataptr = outer.data - # loop through all subvectors - cdef unsigned long i - for i in range(numele): - create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) - return sizeof(outerobj) - - -cdef cpp_map[string, Converter*] CONVERTERS -ctypedef pair[string, Converter*] CONVERTERS_ITEM - -# basic type converters -for ctypename, (ctype, dtype, dtypecode) in TYPES.items(): - CONVERTERS.insert(CONVERTERS_ITEM( - ctype, new BasicConverter( - dtype.itemsize, dtype.name, dtypecode))) - - -# vector<> converters -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorBoolConverter())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[char]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[unsigned_char]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[short]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[unsigned_short]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[int]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[unsigned_int]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[unsigned_long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[long_long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[unsigned_long_long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[float]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorConverter[double]())) -# vector > converters -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorBoolConverter())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[char]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[unsigned_char]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[short]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[unsigned_short]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[int]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[unsigned_int]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[unsigned_long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[long_long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[unsigned_long_long]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[float]())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorConverter[double]())) -# string converters -CONVERTERS.insert(CONVERTERS_ITEM( - 'string', new StringConverter())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector', new VectorStringConverter())) -CONVERTERS.insert(CONVERTERS_ITEM( - 'vector >', new VectorVectorStringConverter())) - - -cdef Converter* find_converter(Column* col): - cdef ColumnType ct = col.coltype - cdef string typename = string(col.GetTypeName()) - cdef Converter* conv - cdef Converter* basic_conv - if ct == SINGLE: - return find_converter_by_typename(typename) - elif ct == FIXED: - conv = find_converter_by_typename(typename + '[fixed]') - if conv == NULL: - basic_conv = find_converter_by_typename(typename) - if basic_conv == NULL: - return NULL - conv = new FixedArrayConverter( - basic_conv, - col.countval) - CONVERTERS.insert(CONVERTERS_ITEM( - typename + '[fixed]', conv)) - return conv - elif ct == VARY: - conv = find_converter_by_typename(typename + '[vary]') - if conv == NULL: - basic_conv = find_converter_by_typename(typename) - if basic_conv == NULL: - return NULL - conv = new VaryArrayConverter( - basic_conv) - CONVERTERS.insert(CONVERTERS_ITEM( - typename + '[vary]', conv)) - return conv - return NULL - - -cdef Converter* find_converter_by_typename(string typename): - it = CONVERTERS.find(resolve_type(typename.c_str())) - if it == CONVERTERS.end(): - return NULL - return deref(it).second - - -cdef np.ndarray init_array(vector[Column*]& columns, - vector[Converter*]& cv, - unsigned long entries, - include_weight, - weight_name): - cdef Column* this_col - cdef Converter* this_conv - cdef unsigned int i - nst = [] - for i in range(columns.size()): - this_col = columns[i] - this_conv = find_converter(this_col) - if this_conv == NULL: - raise ValueError("no converter for {0}".format(this_col.GetTypeName())) - nst.append((this_col.colname, this_conv.get_nptype())) - cv.push_back(this_conv) - if include_weight: - nst.append((weight_name, np.dtype('d'))) - return np.empty(entries, dtype=nst) - - cdef handle_load(int load, bool ignore_index=False): if load >= 0: return @@ -563,105 +99,198 @@ cdef handle_load(int load, bool ignore_index=False): raise RuntimeError("the chain is not initialized") -cdef object tree2array(TTree* tree, branches, selection, +cdef object tree2array(TTree* tree, branches, string selection, start, stop, step, - include_weight, weight_name): + bool include_weight, string weight_name): if tree.GetNbranches() == 0: raise ValueError("tree has no branches") - cdef vector[Column*] columns - cdef Column* col + cdef int num_requested_branches = 0 + if branches is not None: + num_requested_branches = len(branches) + if num_requested_branches == 0: + raise ValueError("branches is an empty list") + + cdef int num_entries = tree.GetEntries() + cdef int num_entries_selected = 0 cdef TreeChain* chain = new TreeChain(tree) handle_load(chain.Prepare(), True) + cdef TObjArray* branch_array = tree.GetListOfBranches() + cdef TObjArray* leaf_array + cdef TBranch* tbranch + cdef TLeaf* tleaf + + cdef Column* col + cdef Converter* conv + + cdef vector[Column*] columns, columns_tmp + cdef vector[Converter*] converters, converters_tmp + # Used to preserve branch order if user specified branches: + cdef vector[vector['Column*']] column_buckets + cdef vector[vector['Converter*']] converter_buckets + # Avoid calling FindBranch for each branch since that results in O(n^2) + cdef TTreeFormula* selection_formula = NULL cdef TTreeFormula* formula = NULL - cdef int num_entries = chain.GetEntries() - cdef int num_entries_selected = 0 - cdef int ientry - cdef Converter* conv - cdef unsigned long numcol - cdef void* dataptr + cdef int ibranch, ileaf, ientry, branch_idx = 0 + cdef int num_branches = branch_array.GetEntries() + cdef unsigned int icol, num_columns + cdef np.ndarray arr - cdef int nb + cdef void* data_ptr + cdef int num_bytes cdef int entry_size - cdef vector[Converter*] conv_array + cdef char* c_string + cdef bool shortname + cdef string column_name + cdef const_char* branch_name + cdef const_char* leaf_name + + if num_requested_branches > 0: + columns.reserve(num_requested_branches) + converters.reserve(num_requested_branches) + column_buckets.assign(num_requested_branches, vector['Column*']()) + converter_buckets.assign(num_requested_branches, vector['Converter*']()) + else: + columns.reserve(num_branches) + converters.reserve(num_branches) try: # Set up the selection if we have one - if selection: - c_string = selection - selection_formula = new TTreeFormula("selection", c_string, chain.fChain) + if selection.size(): + selection_formula = new TTreeFormula("selection", selection.c_str(), tree) if selection_formula == NULL or selection_formula.GetNdim() == 0: del selection_formula - raise ValueError("could not compile selection formula") + raise ValueError( + "could not compile selection expression '{0}'".format(selection)) # The chain will take care of updating the formula leaves when # rolling over to the next tree. chain.AddFormula(selection_formula) - - # Parse the tree structure to determine branches and leaves - structure = parse_tree_structure(tree, branches=branches) - user_branches = False - if branches is None: - branches = structure.keys() - elif len(branches) == 0: - raise ValueError("branches is an empty list") - elif len(branches) != len(set(branches)): - raise ValueError("duplicate branches requested") - else: - user_branches = True - - for branch in branches: - if branch in structure: - leaves = structure[branch] - shortname = len(leaves) == 1 - for leaf, ltype in leaves: - if CONVERTERS.find(ltype) != CONVERTERS.end(): - colname = branch if shortname else '{0}_{1}'.format(branch, leaf) - col = chain.MakeColumn(branch, leaf, colname) - columns.push_back(col) - elif user_branches: - raise TypeError( - "cannot convert leaf {0} of branch {1} " - "with type {2} (skipping)".format(branch, leaf, ltype)) + + branch_dict = None + if num_requested_branches > 0: + branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + if len(branch_dict) != num_requested_branches: + raise ValueError("duplicate branches requested") + + # Build vector of Converters for branches + for ibranch in range(num_branches): + tbranch = branch_array.At(ibranch) + branch_name = tbranch.GetName() + if num_requested_branches > 0: + if len(branch_dict) == 0: + # No more branches to consider + break + branch_idx = branch_dict.pop(branch_name, -1) + if branch_idx == -1: + # This branch was not selected by the user + continue + + leaf_array = tbranch.GetListOfLeaves() + shortname = leaf_array.GetEntries() == 1 + + for ileaf in range(leaf_array.GetEntries()): + tleaf = leaf_array.At(ileaf) + leaf_name = tleaf.GetName() + conv = get_converter(tleaf) + if conv != NULL: + # A converter exists for this leaf + column_name = string(branch_name) + if not shortname: + column_name.append( '_') + column_name.append(leaf_name) + # Create a column for this branch/leaf pair + col = new BranchColumn(column_name, tleaf) + + if num_requested_branches > 0: + column_buckets[branch_idx].push_back(col) + converter_buckets[branch_idx].push_back(conv) else: - warnings.warn( - "cannot convert leaf {0} of branch {1} " - "with type {2} (skipping)".format(branch, leaf, ltype), - RootNumpyUnconvertibleWarning) - else: - # Attempt to interpret as an expression - c_string = branch - formula = new TTreeFormula(c_string, c_string, chain.fChain) + columns.push_back(col) + converters.push_back(conv) + + chain.AddColumn(string(branch_name), string(leaf_name), + col) + + elif num_requested_branches > 0: + # User explicitly requested this branch but there is no + # converter to handle it + raise TypeError( + "cannot convert leaf '{0}' of branch '{1}' " + "with type '{2}'".format( + branch_name, leaf_name, + resolve_type(tleaf.GetTypeName()))) + else: + # Just warn that this branch cannot be converted + warnings.warn( + "cannot convert leaf '{0}' of branch '{1}' " + "with type '{2}' (skipping)".format( + branch_name, leaf_name, + resolve_type(tleaf.GetTypeName())), + RootNumpyUnconvertibleWarning) + + if num_requested_branches > 0: + # Attempt to interpret remaining "branches" as expressions + for expression in branch_dict.keys(): + branch_idx = branch_dict[expression] + c_string = expression + formula = new TTreeFormula(c_string, c_string, tree) if formula == NULL or formula.GetNdim() == 0: del formula raise ValueError( - "the branch or expression {0} " - "is not present or valid".format(branch)) + "the branch or expression '{0}' " + "is not present or valid".format(expression)) # The chain will take care of updating the formula leaves when # rolling over to the next tree. chain.AddFormula(formula) - col = new FormulaColumn(branch, formula) - columns.push_back(col) - - if columns.size() == 0: + col = new FormulaColumn(expression, formula) + conv = find_converter_by_typename('double') + if conv == NULL: + # Oops, this should never happen + raise AssertionError( + "could not find double converter for formula") + + column_buckets[branch_idx].push_back(col) + converter_buckets[branch_idx].push_back(conv) + + # Flatten buckets into 1D vectors, thus preserving branch order + for branch_idx in range(num_requested_branches): + columns.insert(columns.end(), + column_buckets[branch_idx].begin(), + column_buckets[branch_idx].end()) + converters.insert(converters.end(), + converter_buckets[branch_idx].begin(), + converter_buckets[branch_idx].end()) + + elif columns.size() == 0: raise RuntimeError("unable to convert any branches in this tree") - + # Activate branches used by formulae and columns # and deactivate all others chain.InitBranches() # Now that we have all the columns we can # make an appropriate array structure - arr = init_array(columns, conv_array, num_entries, - include_weight, weight_name) - # Exclude weight column - numcol = columns.size() - + dtype = [] + for icol in range(columns.size()): + this_col = columns[icol] + this_conv = converters[icol] + dtype.append((this_col.name, this_conv.get_nptype())) + if include_weight: + dtype.append((weight_name, np.dtype('d'))) + + # Initialize the array + arr = np.empty(num_entries, dtype=dtype) + + # Exclude weight column in num_columns + num_columns = columns.size() + + # Loop on entries in the tree and write the data in the array indices = slice(start, stop, step).indices(num_entries) for ientry in xrange(*indices): entry_size = chain.GetEntry(ientry) @@ -677,41 +306,45 @@ cdef object tree2array(TTree* tree, branches, selection, continue # Copy the values into the array - dataptr = np.PyArray_GETPTR1(arr, num_entries_selected) - for icol in xrange(numcol): + data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) + for icol in range(num_columns): col = columns[icol] - conv = conv_array[icol] - nb = conv.write(col, dataptr) - # poorman pointer magic - dataptr = shift(dataptr, nb) + conv = converters[icol] + num_bytes = conv.write(col, data_ptr) + data_ptr = shift(data_ptr, num_bytes) if include_weight: - ( dataptr)[0] = chain.GetWeight() + ( data_ptr)[0] = tree.GetWeight() # Increment number of selected entries last num_entries_selected += 1 + finally: + # Delete TreeChain del chain - - # If we selected fewer than num_entries entries then shrink the array + # Delete Columns + for icol in range(columns.size()): + del columns[icol] + + # Shrink the array if we selected fewer than num_entries entries if num_entries_selected < num_entries: arr.resize(num_entries_selected) return arr -def root2array_fromFname(fnames, treename, branches, +def root2array_fromFname(fnames, string treename, branches, selection, start, stop, step, - include_weight, weight_name): + bool include_weight, string weight_name): cdef TChain* ttree = NULL try: - ttree = new TChain(treename) + ttree = new TChain(treename.c_str()) for fn in fnames: if ttree.Add(fn, -1) == 0: raise IOError("unable to access tree '{0}' in {1}".format( treename, fn)) ret = tree2array( ttree, branches, - selection, start, stop, step, + selection or '', start, stop, step, include_weight, weight_name) finally: del ttree @@ -720,17 +353,12 @@ def root2array_fromFname(fnames, treename, branches, def root2array_fromCObj(tree, branches, selection, start, stop, step, - include_weight, weight_name): - # this is not a safe method - # provided here for convenience only - # typecheck should be implemented by the wrapper - if not PyCObject_Check(tree): - raise ValueError("tree must be PyCObject") + bool include_weight, string weight_name): cdef TTree* chain = PyCObject_AsVoidPtr(tree) return tree2array( - chain, branches, selection, - start, stop, step, - include_weight, weight_name) + chain, branches, + selection or '', start, stop, step, + include_weight, weight_name) #################################### @@ -738,8 +366,10 @@ def root2array_fromCObj(tree, branches, selection, #################################### cdef cppclass NP2CConverter: + void fill_from(void* source): pass + __dealloc__(): pass @@ -750,8 +380,7 @@ cdef cppclass ScalarNP2CConverter(NP2CConverter): string name void* value TBranch* branch - # don't use copy constructor of this one since it will screw up - # tree binding and/or ownership of value + __init__(TTree* tree, string name, string roottype, int nbytes): cdef string leaflist this.nbytes = nbytes @@ -767,8 +396,8 @@ cdef cppclass ScalarNP2CConverter(NP2CConverter): existing_type = this.branch.GetTitle().rpartition('/')[-1] if str(roottype) != existing_type: raise TypeError( - "field `{0}` of type `{1}` is not compatible " - "with existing branch of type `{2}`".format( + "field '{0}' of type '{1}' is not compatible " + "with existing branch of type '{2}'".format( name, roottype, existing_type)) this.branch.SetAddress(this.value) this.branch.SetStatus(1) @@ -781,36 +410,21 @@ cdef cppclass ScalarNP2CConverter(NP2CConverter): this.branch.Fill() -cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype, peekvalue=None): +cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype): # TODO: - # np.float16: #this needs special treatment root doesn't have 16 bit float? - # np.object #this too should detect basic numpy array - # How to detect fixed length array? + # np.float16 needs special treatment. ROOT doesn't support 16-bit floats. + # Handle np.object (array) columns if dtype in TYPES_NUMPY2ROOT: nbytes, roottype = TYPES_NUMPY2ROOT[dtype] return new ScalarNP2CConverter(tree, name, roottype, nbytes) - elif dtype == np.dtype(np.object): - warnings.warn("converter for %r not implemented yet (skipping)" % dtype) - return NULL - # let's peek - """ - if type(peekvalue) == type(np.array([])): - ndim = peekvalue.ndim - dtype = peekvalue.dtype - #TODO finish this - """ - else: - warnings.warn("converter for %r not implemented yet (skipping)" % dtype) + warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) return NULL -cdef TTree* array2tree(np.ndarray arr, name='tree', TTree* tree=NULL) except *: - # hmm how do I catch all python exception - # and clean up before throwing ? - cdef vector[NP2CConverter*] conv_array +cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: + cdef vector[NP2CConverter*] converters cdef vector[int] posarray cdef vector[int] roffsetarray - cdef auto_ptr[NP2CConverter] tmp cdef unsigned int icv cdef int icol cdef long arr_len = arr.shape[0] @@ -819,24 +433,23 @@ cdef TTree* array2tree(np.ndarray arr, name='tree', TTree* tree=NULL) except *: cdef unsigned long ipos cdef void* source = NULL cdef void* thisrow = NULL - cdef NP2CConverter* tmpcv - - try: + + try: if tree == NULL: - tree = new TTree(name, name) - + tree = new TTree(name.c_str(), name.c_str()) + fieldnames = arr.dtype.names fields = arr.dtype.fields - - # figure out the structure + + # determine the structure for icol in range(len(fieldnames)): fieldname = fieldnames[icol] # roffset is an offset of particular field in each record - dtype, roffset = fields[fieldname] - cvt = find_np2c_converter(tree, fieldname, dtype, arr[0][fieldname]) - if cvt is not NULL: + dtype, roffset = fields[fieldname] + cvt = find_np2c_converter(tree, fieldname, dtype) + if cvt != NULL: roffsetarray.push_back(roffset) - conv_array.push_back(cvt) + converters.push_back(cvt) posarray.push_back(icol) # fill in data @@ -846,22 +459,19 @@ cdef TTree* array2tree(np.ndarray arr, name='tree', TTree* tree=NULL) except *: for ipos in range(pos_len): roffset = roffsetarray[ipos] source = shift(thisrow, roffset) - conv_array[ipos].fill_from(source) - + converters[ipos].fill_from(source) + # need to update the number of entries in the tree to match # the number in the branches since each branch is filled separately. tree.SetEntries(-1) - + except: raise - + finally: - # how do I clean up TTree? - # root has some global funny memory management... - # need to make sure no double free - for icv in range(conv_array.size()): - tmpcv = conv_array[icv] - del tmpcv + for icv in range(converters.size()): + del converters[icv] + # TODO: clean up tree return tree @@ -870,36 +480,21 @@ def array2tree_toCObj(arr, name='tree', tree=None): cdef TTree* intree = NULL cdef TTree* outtree = NULL if tree is not None: - # this is not a safe method - # provided here for convenience only - # typecheck should be implemented by the wrapper - if not PyCObject_Check(tree): - raise ValueError("tree must be PyCObject") intree = PyCObject_AsVoidPtr(tree) outtree = array2tree(arr, name=name, tree=intree) return PyCObject_FromVoidPtr(outtree, NULL) def array2root(arr, filename, treename='tree', mode='update'): - cdef TFile* file = Open(filename, mode) - if file is NULL: + cdef TFile* rfile = Open(filename, mode) + if rfile == NULL: raise IOError("cannot open file {0}".format(filename)) - if not file.IsWritable(): + if not rfile.IsWritable(): raise IOError("file {0} is not writable".format(filename)) - # If a tree with that name exists, we want to update it - cdef TTree* tree = file.Get(treename) + cdef TTree* tree = rfile.Get(treename) tree = array2tree(arr, name=treename, tree=tree) tree.Write(treename, 2) # TObject::kOverwrite - file.Close() - # how to clean up TTree? Same question as above. - del file - - -@atexit.register -def cleanup(): - # delete all allocated converters - it = CONVERTERS.begin() - while it != CONVERTERS.end(): - del deref(it).second - inc(it) + rfile.Close() + # TODO: clean up tree + del rfile diff --git a/root_numpy/src/util.h b/root_numpy/src/util.h index 6dca1cc..6550355 100644 --- a/root_numpy/src/util.h +++ b/root_numpy/src/util.h @@ -5,6 +5,7 @@ #include #include #include +#include // Missing string printf // This is safe and convenient but not exactly efficient @@ -50,4 +51,14 @@ template class TypeName const char* name; }; +// Workaround Cython's lack of template and pointer deref +template class Vector2Array +{ + public: + inline T* convert(std::vector* v) + { + return v->size() > 0 ? &((*v)[0]) : NULL; + } +}; + #endif diff --git a/root_numpy/testdata/doubletree1.root b/root_numpy/testdata/doubletree1.root deleted file mode 100644 index 136414c..0000000 Binary files a/root_numpy/testdata/doubletree1.root and /dev/null differ diff --git a/root_numpy/testdata/fixed1.root b/root_numpy/testdata/fixed1.root index e0e5868..d8f49c5 100644 Binary files a/root_numpy/testdata/fixed1.root and b/root_numpy/testdata/fixed1.root differ diff --git a/root_numpy/testdata/fixed2.root b/root_numpy/testdata/fixed2.root index 2a0fa7e..9680593 100644 Binary files a/root_numpy/testdata/fixed2.root and b/root_numpy/testdata/fixed2.root differ diff --git a/root_numpy/testdata/generate.cxx b/root_numpy/testdata/generate.cxx index 28c4c78..084aa93 100644 --- a/root_numpy/testdata/generate.cxx +++ b/root_numpy/testdata/generate.cxx @@ -13,18 +13,19 @@ using std::vector; using std::string; -void makentuple() +void make_ntuple() { TFile f("ntuple.root", "RECREATE"); TNtuple ntuple("ntuple", "ntuple", "x:y:z"); - for (int i = 0; i < 10; ++i) { + for (int i = 0; i < 10; ++i) + { ntuple.Fill(gRandom->Gaus(), gRandom->Gaus(), gRandom->Gaus()); } ntuple.Write(); f.Close(); } -void makevector() +void make_vector() { TFile f("vector.root", "RECREATE"); TTree t("tree", "tree with vectors"); @@ -63,7 +64,8 @@ void makevector() t.Branch("vv_c", "std::vector >", &vv_c); t.Branch("vv_b", "std::vector >", &vv_b); - for (int i = 1; i <= 10; ++i) { + for (int i = 1; i <= 10; ++i) + { v_i.clear(); v_f.clear(); v_F.clear(); @@ -80,7 +82,8 @@ void makevector() vv_c.clear(); vv_b.clear(); - for (int j = 0; j < i % 10; ++j) { + for (int j = 0; j < i % 10; ++j) + { v_i.push_back(i+j); v_f.push_back(2*i+j); v_F.push_back(2*i+j); @@ -104,7 +107,7 @@ void makevector() f.Close(); } -void makesingle(int id, double weight) +void make_single(int id, double weight) { char buffer[255]; sprintf(buffer, "single%d.root", id); @@ -114,7 +117,8 @@ void makesingle(int id, double weight) int n; tree.Branch("n_int", &n, "n_int/I"); float f; tree.Branch("f_float", &f, "f_float/F"); double d; tree.Branch("d_double", &d, "d_double/D"); - for(int i=0; i<100; i++) { + for(int i=0; i<100; i++) + { n = i+id; f = i*2.0+id; d = i*3.0+id; @@ -124,31 +128,53 @@ void makesingle(int id, double weight) file.Close(); } -void makefixed(int id) +void make_fixed_length(int id) { char buffer[255]; sprintf(buffer, "fixed%d.root", id); TFile file(buffer, "RECREATE"); TTree tree("tree", "tree"); + // 1D int n[5]; tree.Branch("n_int", &n, "n_int[5]/I"); float f[7]; tree.Branch("f_float", &f, "f_float[7]/F"); double d[10]; tree.Branch("d_double", &d, "d_double[10]/D"); - for(int i=0; i<100; i++) { - for(int i_n=0; i_n<5; i_n++) { + // 2D + int n2[5][2]; tree.Branch("n2_int", &n2, "n2_int[5][2]/I"); + float f2[7][3]; tree.Branch("f2_float", &f2, "f2_float[7][3]/F"); + double d2[10][4]; tree.Branch("d2_double", &d2, "d2_double[10][4]/D"); + + for (int i=0; i<100; ++i) + { + for (int i_n=0; i_n<5; ++i_n) + { n[i_n] = 5*i+i_n+id; + for (int i_n2=0; i_n2<2; ++i_n2) + { + n2[i_n][i_n2] = n[i_n] + i_n2; + } } - for(int i_f=0; i_f<7; i_f++) { + for (int i_f=0; i_f<7; ++i_f) + { f[i_f] = 2*(5*i+i_f)+0.5+id; + for (int i_f2=0; i_f2<3; ++i_f2) + { + f2[i_f][i_f2] = f[i_f] + i_f2; + } } - for(int i_d=0; i_d<10; i_d++) { + for (int i_d=0; i_d<10; ++i_d) + { d[i_d] = 3*(5*i+i_d)+0.5+id; + for (int i_d2=0; i_d2<4; ++i_d2) + { + d2[i_d][i_d2] = d[i_d] + i_d2; + } } tree.Fill(); } tree.Write(); } -void makevary(int id) +void make_variable_length(int id) { char c[100]; unsigned char uc[100]; @@ -175,23 +201,33 @@ void makevary(int id) tree.Branch("len_f", &len_f, "len_f/I"); tree.Branch("len_d", &len_d, "len_d/I"); - tree.Branch("n_char", &c, "n_char[len_n]/B"); - tree.Branch("n_uchar", &uc, "n_uchar[len_n]/b"); - tree.Branch("n_short", &s, "n_short[len_n]/S"); + tree.Branch("n_char", &c, "n_char[len_n]/B"); + tree.Branch("n_uchar", &uc, "n_uchar[len_n]/b"); + tree.Branch("n_short", &s, "n_short[len_n]/S"); tree.Branch("n_ushort", &us, "n_ushort[len_n]/s"); - tree.Branch("n_int", &n, "n_int[len_n]/I"); - tree.Branch("n_uint", &un, "n_uint[len_n]/i"); - tree.Branch("n_long", &l, "n_long[len_n]/L"); - tree.Branch("n_ulong", &ul, "n_ulong[len_n]/l"); - - tree.Branch("f_float", &f, "f_float[len_f]/F"); - tree.Branch("d_double", &d, "d_double[len_d]/D"); - - for(int i=0; i<20; i++) { + tree.Branch("n_int", &n, "n_int[len_n]/I"); + tree.Branch("n_uint", &un, "n_uint[len_n]/i"); + tree.Branch("n_long", &l, "n_long[len_n]/L"); + tree.Branch("n_ulong", &ul, "n_ulong[len_n]/l"); + + tree.Branch("f_float", &f, "f_float[len_f]/F"); + tree.Branch("d_double", &d, "d_double[len_d]/D"); + + // 2D with variable-length first axis + int n2[100][2]; + float f2[100][3]; + double d2[100][4]; + tree.Branch("n2_int", &n2, "n2_int[len_n][2]/I"); + tree.Branch("f2_float", &f2, "f2_float[len_f][3]/F"); + tree.Branch("d2_double", &d2, "d2_double[len_d][4]/D"); + + for (int i=0; i<20; i++) + { len_n = i*id; len_f = i*id+1; len_d = i*id+2; - for(int i_n=0; i_nGaus(); y = gRandom->Gaus(); z = gRandom->Gaus(); @@ -289,7 +341,7 @@ void makerandom() file.Close(); } -void makestring() +void make_string() { TFile file("string.root", "RECREATE"); TTree tree("tree", "tree with string branches"); @@ -299,10 +351,12 @@ void makestring() tree.Branch("message", &message); tree.Branch("vect", "std::vector", &vect); tree.Branch("vect2d", "std::vector >", &vect2d); - for (int i=0; i<10; ++i) { + for (int i=0; i<10; ++i) + { vect.clear(); vect2d.clear(); - for (int j=0; j<5; ++j) { + for (int j=0; j<5; ++j) + { vect.push_back("Hello!"); vect2d.push_back(vect); } @@ -312,7 +366,7 @@ void makestring() file.Close(); } -void makeobject(int id) +void make_object(int id) { char buffer[255]; sprintf(buffer, "object%d.root", id); @@ -323,7 +377,8 @@ void makeobject(int id) tree.Branch("entry", &entry, "i/I"); // TLorentzVector is split across multiple subbranches tree.Branch("vect", &vect); - for (entry=0; entry<10; ++entry) { + for (entry=0; entry<10; ++entry) + { vect.SetPtEtaPhiM(entry + id, entry + id, 0, 0); tree.Fill(); } @@ -333,19 +388,19 @@ void makeobject(int id) int main(void) { - makentuple(); - makesingle(1, 2.); - makesingle(2, 3.); - makefixed(1); - makefixed(2); - makevary(1); - makevary(2); - make2tree(1); - makevector(); - makestruct(); - makerandom(); - makestring(); - makeobject(1); - makeobject(2); + make_ntuple(); + make_single(1, 2.); + make_single(2, 3.); + make_fixed_length(1); + make_fixed_length(2); + make_variable_length(1); + make_variable_length(2); + make_trees(); + make_vector(); + make_struct(); + make_random(); + make_string(); + make_object(1); + make_object(2); return 0; } diff --git a/root_numpy/testdata/ntuple.root b/root_numpy/testdata/ntuple.root index 1a8a28c..588b1e7 100644 Binary files a/root_numpy/testdata/ntuple.root and b/root_numpy/testdata/ntuple.root differ diff --git a/root_numpy/testdata/object1.root b/root_numpy/testdata/object1.root index fc7460e..73b3195 100644 Binary files a/root_numpy/testdata/object1.root and b/root_numpy/testdata/object1.root differ diff --git a/root_numpy/testdata/object2.root b/root_numpy/testdata/object2.root index 9e82b97..f3349f2 100644 Binary files a/root_numpy/testdata/object2.root and b/root_numpy/testdata/object2.root differ diff --git a/root_numpy/testdata/single1.root b/root_numpy/testdata/single1.root index 8d29c2f..6bf7d99 100644 Binary files a/root_numpy/testdata/single1.root and b/root_numpy/testdata/single1.root differ diff --git a/root_numpy/testdata/single2.root b/root_numpy/testdata/single2.root index 7bdce72..e84f5e7 100644 Binary files a/root_numpy/testdata/single2.root and b/root_numpy/testdata/single2.root differ diff --git a/root_numpy/testdata/string.root b/root_numpy/testdata/string.root index db1a994..008a9c8 100644 Binary files a/root_numpy/testdata/string.root and b/root_numpy/testdata/string.root differ diff --git a/root_numpy/testdata/struct.root b/root_numpy/testdata/struct.root index a2c4cf4..859a7ce 100644 Binary files a/root_numpy/testdata/struct.root and b/root_numpy/testdata/struct.root differ diff --git a/root_numpy/testdata/test.root b/root_numpy/testdata/test.root index e4f9338..8630fdb 100644 Binary files a/root_numpy/testdata/test.root and b/root_numpy/testdata/test.root differ diff --git a/root_numpy/testdata/trees.root b/root_numpy/testdata/trees.root new file mode 100644 index 0000000..5da8328 Binary files /dev/null and b/root_numpy/testdata/trees.root differ diff --git a/root_numpy/testdata/vary1.root b/root_numpy/testdata/vary1.root index 747c6e5..63bd096 100644 Binary files a/root_numpy/testdata/vary1.root and b/root_numpy/testdata/vary1.root differ diff --git a/root_numpy/testdata/vary2.root b/root_numpy/testdata/vary2.root index 7b16f02..1c8c418 100644 Binary files a/root_numpy/testdata/vary2.root and b/root_numpy/testdata/vary2.root differ diff --git a/root_numpy/testdata/vector.root b/root_numpy/testdata/vector.root index 978f54e..6997750 100644 Binary files a/root_numpy/testdata/vector.root and b/root_numpy/testdata/vector.root differ diff --git a/root_numpy/tests.py b/root_numpy/tests.py index 17cbe6c..fa1bc78 100644 --- a/root_numpy/tests.py +++ b/root_numpy/tests.py @@ -119,7 +119,7 @@ def test_single_filename_not_exist(): @raises(ValueError) def test_double_tree_name_not_specified(): - f = load('doubletree1.root') + f = load('trees.root') a = rnp.root2array(f) @@ -164,21 +164,39 @@ def test_no_supported_branches(): assert_raises(RuntimeError, rnp.tree2array, tree) -def test_fixed(): +def test_preserve_branch_order(): + a = rnp.root2array(load('test.root')) + assert_equal(a.dtype.names, ('i', 'x', 'y', 'z')) + + a = rnp.root2array(load('test.root'), branches=['y', 'x', 'z']) + assert_equal(a.dtype.names, ('y', 'x', 'z')) + + +def test_fixed_length_arrays(): f = load(['fixed1.root', 'fixed2.root']) a = rnp.root2array(f) assert_equal( a.dtype, [('n_int', ' Interval : maximum lower than + minimum``. To place a signal event first:: + + # Get index of first signal event + first_signal = np.nonzero(labels == signal_label)[0][0] + # Swap this with first event + events[0], events[first_signal] = events[first_signal].copy(), events[0].copy() + labels[0], labels[first_signal] = labels[first_signal], labels[0] + weights[0], weights[first_signal] = weights[first_signal], weights[0] """ if not isinstance(factory, TMVA.Factory):