From b2d32f1f90a358ac2d5696142cc19e00ff0c418b Mon Sep 17 00:00:00 2001 From: Noel Dawe Date: Fri, 8 May 2015 10:26:06 +1000 Subject: [PATCH 1/6] bump to 4.2.0 --- root_numpy/info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 21d8df4b66228942fa1208a31910f2637c6c3ecd Mon Sep 17 00:00:00 2001 From: Noel Dawe Date: Wed, 13 May 2015 22:49:44 +1000 Subject: [PATCH 2/6] rewrite tree2array internals for improved speed (some tests show x2 speedup) and support for arrays of arbitrary dimensionality --- README.rst | 8 +- root_numpy/_tree.py | 48 +- root_numpy/src/Column.h | 106 +- root_numpy/src/ROOT.pxi | 16 +- root_numpy/src/TreeChain.h | 105 +- root_numpy/src/Vector2Array.h | 14 - root_numpy/src/_librootnumpy.cpp | 30774 +++++++++++++------------ root_numpy/src/converters.pyx | 507 + root_numpy/src/root_numpy.pxi | 36 +- root_numpy/src/setup.pxi | 1 + root_numpy/src/tree.pyx | 884 +- root_numpy/src/util.h | 11 + root_numpy/testdata/doubletree1.root | Bin 6050 -> 0 bytes root_numpy/testdata/fixed1.root | Bin 8647 -> 16267 bytes root_numpy/testdata/fixed2.root | Bin 8641 -> 16155 bytes root_numpy/testdata/generate.cxx | 173 +- root_numpy/testdata/ntuple.root | Bin 5574 -> 5625 bytes root_numpy/testdata/object1.root | Bin 8008 -> 6462 bytes root_numpy/testdata/object2.root | Bin 8003 -> 6454 bytes root_numpy/testdata/single1.root | Bin 6245 -> 6282 bytes root_numpy/testdata/single2.root | Bin 6245 -> 6282 bytes root_numpy/testdata/string.root | Bin 6367 -> 6410 bytes root_numpy/testdata/struct.root | Bin 5493 -> 5525 bytes root_numpy/testdata/test.root | Bin 6888 -> 6920 bytes root_numpy/testdata/trees.root | Bin 0 -> 6068 bytes root_numpy/testdata/vary1.root | Bin 10502 -> 13795 bytes root_numpy/testdata/vary2.root | Bin 12019 -> 16716 bytes root_numpy/testdata/vector.root | Bin 11318 -> 11333 bytes root_numpy/tests.py | 57 +- 29 files changed, 17108 insertions(+), 15632 deletions(-) delete mode 100644 root_numpy/src/Vector2Array.h create mode 100644 root_numpy/src/converters.pyx delete mode 100644 root_numpy/testdata/doubletree1.root create mode 100644 root_numpy/testdata/trees.root 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/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/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..0ba05f5 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":60 + * + * + * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< + * cdef int ibranch + * cdef TBranch* branch + */ + +#line 60 "root_numpy/src/tree.pyx" +struct __pyx_opt_args_13_librootnumpy_get_tree_structure { + +#line 60 "root_numpy/src/tree.pyx" + int __pyx_n; + +#line 60 "root_numpy/src/tree.pyx" + PyObject *branches; + +#line 60 "root_numpy/src/tree.pyx" +}; + +/* "root_numpy/src/tree.pyx":81 * * * 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 81 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_handle_load { -#line 550 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" int __pyx_n; -#line 550 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" bool ignore_index; -#line 550 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" }; struct __pyx_t_13_librootnumpy_NP2CConverter -#line 550 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" { virtual -#line 550 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" void fill_from(void *); virtual -#line 550 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" ~__pyx_t_13_librootnumpy_NP2CConverter(void); - /* "root_numpy/src/tree.pyx":740 + /* "root_numpy/src/tree.pyx":363 * #################################### * * cdef cppclass NP2CConverter: # <<<<<<<<<<<<<< + * * void fill_from(void* source): - * pass */ -#line 740 "root_numpy/src/tree.pyx" +#line 363 "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 363 "root_numpy/src/tree.pyx" { - /* "root_numpy/src/tree.pyx":747 + /* "root_numpy/src/tree.pyx":372 * * * 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 372 "root_numpy/src/tree.pyx" int nbytes; -#line 747 "root_numpy/src/tree.pyx" +#line 372 "root_numpy/src/tree.pyx" std::string roottype; -#line 747 "root_numpy/src/tree.pyx" +#line 372 "root_numpy/src/tree.pyx" std::string name; -#line 747 "root_numpy/src/tree.pyx" +#line 372 "root_numpy/src/tree.pyx" void *value; -#line 747 "root_numpy/src/tree.pyx" +#line 372 "root_numpy/src/tree.pyx" TBranch *branch; -#line 747 "root_numpy/src/tree.pyx" +#line 372 "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 372 "root_numpy/src/tree.pyx" PyObject *__del__(PyObject *); virtual -#line 747 "root_numpy/src/tree.pyx" +#line 372 "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 372 "root_numpy/src/tree.pyx" }; -/* "root_numpy/src/tree.pyx":807 +/* "root_numpy/src/tree.pyx":419 * * - * 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 419 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_array2tree { -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" int __pyx_n; -#line 807 "root_numpy/src/tree.pyx" - PyObject *name; +#line 419 "root_numpy/src/tree.pyx" + std::string name; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" TTree *tree; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "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"; @@ -2384,6 +2455,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 +2469,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 +2484,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 +2502,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 +2522,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 +2558,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 +2575,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 +2604,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 +2614,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 +2643,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 +2651,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 +2661,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 +2678,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 +2709,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 +2741,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 +2775,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 +2789,20 @@ 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_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 +2821,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 +2864,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 +2885,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 +2905,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 +3040,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 +3061,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 +3072,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 +3101,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 +3220,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,10774 +3240,12067 @@ 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); - - /* "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 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 46 "root_numpy/src/tree.pyx" - __pyx_v_f = TFile::Open(__pyx_t_1, __pyx_k_read); - - /* "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 47 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_v_f == NULL) != 0); - -#line 47 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { - - /* "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 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 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); - -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; - -#line 48 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { - -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); +#line 55 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("create_numpyarray", 0); -#line 48 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +#line 55 "root_numpy/src/converters.pyx" + if (__pyx_optional_args) { -#line 48 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +#line 55 "root_numpy/src/converters.pyx" + if (__pyx_optional_args->__pyx_n > 0) { -#line 48 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 55 "root_numpy/src/converters.pyx" + __pyx_v_ndim = __pyx_optional_args->ndim; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 55 "root_numpy/src/converters.pyx" + if (__pyx_optional_args->__pyx_n > 1) { -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 55 "root_numpy/src/converters.pyx" + __pyx_v_dims = __pyx_optional_args->dims; -#line 48 "root_numpy/src/tree.pyx" +#line 55 "root_numpy/src/converters.pyx" } -#line 48 "root_numpy/src/tree.pyx" +#line 55 "root_numpy/src/converters.pyx" } -#line 48 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 55 "root_numpy/src/converters.pyx" + } -#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;} + /* "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_GOTREF(__pyx_t_3); +#line 56 "root_numpy/src/converters.pyx" + __pyx_v__dims = __pyx_v_dims; -#line 48 "root_numpy/src/tree.pyx" - } else { + /* "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_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 58 "root_numpy/src/converters.pyx" + __pyx_t_1 = ((__pyx_v_dims == NULL) != 0); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 58 "root_numpy/src/converters.pyx" + if (__pyx_t_1) { -#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; + /* "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" - __Pyx_INCREF(__pyx_v_fname); +#line 59 "root_numpy/src/converters.pyx" + __pyx_v__dims = __pyx_v_default_dims; -#line 48 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_fname); + /* "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_GIVEREF(__pyx_v_fname); +#line 60 "root_numpy/src/converters.pyx" + (__pyx_v__dims[0]) = __pyx_v_numele; -#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 60 "root_numpy/src/converters.pyx" + goto __pyx_L3; -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 60 "root_numpy/src/converters.pyx" + } -#line 48 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#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" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#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_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 61 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#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" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 61 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((PyArrayObject *)__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 61 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; + /* "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" - __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 62 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "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" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 64 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_tmp)); -#line 48 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); + /* "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_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 66 "root_numpy/src/converters.pyx" + __pyx_v_nbytes = (__pyx_v_numele * __pyx_v_elesize); -#line 48 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "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" - } +#line 67 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_tmp->data, __pyx_v_src, __pyx_v_nbytes); - /* "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)) + /* "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 49 "root_numpy/src/tree.pyx" - __pyx_v_keys = __pyx_v_f->GetListOfKeys(); +#line 69 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); - /* "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() + /* "root_numpy/src/converters.pyx":70 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * */ -#line 50 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((__pyx_v_keys == NULL) != 0); +#line 70 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); -#line 50 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { +#line 70 "root_numpy/src/converters.pyx" + goto __pyx_L0; - /* "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() + /* "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 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 53 "root_numpy/src/converters.pyx" -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_6 = NULL; +#line 53 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 51 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { +#line 53 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 51 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); +#line 53 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 51 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_6)) { +#line 53 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 51 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +#line 53 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_6); +#line 53 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 53 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_tmp); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#line 53 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 51 "root_numpy/src/tree.pyx" - } +#line 53 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 51 "root_numpy/src/tree.pyx" - } +#line 53 "root_numpy/src/converters.pyx" +} -#line 51 "root_numpy/src/tree.pyx" - if (!__pyx_t_6) { +/* "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_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 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" - } else { +#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_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;} +#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_5); +#line 74 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("create_numpyarray_vectorbool", 0); -#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; + /* "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" - __Pyx_INCREF(__pyx_v_fname); +#line 75 "root_numpy/src/converters.pyx" + __pyx_v_numele = __pyx_v_src->size(); -#line 51 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); + /* "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" - __Pyx_GIVEREF(__pyx_v_fname); +#line 77 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#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;} + /* "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_GOTREF(__pyx_t_3); +#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_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 78 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 51 "root_numpy/src/tree.pyx" - } +#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" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 78 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); -#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 78 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); + /* "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" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 79 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); -#line 51 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__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" - __pyx_t_3 = 0; +#line 81 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_tmp)); -#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;} + /* "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_3); +#line 84 "root_numpy/src/converters.pyx" + __pyx_t_2 = __pyx_v_numele; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#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_Raise(__pyx_t_3, 0, 0, 0); +#line 84 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_3; -#line 51 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + /* "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_filename = __pyx_f[1]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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" - } +#line 85 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "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 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 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 85 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 52 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 85 "root_numpy/src/converters.pyx" + } -#line 52 "root_numpy/src/tree.pyx" - __pyx_v_ret = ((PyObject*)__pyx_t_3); + /* "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 52 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 87 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); - /* "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":88 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * */ -#line 53 "root_numpy/src/tree.pyx" - __pyx_v_n = __pyx_v_keys->GetEntries(); +#line 88 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); - /* "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 88 "root_numpy/src/converters.pyx" + goto __pyx_L0; + + /* "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 55 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_v_n; +#line 74 "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 55 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_8; +#line 74 "root_numpy/src/converters.pyx" + /* function exit code */ - /* "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': - */ +#line 74 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 56 "root_numpy/src/tree.pyx" - __pyx_v_key = ((TKey *)__pyx_v_keys->At(__pyx_v_i)); +#line 74 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); - /* "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 - */ +#line 74 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorbool", __pyx_clineno, __pyx_lineno, __pyx_filename, 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 74 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 74 "root_numpy/src/converters.pyx" + __pyx_L0:; -#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 74 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_tmp); -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 74 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 57 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 74 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 74 "root_numpy/src/converters.pyx" +} -#line 57 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +/* "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 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;} +#line 91 "root_numpy/src/converters.pyx" -#line 57 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); -#line 57 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#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 57 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_clsname, __pyx_t_3); +#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 57 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 91 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("create_numpyarray_vectorstring", 0); - /* "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()) + /* "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 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 92 "root_numpy/src/converters.pyx" + __pyx_v_numele = __pyx_v_src->size(); -#line 58 "root_numpy/src/tree.pyx" - if (!__pyx_t_9) { + /* "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 58 "root_numpy/src/tree.pyx" - } else { +#line 94 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 58 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_9; + /* "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 58 "root_numpy/src/tree.pyx" - goto __pyx_L8_bool_binop_done; +#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 58 "root_numpy/src/tree.pyx" - } +#line 95 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#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;} +#line 95 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; -#line 58 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_9; +#line 95 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 58 "root_numpy/src/tree.pyx" - __pyx_L8_bool_binop_done:; +#line 95 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; -#line 58 "root_numpy/src/tree.pyx" - if (__pyx_t_2) { + /* "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 + */ - /* "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()) - * +#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 96 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#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 96 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((PyArrayObject *)__pyx_t_1); + +#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 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 97 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_tmp); -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "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 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 99 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_tmp)); -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); + /* "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 59 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); +#line 101 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_tmp->data); -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); + /* "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 59 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 104 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; -#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 104 "root_numpy/src/converters.pyx" + for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { -#line 59 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 104 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; -#line 59 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + /* "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" - 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_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_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - goto __pyx_L7; +#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" - } +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 59 "root_numpy/src/tree.pyx" - __pyx_L7:; +#line 105 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); -#line 59 "root_numpy/src/tree.pyx" - } +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); - /* "root_numpy/src/tree.pyx":60 - * if clsname == 'TTree' or clsname == 'TNtuple': - * ret[str(key.GetName())] = None - * return list(ret.keys()) # <<<<<<<<<<<<<< - * - * - */ +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 60 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#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 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;} +#line 105 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 105 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#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 105 "root_numpy/src/converters.pyx" + __Pyx_XDECREF_SET(__pyx_v_py_bytes, __pyx_t_1); -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 105 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 60 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); + /* "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 60 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 106 "root_numpy/src/converters.pyx" + Py_INCREF(__pyx_v_py_bytes); -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; + /* "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 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 107 "root_numpy/src/converters.pyx" + __pyx_v_tmpstrobj = ((PyObject *)__pyx_v_py_bytes); -#line 60 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "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 60 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 108 "root_numpy/src/converters.pyx" + memcpy((&(__pyx_v_dataptr[(__pyx_v_i * __pyx_v_objsize)])), (&__pyx_v_tmpstrobj), (sizeof(PyObject *))); -#line 60 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_3; +#line 108 "root_numpy/src/converters.pyx" + } -#line 60 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; + /* "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" +#line 110 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); + + /* "root_numpy/src/converters.pyx":111 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * + */ + +#line 111 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); + +#line 111 "root_numpy/src/converters.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":45 + /* "root_numpy/src/converters.pyx":91 * * - * def list_trees(fname): # <<<<<<<<<<<<<< - * cdef TFile* f = Open(fname, 'read') - * if f is NULL: + * cdef inline int create_numpyarray_vectorstring(void* buffer, vector[string]* src): # <<<<<<<<<<<<<< + * cdef unsigned long numele = src.size() + * cdef np.npy_intp dims[1] */ -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" /* function exit code */ -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" __pyx_L1_error:; -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); - -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); +#line 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); - -#line 45 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.list_trees", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 91 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorstring", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 45 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 91 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" __pyx_L0:; -#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 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_tmp); -#line 45 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 91 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_py_bytes); -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" return __pyx_r; -#line 45 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":63 +/* "root_numpy/src/converters.pyx":116 + * cdef cppclass Converter: * + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * pass * - * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< - * if tree is None: - * # automatically select single tree */ -#line 63 "root_numpy/src/tree.pyx" +#line 116 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" -/* Python wrapper */ +#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 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 116 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#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 116 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 63 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = 0; +#line 116 "root_numpy/src/converters.pyx" -#line 63 "root_numpy/src/tree.pyx" + +#line 116 "root_numpy/src/converters.pyx" + /* function exit code */ + +#line 116 "root_numpy/src/converters.pyx" + __pyx_r = 0; + +#line 116 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); + +#line 116 "root_numpy/src/converters.pyx" + return __pyx_r; + +#line 116 "root_numpy/src/converters.pyx" +} + +/* "root_numpy/src/converters.pyx":119 + * pass + * + * object get_nptype(): # <<<<<<<<<<<<<< + * pass + * + */ + +#line 119 "root_numpy/src/converters.pyx" + + +#line 119 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_Converter::get_nptype(void) { + +#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 141 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); -#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 141 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 141 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#line 141 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#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" + return __pyx_r; -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); +#line 141 "root_numpy/src/converters.pyx" +} -#line 68 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +/* "root_numpy/src/converters.pyx":147 + * cdef cppclass ObjectConverterBase(Converter): + * + * object get_nptype(): # <<<<<<<<<<<<<< + * return np.object + * + */ -#line 68 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +#line 147 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 147 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptype(void) { -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); +#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" - } + /* "root_numpy/src/converters.pyx":148 + * + * object get_nptype(): + * return np.object # <<<<<<<<<<<<<< + * + * object get_nptypecode(): + */ -#line 68 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 148 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_r); -#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_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_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 148 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#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" - } else { +#line 148 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#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, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; +#line 148 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; -#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" + goto __pyx_L0; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_6); + /* "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_6 = 0; +#line 147 "root_numpy/src/converters.pyx" -#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 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 147 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 147 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 68 "root_numpy/src/tree.pyx" - } +#line 147 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#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_2); -#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_AddTraceback("ObjectConverterBase.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 147 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#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_L0:; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 147 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 68 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 147 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#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" + return __pyx_r; -#line 68 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 147 "root_numpy/src/converters.pyx" +} -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 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_Raise(__pyx_t_3, 0, 0, 0); +#line 150 "root_numpy/src/converters.pyx" -#line 68 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 68 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 150 "root_numpy/src/converters.pyx" +PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptypecode(void) { -#line 68 "root_numpy/src/tree.pyx" - } +#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; -#line 68 "root_numpy/src/tree.pyx" - /*else*/ { +#line 150 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptypecode", 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: + /* "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); + /* "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_6 = NULL; +#line 173 "root_numpy/src/converters.pyx" + __pyx_t_2.__pyx_n = 2; -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 173 "root_numpy/src/converters.pyx" + __pyx_t_2.ndim = this->ndim; -#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.dims = this->dims; -#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_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" - if (likely(__pyx_t_6)) { +#line 173 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_t_1; -#line 76 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); +#line 173 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_6); + /* "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_INCREF(function); +#line 171 "root_numpy/src/converters.pyx" -#line 76 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_4, function); -#line 76 "root_numpy/src/tree.pyx" - __pyx_t_7 = 1; +#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" - } +#line 171 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#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" + return __pyx_r; -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 171 "root_numpy/src/converters.pyx" +} -#line 76 "root_numpy/src/tree.pyx" - if (__pyx_t_6) { +/* "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" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_6); __pyx_t_6 = NULL; +#line 182 "root_numpy/src/converters.pyx" -#line 76 "root_numpy/src/tree.pyx" - } -#line 76 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__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" - PyTuple_SET_ITEM(__pyx_t_8, 0+__pyx_t_7, __pyx_v_tree); +#line 182 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 76 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_tree); - -#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 63 "root_numpy/src/tree.pyx" + +#line 190 "root_numpy/src/converters.pyx" + /* function exit code */ + +#line 190 "root_numpy/src/converters.pyx" + __pyx_L0:; + +#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 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannyDeclarations - -#line 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_branches (wrapper)", 0); - -#line 80 "root_numpy/src/tree.pyx" - { - -#line 80 "root_numpy/src/tree.pyx" - static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; - -#line 80 "root_numpy/src/tree.pyx" - PyObject* values[2] = {0,0}; - -#line 80 "root_numpy/src/tree.pyx" - values[1] = ((PyObject *)Py_None); - -#line 80 "root_numpy/src/tree.pyx" - if (unlikely(__pyx_kwds)) { - -#line 80 "root_numpy/src/tree.pyx" - Py_ssize_t kw_args; - -#line 80 "root_numpy/src/tree.pyx" - const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); +#line 195 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptype", 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); + /* "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" - case 0: break; - default: -#line 80 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +#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" - kw_args = PyDict_Size(__pyx_kwds); +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - switch (pos_args) { +#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" - case 0: +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - case 1: +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - if (kw_args > 0) { +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#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_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" - if (value) { values[1] = value; kw_args--; } +#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" - } +#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" - if (unlikely(kw_args > 0)) { +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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;} +#line 196 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - } +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - } else { +#line 196 "root_numpy/src/converters.pyx" + __Pyx_INCREF(((PyObject *)this->shape)); -#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 196 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)this->shape)); -#line 80 "root_numpy/src/tree.pyx" - break; - default: -#line 80 "root_numpy/src/tree.pyx" -goto __pyx_L5_argtuple_error; +#line 196 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(((PyObject *)this->shape)); -#line 80 "root_numpy/src/tree.pyx" - } +#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" - __pyx_v_fname = values[0]; +#line 196 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; -#line 80 "root_numpy/src/tree.pyx" - __pyx_v_tree = values[1]; +#line 196 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 80 "root_numpy/src/tree.pyx" - } + /* "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" - goto __pyx_L4_argument_unpacking_done; +#line 195 "root_numpy/src/converters.pyx" -#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 80 "root_numpy/src/tree.pyx" - __pyx_L3_error:; +#line 195 "root_numpy/src/converters.pyx" + /* function exit code */ -#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" + __pyx_L1_error:; -#line 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 195 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" - return NULL; +#line 195 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#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 195 "root_numpy/src/converters.pyx" + __Pyx_AddTraceback("FixedArrayConverter.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 80 "root_numpy/src/tree.pyx" +#line 195 "root_numpy/src/converters.pyx" + __pyx_r = 0; +#line 195 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 80 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 195 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 80 "root_numpy/src/tree.pyx" +#line 195 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 80 "root_numpy/src/tree.pyx" +#line 195 "root_numpy/src/converters.pyx" return __pyx_r; -#line 80 "root_numpy/src/tree.pyx" +#line 195 "root_numpy/src/converters.pyx" } -#line 80 "root_numpy/src/tree.pyx" +/* "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 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 198 "root_numpy/src/converters.pyx" +int __pyx_t_13_librootnumpy_FixedArrayConverter::get_nptypecode(void) { -#line 80 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; +#line 198 "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; - 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 80 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("list_branches", 0); +#line 198 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("get_nptypecode", 0); - /* "root_numpy/src/tree.pyx":81 + /* "root_numpy/src/converters.pyx":199 * - * def list_branches(fname, tree=None): - * return list(list_structures(fname, tree).keys()) # <<<<<<<<<<<<<< + * int get_nptypecode(): + * return this.conv.nptypecode # <<<<<<<<<<<<<< * * */ -#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 81 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { +#line 199 "root_numpy/src/converters.pyx" + __pyx_r = this->conv->nptypecode; -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); +#line 199 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 81 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_4)) { + /* "root_numpy/src/converters.pyx":198 + * return (np.dtype(this.conv.nptype), this.shape) + * + * int get_nptypecode(): # <<<<<<<<<<<<<< + * return this.conv.nptypecode + * + */ -#line 81 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); +#line 198 "root_numpy/src/converters.pyx" -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_4); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 198 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_3, function); +#line 198 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_5 = 1; +#line 198 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 81 "root_numpy/src/tree.pyx" - } +#line 198 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 81 "root_numpy/src/tree.pyx" - } +#line 198 "root_numpy/src/converters.pyx" +} -#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;} +/* "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" - __Pyx_GOTREF(__pyx_t_6); +#line 207 "root_numpy/src/converters.pyx" -#line 81 "root_numpy/src/tree.pyx" - if (__pyx_t_4) { -#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 207 "root_numpy/src/converters.pyx" +template -#line 81 "root_numpy/src/tree.pyx" - } +#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; + int __pyx_t_4; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_fname); +#line 207 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 81 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_v_fname); + /* "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_GIVEREF(__pyx_v_fname); +#line 208 "root_numpy/src/converters.pyx" + __pyx_v_ast = TypeName (); -#line 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_tree); + /* "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" - PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_tree); +#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" - __Pyx_GIVEREF(__pyx_v_tree); +#line 209 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#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 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" +#line 209 "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 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" +#line 209 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 81 "root_numpy/src/tree.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 81 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); - -#line 81 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_2)) { - -#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 81 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); - -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_3, function); - -#line 81 "root_numpy/src/tree.pyx" - } +#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" - if (__pyx_t_2) { +#line 209 "root_numpy/src/converters.pyx" + __pyx_v_info = __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 209 "root_numpy/src/converters.pyx" + __pyx_t_3 = 0; -#line 81 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + /* "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" - } else { +#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" - __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 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_GOTREF(__pyx_t_1); +#line 210 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" +#line 210 "root_numpy/src/converters.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#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 81 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); +#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_GIVEREF(__pyx_t_1); +#line 210 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 81 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 210 "root_numpy/src/converters.pyx" + this->elesize = __pyx_t_4; -#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":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_GOTREF(__pyx_t_1); +#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" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 211 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#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" - __pyx_t_1 = 0; +#line 211 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 81 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 211 "root_numpy/src/converters.pyx" + this->nptypecode = __pyx_t_4; - /* "root_numpy/src/tree.pyx":80 - * - * - * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< - * return list(list_structures(fname, tree).keys()) + /* "root_numpy/src/converters.pyx":207 + * Vector2Array[T] v2a * + * __init__(): # <<<<<<<<<<<<<< + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] */ -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" /* function exit code */ -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" + goto __pyx_L0; + +#line 207 "root_numpy/src/converters.pyx" __pyx_L1_error:; -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); - -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); - -#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 207 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" __pyx_L0:; -#line 80 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 207 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_info); -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" __Pyx_RefNannyFinishContext(); -#line 80 "root_numpy/src/tree.pyx" - return __pyx_r; - -#line 80 "root_numpy/src/tree.pyx" +#line 207 "root_numpy/src/converters.pyx" } -/* "root_numpy/src/tree.pyx":84 - * +/* "root_numpy/src/converters.pyx":213 + * this.nptypecode = info[2] * - * cdef parse_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< - * cdef TObjArray* leaves - * cdef TLeaf* leaf + * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< + * cdef vector[T]* tmp = col.GetValuePointer() + * cdef unsigned long numele = tmp.size() */ -#line 84 "root_numpy/src/tree.pyx" +#line 213 "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" +#line 213 "root_numpy/src/converters.pyx" +template + +#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" ; - const char *__pyx_v_lname -#line 84 "root_numpy/src/tree.pyx" + unsigned long __pyx_v_numele +#line 213 "root_numpy/src/converters.pyx" ; - PyObject *__pyx_v_ltype = NULL -#line 84 "root_numpy/src/tree.pyx" + T *__pyx_v_fa +#line 213 "root_numpy/src/converters.pyx" ; -#line 84 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; +#line 213 "root_numpy/src/converters.pyx" + int __pyx_r; __Pyx_RefNannyDeclarations - int __pyx_t_1; - 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_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 213 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 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":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 88 "root_numpy/src/tree.pyx" - __pyx_v_leaves = __pyx_v_branch->GetListOfLeaves(); +#line 214 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); - /* "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":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 89 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_leaves == NULL) != 0); - -#line 89 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 215 "root_numpy/src/converters.pyx" + __pyx_v_numele = __pyx_v_tmp->size(); - /* "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()): + /* "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 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 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); - -#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 218 "root_numpy/src/converters.pyx" + __pyx_v_fa = this->v2a.convert(__pyx_v_tmp); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); + /* "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) # <<<<<<<<<<<<<< + * + * + */ -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_5 = NULL; +#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 90 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { +#line 219 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 90 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); + /* "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 90 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_5)) { +#line 213 "root_numpy/src/converters.pyx" -#line 90 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 213 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 90 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 213 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_3, function); +#line 213 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 90 "root_numpy/src/tree.pyx" - } +#line 213 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 90 "root_numpy/src/tree.pyx" - } +#line 213 "root_numpy/src/converters.pyx" +} -#line 90 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +/* "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_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 227 "root_numpy/src/converters.pyx" -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 227 "root_numpy/src/converters.pyx" +template -#line 90 "root_numpy/src/tree.pyx" - } else { +#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_info = NULL +#line 227 "root_numpy/src/converters.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 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 227 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("", 0); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); + /* "root_numpy/src/converters.pyx":228 + * + * __init__(): + * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize + */ -#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 228 "root_numpy/src/converters.pyx" + __pyx_v_ast = TypeName (); -#line 90 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_4); + /* "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 90 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_4); +#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 90 "root_numpy/src/tree.pyx" - __pyx_t_4 = 0; +#line 229 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#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 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_GOTREF(__pyx_t_2); +#line 229 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#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" - } +#line 229 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#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_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 229 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 229 "root_numpy/src/converters.pyx" + __pyx_v_info = __pyx_t_3; -#line 90 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); +#line 229 "root_numpy/src/converters.pyx" + __pyx_t_3 = 0; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_2); + /* "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" - __pyx_t_2 = 0; +#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_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 230 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#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_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 230 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 90 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 230 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 90 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#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_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 230 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 90 "root_numpy/src/tree.pyx" - } +#line 230 "root_numpy/src/converters.pyx" + this->elesize = __pyx_t_4; - /* "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":231 + * info = TYPES[ast.name] + * this.elesize = info[1].itemsize + * this.nptypecode = info[2] # <<<<<<<<<<<<<< + * + * int write(Column* col, void* buffer): */ -#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 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 91 "root_numpy/src/tree.pyx" +#line 231 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 91 "root_numpy/src/tree.pyx" - __pyx_v_leaflist = ((PyObject*)__pyx_t_2); +#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 91 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 231 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __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 231 "root_numpy/src/converters.pyx" + this->nptypecode = __pyx_t_4; + + /* "root_numpy/src/converters.pyx":227 + * Vector2Array[T] v2a + * + * __init__(): # <<<<<<<<<<<<<< + * cdef TypeName[T] ast = TypeName[T]() + * info = TYPES[ast.name] */ -#line 92 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_v_leaves->GetEntries(); +#line 227 "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 92 "root_numpy/src/tree.pyx" - __pyx_v_ileaf = __pyx_t_8; +#line 227 "root_numpy/src/converters.pyx" + /* function exit code */ - /* "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()) - */ +#line 227 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 93 "root_numpy/src/tree.pyx" - __pyx_v_leaf = ((TLeaf *)__pyx_v_leaves->At(__pyx_v_ileaf)); +#line 227 "root_numpy/src/converters.pyx" + __pyx_L1_error:; - /* "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)) - */ +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 94 "root_numpy/src/tree.pyx" - __pyx_v_lname = __pyx_v_leaf->GetName(); +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); - /* "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 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_3); -#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 227 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorVectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 95 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 227 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 95 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_ltype, ((PyObject*)__pyx_t_2)); +#line 227 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_info); -#line 95 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 227 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); - /* "root_numpy/src/tree.pyx":96 - * lname = leaf.GetName() - * ltype = resolve_type(leaf.GetTypeName()) - * leaflist.append((lname, ltype)) # <<<<<<<<<<<<<< - * if not leaflist: - * raise RuntimeError( - */ +#line 227 "root_numpy/src/converters.pyx" +} -#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;} +/* "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 96 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 233 "root_numpy/src/converters.pyx" -#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 96 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 233 "root_numpy/src/converters.pyx" +template -#line 96 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); +#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 96 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_2); +#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 96 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ltype); +#line 233 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 96 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_ltype); + /* "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 96 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_ltype); +#line 234 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); -#line 96 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; + /* "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 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 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 96 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 239 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 96 "root_numpy/src/tree.pyx" - } +#line 239 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; - /* "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( - */ +#line 239 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 97 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_leaflist != Py_None) && (PyList_GET_SIZE(__pyx_v_leaflist) != 0); +#line 239 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; -#line 97 "root_numpy/src/tree.pyx" - __pyx_t_10 = ((!__pyx_t_1) != 0); + /* "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 97 "root_numpy/src/tree.pyx" - if (__pyx_t_10) { +#line 240 "root_numpy/src/converters.pyx" + __pyx_v_objtypecode = NPY_OBJECT; - /* "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":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 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 241 "root_numpy/src/converters.pyx" + __pyx_v_numele = (__pyx_v_tmp[0]).size(); - /* "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":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 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 100 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 246 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 100 "root_numpy/src/tree.pyx" - __pyx_t_4 = NULL; + /* "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 100 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_2))) { +#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 100 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_2); +#line 247 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 100 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_4)) { +#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 100 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); +#line 247 "root_numpy/src/converters.pyx" + __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_4); +#line 247 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 100 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); + /* "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 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_2, function); +#line 248 "root_numpy/src/converters.pyx" + __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); -#line 100 "root_numpy/src/tree.pyx" - } + /* "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 100 "root_numpy/src/tree.pyx" - } +#line 250 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_outer)); -#line 100 "root_numpy/src/tree.pyx" - if (!__pyx_t_4) { + /* "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_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 252 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + /* "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_GOTREF(__pyx_t_3); +#line 255 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_outer->data); -#line 100 "root_numpy/src/tree.pyx" - } else { + /* "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_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 258 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; -#line 100 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#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" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; +#line 258 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; -#line 100 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_6); + /* "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_GIVEREF(__pyx_t_6); +#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_t_6 = 0; + /* "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" - __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 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" - __Pyx_GOTREF(__pyx_t_3); +#line 260 "root_numpy/src/converters.pyx" + } -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + /* "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" - } +#line 262 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_outerobj)); -#line 100 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 262 "root_numpy/src/converters.pyx" + goto __pyx_L0; - /* "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":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 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 233 "root_numpy/src/converters.pyx" -#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 233 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 98 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_3); +#line 233 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 98 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 233 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#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 233 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("VectorVectorConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 98 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 233 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 98 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 233 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 98 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_3, 0, 0, 0); +#line 233 "root_numpy/src/converters.pyx" + __Pyx_XDECREF((PyObject *)__pyx_v_outer); -#line 98 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 233 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 98 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 233 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 98 "root_numpy/src/tree.pyx" - } +#line 233 "root_numpy/src/converters.pyx" +} - /* "root_numpy/src/tree.pyx":101 - * "leaf list for branch {0} is empty".format( - * branch.GetName())) - * return leaflist # <<<<<<<<<<<<<< - * - * +/* "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 101 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 267 "root_numpy/src/converters.pyx" -#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 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 101 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 267 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations - /* "root_numpy/src/tree.pyx":84 - * +#line 267 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); + + /* "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) * - * cdef parse_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< - * cdef TObjArray* leaves - * cdef TLeaf* leaf */ -#line 84 "root_numpy/src/tree.pyx" - - -#line 84 "root_numpy/src/tree.pyx" - /* function exit code */ - -#line 84 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 268 "root_numpy/src/converters.pyx" + __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); + /* "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 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 269 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(__pyx_v_buffer, __pyx_v_tmp); -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); +#line 269 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 84 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); + /* "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" - __Pyx_XDECREF(__pyx_t_6); +#line 267 "root_numpy/src/converters.pyx" -#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 267 "root_numpy/src/converters.pyx" + /* function exit code */ -#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 279 "root_numpy/src/converters.pyx" + __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; -#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 279 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 107 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 279 "root_numpy/src/converters.pyx" + __pyx_v_objsize = __pyx_t_2; -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_3 = NULL; + /* "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" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_2))) { +#line 280 "root_numpy/src/converters.pyx" + __pyx_v_objtypecode = NPY_OBJECT; -#line 107 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); + /* "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" - if (likely(__pyx_t_3)) { +#line 281 "root_numpy/src/converters.pyx" + __pyx_v_numele = (__pyx_v_tmp[0]).size(); -#line 107 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); + /* "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" - __Pyx_INCREF(__pyx_t_3); +#line 286 "root_numpy/src/converters.pyx" + (__pyx_v_dims[0]) = __pyx_v_numele; -#line 107 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); + /* "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" - __Pyx_DECREF_SET(__pyx_t_2, function); +#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" - } +#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" - if (__pyx_t_3) { +#line 287 "root_numpy/src/converters.pyx" + __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); -#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 287 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 107 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + /* "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 107 "root_numpy/src/tree.pyx" - } else { +#line 288 "root_numpy/src/converters.pyx" + __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); -#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":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 107 "root_numpy/src/tree.pyx" - } +#line 290 "root_numpy/src/converters.pyx" + Py_INCREF(((PyObject *)__pyx_v_outer)); -#line 107 "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 107 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 292 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); -#line 107 "root_numpy/src/tree.pyx" - __pyx_v_ret = __pyx_t_1; + /* "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 107 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 295 "root_numpy/src/converters.pyx" + __pyx_v_dataptr = ((char *)__pyx_v_outer->data); - /* "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":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 108 "root_numpy/src/tree.pyx" - __pyx_t_4 = (__pyx_v_branches != Py_None); +#line 298 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_numele; -#line 108 "root_numpy/src/tree.pyx" - __pyx_t_5 = (__pyx_t_4 != 0); +#line 298 "root_numpy/src/converters.pyx" + for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { -#line 108 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 298 "root_numpy/src/converters.pyx" + __pyx_v_i = __pyx_t_4; - /* "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":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" - if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { +#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_1 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; +#line 299 "root_numpy/src/converters.pyx" + } -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_7 = NULL; + /* "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 { - __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 300 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_outerobj)); -#line 109 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 300 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#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;} + /* "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" - } +#line 274 "root_numpy/src/converters.pyx" -#line 109 "root_numpy/src/tree.pyx" - for (;;) { -#line 109 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_7)) { +#line 274 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 109 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_1))) { +#line 274 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 109 "root_numpy/src/tree.pyx" - if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; +#line 274 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 109 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#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" - __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;} +#line 274 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 109 "root_numpy/src/tree.pyx" - #else +#line 274 "root_numpy/src/converters.pyx" + __pyx_L0:; -#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" + __Pyx_XDECREF((PyObject *)__pyx_v_outer); -#line 109 "root_numpy/src/tree.pyx" - #endif +#line 274 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); -#line 109 "root_numpy/src/tree.pyx" - } else { +#line 274 "root_numpy/src/converters.pyx" + return __pyx_r; -#line 109 "root_numpy/src/tree.pyx" - if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; +#line 274 "root_numpy/src/converters.pyx" +} -#line 109 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +/* "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" - __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 304 "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 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" - #endif +#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" - } - } else -#line 109 "root_numpy/src/tree.pyx" -{ +#line 304 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_t_7(__pyx_t_1); + /* "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 109 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_2)) { +#line 305 "root_numpy/src/converters.pyx" + __pyx_v_s = ((std::string *)__pyx_v_col->GetValuePointer()); -#line 109 "root_numpy/src/tree.pyx" - PyObject* exc_type = PyErr_Occurred(); + /* "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 109 "root_numpy/src/tree.pyx" - if (exc_type) { +#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;} -#line 109 "root_numpy/src/tree.pyx" - if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 109 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 109 "root_numpy/src/tree.pyx" - } +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 109 "root_numpy/src/tree.pyx" - break; +#line 306 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); -#line 109 "root_numpy/src/tree.pyx" - } +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 109 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 306 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 109 "root_numpy/src/tree.pyx" - } +#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 109 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_branch_name, __pyx_t_2); +#line 306 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 109 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 306 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 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 - */ +#line 306 "root_numpy/src/converters.pyx" + __pyx_v_py_bytes = __pyx_t_1; -#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 306 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 110 "root_numpy/src/tree.pyx" - __pyx_v_branch = __pyx_v_tree->GetBranch(__pyx_t_8); + /* "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) + */ - /* "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) +#line 307 "root_numpy/src/converters.pyx" + __pyx_v_tmpobj = ((PyObject *)__pyx_v_py_bytes); + + /* "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 111 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_branch == NULL) != 0); +#line 309 "root_numpy/src/converters.pyx" + Py_INCREF(__pyx_v_py_bytes); -#line 111 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { + /* "root_numpy/src/converters.pyx":311 + * Py_INCREF(py_bytes) + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< + * return sizeof(tmpobj) + * + */ - /* "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 311 "root_numpy/src/converters.pyx" + memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); + + /* "root_numpy/src/converters.pyx":312 + * # now write PyObject* to buffer + * memcpy(buffer, &tmpobj, sizeof(PyObject*)) + * return sizeof(tmpobj) # <<<<<<<<<<<<<< + * + * */ -#line 112 "root_numpy/src/tree.pyx" - goto __pyx_L4_continue; +#line 312 "root_numpy/src/converters.pyx" + __pyx_r = (sizeof(__pyx_v_tmpobj)); -#line 112 "root_numpy/src/tree.pyx" - } +#line 312 "root_numpy/src/converters.pyx" + goto __pyx_L0; - /* "root_numpy/src/tree.pyx":113 - * if branch is NULL: - * continue - * ret[branch.GetName()] = parse_branch_structure(branch) # <<<<<<<<<<<<<< - * return ret - * # all branches + /* "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 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 304 "root_numpy/src/converters.pyx" -#line 113 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); -#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 304 "root_numpy/src/converters.pyx" + /* function exit code */ -#line 113 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 304 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#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 304 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 113 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 304 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 113 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 304 "root_numpy/src/converters.pyx" + __Pyx_WriteUnraisable("StringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 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: - */ +#line 304 "root_numpy/src/converters.pyx" + __pyx_r = 0; -#line 109 "root_numpy/src/tree.pyx" - __pyx_L4_continue:; +#line 304 "root_numpy/src/converters.pyx" + __pyx_L0:; -#line 109 "root_numpy/src/tree.pyx" - } +#line 304 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_py_bytes); -#line 109 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 304 "root_numpy/src/converters.pyx" + __Pyx_RefNannyFinishContext(); - /* "root_numpy/src/tree.pyx":114 - * continue - * ret[branch.GetName()] = parse_branch_structure(branch) - * return ret # <<<<<<<<<<<<<< - * # all branches - * cdef TObjArray* all_branches = tree.GetListOfBranches() +#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 114 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 316 "root_numpy/src/converters.pyx" -#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 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 114 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 316 "root_numpy/src/converters.pyx" + int __pyx_r; + __Pyx_RefNannyDeclarations -#line 114 "root_numpy/src/tree.pyx" - } +#line 316 "root_numpy/src/converters.pyx" + __Pyx_RefNannySetupContext("write", 0); - /* "root_numpy/src/tree.pyx":116 - * return ret - * # all branches - * cdef TObjArray* all_branches = tree.GetListOfBranches() # <<<<<<<<<<<<<< - * if all_branches is NULL: - * return ret - */ - -#line 116 "root_numpy/src/tree.pyx" - __pyx_v_all_branches = __pyx_v_tree->GetListOfBranches(); - - /* "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()): - */ - -#line 117 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_all_branches == NULL) != 0); - -#line 117 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { - - /* "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)) - */ - -#line 118 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); - -#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 118 "root_numpy/src/tree.pyx" - goto __pyx_L0; - -#line 118 "root_numpy/src/tree.pyx" - } - - /* "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 119 "root_numpy/src/tree.pyx" - __pyx_t_9 = __pyx_v_all_branches->GetEntries(); - -#line 119 "root_numpy/src/tree.pyx" - for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) { - -#line 119 "root_numpy/src/tree.pyx" - __pyx_v_ibranch = __pyx_t_10; - - /* "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 120 "root_numpy/src/tree.pyx" - __pyx_v_branch = ((TBranch *)__pyx_v_all_branches->At(__pyx_v_ibranch)); - - /* "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 + /* "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" - __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 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 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 121 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - -#line 121 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - -#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 131 "root_numpy/src/tree.pyx" +#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 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" ; - -#line 162 "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; + 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 438 "root_numpy/src/converters.pyx" + __pyx_t_13_librootnumpy_Converter *__pyx_r; + __Pyx_RefNannyDeclarations + 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; + 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); - - /* "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_INCREF(__pyx_empty_tuple); -#line 170 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_tmp)); +#line 450 "root_numpy/src/converters.pyx" + __pyx_v_leaf_shape = __pyx_empty_tuple; - /* "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 + /* "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 172 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_tmp->data); - - /* "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_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;} -#line 175 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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_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;} -#line 175 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); - /* "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_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#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_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 176 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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_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_GOTREF(__pyx_t_5); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_4); -#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 = NULL; -#line 176 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_6 = 0; -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#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" - __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_t_5 = PyMethod_GET_SELF(__pyx_t_3); -#line 176 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + if (likely(__pyx_t_5)) { -#line 176 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 453 "root_numpy/src/converters.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#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_INCREF(__pyx_t_5); -#line 176 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_INCREF(function); - /* "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" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 177 "root_numpy/src/tree.pyx" - Py_INCREF(__pyx_v_py_bytes); +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_6 = 1; - /* "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" + } -#line 178 "root_numpy/src/tree.pyx" - __pyx_v_tmpstrobj = ((PyObject *)__pyx_v_py_bytes); +#line 453 "root_numpy/src/converters.pyx" + } - /* "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" + __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;} -#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" + __Pyx_GOTREF(__pyx_t_7); -#line 179 "root_numpy/src/tree.pyx" - } +#line 453 "root_numpy/src/converters.pyx" + if (__pyx_t_5) { - /* "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_5); __Pyx_GIVEREF(__pyx_t_5); __pyx_t_5 = NULL; -#line 181 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); +#line 453 "root_numpy/src/converters.pyx" + } - /* "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, 0+__pyx_t_6, __pyx_t_2); -#line 182 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_tmpobj)); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 182 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 453 "root_numpy/src/converters.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_6, __pyx_t_4); - /* "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_GIVEREF(__pyx_t_4); -#line 162 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_2 = 0; +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_4 = 0; -#line 162 "root_numpy/src/tree.pyx" - /* function exit code */ +#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 162 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 453 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); +#line 453 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 162 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.create_numpyarray_vectorstring", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 453 "root_numpy/src/converters.pyx" + __pyx_v_match = __pyx_t_1; -#line 162 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 453 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 162 "root_numpy/src/tree.pyx" - __pyx_L0:; + /* "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" - __Pyx_XDECREF((PyObject *)__pyx_v_tmp); +#line 454 "root_numpy/src/converters.pyx" + __pyx_t_8 = (__pyx_v_match != Py_None); -#line 162 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_py_bytes); +#line 454 "root_numpy/src/converters.pyx" + __pyx_t_9 = (__pyx_t_8 != 0); -#line 162 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 454 "root_numpy/src/converters.pyx" + if (__pyx_t_9) { -#line 162 "root_numpy/src/tree.pyx" - return __pyx_r; + /* "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" -} +#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;} -/* "root_numpy/src/tree.pyx":186 - * - * cdef cppclass Converter: - * __init__(): # <<<<<<<<<<<<<< - * pass - * - */ +#line 455 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 186 "root_numpy/src/tree.pyx" +#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 455 "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 455 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 186 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 455 "root_numpy/src/converters.pyx" + __pyx_v_arraydef = __pyx_t_3; -#line 186 "root_numpy/src/tree.pyx" +#line 455 "root_numpy/src/converters.pyx" + __pyx_t_3 = 0; + /* "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 186 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 456 "root_numpy/src/converters.pyx" + __pyx_t_9 = (__pyx_v_arraydef != Py_None); -#line 186 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 456 "root_numpy/src/converters.pyx" + __pyx_t_8 = (__pyx_t_9 != 0); -#line 186 "root_numpy/src/tree.pyx" -} +#line 456 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -/* "root_numpy/src/tree.pyx":189 - * pass - * - * __dealloc__(): # <<<<<<<<<<<<<< - * pass - * + /* "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 189 "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 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_GOTREF(__pyx_t_3); -#line 189 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#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 189 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 189 "root_numpy/src/tree.pyx" - /* function exit code */ +#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 189 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 189 "root_numpy/src/tree.pyx" -} +#line 457 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -/* "root_numpy/src/tree.pyx":192 - * pass - * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * pass - * - */ +#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;} -#line 192 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#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 457 "root_numpy/src/converters.pyx" + __pyx_v_arraytokens = __pyx_t_1; -#line 192 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 457 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 192 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 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 192 "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 192 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 458 "root_numpy/src/converters.pyx" + __pyx_v_shape = ((PyObject*)__pyx_t_1); -#line 192 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 458 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#line 192 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "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) + */ -#line 192 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 460 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_leaf_count != NULL) != 0); -#line 192 "root_numpy/src/tree.pyx" -} +#line 460 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -/* "root_numpy/src/tree.pyx":195 - * pass - * - * object get_nptype(): # <<<<<<<<<<<<<< - * pass - * + /* "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 195 "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 195 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_Converter::get_nptype(void) { +#line 462 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 195 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations +#line 462 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 195 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); + /* "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 195 "root_numpy/src/tree.pyx" +#line 463 "root_numpy/src/converters.pyx" + __pyx_v_leaf_shape_type = __pyx_e_13_librootnumpy_VARIABLE_LENGTH_ARRAY; +#line 463 "root_numpy/src/converters.pyx" + goto __pyx_L5; -#line 195 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 463 "root_numpy/src/converters.pyx" + } -#line 195 "root_numpy/src/tree.pyx" - __pyx_r = Py_None; __Pyx_INCREF(Py_None); +#line 463 "root_numpy/src/converters.pyx" + /*else*/ { -#line 195 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); + /* "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 195 "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 195 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 465 "root_numpy/src/converters.pyx" + } -#line 195 "root_numpy/src/tree.pyx" -} +#line 465 "root_numpy/src/converters.pyx" + __pyx_L5:; -/* "root_numpy/src/tree.pyx":205 - * string nptype + /* "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) * - * __init__(int size, string nptype, int nptypecode): # <<<<<<<<<<<<<< - * this.size = size - * this.nptypecode = nptypecode */ -#line 205 "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 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" + if (likely(PyList_CheckExact(__pyx_v_arraytokens)) || PyTuple_CheckExact(__pyx_v_arraytokens)) { -#line 205 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_3 = __pyx_v_arraytokens; __Pyx_INCREF(__pyx_t_3); __pyx_t_6 = 0; - /* "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" + __pyx_t_10 = NULL; -#line 206 "root_numpy/src/tree.pyx" - this->size = __pyx_v_size; +#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;} - /* "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" + __Pyx_GOTREF(__pyx_t_3); -#line 207 "root_numpy/src/tree.pyx" - this->nptypecode = __pyx_v_nptypecode; +#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;} - /* "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" + } -#line 208 "root_numpy/src/tree.pyx" - this->nptype = __pyx_v_nptype; +#line 466 "root_numpy/src/converters.pyx" + for (;;) { - /* "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 (likely(!__pyx_t_10)) { -#line 205 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + if (likely(PyList_CheckExact(__pyx_t_3))) { +#line 466 "root_numpy/src/converters.pyx" + if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_3)) break; -#line 205 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 466 "root_numpy/src/converters.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 205 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#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 205 "root_numpy/src/tree.pyx" -} +#line 466 "root_numpy/src/converters.pyx" + #else -/* "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" + __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 210 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + #endif +#line 466 "root_numpy/src/converters.pyx" + } else { -#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" + if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_3)) break; -#line 210 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 466 "root_numpy/src/converters.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 210 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#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":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" + #else -#line 211 "root_numpy/src/tree.pyx" - __pyx_v_src = __pyx_v_col->GetValuePointer(); +#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":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" + #endif -#line 212 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, __pyx_v_src, this->size); +#line 466 "root_numpy/src/converters.pyx" + } + } else +#line 466 "root_numpy/src/converters.pyx" +{ - /* "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_t_7 = __pyx_t_10(__pyx_t_3); -#line 213 "root_numpy/src/tree.pyx" - __pyx_r = this->size; +#line 466 "root_numpy/src/converters.pyx" + if (unlikely(!__pyx_t_7)) { -#line 213 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 466 "root_numpy/src/converters.pyx" + PyObject* exc_type = PyErr_Occurred(); - /* "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 (exc_type) { -#line 210 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 466 "root_numpy/src/converters.pyx" + else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 210 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 466 "root_numpy/src/converters.pyx" + } -#line 210 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 466 "root_numpy/src/converters.pyx" + break; -#line 210 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 466 "root_numpy/src/converters.pyx" + } -#line 210 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 466 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_7); -#line 210 "root_numpy/src/tree.pyx" -} +#line 466 "root_numpy/src/converters.pyx" + } -/* "root_numpy/src/tree.pyx":215 - * return this.size - * - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.dtype(this.nptype) - * - */ +#line 466 "root_numpy/src/converters.pyx" + __Pyx_XDECREF_SET(__pyx_v_token, __pyx_t_7); -#line 215 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/converters.pyx" + __pyx_t_7 = 0; +#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;} -#line 215 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_BasicConverter::get_nptype(void) { +#line 466 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_7); -#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 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 215 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); +#line 466 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":216 - * - * object get_nptype(): - * return np.dtype(this.nptype) # <<<<<<<<<<<<<< - * - * int get_nptypecode(): - */ +#line 466 "root_numpy/src/converters.pyx" + } -#line 216 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 466 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#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 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 216 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 466 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#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;} + /* "root_numpy/src/converters.pyx":467 + * leaf_shape_type = FIXED_LENGTH_ARRAY + * shape.extend([int(token) for token in arraytokens]) + * leaf_shape = tuple(shape) # <<<<<<<<<<<<<< + * + * if leaf_shape_type == SINGLE_VALUE: + */ -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#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 216 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); +#line 467 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 467 "root_numpy/src/converters.pyx" + __Pyx_DECREF_SET(__pyx_v_leaf_shape, ((PyObject*)__pyx_t_1)); -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 467 "root_numpy/src/converters.pyx" + __pyx_t_1 = 0; -#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 467 "root_numpy/src/converters.pyx" + goto __pyx_L4; -#line 216 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 467 "root_numpy/src/converters.pyx" + } -#line 216 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 467 "root_numpy/src/converters.pyx" + __pyx_L4:; -#line 216 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#line 467 "root_numpy/src/converters.pyx" + goto __pyx_L3; -#line 216 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 467 "root_numpy/src/converters.pyx" + } -#line 216 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 467 "root_numpy/src/converters.pyx" + __pyx_L3:; - /* "root_numpy/src/tree.pyx":215 - * return this.size + /* "root_numpy/src/converters.pyx":469 + * leaf_shape = tuple(shape) * - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.dtype(this.nptype) + * if leaf_shape_type == SINGLE_VALUE: # <<<<<<<<<<<<<< + * return find_converter_by_typename(leaf_type) * */ -#line 215 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_leaf_shape_type == __pyx_e_13_librootnumpy_SINGLE_VALUE) != 0); +#line 469 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 215 "root_numpy/src/tree.pyx" - /* function exit code */ + /* "root_numpy/src/converters.pyx":470 + * + * if leaf_shape_type == SINGLE_VALUE: + * return find_converter_by_typename(leaf_type) # <<<<<<<<<<<<<< + * + * if leaf_shape_type == VARIABLE_LENGTH_ARRAY: + */ -#line 215 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#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 215 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 470 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); -#line 215 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); - -#line 215 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("BasicConverter.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); - -#line 215 "root_numpy/src/tree.pyx" - __pyx_r = 0; - -#line 215 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 470 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 215 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 470 "root_numpy/src/converters.pyx" + } -#line 215 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "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 215 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 472 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_leaf_shape_type == __pyx_e_13_librootnumpy_VARIABLE_LENGTH_ARRAY) != 0); -#line 215 "root_numpy/src/tree.pyx" -} +#line 472 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -/* "root_numpy/src/tree.pyx":218 - * return np.dtype(this.nptype) - * - * int get_nptypecode(): # <<<<<<<<<<<<<< - * return this.nptypecode + /* "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 218 "root_numpy/src/tree.pyx" +#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 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 218 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_BasicConverter::get_nptypecode(void) { +#line 473 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 218 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#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 218 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptypecode", 0); +#line 473 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":219 - * - * int get_nptypecode(): - * return this.nptypecode # <<<<<<<<<<<<<< - * - * +#line 473 "root_numpy/src/converters.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); + + /* "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 219 "root_numpy/src/tree.pyx" - __pyx_r = this->nptypecode; +#line 474 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_conv == NULL) != 0); -#line 219 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 474 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { - /* "root_numpy/src/tree.pyx":218 - * return np.dtype(this.nptype) - * - * int get_nptypecode(): # <<<<<<<<<<<<<< - * return this.nptypecode - * + /* "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 218 "root_numpy/src/tree.pyx" +#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 476 "root_numpy/src/converters.pyx" + __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); -#line 218 "root_numpy/src/tree.pyx" - /* function exit code */ + /* "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 218 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 477 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_basic_conv == NULL) != 0); -#line 218 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 477 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 218 "root_numpy/src/tree.pyx" - return __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 218 "root_numpy/src/tree.pyx" -} +#line 478 "root_numpy/src/converters.pyx" + __pyx_r = NULL; -/* "root_numpy/src/tree.pyx":223 - * - * cdef cppclass ObjectConverterBase(Converter): - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.object - * +#line 478 "root_numpy/src/converters.pyx" + goto __pyx_L0; + +#line 478 "root_numpy/src/converters.pyx" + } + + /* "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 223 "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 479 "root_numpy/src/converters.pyx" + __pyx_v_ndim = (__pyx_t_6 + 1); -#line 223 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptype(void) { + /* "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 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 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))))); -#line 223 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptype", 0); + /* "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( + */ - /* "root_numpy/src/tree.pyx":224 - * cdef cppclass ObjectConverterBase(Converter): - * object get_nptype(): - * return np.object # <<<<<<<<<<<<<< - * - * object get_nptypecode(): +#line 481 "root_numpy/src/converters.pyx" + __pyx_t_13 = __pyx_v_ndim; + +#line 481 "root_numpy/src/converters.pyx" + for (__pyx_v_idim = 1; __pyx_v_idim < __pyx_t_13; __pyx_v_idim++) { + + /* "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 224 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 482 "root_numpy/src/converters.pyx" + __pyx_t_14 = (__pyx_v_idim - 1); -#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 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 224 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 482 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#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 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 224 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 482 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 224 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 482 "root_numpy/src/converters.pyx" + (__pyx_v_dims[__pyx_v_idim]) = __pyx_t_15; -#line 224 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_2; +#line 482 "root_numpy/src/converters.pyx" + } -#line 224 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; + /* "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 224 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#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/tree.pyx":223 - * - * cdef cppclass ObjectConverterBase(Converter): - * object get_nptype(): # <<<<<<<<<<<<<< - * return np.object + /* "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" - /* function exit code */ +#line 485 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 223 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#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_XDECREF(__pyx_t_1); +#line 485 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 223 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 485 "root_numpy/src/converters.pyx" + try { -#line 223 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("ObjectConverterBase.get_nptype", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 485 "root_numpy/src/converters.pyx" + __pyx_t_16 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_12, __pyx_v_conv); -#line 223 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 485 "root_numpy/src/converters.pyx" + } catch(...) { -#line 223 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 485 "root_numpy/src/converters.pyx" + __Pyx_CppExn2PyErr(); -#line 223 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 485 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 485; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 223 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 485 "root_numpy/src/converters.pyx" + } -#line 223 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 485 "root_numpy/src/converters.pyx" + __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_16); -#line 223 "root_numpy/src/tree.pyx" -} +#line 485 "root_numpy/src/converters.pyx" + goto __pyx_L10; -/* "root_numpy/src/tree.pyx":226 - * return np.object - * - * object get_nptypecode(): # <<<<<<<<<<<<<< - * return np.NPY_OBJECT - * - */ +#line 485 "root_numpy/src/converters.pyx" + } -#line 226 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/converters.pyx" + __pyx_L10:; + /* "root_numpy/src/converters.pyx":486 + * basic_conv, ndim, dims) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + * return conv # <<<<<<<<<<<<<< + * + * # Fixed-length array + */ -#line 226 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_ObjectConverterBase::get_nptypecode(void) { +#line 486 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_v_conv; -#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 486 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 226 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptypecode", 0); +#line 486 "root_numpy/src/converters.pyx" + } - /* "root_numpy/src/tree.pyx":227 - * - * object get_nptypecode(): - * return np.NPY_OBJECT # <<<<<<<<<<<<<< - * + /* "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 227 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#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 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 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 227 "root_numpy/src/tree.pyx" +#line 489 "root_numpy/src/converters.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 227 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#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 227 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 489 "root_numpy/src/converters.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 227 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 489 "root_numpy/src/converters.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_12); - /* "root_numpy/src/tree.pyx":226 - * return np.object - * - * object get_nptypecode(): # <<<<<<<<<<<<<< - * return np.NPY_OBJECT - * + /* "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 226 "root_numpy/src/tree.pyx" +#line 490 "root_numpy/src/converters.pyx" + __pyx_t_8 = ((__pyx_v_conv == NULL) != 0); +#line 490 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 226 "root_numpy/src/tree.pyx" - /* function exit code */ + /* "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" - __pyx_L1_error:; +#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 226 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#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" - __Pyx_AddTraceback("ObjectConverterBase.get_nptypecode", __pyx_clineno, __pyx_lineno, __pyx_filename); + /* "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" - __pyx_r = 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_L0:; +#line 493 "root_numpy/src/converters.pyx" + if (__pyx_t_8) { -#line 226 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); + /* "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 226 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 494 "root_numpy/src/converters.pyx" + __pyx_r = NULL; -#line 226 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 494 "root_numpy/src/converters.pyx" + goto __pyx_L0; -#line 226 "root_numpy/src/tree.pyx" -} +#line 494 "root_numpy/src/converters.pyx" + } -/* "root_numpy/src/tree.pyx":235 - * int elesize + /* "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 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/converters.pyx":497 + * conv = new FixedArrayConverter( + * basic_conv, leaf_shape) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) # <<<<<<<<<<<<<< + * return conv * - * __init__(BasicConverter* conv): # <<<<<<<<<<<<<< - * this.conv = conv - * this.typecode = conv.get_nptypecode() */ -#line 235 "root_numpy/src/tree.pyx" +#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 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 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_GOTREF(__pyx_t_1); -#line 235 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#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;} - /* "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" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 236 "root_numpy/src/tree.pyx" - this->conv = __pyx_v_conv; +#line 497 "root_numpy/src/converters.pyx" + try { - /* "root_numpy/src/tree.pyx":237 - * __init__(BasicConverter* conv): - * this.conv = conv - * this.typecode = conv.get_nptypecode() # <<<<<<<<<<<<<< - * this.elesize = conv.size - * - */ +#line 497 "root_numpy/src/converters.pyx" + __pyx_t_16 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_12, __pyx_v_conv); -#line 237 "root_numpy/src/tree.pyx" - this->typecode = __pyx_v_conv->get_nptypecode(); +#line 497 "root_numpy/src/converters.pyx" + } catch(...) { - /* "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 497 "root_numpy/src/converters.pyx" + __Pyx_CppExn2PyErr(); -#line 238 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_v_conv->size; +#line 497 "root_numpy/src/converters.pyx" + {__pyx_filename = __pyx_f[1]; __pyx_lineno = 497; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 238 "root_numpy/src/tree.pyx" - this->elesize = __pyx_t_1; +#line 497 "root_numpy/src/converters.pyx" + } - /* "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_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_16); -#line 235 "root_numpy/src/tree.pyx" +#line 497 "root_numpy/src/converters.pyx" + goto __pyx_L14; +#line 497 "root_numpy/src/converters.pyx" + } -#line 235 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 497 "root_numpy/src/converters.pyx" + __pyx_L14:; -#line 235 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/converters.pyx":498 + * basic_conv, leaf_shape) + * CONVERTERS.insert(CONVERTERS_ITEM(leaf_type + arraydef, conv)) + * return conv # <<<<<<<<<<<<<< + * + * + */ -#line 235 "root_numpy/src/tree.pyx" -} +#line 498 "root_numpy/src/converters.pyx" + __pyx_r = __pyx_v_conv; -/* "root_numpy/src/tree.pyx":240 - * this.elesize = conv.size +#line 498 "root_numpy/src/converters.pyx" + goto __pyx_L0; + + /* "root_numpy/src/converters.pyx":438 * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef int numele = col.GetLen() - * cdef void* src = col.GetValuePointer() + * + * cdef Converter* get_converter(TLeaf* leaf): # <<<<<<<<<<<<<< + * # Find existing converter or attempt to create a new one + * cdef Converter* conv */ -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" -#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" + /* function exit code */ -#line 240 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 438 "root_numpy/src/converters.pyx" + __pyx_L1_error:; -#line 240 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_1); - /* "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_2); + +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_3); -#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_4); - /* "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_XDECREF(__pyx_t_5); -#line 242 "root_numpy/src/tree.pyx" - __pyx_v_src = __pyx_v_col->GetValuePointer(); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_t_7); - /* "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_WriteUnraisable("_librootnumpy.get_converter", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#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_r = 0; -#line 243 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 438 "root_numpy/src/converters.pyx" + __pyx_L0:; - /* "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_leaf_type); -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_leaf_shape); +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_match); -#line 240 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_arraydef); -#line 240 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_arraytokens); -#line 240 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_shape); + +#line 438 "root_numpy/src/converters.pyx" + __Pyx_XDECREF(__pyx_v_token); + +#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 254 "root_numpy/src/tree.pyx" +#line 502 "root_numpy/src/converters.pyx" + __Pyx_XGIVEREF(__pyx_r); + +#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 260 "root_numpy/src/tree.pyx" -PyObject *__pyx_t_13_librootnumpy_FixedArrayConverter::get_nptype(void) { - -#line 260 "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; - 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); - - /* "root_numpy/src/tree.pyx":261 - * - * object get_nptype(): - * return (np.dtype(this.conv.nptype), this.L) # <<<<<<<<<<<<<< - * - * int get_nptypecode(): - */ +#line 4 "root_numpy/src/tree.pyx" -#line 261 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); -#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 4 "root_numpy/src/tree.pyx" +/* Python wrapper */ -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#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 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 4 "root_numpy/src/tree.pyx" +static PyObject *__pyx_pw_13_librootnumpy_3list_trees(PyObject *__pyx_self, PyObject *__pyx_v_fname) { -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 4 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = 0; -#line 261 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannyDeclarations -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#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 261 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 4 "root_numpy/src/tree.pyx" -#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 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 4 "root_numpy/src/tree.pyx" + /* function exit code */ -#line 261 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); -#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 4 "root_numpy/src/tree.pyx" + return __pyx_r; -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 4 "root_numpy/src/tree.pyx" +} -#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 4 "root_numpy/src/tree.pyx" -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); -#line 261 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); +#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 261 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 4 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; + __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_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 261 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2); +#line 4 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_trees", 0); -#line 261 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_2); + /* "root_numpy/src/tree.pyx":5 + * + * 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_t_1 = 0; +#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_2 = 0; +#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_r = __pyx_t_3; + /* "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_3 = 0; +#line 6 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_rfile == NULL) != 0); -#line 261 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 6 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":260 - * return nbytes - * - * object get_nptype(): # <<<<<<<<<<<<<< - * return (np.dtype(this.conv.nptype), this.L) - * + /* "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 260 "root_numpy/src/tree.pyx" +#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 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 260 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_5 = NULL; -#line 260 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 7 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 7 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_5)) { -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 7 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); -#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_INCREF(__pyx_t_5); -#line 260 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 260 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_4, function); -#line 260 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 7 "root_numpy/src/tree.pyx" + } -#line 260 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 7 "root_numpy/src/tree.pyx" + } -#line 260 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 7 "root_numpy/src/tree.pyx" + if (!__pyx_t_5) { -#line 260 "root_numpy/src/tree.pyx" -} +#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;} -/* "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" + } else { +#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 263 "root_numpy/src/tree.pyx" -int __pyx_t_13_librootnumpy_FixedArrayConverter::get_nptypecode(void) { +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 263 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#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 263 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("get_nptypecode", 0); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); - /* "root_numpy/src/tree.pyx":264 - * - * int get_nptypecode(): - * return this.conv.nptypecode # <<<<<<<<<<<<<< - * - * - */ +#line 7 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_fname); -#line 264 "root_numpy/src/tree.pyx" - __pyx_r = this->conv->nptypecode; +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#line 264 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#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;} - /* "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_6); __pyx_t_6 = 0; +#line 7 "root_numpy/src/tree.pyx" + } -#line 263 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 263 "root_numpy/src/tree.pyx" - __pyx_L0:; +#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 263 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 263 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 7 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 263 "root_numpy/src/tree.pyx" -} +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -/* "root_numpy/src/tree.pyx":272 - * Vector2Array[T] v2a - * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] - */ +#line 7 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 272 "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;} +#line 7 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 272 "root_numpy/src/tree.pyx" -template +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#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 7 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_3, 0, 0, 0); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 7 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":273 - * - * __init__(): - * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize +#line 7 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 7 "root_numpy/src/tree.pyx" + } + + /* "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 273 "root_numpy/src/tree.pyx" - __pyx_v_ast = TypeName (); +#line 8 "root_numpy/src/tree.pyx" + __pyx_v_keys = __pyx_v_rfile->GetListOfKeys(); - /* "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] + /* "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 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 9 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_keys == NULL) != 0); -#line 274 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 9 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { -#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;} + /* "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 274 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#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 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_4); -#line 274 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 10 "root_numpy/src/tree.pyx" + __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" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) { -#line 274 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); -#line 274 "root_numpy/src/tree.pyx" - __pyx_v_info = __pyx_t_3; +#line 10 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_6)) { -#line 274 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 10 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); - /* "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_INCREF(__pyx_t_6); -#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_INCREF(function); -#line 275 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_4, function); -#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" + } -#line 275 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 10 "root_numpy/src/tree.pyx" + } -#line 275 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 10 "root_numpy/src/tree.pyx" + if (!__pyx_t_6) { -#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" + __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 275 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 275 "root_numpy/src/tree.pyx" - this->elesize = __pyx_t_4; +#line 10 "root_numpy/src/tree.pyx" + } else { - /* "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_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 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_5); -#line 276 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#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 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_INCREF(__pyx_v_fname); -#line 276 "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 276 "root_numpy/src/tree.pyx" - this->nptypecode = __pyx_t_4; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); - /* "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_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;} -#line 272 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 272 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 10 "root_numpy/src/tree.pyx" + } -#line 272 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 272 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#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 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 10 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 10 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 272 "root_numpy/src/tree.pyx" - __pyx_L0:; +#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 272 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_info); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 272 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 272 "root_numpy/src/tree.pyx" -} +#line 10 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_3, 0, 0, 0); -/* "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 10 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 278 "root_numpy/src/tree.pyx" +#line 10 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 10 "root_numpy/src/tree.pyx" + } -#line 278 "root_numpy/src/tree.pyx" -template + /* "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 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 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 278 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 11 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 278 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 11 "root_numpy/src/tree.pyx" + __pyx_v_ret = ((PyObject*)__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 11 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; + + /* "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 279 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); +#line 12 "root_numpy/src/tree.pyx" + __pyx_v_nkeys = __pyx_v_keys->GetEntries(); - /* "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]) + /* "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 280 "root_numpy/src/tree.pyx" - __pyx_v_numele = __pyx_v_tmp->size(); +#line 14 "root_numpy/src/tree.pyx" + __pyx_t_7 = __pyx_v_nkeys; - /* "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 14 "root_numpy/src/tree.pyx" + for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { + +#line 14 "root_numpy/src/tree.pyx" + __pyx_v_i = __pyx_t_8; + + /* "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 283 "root_numpy/src/tree.pyx" - __pyx_v_fa = this->v2a.convert(__pyx_v_tmp); +#line 15 "root_numpy/src/tree.pyx" + __pyx_v_key = ((TKey *)__pyx_v_keys->At(__pyx_v_i)); - /* "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":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 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 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 284 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); - /* "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 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" +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); +#line 16 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 278 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 278 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 278 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#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;} -#line 278 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 16 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 278 "root_numpy/src/tree.pyx" -} +#line 16 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -/* "root_numpy/src/tree.pyx":292 - * Vector2Array[T] v2a - * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] +#line 16 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_clsname, __pyx_t_3); + +#line 16 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; + + /* "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 + * return list(ret.keys()) */ -#line 292 "root_numpy/src/tree.pyx" +#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 17 "root_numpy/src/tree.pyx" + if (!__pyx_t_9) { -#line 292 "root_numpy/src/tree.pyx" -template +#line 17 "root_numpy/src/tree.pyx" + } else { -#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" +#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 17 "root_numpy/src/tree.pyx" + } + +#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 17 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_9; + +#line 17 "root_numpy/src/tree.pyx" + __pyx_L8_bool_binop_done:; + +#line 17 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + + /* "root_numpy/src/tree.pyx":18 + * clsname = str(key.GetClassName()) + * if clsname == 'TTree' or clsname == 'TNtuple': + * ret[str(key.GetName())] = None # <<<<<<<<<<<<<< + * return list(ret.keys()) + * + */ + +#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 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 18 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); + +#line 18 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); + +#line 18 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); + +#line 18 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; + +#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 18 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 18 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + +#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 18 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 18 "root_numpy/src/tree.pyx" + goto __pyx_L7; + +#line 18 "root_numpy/src/tree.pyx" + } + +#line 18 "root_numpy/src/tree.pyx" + __pyx_L7:; + +#line 18 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":19 + * if clsname == 'TTree' or clsname == 'TNtuple': + * ret[str(key.GetName())] = None + * return list(ret.keys()) # <<<<<<<<<<<<<< + * + * + */ + +#line 19 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + +#line 19 "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 = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 19 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 19 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 19 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); + +#line 19 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); + +#line 19 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); + +#line 19 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; + +#line 19 "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 = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 19 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 19 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + +#line 19 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_3; + +#line 19 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; + +#line 19 "root_numpy/src/tree.pyx" + goto __pyx_L0; + + /* "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" + + +#line 4 "root_numpy/src/tree.pyx" + /* function exit code */ + +#line 4 "root_numpy/src/tree.pyx" + __pyx_L1_error:; + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); + +#line 4 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); + +#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 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" +} + +/* "root_numpy/src/tree.pyx":22 + * + * + * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< + * if tree == None: + * # automatically select single tree + */ + +#line 22 "root_numpy/src/tree.pyx" + + +#line 22 "root_numpy/src/tree.pyx" +/* Python wrapper */ + +#line 22 "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 22 "root_numpy/src/tree.pyx" +{"list_structures", (PyCFunction)__pyx_pw_13_librootnumpy_5list_structures, METH_VARARGS|METH_KEYWORDS, 0}; + +#line 22 "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 22 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_tree = 0 +#line 22 "root_numpy/src/tree.pyx" ; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; + +#line 22 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = 0; + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_RefNannyDeclarations + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_structures (wrapper)", 0); + +#line 22 "root_numpy/src/tree.pyx" + { + +#line 22 "root_numpy/src/tree.pyx" + static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; + +#line 22 "root_numpy/src/tree.pyx" + PyObject* values[2] = {0,0}; + +#line 22 "root_numpy/src/tree.pyx" + values[1] = ((PyObject *)Py_None); + +#line 22 "root_numpy/src/tree.pyx" + if (unlikely(__pyx_kwds)) { + +#line 22 "root_numpy/src/tree.pyx" + Py_ssize_t kw_args; + +#line 22 "root_numpy/src/tree.pyx" + const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); + +#line 22 "root_numpy/src/tree.pyx" + switch (pos_args) { + case 2: +#line 22 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 22 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + +#line 22 "root_numpy/src/tree.pyx" + case 0: break; + default: +#line 22 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + kw_args = PyDict_Size(__pyx_kwds); + +#line 22 "root_numpy/src/tree.pyx" + switch (pos_args) { + +#line 22 "root_numpy/src/tree.pyx" + case 0: + +#line 22 "root_numpy/src/tree.pyx" + if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; + else +#line 22 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 22 "root_numpy/src/tree.pyx" + case 1: + +#line 22 "root_numpy/src/tree.pyx" + if (kw_args > 0) { + +#line 22 "root_numpy/src/tree.pyx" + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); + +#line 22 "root_numpy/src/tree.pyx" + if (value) { values[1] = value; kw_args--; } + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + if (unlikely(kw_args > 0)) { + +#line 22 "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 = 22; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + } else { + +#line 22 "root_numpy/src/tree.pyx" + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 2: +#line 22 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 22 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + +#line 22 "root_numpy/src/tree.pyx" + break; + default: +#line 22 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + __pyx_v_fname = values[0]; + +#line 22 "root_numpy/src/tree.pyx" + __pyx_v_tree = values[1]; + +#line 22 "root_numpy/src/tree.pyx" + } + +#line 22 "root_numpy/src/tree.pyx" + goto __pyx_L4_argument_unpacking_done; + +#line 22 "root_numpy/src/tree.pyx" + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("list_structures", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); +#line 22 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 22 "root_numpy/src/tree.pyx" + __pyx_L3_error:; + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 22 "root_numpy/src/tree.pyx" + return NULL; + +#line 22 "root_numpy/src/tree.pyx" + __pyx_L4_argument_unpacking_done:; + __pyx_r = +#line 22 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_4list_structures(__pyx_self, __pyx_v_fname, __pyx_v_tree); + +#line 22 "root_numpy/src/tree.pyx" + + +#line 22 "root_numpy/src/tree.pyx" + /* function exit code */ + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 22 "root_numpy/src/tree.pyx" + return __pyx_r; + +#line 22 "root_numpy/src/tree.pyx" +} + +#line 22 "root_numpy/src/tree.pyx" + + +#line 22 "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 22 "root_numpy/src/tree.pyx" +; + TTree *__pyx_v_rtree +#line 22 "root_numpy/src/tree.pyx" +; + +#line 22 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; - PyObject *__pyx_t_2 = NULL; + int __pyx_t_2; PyObject *__pyx_t_3 = NULL; - int __pyx_t_4; + 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 292 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("", 0); +#line 22 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_structures", 0); + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_tree); - /* "root_numpy/src/tree.pyx":293 + /* "root_numpy/src/tree.pyx":23 * - * __init__(): - * cdef TypeName[T] ast = TypeName[T]() # <<<<<<<<<<<<<< - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize + * def list_structures(fname, tree=None): + * if tree == None: # <<<<<<<<<<<<<< + * # automatically select single tree + * tree = list_trees(fname) + */ + +#line 23 "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 = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 23 "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 = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 23 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 23 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + + /* "root_numpy/src/tree.pyx":25 + * 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 25 "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 = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 25 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; + +#line 25 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { + +#line 25 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); + +#line 25 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { + +#line 25 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); + +#line 25 "root_numpy/src/tree.pyx" + } + +#line 25 "root_numpy/src/tree.pyx" + } + +#line 25 "root_numpy/src/tree.pyx" + if (!__pyx_t_4) { + +#line 25 "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 = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 25 "root_numpy/src/tree.pyx" + } else { + +#line 25 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); + +#line 25 "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 25 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); + +#line 25 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); + +#line 25 "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 = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +#line 25 "root_numpy/src/tree.pyx" + } + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 25 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_1); + +#line 25 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + + /* "root_numpy/src/tree.pyx":26 + * # 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 293 "root_numpy/src/tree.pyx" - __pyx_v_ast = TypeName (); +#line 26 "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 = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 26 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_t_6 != 1) != 0); + +#line 26 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + + /* "root_numpy/src/tree.pyx":27 + * 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 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); + +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; + +#line 27 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { + +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); + +#line 27 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { + +#line 27 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); + +#line 27 "root_numpy/src/tree.pyx" + } + +#line 27 "root_numpy/src/tree.pyx" + } + +#line 27 "root_numpy/src/tree.pyx" + if (!__pyx_t_4) { + +#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 27 "root_numpy/src/tree.pyx" + } else { + +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 27 "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 27 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_5); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_5); + +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; + +#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + +#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_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 27 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); + +#line 27 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_1, 0, 0, 0); + +#line 27 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 27 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 27 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":28 + * 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 28 "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 = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; + +#line 28 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 28 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_1); + +#line 28 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 28 "root_numpy/src/tree.pyx" + goto __pyx_L3; + +#line 28 "root_numpy/src/tree.pyx" + } + +#line 28 "root_numpy/src/tree.pyx" + __pyx_L3:; + + /* "root_numpy/src/tree.pyx":29 + * 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 29 "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 = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 29 "root_numpy/src/tree.pyx" + __pyx_v_rfile = TFile::Open(__pyx_t_8, __pyx_k_read); + + /* "root_numpy/src/tree.pyx":30 + * 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 30 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_rfile == NULL) != 0); + +#line 30 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + + /* "root_numpy/src/tree.pyx":31 + * 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 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 31 "root_numpy/src/tree.pyx" + __pyx_t_7 = NULL; + +#line 31 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { + +#line 31 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_3); + +#line 31 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_7)) { + +#line 31 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_7); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); + +#line 31 "root_numpy/src/tree.pyx" + } + +#line 31 "root_numpy/src/tree.pyx" + } + +#line 31 "root_numpy/src/tree.pyx" + if (!__pyx_t_7) { + +#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 31 "root_numpy/src/tree.pyx" + } else { + +#line 31 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); + +#line 31 "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 31 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); + +#line 31 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); + +#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + +#line 31 "root_numpy/src/tree.pyx" + } + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 31 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 31 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); + +#line 31 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; + +#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_1, 0, 0, 0); + +#line 31 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + +#line 31 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 31 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":32 + * 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 32 "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 = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 32 "root_numpy/src/tree.pyx" + __pyx_v_rtree = ((TTree *)__pyx_v_rfile->Get(__pyx_t_8)); + + /* "root_numpy/src/tree.pyx":33 + * 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)) + * return get_tree_structure(rtree) + */ + +#line 33 "root_numpy/src/tree.pyx" + __pyx_t_2 = ((__pyx_v_rtree == NULL) != 0); + +#line 33 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + + /* "root_numpy/src/tree.pyx":34 + * cdef TTree* rtree = rfile.Get(tree) + * if rtree == NULL: + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) # <<<<<<<<<<<<<< + * return get_tree_structure(rtree) + * + */ + +#line 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 34 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_5 = NULL; + +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; + +#line 34 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { + +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); + +#line 34 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_5)) { + +#line 34 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + +#line 34 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_5); + +#line 34 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 34 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); + +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_6 = 1; + +#line 34 "root_numpy/src/tree.pyx" + } + +#line 34 "root_numpy/src/tree.pyx" + } + +#line 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 34 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 34 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { + +#line 34 "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 34 "root_numpy/src/tree.pyx" + } + +#line 34 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_tree); - /* "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 34 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 0+__pyx_t_6, __pyx_v_tree); -#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 34 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_tree); -#line 294 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 34 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); -#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 34 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_6, __pyx_v_fname); -#line 294 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 34 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_fname); -#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 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 294 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 34 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 294 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 34 "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_2); __pyx_t_2 = 0; +#line 34 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 294 "root_numpy/src/tree.pyx" - __pyx_v_info = __pyx_t_3; +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 294 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 34 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); - /* "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] - * - */ +#line 34 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#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 34 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 295 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 34 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#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 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 295 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 34 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 295 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 34 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#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 34 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_1, 0, 0, 0); -#line 295 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 34 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 295 "root_numpy/src/tree.pyx" - this->elesize = __pyx_t_4; +#line 34 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":296 - * info = TYPES[ast.name] - * this.elesize = info[1].itemsize - * this.nptypecode = info[2] # <<<<<<<<<<<<<< +#line 34 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":35 + * if rtree == NULL: + * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) + * return get_tree_structure(rtree) # <<<<<<<<<<<<<< + * * - * int write(Column* col, void* buffer): */ -#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 35 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 296 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 35 "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 = 35; __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 35 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 296 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 35 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_1; -#line 296 "root_numpy/src/tree.pyx" - this->nptypecode = __pyx_t_4; +#line 35 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":292 - * Vector2Array[T] v2a +#line 35 "root_numpy/src/tree.pyx" + goto __pyx_L0; + + /* "root_numpy/src/tree.pyx":22 * - * __init__(): # <<<<<<<<<<<<<< - * cdef TypeName[T] ast = TypeName[T]() - * info = TYPES[ast.name] + * + * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< + * if tree == None: + * # automatically select single tree */ -#line 292 "root_numpy/src/tree.pyx" +#line 22 "root_numpy/src/tree.pyx" -#line 292 "root_numpy/src/tree.pyx" +#line 22 "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 22 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 292 "root_numpy/src/tree.pyx" +#line 22 "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 22 "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 22 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); -#line 292 "root_numpy/src/tree.pyx" +#line 22 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_7); + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 22 "root_numpy/src/tree.pyx" + __pyx_r = NULL; + +#line 22 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 292 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_info); +#line 22 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_tree); -#line 292 "root_numpy/src/tree.pyx" +#line 22 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); + +#line 22 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 292 "root_numpy/src/tree.pyx" +#line 22 "root_numpy/src/tree.pyx" + return __pyx_r; + +#line 22 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":298 - * this.nptypecode = info[2] +/* "root_numpy/src/tree.pyx":38 + * + * + * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< + * return list(list_structures(fname, tree).keys()) * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[T]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors */ -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" -#line 298 "root_numpy/src/tree.pyx" -template +#line 38 "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" -; - PyArrayObject *__pyx_v_outer = 0 -#line 298 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_outerobj -#line 298 "root_numpy/src/tree.pyx" -; - char *__pyx_v_dataptr -#line 298 "root_numpy/src/tree.pyx" +#line 38 "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 38 "root_numpy/src/tree.pyx" +{"list_branches", (PyCFunction)__pyx_pw_13_librootnumpy_7list_branches, METH_VARARGS|METH_KEYWORDS, 0}; + +#line 38 "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 38 "root_numpy/src/tree.pyx" ; - unsigned long __pyx_v_i -#line 298 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_tree = 0 +#line 38 "root_numpy/src/tree.pyx" ; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 298 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 38 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = 0; + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_RefNannyDeclarations + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_branches (wrapper)", 0); + +#line 38 "root_numpy/src/tree.pyx" + { + +#line 38 "root_numpy/src/tree.pyx" + static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; + +#line 38 "root_numpy/src/tree.pyx" + PyObject* values[2] = {0,0}; + +#line 38 "root_numpy/src/tree.pyx" + values[1] = ((PyObject *)Py_None); + +#line 38 "root_numpy/src/tree.pyx" + if (unlikely(__pyx_kwds)) { + +#line 38 "root_numpy/src/tree.pyx" + Py_ssize_t kw_args; + +#line 38 "root_numpy/src/tree.pyx" + const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); + +#line 38 "root_numpy/src/tree.pyx" + switch (pos_args) { + case 2: +#line 38 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 38 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + +#line 38 "root_numpy/src/tree.pyx" + case 0: break; + default: +#line 38 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + kw_args = PyDict_Size(__pyx_kwds); + +#line 38 "root_numpy/src/tree.pyx" + switch (pos_args) { + +#line 38 "root_numpy/src/tree.pyx" + case 0: + +#line 38 "root_numpy/src/tree.pyx" + if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; + else +#line 38 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 38 "root_numpy/src/tree.pyx" + case 1: + +#line 38 "root_numpy/src/tree.pyx" + if (kw_args > 0) { + +#line 38 "root_numpy/src/tree.pyx" + PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); + +#line 38 "root_numpy/src/tree.pyx" + if (value) { values[1] = value; kw_args--; } + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + if (unlikely(kw_args > 0)) { + +#line 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + } else { + +#line 38 "root_numpy/src/tree.pyx" + switch (PyTuple_GET_SIZE(__pyx_args)) { + case 2: +#line 38 "root_numpy/src/tree.pyx" +values[1] = PyTuple_GET_ITEM(__pyx_args, 1); + case 1: +#line 38 "root_numpy/src/tree.pyx" +values[0] = PyTuple_GET_ITEM(__pyx_args, 0); + +#line 38 "root_numpy/src/tree.pyx" + break; + default: +#line 38 "root_numpy/src/tree.pyx" +goto __pyx_L5_argtuple_error; + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + __pyx_v_fname = values[0]; + +#line 38 "root_numpy/src/tree.pyx" + __pyx_v_tree = values[1]; + +#line 38 "root_numpy/src/tree.pyx" + } + +#line 38 "root_numpy/src/tree.pyx" + goto __pyx_L4_argument_unpacking_done; + +#line 38 "root_numpy/src/tree.pyx" + __pyx_L5_argtuple_error:; + __Pyx_RaiseArgtupleInvalid("list_branches", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); +#line 38 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L3_error;} + +#line 38 "root_numpy/src/tree.pyx" + __pyx_L3_error:; + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 38 "root_numpy/src/tree.pyx" + return NULL; + +#line 38 "root_numpy/src/tree.pyx" + __pyx_L4_argument_unpacking_done:; + __pyx_r = +#line 38 "root_numpy/src/tree.pyx" +__pyx_pf_13_librootnumpy_6list_branches(__pyx_self, __pyx_v_fname, __pyx_v_tree); + +#line 38 "root_numpy/src/tree.pyx" + + +#line 38 "root_numpy/src/tree.pyx" + /* function exit code */ + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); + +#line 38 "root_numpy/src/tree.pyx" + return __pyx_r; + +#line 38 "root_numpy/src/tree.pyx" +} + +#line 38 "root_numpy/src/tree.pyx" + + +#line 38 "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 38 "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_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 298 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 38 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("list_branches", 0); - /* "root_numpy/src/tree.pyx":299 + /* "root_numpy/src/tree.pyx":39 + * + * def list_branches(fname, tree=None): + * return list(list_structures(fname, tree).keys()) # <<<<<<<<<<<<<< + * * - * int write(Column* col, void* buffer): - * cdef vector[vector[T]]* tmp = col.GetValuePointer() # <<<<<<<<<<<<<< - * # this will hold number of subvectors - * cdef unsigned long numele */ -#line 299 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); +#line 39 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); - /* "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 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 304 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; -#line 304 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; -#line 304 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 39 "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 39 "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 39 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { -#line 305 "root_numpy/src/tree.pyx" - __pyx_v_objtypecode = NPY_OBJECT; +#line 39 "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 39 "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 39 "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 39 "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 39 "root_numpy/src/tree.pyx" + __pyx_t_5 = 1; - /* "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 39 "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 39 "root_numpy/src/tree.pyx" + } -#line 312 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 39 "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 = 39; __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 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 312 "root_numpy/src/tree.pyx" - __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); +#line 39 "root_numpy/src/tree.pyx" + if (__pyx_t_4) { -#line 312 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 39 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_4); __pyx_t_4 = NULL; - /* "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 39 "root_numpy/src/tree.pyx" + } -#line 313 "root_numpy/src/tree.pyx" - __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); +#line 39 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_fname); - /* "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 39 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_v_fname); -#line 315 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_outer)); +#line 39 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__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 39 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_tree); -#line 317 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); +#line 39 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_tree); - /* "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 39 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_tree); + +#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_2 = NULL; + +#line 39 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { + +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); + +#line 39 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_2)) { + +#line 39 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_2); + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); + +#line 39 "root_numpy/src/tree.pyx" + } + +#line 39 "root_numpy/src/tree.pyx" + } + +#line 39 "root_numpy/src/tree.pyx" + if (__pyx_t_2) { + +#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 39 "root_numpy/src/tree.pyx" + } else { + +#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 39 "root_numpy/src/tree.pyx" + } -#line 320 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_outer->data); +#line 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "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 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 323 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 39; __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 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 323 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 39 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); - /* "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) - */ +#line 39 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_1); -#line 324 "root_numpy/src/tree.pyx" - __pyx_v_fa = this->v2a.convert((&((__pyx_v_tmp[0])[__pyx_v_i]))); +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; - /* "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 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 39 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 325 "root_numpy/src/tree.pyx" - } +#line 39 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":327 - * create_numpyarray(&dataptr[i*objsize], fa, this.nptypecode, - * tmp[0][i].size(), this.elesize) - * return sizeof(outerobj) # <<<<<<<<<<<<<< - * - * - */ +#line 39 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_1; -#line 327 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_outerobj)); +#line 39 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#line 327 "root_numpy/src/tree.pyx" +#line 39 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":298 - * this.nptypecode = info[2] + /* "root_numpy/src/tree.pyx":38 + * + * + * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< + * return list(list_structures(fname, tree).keys()) * - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[T]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors */ -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" /* function exit code */ -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 298 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 38 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 298 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 38 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 38 "root_numpy/src/tree.pyx" + __pyx_r = NULL; + +#line 38 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 298 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_outer); +#line 38 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" return __pyx_r; -#line 298 "root_numpy/src/tree.pyx" +#line 38 "root_numpy/src/tree.pyx" } -/* "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":42 + * + * + * cdef get_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< + * cdef TObjArray* leaves + * cdef TLeaf* leaf */ -#line 332 "root_numpy/src/tree.pyx" +#line 42 "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 42 "root_numpy/src/tree.pyx" +static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_branch) { + TObjArray *__pyx_v_leaves +#line 42 "root_numpy/src/tree.pyx" +; + TLeaf *__pyx_v_leaf +#line 42 "root_numpy/src/tree.pyx" +; + int __pyx_v_ileaf +#line 42 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_leaflist = NULL +#line 42 "root_numpy/src/tree.pyx" ; -#line 332 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 42 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations + int __pyx_t_1; + 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_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 332 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 42 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("get_branch_structure", 0); - /* "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) - * + /* "root_numpy/src/tree.pyx":46 + * cdef TLeaf* leaf + * cdef int ileaf + * leaves = branch.GetListOfLeaves() # <<<<<<<<<<<<<< + * if leaves == NULL: + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) */ -#line 333 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); +#line 46 "root_numpy/src/tree.pyx" + __pyx_v_leaves = __pyx_v_branch->GetListOfLeaves(); - /* "root_numpy/src/tree.pyx":334 - * int write(Column* col, void* buffer): - * cdef vector[bool]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorbool(buffer, tmp) # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/tree.pyx":47 + * cdef int ileaf + * leaves = branch.GetListOfLeaves() + * if leaves == NULL: # <<<<<<<<<<<<<< + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) + * leaflist = [] */ -#line 334 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorbool(__pyx_v_buffer, __pyx_v_tmp); +#line 47 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_leaves == NULL) != 0); -#line 334 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 47 "root_numpy/src/tree.pyx" + if (__pyx_t_1) { - /* "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":48 + * leaves = branch.GetListOfLeaves() + * if leaves == NULL: + * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) # <<<<<<<<<<<<<< + * leaflist = [] + * for ileaf in range(leaves.GetEntries()): */ -#line 332 "root_numpy/src/tree.pyx" +#line 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 332 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 332 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 332 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 48 "root_numpy/src/tree.pyx" + __pyx_t_5 = NULL; -#line 332 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 48 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 332 "root_numpy/src/tree.pyx" -} +#line 48 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); -/* "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 48 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_5)) { -#line 339 "root_numpy/src/tree.pyx" +#line 48 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); +#line 48 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_5); -#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 48 "root_numpy/src/tree.pyx" + __Pyx_INCREF(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 48 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 339 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 48 "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 48 "root_numpy/src/tree.pyx" + } -#line 340 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); +#line 48 "root_numpy/src/tree.pyx" + if (!__pyx_t_5) { - /* "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 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 48 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 344 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 344 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; +#line 48 "root_numpy/src/tree.pyx" + } else { -#line 344 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 48 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 344 "root_numpy/src/tree.pyx" - __pyx_v_objsize = __pyx_t_2; +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); - /* "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 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 345 "root_numpy/src/tree.pyx" - __pyx_v_objtypecode = NPY_OBJECT; +#line 48 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_4); - /* "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 48 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_4); -#line 346 "root_numpy/src/tree.pyx" - __pyx_v_numele = (__pyx_v_tmp[0]).size(); +#line 48 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; - /* "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 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 351 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "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 48 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 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 48 "root_numpy/src/tree.pyx" + } -#line 352 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 48 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#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 48 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 352 "root_numpy/src/tree.pyx" - __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 352 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 48 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); - /* "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 48 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 353 "root_numpy/src/tree.pyx" - __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); +#line 48 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "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 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 48 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 48 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; + +#line 48 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); + +#line 48 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + +#line 48 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 48 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":49 + * 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 355 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_outer)); +#line 49 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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 49 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); + +#line 49 "root_numpy/src/tree.pyx" + __pyx_v_leaflist = ((PyObject*)__pyx_t_2); + +#line 49 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; + + /* "root_numpy/src/tree.pyx":50 + * 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 357 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); +#line 50 "root_numpy/src/tree.pyx" + __pyx_t_7 = __pyx_v_leaves->GetEntries(); - /* "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 50 "root_numpy/src/tree.pyx" + for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { + +#line 50 "root_numpy/src/tree.pyx" + __pyx_v_ileaf = __pyx_t_8; + + /* "root_numpy/src/tree.pyx":51 + * leaflist = [] + * for ileaf in range(leaves.GetEntries()): + * leaf = leaves.At(ileaf) # <<<<<<<<<<<<<< + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) + * if not leaflist: */ -#line 360 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_outer->data); +#line 51 "root_numpy/src/tree.pyx" + __pyx_v_leaf = ((TLeaf *)__pyx_v_leaves->At(__pyx_v_ileaf)); - /* "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) + /* "root_numpy/src/tree.pyx":52 + * for ileaf in range(leaves.GetEntries()): + * leaf = leaves.At(ileaf) + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) # <<<<<<<<<<<<<< + * if not leaflist: + * raise RuntimeError( */ -#line 363 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 52 "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 = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 363 "root_numpy/src/tree.pyx" - for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { +#line 52 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 363 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 52 "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 = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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 52 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#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 52 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 364 "root_numpy/src/tree.pyx" - } +#line 52 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); - /* "root_numpy/src/tree.pyx":365 - * for i in range(numele): - * create_numpyarray_vectorbool(&dataptr[i*objsize], &tmp[0][i]) - * return sizeof(outerobj) # <<<<<<<<<<<<<< - * - * - */ +#line 52 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2); -#line 365 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_outerobj)); +#line 52 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 365 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 52 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3); - /* "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 52 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_3); -#line 339 "root_numpy/src/tree.pyx" +#line 52 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; +#line 52 "root_numpy/src/tree.pyx" + __pyx_t_3 = 0; -#line 339 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 52 "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 = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 339 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 52 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 339 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 52 "root_numpy/src/tree.pyx" + } -#line 339 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorBoolConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); + /* "root_numpy/src/tree.pyx":53 + * 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 339 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_1 = (__pyx_v_leaflist != Py_None) && (PyList_GET_SIZE(__pyx_v_leaflist) != 0); -#line 339 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 53 "root_numpy/src/tree.pyx" + __pyx_t_10 = ((!__pyx_t_1) != 0); -#line 339 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_outer); +#line 53 "root_numpy/src/tree.pyx" + if (__pyx_t_10) { -#line 339 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/tree.pyx":55 + * if not leaflist: + * raise RuntimeError( + * "leaf list for branch '{0}' is empty".format( # <<<<<<<<<<<<<< + * branch.GetName())) + * return leaflist + */ -#line 339 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 55 "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 = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 339 "root_numpy/src/tree.pyx" -} +#line 55 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -/* "root_numpy/src/tree.pyx":369 + /* "root_numpy/src/tree.pyx":56 + * raise RuntimeError( + * "leaf list for branch '{0}' is empty".format( + * branch.GetName())) # <<<<<<<<<<<<<< + * return leaflist * - * 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 56 "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 = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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" -; - PyObject *__pyx_v_tmpobj -#line 369 "root_numpy/src/tree.pyx" -; +#line 56 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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 56 "root_numpy/src/tree.pyx" + __pyx_t_4 = NULL; -#line 369 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 56 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { - /* "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 56 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); -#line 370 "root_numpy/src/tree.pyx" - __pyx_v_s = ((std::string *)__pyx_v_col->GetValuePointer()); +#line 56 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_4)) { - /* "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 56 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#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 56 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_4); -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 56 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#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 56 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_3, function); -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 56 "root_numpy/src/tree.pyx" + } -#line 371 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1); +#line 56 "root_numpy/src/tree.pyx" + } -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 56 "root_numpy/src/tree.pyx" + if (!__pyx_t_4) { -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 56 "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 = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 56 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 371 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 56 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 371 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 56 "root_numpy/src/tree.pyx" + } else { -#line 371 "root_numpy/src/tree.pyx" - __pyx_v_py_bytes = __pyx_t_1; +#line 56 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 371 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 56 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); - /* "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 56 "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 372 "root_numpy/src/tree.pyx" - __pyx_v_tmpobj = ((PyObject *)__pyx_v_py_bytes); +#line 56 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_2); - /* "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 56 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 374 "root_numpy/src/tree.pyx" - Py_INCREF(__pyx_v_py_bytes); +#line 56 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":376 - * Py_INCREF(py_bytes) - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) # <<<<<<<<<<<<<< - * return sizeof(tmpobj) - * - */ +#line 56 "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 = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 376 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_tmpobj), (sizeof(PyObject *))); +#line 56 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); - /* "root_numpy/src/tree.pyx":377 - * # now write PyObject* to buffer - * memcpy(buffer, &tmpobj, sizeof(PyObject*)) - * return sizeof(tmpobj) # <<<<<<<<<<<<<< - * - * - */ +#line 56 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 377 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_tmpobj)); +#line 56 "root_numpy/src/tree.pyx" + } -#line 377 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 56 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "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]) + /* "root_numpy/src/tree.pyx":54 + * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) + * if not leaflist: + * raise RuntimeError( # <<<<<<<<<<<<<< + * "leaf list for branch '{0}' is empty".format( + * branch.GetName())) */ -#line 369 "root_numpy/src/tree.pyx" - +#line 54 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 369 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 54 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#line 369 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 54 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6); -#line 369 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 54 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_6); -#line 369 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 54 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; -#line 369 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("StringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 54 "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 = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 369 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 54 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); -#line 369 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 54 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 369 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_py_bytes); +#line 54 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_6, 0, 0, 0); -#line 369 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 54 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 369 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 54 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 369 "root_numpy/src/tree.pyx" -} +#line 54 "root_numpy/src/tree.pyx" + } -/* "root_numpy/src/tree.pyx":381 + /* "root_numpy/src/tree.pyx":57 + * "leaf list for branch '{0}' is empty".format( + * branch.GetName())) + * return leaflist # <<<<<<<<<<<<<< + * * - * 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 57 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#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 57 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_leaflist); -#line 381 "root_numpy/src/tree.pyx" - int __pyx_r; - __Pyx_RefNannyDeclarations +#line 57 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_leaflist; -#line 381 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 57 "root_numpy/src/tree.pyx" + goto __pyx_L0; - /* "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":42 + * * + * cdef get_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< + * cdef TObjArray* leaves + * cdef TLeaf* leaf */ -#line 382 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector *)__pyx_v_col->GetValuePointer()); +#line 42 "root_numpy/src/tree.pyx" - /* "root_numpy/src/tree.pyx":383 - * int write(Column* col, void* buffer): - * cdef vector[string]* tmp = col.GetValuePointer() - * return create_numpyarray_vectorstring(buffer, tmp) # <<<<<<<<<<<<<< - * - * - */ -#line 383 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_create_numpyarray_vectorstring(__pyx_v_buffer, __pyx_v_tmp); +#line 42 "root_numpy/src/tree.pyx" + /* function exit code */ -#line 383 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 42 "root_numpy/src/tree.pyx" + __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 42 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 381 "root_numpy/src/tree.pyx" +#line 42 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); +#line 42 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); -#line 381 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 42 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 381 "root_numpy/src/tree.pyx" +#line 42 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); + +#line 42 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.get_branch_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); + +#line 42 "root_numpy/src/tree.pyx" + __pyx_r = 0; + +#line 42 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 381 "root_numpy/src/tree.pyx" +#line 42 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_leaflist); + +#line 42 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); + +#line 42 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 381 "root_numpy/src/tree.pyx" +#line 42 "root_numpy/src/tree.pyx" return __pyx_r; -#line 381 "root_numpy/src/tree.pyx" +#line 42 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":387 +/* "root_numpy/src/tree.pyx":60 * - * cdef cppclass VectorVectorStringConverter(ObjectConverterBase): - * int write(Column* col, void* buffer): # <<<<<<<<<<<<<< - * cdef vector[vector[string]]* tmp = col.GetValuePointer() - * # this will hold number of subvectors + * + * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< + * cdef int ibranch + * cdef TBranch* branch */ -#line 387 "root_numpy/src/tree.pyx" +#line 60 "root_numpy/src/tree.pyx" -#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" +#line 60 "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 60 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_branches = ((PyObject *)Py_None); + int __pyx_v_ibranch +#line 60 "root_numpy/src/tree.pyx" ; - PyArrayObject *__pyx_v_outer = 0 -#line 387 "root_numpy/src/tree.pyx" + TBranch *__pyx_v_branch +#line 60 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_outerobj -#line 387 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_ret = NULL +#line 60 "root_numpy/src/tree.pyx" ; - char *__pyx_v_dataptr -#line 387 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_branch_name = NULL +#line 60 "root_numpy/src/tree.pyx" ; - unsigned long __pyx_v_i -#line 387 "root_numpy/src/tree.pyx" + TObjArray *__pyx_v_all_branches +#line 60 "root_numpy/src/tree.pyx" ; -#line 387 "root_numpy/src/tree.pyx" - int __pyx_r; +#line 60 "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_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_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 387 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("write", 0); +#line 60 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("get_tree_structure", 0); - /* "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 60 "root_numpy/src/tree.pyx" + if (__pyx_optional_args) { -#line 388 "root_numpy/src/tree.pyx" - __pyx_v_tmp = ((std::vector > *)__pyx_v_col->GetValuePointer()); +#line 60 "root_numpy/src/tree.pyx" + if (__pyx_optional_args->__pyx_n > 0) { - /* "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 60 "root_numpy/src/tree.pyx" + __pyx_v_branches = __pyx_optional_args->branches; -#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 60 "root_numpy/src/tree.pyx" + } -#line 392 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 60 "root_numpy/src/tree.pyx" + } -#line 392 "root_numpy/src/tree.pyx" - __pyx_t_2 = ((PyArray_Descr *)__pyx_t_1)->elsize; + /* "root_numpy/src/tree.pyx":63 + * cdef int ibranch + * cdef TBranch* branch + * ret = OrderedDict() # <<<<<<<<<<<<<< + * if branches is not None: + * for branch_name in branches: + */ -#line 392 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 63 "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 = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 392 "root_numpy/src/tree.pyx" - __pyx_v_objsize = __pyx_t_2; +#line 63 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "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 63 "root_numpy/src/tree.pyx" + __pyx_t_3 = NULL; -#line 393 "root_numpy/src/tree.pyx" - __pyx_v_objtypecode = NPY_OBJECT; +#line 63 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_2))) { - /* "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 63 "root_numpy/src/tree.pyx" + __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); -#line 394 "root_numpy/src/tree.pyx" - __pyx_v_numele = (__pyx_v_tmp[0]).size(); +#line 63 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_3)) { - /* "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 63 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); -#line 399 "root_numpy/src/tree.pyx" - (__pyx_v_dims[0]) = __pyx_v_numele; +#line 63 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_3); - /* "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 63 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#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 63 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_2, function); -#line 400 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 63 "root_numpy/src/tree.pyx" + } -#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 63 "root_numpy/src/tree.pyx" + } -#line 400 "root_numpy/src/tree.pyx" - __pyx_v_outer = ((PyArrayObject *)__pyx_t_1); +#line 63 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 400 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 63 "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 = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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 63 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 401 "root_numpy/src/tree.pyx" - __pyx_v_outerobj = ((PyObject *)__pyx_v_outer); +#line 63 "root_numpy/src/tree.pyx" + } else { - /* "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 63 "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 = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 403 "root_numpy/src/tree.pyx" - Py_INCREF(((PyObject *)__pyx_v_outer)); +#line 63 "root_numpy/src/tree.pyx" + } - /* "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 63 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 405 "root_numpy/src/tree.pyx" - memcpy(__pyx_v_buffer, (&__pyx_v_outerobj), (sizeof(PyObject *))); +#line 63 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "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 63 "root_numpy/src/tree.pyx" + __pyx_v_ret = __pyx_t_1; -#line 408 "root_numpy/src/tree.pyx" - __pyx_v_dataptr = ((char *)__pyx_v_outer->data); +#line 63 "root_numpy/src/tree.pyx" + __pyx_t_1 = 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) + /* "root_numpy/src/tree.pyx":64 + * cdef TBranch* branch + * ret = OrderedDict() + * if branches is not None: # <<<<<<<<<<<<<< + * for branch_name in branches: + * branch = tree.GetBranch(branch_name) */ -#line 411 "root_numpy/src/tree.pyx" - __pyx_t_3 = __pyx_v_numele; +#line 64 "root_numpy/src/tree.pyx" + __pyx_t_4 = (__pyx_v_branches != Py_None); -#line 411 "root_numpy/src/tree.pyx" - for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) { +#line 64 "root_numpy/src/tree.pyx" + __pyx_t_5 = (__pyx_t_4 != 0); -#line 411 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_4; +#line 64 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { - /* "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) - * + /* "root_numpy/src/tree.pyx":65 + * ret = OrderedDict() + * if branches is not None: + * for branch_name in branches: # <<<<<<<<<<<<<< + * branch = tree.GetBranch(branch_name) + * if branch == NULL: */ -#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 65 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { -#line 412 "root_numpy/src/tree.pyx" - } +#line 65 "root_numpy/src/tree.pyx" + __pyx_t_1 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; - /* "root_numpy/src/tree.pyx":413 - * for i in range(numele): - * create_numpyarray_vectorstring(&dataptr[i*objsize], &tmp[0][i]) - * return sizeof(outerobj) # <<<<<<<<<<<<<< - * - * - */ +#line 65 "root_numpy/src/tree.pyx" + __pyx_t_7 = NULL; -#line 413 "root_numpy/src/tree.pyx" - __pyx_r = (sizeof(__pyx_v_outerobj)); +#line 65 "root_numpy/src/tree.pyx" + } else { + __pyx_t_6 = -1; +#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 413 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 65 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); - /* "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 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 387 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" + } +#line 65 "root_numpy/src/tree.pyx" + for (;;) { -#line 387 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 65 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_7)) { -#line 387 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 65 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_1))) { -#line 387 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 65 "root_numpy/src/tree.pyx" + if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; -#line 387 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("VectorVectorStringConverter.write", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 65 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 387 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 387 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 65 "root_numpy/src/tree.pyx" + #else -#line 387 "root_numpy/src/tree.pyx" - __Pyx_XDECREF((PyObject *)__pyx_v_outer); +#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 387 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 65 "root_numpy/src/tree.pyx" + #endif -#line 387 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 65 "root_numpy/src/tree.pyx" + } else { -#line 387 "root_numpy/src/tree.pyx" -} +#line 65 "root_numpy/src/tree.pyx" + if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; -/* "root_numpy/src/tree.pyx":489 - * - * - * cdef Converter* find_converter(Column* col): # <<<<<<<<<<<<<< - * cdef ColumnType ct = col.coltype - * cdef string typename = string(col.GetTypeName()) - */ +#line 65 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 489 "root_numpy/src/tree.pyx" +#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 65 "root_numpy/src/tree.pyx" + #else -#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" -; - std::string __pyx_v_typename -#line 489 "root_numpy/src/tree.pyx" -; - __pyx_t_13_librootnumpy_Converter *__pyx_v_conv -#line 489 "root_numpy/src/tree.pyx" -; - __pyx_t_13_librootnumpy_Converter *__pyx_v_basic_conv -#line 489 "root_numpy/src/tree.pyx" -; +#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 489 "root_numpy/src/tree.pyx" - __pyx_t_13_librootnumpy_Converter *__pyx_r; - __Pyx_RefNannyDeclarations - enum ColumnType __pyx_t_1; - std::string __pyx_t_2; - PyObject *__pyx_t_3 = NULL; - PyObject *__pyx_t_4 = NULL; - int __pyx_t_5; - __pyx_t_13_librootnumpy_CONVERTERS_ITEM __pyx_t_6; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 65 "root_numpy/src/tree.pyx" + #endif -#line 489 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("find_converter", 0); +#line 65 "root_numpy/src/tree.pyx" + } + } else +#line 65 "root_numpy/src/tree.pyx" +{ - /* "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 65 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_7(__pyx_t_1); -#line 490 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_v_col->coltype; +#line 65 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_2)) { -#line 490 "root_numpy/src/tree.pyx" - __pyx_v_ct = __pyx_t_1; +#line 65 "root_numpy/src/tree.pyx" + PyObject* exc_type = PyErr_Occurred(); - /* "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 65 "root_numpy/src/tree.pyx" + if (exc_type) { -#line 491 "root_numpy/src/tree.pyx" - try { +#line 65 "root_numpy/src/tree.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 491 "root_numpy/src/tree.pyx" - __pyx_t_2 = std::string(__pyx_v_col->GetTypeName()); +#line 65 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 491 "root_numpy/src/tree.pyx" - } catch(...) { +#line 65 "root_numpy/src/tree.pyx" + } -#line 491 "root_numpy/src/tree.pyx" - __Pyx_CppExn2PyErr(); +#line 65 "root_numpy/src/tree.pyx" + break; -#line 491 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 65 "root_numpy/src/tree.pyx" + } -#line 491 "root_numpy/src/tree.pyx" - } +#line 65 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 491 "root_numpy/src/tree.pyx" - __pyx_v_typename = __pyx_t_2; +#line 65 "root_numpy/src/tree.pyx" + } - /* "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 65 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_branch_name, __pyx_t_2); -#line 508 "root_numpy/src/tree.pyx" - switch (__pyx_v_ct) { +#line 65 "root_numpy/src/tree.pyx" + __pyx_t_2 = 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":66 + * if branches is not None: + * for branch_name in branches: + * branch = tree.GetBranch(branch_name) # <<<<<<<<<<<<<< + * if branch == NULL: + * continue */ -#line 494 "root_numpy/src/tree.pyx" - case SINGLE: +#line 66 "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 = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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]') - */ +#line 66 "root_numpy/src/tree.pyx" + __pyx_v_branch = __pyx_v_tree->GetBranch(__pyx_t_8); -#line 495 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_v_typename); + /* "root_numpy/src/tree.pyx":67 + * for branch_name in branches: + * branch = tree.GetBranch(branch_name) + * if branch == NULL: # <<<<<<<<<<<<<< + * continue + * ret[branch.GetName()] = get_branch_structure(branch) + */ -#line 495 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 67 "root_numpy/src/tree.pyx" + __pyx_t_5 = ((__pyx_v_branch == NULL) != 0); -#line 495 "root_numpy/src/tree.pyx" - break; +#line 67 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { - /* "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: + /* "root_numpy/src/tree.pyx":68 + * branch = tree.GetBranch(branch_name) + * if branch == NULL: + * continue # <<<<<<<<<<<<<< + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret */ -#line 496 "root_numpy/src/tree.pyx" - case FIXED: +#line 68 "root_numpy/src/tree.pyx" + goto __pyx_L4_continue; - /* "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) - */ +#line 68 "root_numpy/src/tree.pyx" + } -#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;} + /* "root_numpy/src/tree.pyx":69 + * if branch == NULL: + * continue + * ret[branch.GetName()] = get_branch_structure(branch) # <<<<<<<<<<<<<< + * return ret + * # all branches + */ -#line 497 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 69 "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 = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 69 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 497 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 69 "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 = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 497 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 69 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_3); -#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 69 "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 = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 497 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 69 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 497 "root_numpy/src/tree.pyx" - __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_2); +#line 69 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "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: + /* "root_numpy/src/tree.pyx":65 + * ret = OrderedDict() + * if branches is not None: + * for branch_name in branches: # <<<<<<<<<<<<<< + * branch = tree.GetBranch(branch_name) + * if branch == NULL: */ -#line 498 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_conv == NULL) != 0); +#line 65 "root_numpy/src/tree.pyx" + __pyx_L4_continue:; -#line 498 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 65 "root_numpy/src/tree.pyx" + } - /* "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 65 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "root_numpy/src/tree.pyx":70 + * continue + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret # <<<<<<<<<<<<<< + * # all branches + * cdef TObjArray* all_branches = tree.GetListOfBranches() */ -#line 499 "root_numpy/src/tree.pyx" - __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_v_typename); +#line 70 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); - /* "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 70 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_ret); -#line 500 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_basic_conv == NULL) != 0); +#line 70 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_ret; -#line 500 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 70 "root_numpy/src/tree.pyx" + goto __pyx_L0; - /* "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 70 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":72 + * return ret + * # all branches + * cdef TObjArray* all_branches = tree.GetListOfBranches() # <<<<<<<<<<<<<< + * if all_branches == NULL: + * return ret */ -#line 501 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 72 "root_numpy/src/tree.pyx" + __pyx_v_all_branches = __pyx_v_tree->GetListOfBranches(); -#line 501 "root_numpy/src/tree.pyx" - goto __pyx_L0; + /* "root_numpy/src/tree.pyx":73 + * # all branches + * cdef TObjArray* all_branches = tree.GetListOfBranches() + * if all_branches == NULL: # <<<<<<<<<<<<<< + * return ret + * for ibranch in range(all_branches.GetEntries()): + */ -#line 501 "root_numpy/src/tree.pyx" - } +#line 73 "root_numpy/src/tree.pyx" + __pyx_t_5 = ((__pyx_v_all_branches == NULL) != 0); - /* "root_numpy/src/tree.pyx":502 - * if basic_conv == NULL: - * return NULL - * conv = new FixedArrayConverter( # <<<<<<<<<<<<<< - * basic_conv, - * col.countval) +#line 73 "root_numpy/src/tree.pyx" + if (__pyx_t_5) { + + /* "root_numpy/src/tree.pyx":74 + * 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 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); +#line 74 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); - /* "root_numpy/src/tree.pyx":506 - * col.countval) - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[fixed]', conv)) # <<<<<<<<<<<<<< - * return conv - * elif ct == VARY: - */ +#line 74 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_ret); -#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 74 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_ret; -#line 506 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 74 "root_numpy/src/tree.pyx" + goto __pyx_L0; -#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 74 "root_numpy/src/tree.pyx" + } -#line 506 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); + /* "root_numpy/src/tree.pyx":75 + * 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 506 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 75 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_v_all_branches->GetEntries(); -#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 75 "root_numpy/src/tree.pyx" + for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) { -#line 506 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 75 "root_numpy/src/tree.pyx" + __pyx_v_ibranch = __pyx_t_10; - /* "root_numpy/src/tree.pyx":505 - * basic_conv, - * col.countval) - * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< - * typename + '[fixed]', conv)) - * return conv + /* "root_numpy/src/tree.pyx":76 + * return ret + * for ibranch in range(all_branches.GetEntries()): + * branch = (all_branches.At(ibranch)) # <<<<<<<<<<<<<< + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret */ -#line 505 "root_numpy/src/tree.pyx" - try { +#line 76 "root_numpy/src/tree.pyx" + __pyx_v_branch = ((TBranch *)__pyx_v_all_branches->At(__pyx_v_ibranch)); -#line 505 "root_numpy/src/tree.pyx" - __pyx_t_6 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_2, __pyx_v_conv); + /* "root_numpy/src/tree.pyx":77 + * for ibranch in range(all_branches.GetEntries()): + * branch = (all_branches.At(ibranch)) + * ret[branch.GetName()] = get_branch_structure(branch) # <<<<<<<<<<<<<< + * return ret + * + */ -#line 505 "root_numpy/src/tree.pyx" - } catch(...) { +#line 77 "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 = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 505 "root_numpy/src/tree.pyx" - __Pyx_CppExn2PyErr(); +#line 77 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 505 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 505; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 77 "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 = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 505 "root_numpy/src/tree.pyx" - } +#line 77 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 505 "root_numpy/src/tree.pyx" - __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_6); +#line 77 "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 = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 505 "root_numpy/src/tree.pyx" - goto __pyx_L3; +#line 77 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 505 "root_numpy/src/tree.pyx" - } +#line 77 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 505 "root_numpy/src/tree.pyx" - __pyx_L3:; +#line 77 "root_numpy/src/tree.pyx" + } - /* "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]') + /* "root_numpy/src/tree.pyx":78 + * branch = (all_branches.At(ibranch)) + * ret[branch.GetName()] = get_branch_structure(branch) + * return ret # <<<<<<<<<<<<<< + * + * */ -#line 507 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_conv; +#line 78 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 507 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 78 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_ret); -#line 507 "root_numpy/src/tree.pyx" - break; +#line 78 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_v_ret; - /* "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 78 "root_numpy/src/tree.pyx" + goto __pyx_L0; + + /* "root_numpy/src/tree.pyx":60 + * + * + * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< + * cdef int ibranch + * cdef TBranch* branch */ -#line 508 "root_numpy/src/tree.pyx" - case VARY: +#line 60 "root_numpy/src/tree.pyx" - /* "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 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 60 "root_numpy/src/tree.pyx" + /* function exit code */ -#line 509 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 60 "root_numpy/src/tree.pyx" + __pyx_L1_error:; -#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 60 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 509 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 60 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 509 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 60 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_3); -#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 60 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.get_tree_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 509 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 60 "root_numpy/src/tree.pyx" + __pyx_r = 0; -#line 509 "root_numpy/src/tree.pyx" - __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_2); +#line 60 "root_numpy/src/tree.pyx" + __pyx_L0:; - /* "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 60 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_ret); -#line 510 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_conv == NULL) != 0); +#line 60 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_branch_name); -#line 510 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 60 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); - /* "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 60 "root_numpy/src/tree.pyx" + __Pyx_RefNannyFinishContext(); -#line 511 "root_numpy/src/tree.pyx" - __pyx_v_basic_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_v_typename); +#line 60 "root_numpy/src/tree.pyx" + return __pyx_r; - /* "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( +#line 60 "root_numpy/src/tree.pyx" +} + +/* "root_numpy/src/tree.pyx":81 + * + * + * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< + * if load >= 0: + * return */ -#line 512 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_basic_conv == NULL) != 0); +#line 81 "root_numpy/src/tree.pyx" -#line 512 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { - /* "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 81 "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 513 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 81 "root_numpy/src/tree.pyx" + bool __pyx_v_ignore_index = ((bool)0); -#line 513 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 81 "root_numpy/src/tree.pyx" + PyObject *__pyx_r = NULL; + __Pyx_RefNannyDeclarations + int __pyx_t_1; + PyObject *__pyx_t_2 = NULL; + int __pyx_lineno = 0; + const char *__pyx_filename = NULL; + int __pyx_clineno = 0; -#line 513 "root_numpy/src/tree.pyx" - } +#line 81 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("handle_load", 0); - /* "root_numpy/src/tree.pyx":514 - * if basic_conv == NULL: - * return NULL - * conv = new VaryArrayConverter( # <<<<<<<<<<<<<< - * basic_conv) - * CONVERTERS.insert(CONVERTERS_ITEM( - */ +#line 81 "root_numpy/src/tree.pyx" + if (__pyx_optional_args) { -#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 81 "root_numpy/src/tree.pyx" + if (__pyx_optional_args->__pyx_n > 0) { - /* "root_numpy/src/tree.pyx":517 - * basic_conv) - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[vary]', conv)) # <<<<<<<<<<<<<< - * return conv - * return NULL +#line 81 "root_numpy/src/tree.pyx" + __pyx_v_ignore_index = __pyx_optional_args->ignore_index; + +#line 81 "root_numpy/src/tree.pyx" + } + +#line 81 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":82 + * + * cdef handle_load(int load, bool ignore_index=False): + * if load >= 0: # <<<<<<<<<<<<<< + * return + * if load == -1: */ -#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 82 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_load >= 0) != 0); -#line 517 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 82 "root_numpy/src/tree.pyx" + if (__pyx_t_1) { -#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;} + /* "root_numpy/src/tree.pyx":83 + * cdef handle_load(int load, bool ignore_index=False): + * if load >= 0: + * return # <<<<<<<<<<<<<< + * if load == -1: + * raise ValueError("chain is empty") + */ -#line 517 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 83 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 517 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 83 "root_numpy/src/tree.pyx" + __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#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 83 "root_numpy/src/tree.pyx" + goto __pyx_L0; -#line 517 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; +#line 83 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":516 - * conv = new VaryArrayConverter( - * basic_conv) - * CONVERTERS.insert(CONVERTERS_ITEM( # <<<<<<<<<<<<<< - * typename + '[vary]', conv)) - * return conv + /* "root_numpy/src/tree.pyx":92 + * elif load == -3: + * raise IOError("cannot open current file") + * elif load == -4: # <<<<<<<<<<<<<< + * raise IOError("cannot access tree in current file") + * raise RuntimeError("the chain is not initialized") */ -#line 516 "root_numpy/src/tree.pyx" - try { +#line 92 "root_numpy/src/tree.pyx" + switch (__pyx_v_load) { -#line 516 "root_numpy/src/tree.pyx" - __pyx_t_6 = __pyx_t_13_librootnumpy_CONVERTERS_ITEM(__pyx_t_2, __pyx_v_conv); + /* "root_numpy/src/tree.pyx":84 + * if load >= 0: + * return + * if load == -1: # <<<<<<<<<<<<<< + * raise ValueError("chain is empty") + * elif load == -2: + */ -#line 516 "root_numpy/src/tree.pyx" - } catch(...) { +#line 84 "root_numpy/src/tree.pyx" + case -1: -#line 516 "root_numpy/src/tree.pyx" - __Pyx_CppExn2PyErr(); + /* "root_numpy/src/tree.pyx":85 + * return + * if load == -1: + * raise ValueError("chain is empty") # <<<<<<<<<<<<<< + * elif load == -2: + * if ignore_index: + */ -#line 516 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 516; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 85 "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 = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 516 "root_numpy/src/tree.pyx" - } +#line 85 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 516 "root_numpy/src/tree.pyx" - __pyx_v_13_librootnumpy_CONVERTERS.insert(__pyx_t_6); +#line 85 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 516 "root_numpy/src/tree.pyx" - goto __pyx_L5; +#line 85 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 516 "root_numpy/src/tree.pyx" - } +#line 85 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 516 "root_numpy/src/tree.pyx" - __pyx_L5:; +#line 85 "root_numpy/src/tree.pyx" + break; - /* "root_numpy/src/tree.pyx":518 - * CONVERTERS.insert(CONVERTERS_ITEM( - * typename + '[vary]', conv)) - * return conv # <<<<<<<<<<<<<< - * return NULL - * + /* "root_numpy/src/tree.pyx":86 + * if load == -1: + * raise ValueError("chain is empty") + * elif load == -2: # <<<<<<<<<<<<<< + * if ignore_index: + * return */ -#line 518 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_v_conv; - -#line 518 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 86 "root_numpy/src/tree.pyx" + case -2: -#line 518 "root_numpy/src/tree.pyx" - break; + /* "root_numpy/src/tree.pyx":87 + * raise ValueError("chain is empty") + * elif load == -2: + * if ignore_index: # <<<<<<<<<<<<<< + * return + * raise IndexError("tree index in chain is out of bounds") + */ -#line 518 "root_numpy/src/tree.pyx" - default: break; +#line 87 "root_numpy/src/tree.pyx" + __pyx_t_1 = (__pyx_v_ignore_index != 0); -#line 518 "root_numpy/src/tree.pyx" - } +#line 87 "root_numpy/src/tree.pyx" + if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":519 - * typename + '[vary]', conv)) - * return conv - * return NULL # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/tree.pyx":88 + * elif load == -2: + * if ignore_index: + * return # <<<<<<<<<<<<<< + * raise IndexError("tree index in chain is out of bounds") + * elif load == -3: */ -#line 519 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 88 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); -#line 519 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 88 "root_numpy/src/tree.pyx" + __pyx_r = Py_None; __Pyx_INCREF(Py_None); + +#line 88 "root_numpy/src/tree.pyx" + goto __pyx_L0; + +#line 88 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":489 - * - * - * cdef Converter* find_converter(Column* col): # <<<<<<<<<<<<<< - * cdef ColumnType ct = col.coltype - * cdef string typename = string(col.GetTypeName()) + /* "root_numpy/src/tree.pyx":89 + * if ignore_index: + * return + * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< + * elif load == -3: + * raise IOError("cannot open current file") */ -#line 489 "root_numpy/src/tree.pyx" - +#line 89 "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 = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 489 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 89 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 489 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 89 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 489 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 89 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 489 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_4); +#line 89 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 489 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.find_converter", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 89 "root_numpy/src/tree.pyx" + break; -#line 489 "root_numpy/src/tree.pyx" - __pyx_r = 0; + /* "root_numpy/src/tree.pyx":90 + * return + * raise IndexError("tree index in chain is out of bounds") + * elif load == -3: # <<<<<<<<<<<<<< + * raise IOError("cannot open current file") + * elif load == -4: + */ -#line 489 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 90 "root_numpy/src/tree.pyx" + case -3: -#line 489 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); + /* "root_numpy/src/tree.pyx":91 + * raise IndexError("tree index in chain is out of bounds") + * elif load == -3: + * raise IOError("cannot open current file") # <<<<<<<<<<<<<< + * elif load == -4: + * raise IOError("cannot access tree in current file") + */ -#line 489 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 91 "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 = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 489 "root_numpy/src/tree.pyx" -} +#line 91 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__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 91 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 522 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 91 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 91; __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 91 "root_numpy/src/tree.pyx" + break; -#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; + /* "root_numpy/src/tree.pyx":92 + * elif load == -3: + * raise IOError("cannot open current file") + * elif load == -4: # <<<<<<<<<<<<<< + * raise IOError("cannot access tree in current file") + * raise RuntimeError("the chain is not initialized") + */ -#line 522 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("find_converter_by_typename", 0); +#line 92 "root_numpy/src/tree.pyx" + case -4: - /* "root_numpy/src/tree.pyx":523 + /* "root_numpy/src/tree.pyx":93 + * raise IOError("cannot open current file") + * elif load == -4: + * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< + * raise RuntimeError("the chain is not initialized") * - * cdef Converter* find_converter_by_typename(string typename): - * it = CONVERTERS.find(resolve_type(typename.c_str())) # <<<<<<<<<<<<<< - * if it == CONVERTERS.end(): - * return NULL */ -#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 93 "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 = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 523 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 93 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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 93 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 523 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 93 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 523 "root_numpy/src/tree.pyx" - __pyx_v_it = __pyx_v_13_librootnumpy_CONVERTERS.find(__pyx_t_2); +#line 93 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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 93 "root_numpy/src/tree.pyx" + break; -#line 524 "root_numpy/src/tree.pyx" - __pyx_t_3 = ((__pyx_v_it == __pyx_v_13_librootnumpy_CONVERTERS.end()) != 0); +#line 93 "root_numpy/src/tree.pyx" + default: break; -#line 524 "root_numpy/src/tree.pyx" - if (__pyx_t_3) { +#line 93 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":525 - * it = CONVERTERS.find(resolve_type(typename.c_str())) - * if it == CONVERTERS.end(): - * return NULL # <<<<<<<<<<<<<< - * return deref(it).second + /* "root_numpy/src/tree.pyx":94 + * elif load == -4: + * raise IOError("cannot access tree in current file") + * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< + * * */ -#line 525 "root_numpy/src/tree.pyx" - __pyx_r = NULL; - -#line 525 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 94 "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 = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 525 "root_numpy/src/tree.pyx" - } +#line 94 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":526 - * if it == CONVERTERS.end(): - * return NULL - * return deref(it).second # <<<<<<<<<<<<<< - * - * - */ +#line 94 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 526 "root_numpy/src/tree.pyx" - __pyx_r = (*__pyx_v_it).second; +#line 94 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 526 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 94 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":522 + /* "root_numpy/src/tree.pyx":81 * * - * cdef Converter* find_converter_by_typename(string typename): # <<<<<<<<<<<<<< - * it = CONVERTERS.find(resolve_type(typename.c_str())) - * if it == CONVERTERS.end(): + * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< + * if load >= 0: + * return */ -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" /* function exit code */ -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 522 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 81 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_2); -#line 522 "root_numpy/src/tree.pyx" - __Pyx_WriteUnraisable("_librootnumpy.find_converter_by_typename", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); +#line 81 "root_numpy/src/tree.pyx" + __Pyx_AddTraceback("_librootnumpy.handle_load", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_r); + +#line 81 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" return __pyx_r; -#line 522 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":529 +/* "root_numpy/src/tree.pyx":97 * * - * cdef np.ndarray init_array(vector[Column*]& columns, # <<<<<<<<<<<<<< - * vector[Converter*]& cv, - * unsigned long entries, + * cdef object tree2array(TTree* tree, branches, string selection, # <<<<<<<<<<<<<< + * start, stop, step, + * bool include_weight, string weight_name): */ -#line 529 "root_numpy/src/tree.pyx" +#line 97 "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) { +#line 97 "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 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_num_entries +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_num_entries_selected +#line 97 "root_numpy/src/tree.pyx" +; + TreeChain *__pyx_v_chain +#line 97 "root_numpy/src/tree.pyx" +; + TObjArray *__pyx_v_branch_array +#line 97 "root_numpy/src/tree.pyx" +; + TObjArray *__pyx_v_leaf_array +#line 97 "root_numpy/src/tree.pyx" +; + TBranch *__pyx_v_tbranch +#line 97 "root_numpy/src/tree.pyx" +; + TLeaf *__pyx_v_tleaf +#line 97 "root_numpy/src/tree.pyx" +; + Column *__pyx_v_col +#line 97 "root_numpy/src/tree.pyx" +; + __pyx_t_13_librootnumpy_Converter *__pyx_v_conv +#line 97 "root_numpy/src/tree.pyx" +; + std::vector __pyx_v_columns +#line 97 "root_numpy/src/tree.pyx" +; + std::vector<__pyx_t_13_librootnumpy_Converter *> __pyx_v_converters +#line 97 "root_numpy/src/tree.pyx" +; + std::vector > __pyx_v_column_buckets +#line 97 "root_numpy/src/tree.pyx" +; + std::vector > __pyx_v_converter_buckets +#line 97 "root_numpy/src/tree.pyx" +; + TTreeFormula *__pyx_v_selection_formula +#line 97 "root_numpy/src/tree.pyx" +; + TTreeFormula *__pyx_v_formula +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_ibranch +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_ileaf +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_ientry +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_branch_idx +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_num_branches +#line 97 "root_numpy/src/tree.pyx" +; + unsigned int __pyx_v_icol +#line 97 "root_numpy/src/tree.pyx" +; + unsigned int __pyx_v_num_columns +#line 97 "root_numpy/src/tree.pyx" +; + PyArrayObject *__pyx_v_arr = 0 +#line 97 "root_numpy/src/tree.pyx" +; + void *__pyx_v_data_ptr +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_num_bytes +#line 97 "root_numpy/src/tree.pyx" +; + int __pyx_v_entry_size +#line 97 "root_numpy/src/tree.pyx" +; + char *__pyx_v_c_string +#line 97 "root_numpy/src/tree.pyx" +; + bool __pyx_v_shortname +#line 97 "root_numpy/src/tree.pyx" +; + std::string __pyx_v_column_name +#line 97 "root_numpy/src/tree.pyx" +; + const char *__pyx_v_branch_name +#line 97 "root_numpy/src/tree.pyx" +; + const char *__pyx_v_leaf_name +#line 97 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_branch_dict = NULL +#line 97 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_expression = NULL +#line 97 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_dtype = NULL +#line 97 "root_numpy/src/tree.pyx" +; Column *__pyx_v_this_col -#line 529 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" ; __pyx_t_13_librootnumpy_Converter *__pyx_v_this_conv -#line 529 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" ; - unsigned int __pyx_v_i -#line 529 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_indices = NULL +#line 97 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_idx = NULL +#line 97 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_nst = NULL -#line 529 "root_numpy/src/tree.pyx" + PyObject *__pyx_v_b = NULL +#line 97 "root_numpy/src/tree.pyx" ; -#line 529 "root_numpy/src/tree.pyx" - PyArrayObject *__pyx_r = NULL; +#line 97 "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; - int __pyx_t_4; - PyObject *__pyx_t_5 = NULL; - PyObject *__pyx_t_6 = NULL; - PyObject *__pyx_t_7 = NULL; + int __pyx_t_1; + PyObject *__pyx_t_2 = 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; - int __pyx_t_9; + PyObject *__pyx_t_9 = NULL; + PyObject *__pyx_t_10 = NULL; + PyObject *__pyx_t_11 = NULL; + PyObject *(*__pyx_t_12)(PyObject *); + int __pyx_t_13; + int __pyx_t_14; + int __pyx_t_15; + int __pyx_t_16; + std::string __pyx_t_17; + std::string __pyx_t_18; + PyObject *__pyx_t_19 = NULL; + PyObject *__pyx_t_20 = NULL; + PyObject *__pyx_t_21 = NULL; + PyObject *__pyx_t_22 = NULL; + char *__pyx_t_23; + size_t __pyx_t_24; + unsigned int __pyx_t_25; + int __pyx_t_26; + 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 529 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("init_array", 0); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_RefNannySetupContext("tree2array", 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] + /* "root_numpy/src/tree.pyx":101 + * bool include_weight, string weight_name): + * + * if tree.GetNbranches() == 0: # <<<<<<<<<<<<<< + * raise ValueError("tree has no branches") + * */ -#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 537 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); - -#line 537 "root_numpy/src/tree.pyx" - __pyx_v_nst = ((PyObject*)__pyx_t_1); +#line 101 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_tree->GetNbranches() == 0) != 0); -#line 537 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 101 "root_numpy/src/tree.pyx" + if (__pyx_t_1) { - /* "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":102 + * + * if tree.GetNbranches() == 0: + * raise ValueError("tree has no branches") # <<<<<<<<<<<<<< + * + * cdef int num_requested_branches = 0 */ -#line 538 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_v_columns.size(); +#line 102 "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 = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 538 "root_numpy/src/tree.pyx" - for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) { +#line 102 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 538 "root_numpy/src/tree.pyx" - __pyx_v_i = __pyx_t_3; +#line 102 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); - /* "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 102 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 539 "root_numpy/src/tree.pyx" - __pyx_v_this_col = (__pyx_v_columns[__pyx_v_i]); +#line 102 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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 102 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":104 + * raise ValueError("tree has no branches") + * + * cdef int num_requested_branches = 0 # <<<<<<<<<<<<<< + * if branches is not None: + * num_requested_branches = len(branches) */ -#line 540 "root_numpy/src/tree.pyx" - __pyx_v_this_conv = __pyx_f_13_librootnumpy_find_converter(__pyx_v_this_col); +#line 104 "root_numpy/src/tree.pyx" + __pyx_v_num_requested_branches = 0; - /* "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())) + /* "root_numpy/src/tree.pyx":105 + * + * cdef int num_requested_branches = 0 + * if branches is not None: # <<<<<<<<<<<<<< + * num_requested_branches = len(branches) + * if num_requested_branches == 0: */ -#line 541 "root_numpy/src/tree.pyx" - __pyx_t_4 = ((__pyx_v_this_conv == NULL) != 0); +#line 105 "root_numpy/src/tree.pyx" + __pyx_t_1 = (__pyx_v_branches != Py_None); -#line 541 "root_numpy/src/tree.pyx" - if (__pyx_t_4) { +#line 105 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_t_1 != 0); + +#line 105 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "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) + /* "root_numpy/src/tree.pyx":106 + * 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 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 106 "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 = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 106 "root_numpy/src/tree.pyx" + __pyx_v_num_requested_branches = __pyx_t_4; -#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;} + /* "root_numpy/src/tree.pyx":107 + * if branches is not None: + * num_requested_branches = len(branches) + * if num_requested_branches == 0: # <<<<<<<<<<<<<< + * raise ValueError("branches is an empty list") + * + */ -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 107 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches == 0) != 0); -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_7 = NULL; +#line 107 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 542 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { + /* "root_numpy/src/tree.pyx":108 + * num_requested_branches = len(branches) + * if num_requested_branches == 0: + * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< + * + * cdef int num_entries = tree.GetEntries() + */ -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_5); +#line 108 "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 = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_7)) { +#line 108 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 542 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); +#line 108 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_7); +#line 108 "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 108 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_5, function); +#line 108 "root_numpy/src/tree.pyx" + } -#line 542 "root_numpy/src/tree.pyx" - } +#line 108 "root_numpy/src/tree.pyx" + goto __pyx_L4; -#line 542 "root_numpy/src/tree.pyx" - } +#line 108 "root_numpy/src/tree.pyx" + } -#line 542 "root_numpy/src/tree.pyx" - if (!__pyx_t_7) { +#line 108 "root_numpy/src/tree.pyx" + __pyx_L4:; -#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;} + /* "root_numpy/src/tree.pyx":110 + * raise ValueError("branches is an empty list") + * + * cdef int num_entries = tree.GetEntries() # <<<<<<<<<<<<<< + * cdef int num_entries_selected = 0 + * + */ -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 110 "root_numpy/src/tree.pyx" + __pyx_v_num_entries = __pyx_v_tree->GetEntries(); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); + /* "root_numpy/src/tree.pyx":111 + * + * cdef int num_entries = tree.GetEntries() + * cdef int num_entries_selected = 0 # <<<<<<<<<<<<<< + * + * cdef TreeChain* chain = new TreeChain(tree) + */ -#line 542 "root_numpy/src/tree.pyx" - } else { +#line 111 "root_numpy/src/tree.pyx" + __pyx_v_num_entries_selected = 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;} + /* "root_numpy/src/tree.pyx":113 + * cdef int num_entries_selected = 0 + * + * cdef TreeChain* chain = new TreeChain(tree) # <<<<<<<<<<<<<< + * handle_load(chain.Prepare(), True) + * + */ -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 113 "root_numpy/src/tree.pyx" + __pyx_v_chain = new TreeChain(__pyx_v_tree); -#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; + /* "root_numpy/src/tree.pyx":114 + * + * cdef TreeChain* chain = new TreeChain(tree) + * handle_load(chain.Prepare(), True) # <<<<<<<<<<<<<< + * + * cdef TObjArray* branch_array = tree.GetListOfBranches() + */ -#line 542 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_t_6); +#line 114 "root_numpy/src/tree.pyx" + __pyx_t_5.__pyx_n = 1; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_6); +#line 114 "root_numpy/src/tree.pyx" + __pyx_t_5.ignore_index = 1; -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_6 = 0; +#line 114 "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 = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 114 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 114 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; + /* "root_numpy/src/tree.pyx":116 + * handle_load(chain.Prepare(), True) + * + * cdef TObjArray* branch_array = tree.GetListOfBranches() # <<<<<<<<<<<<<< + * cdef TObjArray* leaf_array + * cdef TBranch* tbranch + */ -#line 542 "root_numpy/src/tree.pyx" - } +#line 116 "root_numpy/src/tree.pyx" + __pyx_v_branch_array = __pyx_v_tree->GetListOfBranches(); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + /* "root_numpy/src/tree.pyx":131 + * # Avoid calling FindBranch for each branch since that results in O(n^2) + * + * cdef TTreeFormula* selection_formula = NULL # <<<<<<<<<<<<<< + * cdef TTreeFormula* formula = NULL + * + */ -#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 131 "root_numpy/src/tree.pyx" + __pyx_v_selection_formula = NULL; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); + /* "root_numpy/src/tree.pyx":132 + * + * cdef TTreeFormula* selection_formula = NULL + * cdef TTreeFormula* formula = NULL # <<<<<<<<<<<<<< + * + * cdef int ibranch, ileaf, ientry, branch_idx = 0 + */ -#line 542 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); +#line 132 "root_numpy/src/tree.pyx" + __pyx_v_formula = NULL; -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); + /* "root_numpy/src/tree.pyx":134 + * cdef TTreeFormula* formula = NULL + * + * cdef int ibranch, ileaf, ientry, branch_idx = 0 # <<<<<<<<<<<<<< + * cdef int num_branches = branch_array.GetEntries() + * cdef unsigned int icol, num_columns + */ -#line 542 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 134 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = 0; -#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;} + /* "root_numpy/src/tree.pyx":135 + * + * cdef int ibranch, ileaf, ientry, branch_idx = 0 + * cdef int num_branches = branch_array.GetEntries() # <<<<<<<<<<<<<< + * cdef unsigned int icol, num_columns + * + */ -#line 542 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 135 "root_numpy/src/tree.pyx" + __pyx_v_num_branches = __pyx_v_branch_array->GetEntries(); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + /* "root_numpy/src/tree.pyx":149 + * cdef const_char* leaf_name + * + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * columns.reserve(num_requested_branches) + * converters.reserve(num_requested_branches) + */ -#line 542 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_1, 0, 0, 0); +#line 149 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 542 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 149 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 542 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 542; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + /* "root_numpy/src/tree.pyx":150 + * + * if num_requested_branches > 0: + * columns.reserve(num_requested_branches) # <<<<<<<<<<<<<< + * converters.reserve(num_requested_branches) + * column_buckets.assign(num_requested_branches, vector['Column*']()) + */ -#line 542 "root_numpy/src/tree.pyx" - } +#line 150 "root_numpy/src/tree.pyx" + __pyx_v_columns.reserve(__pyx_v_num_requested_branches); - /* "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: + /* "root_numpy/src/tree.pyx":151 + * 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 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 151 "root_numpy/src/tree.pyx" + __pyx_v_converters.reserve(__pyx_v_num_requested_branches); -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); + /* "root_numpy/src/tree.pyx":152 + * 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 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 152 "root_numpy/src/tree.pyx" + try { -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 152 "root_numpy/src/tree.pyx" + __pyx_t_6 = std::vector (); -#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 152 "root_numpy/src/tree.pyx" + } catch(...) { -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 152 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 543 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_1); +#line 152 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_1); +#line 152 "root_numpy/src/tree.pyx" + } -#line 543 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_5); +#line 152 "root_numpy/src/tree.pyx" + __pyx_v_column_buckets.assign(__pyx_v_num_requested_branches, __pyx_t_6); -#line 543 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); + /* "root_numpy/src/tree.pyx":153 + * 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 543 "root_numpy/src/tree.pyx" - __pyx_t_1 = 0; +#line 153 "root_numpy/src/tree.pyx" + try { -#line 543 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 153 "root_numpy/src/tree.pyx" + __pyx_t_7 = std::vector<__pyx_t_13_librootnumpy_Converter *> (); -#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 153 "root_numpy/src/tree.pyx" + } catch(...) { -#line 543 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 153 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); - /* "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'))) - */ +#line 153 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 544 "root_numpy/src/tree.pyx" - __pyx_v_cv.push_back(__pyx_v_this_conv); +#line 153 "root_numpy/src/tree.pyx" + } -#line 544 "root_numpy/src/tree.pyx" - } +#line 153 "root_numpy/src/tree.pyx" + __pyx_v_converter_buckets.assign(__pyx_v_num_requested_branches, __pyx_t_7); - /* "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) - */ +#line 153 "root_numpy/src/tree.pyx" + goto __pyx_L6; -#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 153 "root_numpy/src/tree.pyx" + } -#line 545 "root_numpy/src/tree.pyx" - if (__pyx_t_4) { +#line 153 "root_numpy/src/tree.pyx" + /*else*/ { - /* "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":155 + * converter_buckets.assign(num_requested_branches, vector['Converter*']()) + * else: + * columns.reserve(num_branches) # <<<<<<<<<<<<<< + * converters.reserve(num_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 546 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); - -#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 546 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 155 "root_numpy/src/tree.pyx" + __pyx_v_columns.reserve(__pyx_v_num_branches); -#line 546 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_weight_name); + /* "root_numpy/src/tree.pyx":156 + * else: + * columns.reserve(num_branches) + * converters.reserve(num_branches) # <<<<<<<<<<<<<< + * + * try: + */ -#line 546 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_weight_name); +#line 156 "root_numpy/src/tree.pyx" + __pyx_v_converters.reserve(__pyx_v_num_branches); -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_weight_name); +#line 156 "root_numpy/src/tree.pyx" + } -#line 546 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_8); +#line 156 "root_numpy/src/tree.pyx" + __pyx_L6:; -#line 546 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_8); + /* "root_numpy/src/tree.pyx":158 + * converters.reserve(num_branches) + * + * try: # <<<<<<<<<<<<<< + * # Set up the selection if we have one + * if selection.size(): + */ -#line 546 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 158 "root_numpy/src/tree.pyx" + /*try:*/ { -#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;} + /* "root_numpy/src/tree.pyx":160 + * try: + * # 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: + */ -#line 546 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 160 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_v_selection.size() != 0); -#line 546 "root_numpy/src/tree.pyx" - goto __pyx_L6; +#line 160 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 546 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":161 + * # 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 546 "root_numpy/src/tree.pyx" - __pyx_L6:; +#line 161 "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":547 - * if include_weight: - * nst.append((weight_name, np.dtype('d'))) - * return np.empty(entries, dtype=nst) # <<<<<<<<<<<<<< - * - * + /* "root_numpy/src/tree.pyx":162 + * 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( */ -#line 547 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(((PyObject *)__pyx_r)); +#line 162 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_selection_formula == 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 162 "root_numpy/src/tree.pyx" + if (!__pyx_t_1) { -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 162 "root_numpy/src/tree.pyx" + } else { -#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 162 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 162 "root_numpy/src/tree.pyx" + goto __pyx_L12_bool_binop_done; -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 162 "root_numpy/src/tree.pyx" + } -#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 162 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_selection_formula->GetNdim() == 0) != 0); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 162 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#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;} +#line 162 "root_numpy/src/tree.pyx" + __pyx_L12_bool_binop_done:; -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_1); +#line 162 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 547 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5); + /* "root_numpy/src/tree.pyx":163 + * 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 expression '{0}'".format(selection)) + */ -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); +#line 163 "root_numpy/src/tree.pyx" + delete __pyx_v_selection_formula; -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; + /* "root_numpy/src/tree.pyx":165 + * del 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 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 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 165 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#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 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_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 165 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 165 "root_numpy/src/tree.pyx" + __pyx_t_10 = NULL; -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 165 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; +#line 165 "root_numpy/src/tree.pyx" + __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_8); -#line 547 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; +#line 165 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_10)) { -#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 165 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 547 "root_numpy/src/tree.pyx" - __pyx_r = ((PyArrayObject *)__pyx_t_6); +#line 165 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_10); -#line 547 "root_numpy/src/tree.pyx" - __pyx_t_6 = 0; +#line 165 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 547 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 165 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_8, function); - /* "root_numpy/src/tree.pyx":529 - * - * - * cdef np.ndarray init_array(vector[Column*]& columns, # <<<<<<<<<<<<<< - * vector[Converter*]& cv, - * unsigned long entries, - */ +#line 165 "root_numpy/src/tree.pyx" + } -#line 529 "root_numpy/src/tree.pyx" +#line 165 "root_numpy/src/tree.pyx" + } +#line 165 "root_numpy/src/tree.pyx" + if (!__pyx_t_10) { -#line 529 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 529 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 165 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_1); +#line 165 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); +#line 165 "root_numpy/src/tree.pyx" + } else { -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_6); +#line 165 "root_numpy/src/tree.pyx" + __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); +#line 165 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); +#line 165 "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 529 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.init_array", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 165 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_t_9); -#line 529 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 165 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 529 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 165 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_nst); +#line 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 529 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF((PyObject *)__pyx_r); +#line 165 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 529 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 165 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 529 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 165 "root_numpy/src/tree.pyx" + } -#line 529 "root_numpy/src/tree.pyx" -} +#line 165 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -/* "root_numpy/src/tree.pyx":550 - * - * - * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< - * if load >= 0: - * return + /* "root_numpy/src/tree.pyx":164 + * 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 550 "root_numpy/src/tree.pyx" +#line 164 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 164 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 550 "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 164 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 550 "root_numpy/src/tree.pyx" - bool __pyx_v_ignore_index = ((bool)0); +#line 164 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 550 "root_numpy/src/tree.pyx" - PyObject *__pyx_r = NULL; - __Pyx_RefNannyDeclarations - int __pyx_t_1; - PyObject *__pyx_t_2 = NULL; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 164 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 550 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("handle_load", 0); +#line 164 "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 = 164; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 550 "root_numpy/src/tree.pyx" - if (__pyx_optional_args) { +#line 164 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 550 "root_numpy/src/tree.pyx" - if (__pyx_optional_args->__pyx_n > 0) { +#line 164 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 550 "root_numpy/src/tree.pyx" - __pyx_v_ignore_index = __pyx_optional_args->ignore_index; +#line 164 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 550 "root_numpy/src/tree.pyx" - } +#line 164 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 550 "root_numpy/src/tree.pyx" - } +#line 164 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 164 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":551 + /* "root_numpy/src/tree.pyx":168 + * # The chain will take care of updating the formula leaves when + * # rolling over to the next tree. + * chain.AddFormula(selection_formula) # <<<<<<<<<<<<<< * - * cdef handle_load(int load, bool ignore_index=False): - * if load >= 0: # <<<<<<<<<<<<<< - * return - * if load == -1: + * branch_dict = None */ -#line 551 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_load >= 0) != 0); +#line 168 "root_numpy/src/tree.pyx" + __pyx_v_chain->AddFormula(__pyx_v_selection_formula); -#line 551 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 168 "root_numpy/src/tree.pyx" + goto __pyx_L10; - /* "root_numpy/src/tree.pyx":552 - * cdef handle_load(int load, bool ignore_index=False): - * if load >= 0: - * return # <<<<<<<<<<<<<< - * if load == -1: - * raise ValueError("chain is empty") - */ +#line 168 "root_numpy/src/tree.pyx" + } -#line 552 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 168 "root_numpy/src/tree.pyx" + __pyx_L10:; -#line 552 "root_numpy/src/tree.pyx" - __pyx_r = Py_None; __Pyx_INCREF(Py_None); + /* "root_numpy/src/tree.pyx":170 + * chain.AddFormula(selection_formula) + * + * branch_dict = None # <<<<<<<<<<<<<< + * if num_requested_branches > 0: + * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) + */ -#line 552 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 170 "root_numpy/src/tree.pyx" + __Pyx_INCREF(Py_None); -#line 552 "root_numpy/src/tree.pyx" - } +#line 170 "root_numpy/src/tree.pyx" + __pyx_v_branch_dict = Py_None; - /* "root_numpy/src/tree.pyx":561 - * elif load == -3: - * raise IOError("cannot open current file") - * elif load == -4: # <<<<<<<<<<<<<< - * raise IOError("cannot access tree in current file") - * raise RuntimeError("the chain is not initialized") + /* "root_numpy/src/tree.pyx":171 + * + * 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 561 "root_numpy/src/tree.pyx" - switch (__pyx_v_load) { - - /* "root_numpy/src/tree.pyx":553 - * if load >= 0: - * return - * if load == -1: # <<<<<<<<<<<<<< - * raise ValueError("chain is empty") - * elif load == -2: - */ +#line 171 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 553 "root_numpy/src/tree.pyx" - case -1: +#line 171 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":554 - * return - * if load == -1: - * raise ValueError("chain is empty") # <<<<<<<<<<<<<< - * elif load == -2: - * if ignore_index: + /* "root_numpy/src/tree.pyx":172 + * 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 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 554 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 554 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 554 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_int_0); -#line 554 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 554; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_int_0; -#line 554 "root_numpy/src/tree.pyx" - break; +#line 172 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { - /* "root_numpy/src/tree.pyx":555 - * if load == -1: - * raise ValueError("chain is empty") - * elif load == -2: # <<<<<<<<<<<<<< - * if ignore_index: - * return - */ +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_11 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_11); __pyx_t_4 = 0; -#line 555 "root_numpy/src/tree.pyx" - case -2: +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_12 = NULL; - /* "root_numpy/src/tree.pyx":556 - * raise ValueError("chain is empty") - * elif load == -2: - * if ignore_index: # <<<<<<<<<<<<<< - * return - * raise IndexError("tree index in chain is out of bounds") - */ +#line 172 "root_numpy/src/tree.pyx" + } else { + __pyx_t_4 = -1; +#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 556 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_ignore_index != 0); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 556 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":557 - * elif load == -2: - * if ignore_index: - * return # <<<<<<<<<<<<<< - * raise IndexError("tree index in chain is out of bounds") - * elif load == -3: - */ +#line 172 "root_numpy/src/tree.pyx" + } -#line 557 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#line 172 "root_numpy/src/tree.pyx" + for (;;) { -#line 557 "root_numpy/src/tree.pyx" - __pyx_r = Py_None; __Pyx_INCREF(Py_None); +#line 172 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_12)) { -#line 557 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 172 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_11))) { -#line 557 "root_numpy/src/tree.pyx" - } +#line 172 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_11)) break; - /* "root_numpy/src/tree.pyx":558 - * if ignore_index: - * return - * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< - * elif load == -3: - * raise IOError("cannot open current file") - */ +#line 172 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#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 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 558 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 172 "root_numpy/src/tree.pyx" + #else -#line 558 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 558 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 172 "root_numpy/src/tree.pyx" + #endif -#line 558 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 172 "root_numpy/src/tree.pyx" + } else { -#line 558 "root_numpy/src/tree.pyx" - break; +#line 172 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_11)) break; - /* "root_numpy/src/tree.pyx":559 - * return - * raise IndexError("tree index in chain is out of bounds") - * elif load == -3: # <<<<<<<<<<<<<< - * raise IOError("cannot open current file") - * elif load == -4: - */ +#line 172 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 559 "root_numpy/src/tree.pyx" - case -3: +#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":560 - * raise IndexError("tree index in chain is out of bounds") - * elif load == -3: - * raise IOError("cannot open current file") # <<<<<<<<<<<<<< - * elif load == -4: - * raise IOError("cannot access tree in current file") - */ +#line 172 "root_numpy/src/tree.pyx" + #else -#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 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 560 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 172 "root_numpy/src/tree.pyx" + #endif -#line 560 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 172 "root_numpy/src/tree.pyx" + } + } else +#line 172 "root_numpy/src/tree.pyx" +{ -#line 560 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_9 = __pyx_t_12(__pyx_t_11); -#line 560 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 172 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_9)) { -#line 560 "root_numpy/src/tree.pyx" - break; +#line 172 "root_numpy/src/tree.pyx" + PyObject* exc_type = PyErr_Occurred(); - /* "root_numpy/src/tree.pyx":561 - * elif load == -3: - * raise IOError("cannot open current file") - * elif load == -4: # <<<<<<<<<<<<<< - * raise IOError("cannot access tree in current file") - * raise RuntimeError("the chain is not initialized") - */ +#line 172 "root_numpy/src/tree.pyx" + if (exc_type) { -#line 561 "root_numpy/src/tree.pyx" - case -4: +#line 172 "root_numpy/src/tree.pyx" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - /* "root_numpy/src/tree.pyx":562 - * raise IOError("cannot open current file") - * elif load == -4: - * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< - * raise RuntimeError("the chain is not initialized") - * - */ +#line 172 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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 172 "root_numpy/src/tree.pyx" + } -#line 562 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 172 "root_numpy/src/tree.pyx" + break; -#line 562 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 172 "root_numpy/src/tree.pyx" + } -#line 562 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 562 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 172 "root_numpy/src/tree.pyx" + } -#line 562 "root_numpy/src/tree.pyx" - break; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_9); -#line 562 "root_numpy/src/tree.pyx" - default: break; +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 562 "root_numpy/src/tree.pyx" - } +#line 172 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_8); - /* "root_numpy/src/tree.pyx":563 - * elif load == -4: - * raise IOError("cannot access tree in current file") - * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< - * - * - */ +#line 172 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_idx, __pyx_t_8); -#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 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 563 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 563 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); -#line 563 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_8 = __pyx_t_9; -#line 563 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":550 - * - * - * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< - * if load >= 0: - * return - */ +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_New(2); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 550 "root_numpy/src/tree.pyx" +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_b); -#line 550 "root_numpy/src/tree.pyx" - /* function exit code */ +#line 172 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_v_b); -#line 550 "root_numpy/src/tree.pyx" - __pyx_L1_error:; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_b); -#line 550 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_idx); -#line 550 "root_numpy/src/tree.pyx" - __Pyx_AddTraceback("_librootnumpy.handle_load", __pyx_clineno, __pyx_lineno, __pyx_filename); +#line 172 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_v_idx); -#line 550 "root_numpy/src/tree.pyx" - __pyx_r = 0; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_idx); -#line 550 "root_numpy/src/tree.pyx" - __pyx_L0:; +#line 172 "root_numpy/src/tree.pyx" + if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_9))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 550 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_r); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 550 "root_numpy/src/tree.pyx" - __Pyx_RefNannyFinishContext(); +#line 172 "root_numpy/src/tree.pyx" + } -#line 550 "root_numpy/src/tree.pyx" - return __pyx_r; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 550 "root_numpy/src/tree.pyx" -} +#line 172 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -/* "root_numpy/src/tree.pyx":566 - * - * - * cdef object tree2array(TTree* tree, branches, selection, # <<<<<<<<<<<<<< - * start, stop, step, - * include_weight, weight_name): - */ +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 566 "root_numpy/src/tree.pyx" +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); +#line 172 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#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" -; - Column *__pyx_v_col -#line 566 "root_numpy/src/tree.pyx" -; - TreeChain *__pyx_v_chain -#line 566 "root_numpy/src/tree.pyx" -; - TTreeFormula *__pyx_v_selection_formula -#line 566 "root_numpy/src/tree.pyx" -; - TTreeFormula *__pyx_v_formula -#line 566 "root_numpy/src/tree.pyx" -; - int __pyx_v_num_entries -#line 566 "root_numpy/src/tree.pyx" -; - int __pyx_v_num_entries_selected -#line 566 "root_numpy/src/tree.pyx" -; - int __pyx_v_ientry -#line 566 "root_numpy/src/tree.pyx" -; - __pyx_t_13_librootnumpy_Converter *__pyx_v_conv -#line 566 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_numcol -#line 566 "root_numpy/src/tree.pyx" -; - void *__pyx_v_dataptr -#line 566 "root_numpy/src/tree.pyx" -; - PyArrayObject *__pyx_v_arr = 0 -#line 566 "root_numpy/src/tree.pyx" -; - int __pyx_v_nb -#line 566 "root_numpy/src/tree.pyx" -; - int __pyx_v_entry_size -#line 566 "root_numpy/src/tree.pyx" -; - std::vector<__pyx_t_13_librootnumpy_Converter *> __pyx_v_conv_array -#line 566 "root_numpy/src/tree.pyx" -; - char *__pyx_v_c_string -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_structure = NULL -#line 566 "root_numpy/src/tree.pyx" -; - int __pyx_v_user_branches -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_branch = NULL -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_leaves = NULL -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_shortname = NULL -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_leaf = NULL -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_ltype = NULL -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_colname = NULL -#line 566 "root_numpy/src/tree.pyx" -; - PyObject *__pyx_v_indices = NULL -#line 566 "root_numpy/src/tree.pyx" -; - unsigned long __pyx_v_icol -#line 566 "root_numpy/src/tree.pyx" -; +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 566 "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; - 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_12)(PyObject *); - PyObject *__pyx_t_13 = NULL; - PyObject *__pyx_t_14 = NULL; - PyObject *__pyx_t_15 = NULL; - PyObject *(*__pyx_t_16)(PyObject *); - std::string __pyx_t_17; - Py_ssize_t __pyx_t_18; - PyObject *__pyx_t_19 = NULL; - std::string __pyx_t_20; - std::string __pyx_t_21; - PyObject *__pyx_t_22 = NULL; - int __pyx_t_23; - unsigned long __pyx_t_24; - unsigned long __pyx_t_25; - int __pyx_t_26; - char const *__pyx_t_27; - PyObject *__pyx_t_28 = NULL; - 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; - int __pyx_lineno = 0; - const char *__pyx_filename = NULL; - int __pyx_clineno = 0; +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 566 "root_numpy/src/tree.pyx" - __Pyx_RefNannySetupContext("tree2array", 0); +#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 566 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branches); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":570 - * include_weight, weight_name): - * - * if tree.GetNbranches() == 0: # <<<<<<<<<<<<<< - * raise ValueError("tree has no branches") - * - */ +#line 172 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 570 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_tree->GetNbranches() == 0) != 0); +#line 172 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_v_branch_dict, __pyx_t_2); -#line 570 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 172 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":571 + /* "root_numpy/src/tree.pyx":173 + * 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") * - * if tree.GetNbranches() == 0: - * raise ValueError("tree has no branches") # <<<<<<<<<<<<<< - * - * cdef vector[Column*] columns */ -#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 571 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); - -#line 571 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); - -#line 571 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 173 "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 = 173; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 571 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 173 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_t_4 != __pyx_v_num_requested_branches) != 0); -#line 571 "root_numpy/src/tree.pyx" - } +#line 173 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":576 - * cdef Column* col - * - * cdef TreeChain* chain = new TreeChain(tree) # <<<<<<<<<<<<<< - * handle_load(chain.Prepare(), True) + /* "root_numpy/src/tree.pyx":174 + * 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 576 "root_numpy/src/tree.pyx" - __pyx_v_chain = new TreeChain(__pyx_v_tree); +#line 174 "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 = 174; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":577 - * - * cdef TreeChain* chain = new TreeChain(tree) - * handle_load(chain.Prepare(), True) # <<<<<<<<<<<<<< - * - * cdef TTreeFormula* selection_formula = NULL - */ +#line 174 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 577 "root_numpy/src/tree.pyx" - __pyx_t_3.__pyx_n = 1; +#line 174 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 577 "root_numpy/src/tree.pyx" - __pyx_t_3.ignore_index = 1; +#line 174 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#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 174 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 577 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 174 "root_numpy/src/tree.pyx" + } -#line 577 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 174 "root_numpy/src/tree.pyx" + goto __pyx_L14; - /* "root_numpy/src/tree.pyx":579 - * handle_load(chain.Prepare(), True) - * - * cdef TTreeFormula* selection_formula = NULL # <<<<<<<<<<<<<< - * cdef TTreeFormula* formula = NULL - * cdef int num_entries = chain.GetEntries() - */ +#line 174 "root_numpy/src/tree.pyx" + } -#line 579 "root_numpy/src/tree.pyx" - __pyx_v_selection_formula = NULL; +#line 174 "root_numpy/src/tree.pyx" + __pyx_L14:; - /* "root_numpy/src/tree.pyx":580 + /* "root_numpy/src/tree.pyx":177 * - * cdef TTreeFormula* selection_formula = NULL - * cdef TTreeFormula* formula = NULL # <<<<<<<<<<<<<< - * cdef int num_entries = chain.GetEntries() - * cdef int num_entries_selected = 0 + * # Build vector of Converters for branches + * for ibranch in range(num_branches): # <<<<<<<<<<<<<< + * tbranch = branch_array.At(ibranch) + * branch_name = tbranch.GetName() */ -#line 580 "root_numpy/src/tree.pyx" - __pyx_v_formula = NULL; +#line 177 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_v_num_branches; - /* "root_numpy/src/tree.pyx":581 - * cdef TTreeFormula* selection_formula = NULL - * cdef TTreeFormula* formula = NULL - * cdef int num_entries = chain.GetEntries() # <<<<<<<<<<<<<< - * cdef int num_entries_selected = 0 - * cdef int ientry - */ +#line 177 "root_numpy/src/tree.pyx" + for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 581 "root_numpy/src/tree.pyx" - __pyx_v_num_entries = __pyx_v_chain->GetEntries(); +#line 177 "root_numpy/src/tree.pyx" + __pyx_v_ibranch = __pyx_t_14; - /* "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":178 + * # 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 582 "root_numpy/src/tree.pyx" - __pyx_v_num_entries_selected = 0; +#line 178 "root_numpy/src/tree.pyx" + __pyx_v_tbranch = ((TBranch *)__pyx_v_branch_array->At(__pyx_v_ibranch)); - /* "root_numpy/src/tree.pyx":594 - * cdef char* c_string - * - * try: # <<<<<<<<<<<<<< - * # Set up the selection if we have one - * if selection: + /* "root_numpy/src/tree.pyx":179 + * 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 179 "root_numpy/src/tree.pyx" + __pyx_v_branch_name = __pyx_v_tbranch->GetName(); + + /* "root_numpy/src/tree.pyx":180 + * 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 594 "root_numpy/src/tree.pyx" - /*try:*/ { +#line 180 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); - /* "root_numpy/src/tree.pyx":596 - * try: - * # Set up the selection if we have one - * if selection: # <<<<<<<<<<<<<< - * c_string = selection - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) +#line 180 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":181 + * branch_name = tbranch.GetName() + * if num_requested_branches > 0: + * if len(branch_dict) == 0: # <<<<<<<<<<<<<< + * # No more branches to consider + * break */ -#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 181 "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 = 181; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 596 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 181 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_t_4 == 0) != 0); - /* "root_numpy/src/tree.pyx":597 - * # Set up the selection if we have one - * if selection: - * c_string = selection # <<<<<<<<<<<<<< - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) - * if selection_formula == NULL or selection_formula.GetNdim() == 0: +#line 181 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { + + /* "root_numpy/src/tree.pyx":183 + * if len(branch_dict) == 0: + * # No more branches to consider + * break # <<<<<<<<<<<<<< + * branch_idx = branch_dict.pop(branch_name, -1) + * if branch_idx == -1: */ -#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 183 "root_numpy/src/tree.pyx" + goto __pyx_L19_break; -#line 597 "root_numpy/src/tree.pyx" - __pyx_v_c_string = __pyx_t_4; +#line 183 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":598 - * if selection: - * c_string = selection - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) # <<<<<<<<<<<<<< - * if selection_formula == NULL or selection_formula.GetNdim() == 0: - * del selection_formula + /* "root_numpy/src/tree.pyx":184 + * # 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 598 "root_numpy/src/tree.pyx" - __pyx_v_selection_formula = new TTreeFormula(__pyx_k_selection, __pyx_v_c_string, __pyx_v_chain->fChain); +#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":599 - * c_string = selection - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) - * if selection_formula == NULL or selection_formula.GetNdim() == 0: # <<<<<<<<<<<<<< - * del selection_formula - * raise ValueError("could not compile selection formula") - */ +#line 184 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_selection_formula == NULL) != 0); +#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 599 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 184 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 599 "root_numpy/src/tree.pyx" - } else { +#line 184 "root_numpy/src/tree.pyx" + __pyx_t_9 = NULL; -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 184 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 599 "root_numpy/src/tree.pyx" - goto __pyx_L9_bool_binop_done; +#line 184 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 599 "root_numpy/src/tree.pyx" - } +#line 184 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_8); -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_selection_formula->GetNdim() == 0) != 0); +#line 184 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_9)) { -#line 599 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 184 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 599 "root_numpy/src/tree.pyx" - __pyx_L9_bool_binop_done:; +#line 184 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 599 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 184 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); - /* "root_numpy/src/tree.pyx":600 - * selection_formula = new TTreeFormula("selection", c_string, chain.fChain) - * 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 - */ +#line 184 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_8, function); -#line 600 "root_numpy/src/tree.pyx" - delete __pyx_v_selection_formula; +#line 184 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; - /* "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. - */ +#line 184 "root_numpy/src/tree.pyx" + } -#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 184 "root_numpy/src/tree.pyx" + } -#line 601 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 601 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 184 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); -#line 601 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 184 "root_numpy/src/tree.pyx" + if (__pyx_t_9) { -#line 601 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 601; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 184 "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 601 "root_numpy/src/tree.pyx" - } +#line 184 "root_numpy/src/tree.pyx" + } - /* "root_numpy/src/tree.pyx":604 - * # 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 - */ +#line 184 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_10, 0+__pyx_t_4, __pyx_t_11); -#line 604 "root_numpy/src/tree.pyx" - __pyx_v_chain->AddFormula(__pyx_v_selection_formula); +#line 184 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_11); -#line 604 "root_numpy/src/tree.pyx" - goto __pyx_L7; +#line 184 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_int_neg_1); -#line 604 "root_numpy/src/tree.pyx" - } +#line 184 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_4, __pyx_int_neg_1); -#line 604 "root_numpy/src/tree.pyx" - __pyx_L7:; +#line 184 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_int_neg_1); - /* "root_numpy/src/tree.pyx":607 - * - * # Parse the tree structure to determine branches and leaves - * structure = parse_tree_structure(tree, branches=branches) # <<<<<<<<<<<<<< - * user_branches = False - * if branches is None: - */ +#line 184 "root_numpy/src/tree.pyx" + __pyx_t_11 = 0; -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_6.__pyx_n = 1; +#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} + +#line 184 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_6.branches = __pyx_v_branches; +#line 184 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#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 184 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 607 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 607 "root_numpy/src/tree.pyx" - __pyx_v_structure = __pyx_t_2; +#line 184 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 607 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 184 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = __pyx_t_15; - /* "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() + /* "root_numpy/src/tree.pyx":185 + * break + * branch_idx = branch_dict.pop(branch_name, -1) + * if branch_idx == -1: # <<<<<<<<<<<<<< + * # This branch was not selected by the user + * continue */ -#line 608 "root_numpy/src/tree.pyx" - __pyx_v_user_branches = 0; +#line 185 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_branch_idx == -1) != 0); + +#line 185 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "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: + /* "root_numpy/src/tree.pyx":187 + * if branch_idx == -1: + * # This branch was not selected by the user + * continue # <<<<<<<<<<<<<< + * + * leaf_array = tbranch.GetListOfLeaves() */ -#line 609 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_branches == Py_None); +#line 187 "root_numpy/src/tree.pyx" + goto __pyx_L18_continue; + +#line 187 "root_numpy/src/tree.pyx" + } -#line 609 "root_numpy/src/tree.pyx" - __pyx_t_5 = (__pyx_t_1 != 0); +#line 187 "root_numpy/src/tree.pyx" + goto __pyx_L20; -#line 609 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 187 "root_numpy/src/tree.pyx" + } - /* "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 187 "root_numpy/src/tree.pyx" + __pyx_L20:; + + /* "root_numpy/src/tree.pyx":189 + * continue + * + * leaf_array = tbranch.GetListOfLeaves() # <<<<<<<<<<<<<< + * shortname = leaf_array.GetEntries() == 1 + * */ -#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 189 "root_numpy/src/tree.pyx" + __pyx_v_leaf_array = __pyx_v_tbranch->GetListOfLeaves(); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); + /* "root_numpy/src/tree.pyx":190 + * + * leaf_array = tbranch.GetListOfLeaves() + * shortname = leaf_array.GetEntries() == 1 # <<<<<<<<<<<<<< + * + * for ileaf in range(leaf_array.GetEntries()): + */ -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_8 = NULL; +#line 190 "root_numpy/src/tree.pyx" + __pyx_v_shortname = (__pyx_v_leaf_array->GetEntries() == 1); -#line 610 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_7))) { + /* "root_numpy/src/tree.pyx":192 + * shortname = leaf_array.GetEntries() == 1 + * + * for ileaf in range(leaf_array.GetEntries()): # <<<<<<<<<<<<<< + * tleaf = leaf_array.At(ileaf) + * leaf_name = tleaf.GetName() + */ -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_7); +#line 192 "root_numpy/src/tree.pyx" + __pyx_t_15 = __pyx_v_leaf_array->GetEntries(); -#line 610 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_8)) { +#line 192 "root_numpy/src/tree.pyx" + for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { -#line 610 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); +#line 192 "root_numpy/src/tree.pyx" + __pyx_v_ileaf = __pyx_t_16; -#line 610 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_8); + /* "root_numpy/src/tree.pyx":193 + * + * for ileaf in range(leaf_array.GetEntries()): + * tleaf = leaf_array.At(ileaf) # <<<<<<<<<<<<<< + * leaf_name = tleaf.GetName() + * conv = get_converter(tleaf) + */ -#line 610 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 193 "root_numpy/src/tree.pyx" + __pyx_v_tleaf = ((TLeaf *)__pyx_v_leaf_array->At(__pyx_v_ileaf)); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_7, function); + /* "root_numpy/src/tree.pyx":194 + * for ileaf in range(leaf_array.GetEntries()): + * tleaf = leaf_array.At(ileaf) + * leaf_name = tleaf.GetName() # <<<<<<<<<<<<<< + * conv = get_converter(tleaf) + * if conv != NULL: + */ -#line 610 "root_numpy/src/tree.pyx" - } +#line 194 "root_numpy/src/tree.pyx" + __pyx_v_leaf_name = __pyx_v_tleaf->GetName(); -#line 610 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":195 + * tleaf = leaf_array.At(ileaf) + * leaf_name = tleaf.GetName() + * conv = get_converter(tleaf) # <<<<<<<<<<<<<< + * if conv != NULL: + * # A converter exists for this leaf + */ -#line 610 "root_numpy/src/tree.pyx" - if (__pyx_t_8) { +#line 195 "root_numpy/src/tree.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_get_converter(__pyx_v_tleaf); -#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;} + /* "root_numpy/src/tree.pyx":196 + * leaf_name = tleaf.GetName() + * conv = get_converter(tleaf) + * if conv != NULL: # <<<<<<<<<<<<<< + * # A converter exists for this leaf + * column_name = string(branch_name) + */ -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 196 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_conv != NULL) != 0); -#line 610 "root_numpy/src/tree.pyx" - } else { +#line 196 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#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;} + /* "root_numpy/src/tree.pyx":198 + * if conv != NULL: + * # A converter exists for this leaf + * column_name = string(branch_name) # <<<<<<<<<<<<<< + * if not shortname: + * column_name.append( '_') + */ -#line 610 "root_numpy/src/tree.pyx" - } +#line 198 "root_numpy/src/tree.pyx" + try { -#line 610 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 198 "root_numpy/src/tree.pyx" + __pyx_t_17 = std::string(__pyx_v_branch_name); -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 198 "root_numpy/src/tree.pyx" + } catch(...) { -#line 610 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_v_branches, __pyx_t_2); +#line 198 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 610 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 198 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 610 "root_numpy/src/tree.pyx" - goto __pyx_L11; +#line 198 "root_numpy/src/tree.pyx" + } -#line 610 "root_numpy/src/tree.pyx" - } +#line 198 "root_numpy/src/tree.pyx" + __pyx_v_column_name = __pyx_t_17; - /* "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":199 + * # A converter exists for this leaf + * column_name = string(branch_name) + * if not shortname: # <<<<<<<<<<<<<< + * column_name.append( '_') + * column_name.append(leaf_name) */ -#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 611 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_t_9 == 0) != 0); +#line 199 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((!(__pyx_v_shortname != 0)) != 0); -#line 611 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 199 "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":200 + * 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 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 200 "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 = 200; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 612 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 200 "root_numpy/src/tree.pyx" + __pyx_v_column_name.append(((std::string)__pyx_t_17)); -#line 612 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); + /* "root_numpy/src/tree.pyx":201 + * 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 612 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 201 "root_numpy/src/tree.pyx" + __pyx_v_column_name.append(__pyx_v_leaf_name); -#line 612 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 612; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 201 "root_numpy/src/tree.pyx" + goto __pyx_L26; -#line 612 "root_numpy/src/tree.pyx" - } +#line 201 "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 201 "root_numpy/src/tree.pyx" + __pyx_L26:; -#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;} + /* "root_numpy/src/tree.pyx":203 + * 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 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 203 "root_numpy/src/tree.pyx" + __pyx_v_col = new BranchColumn(__pyx_v_column_name, __pyx_v_tleaf); -#line 613 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); + /* "root_numpy/src/tree.pyx":205 + * 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 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;} +#line 205 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 613 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 205 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 613 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_t_9 != __pyx_t_10) != 0); + /* "root_numpy/src/tree.pyx":206 + * + * if num_requested_branches > 0: + * column_buckets[branch_idx].push_back(col) # <<<<<<<<<<<<<< + * converter_buckets[branch_idx].push_back(conv) + * else: + */ -#line 613 "root_numpy/src/tree.pyx" - if (__pyx_t_5) { +#line 206 "root_numpy/src/tree.pyx" + (__pyx_v_column_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_col); - /* "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":207 + * 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 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 207 "root_numpy/src/tree.pyx" + (__pyx_v_converter_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_conv); -#line 614 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 207 "root_numpy/src/tree.pyx" + goto __pyx_L27; -#line 614 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 207 "root_numpy/src/tree.pyx" + } -#line 614 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 614; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 207 "root_numpy/src/tree.pyx" + /*else*/ { -#line 614 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":209 + * converter_buckets[branch_idx].push_back(conv) + * else: + * columns.push_back(col) # <<<<<<<<<<<<<< + * converters.push_back(conv) + * + */ -#line 614 "root_numpy/src/tree.pyx" - /*else*/ { +#line 209 "root_numpy/src/tree.pyx" + __pyx_v_columns.push_back(__pyx_v_col); - /* "root_numpy/src/tree.pyx":616 - * raise ValueError("duplicate branches requested") - * else: - * user_branches = True # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":210 + * else: + * columns.push_back(col) + * converters.push_back(conv) # <<<<<<<<<<<<<< * - * for branch in branches: + * chain.AddColumn(string(branch_name), string(leaf_name), */ -#line 616 "root_numpy/src/tree.pyx" - __pyx_v_user_branches = 1; +#line 210 "root_numpy/src/tree.pyx" + __pyx_v_converters.push_back(__pyx_v_conv); -#line 616 "root_numpy/src/tree.pyx" - } +#line 210 "root_numpy/src/tree.pyx" + } -#line 616 "root_numpy/src/tree.pyx" - __pyx_L11:; +#line 210 "root_numpy/src/tree.pyx" + __pyx_L27:; - /* "root_numpy/src/tree.pyx":618 - * user_branches = True + /* "root_numpy/src/tree.pyx":212 + * converters.push_back(conv) + * + * chain.AddColumn(string(branch_name), string(leaf_name), # <<<<<<<<<<<<<< + * col) * - * for branch in branches: # <<<<<<<<<<<<<< - * if branch in structure: - * leaves = structure[branch] */ -#line 618 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { +#line 212 "root_numpy/src/tree.pyx" + try { -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_2 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_2); __pyx_t_10 = 0; +#line 212 "root_numpy/src/tree.pyx" + __pyx_t_17 = std::string(__pyx_v_branch_name); -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_11 = NULL; +#line 212 "root_numpy/src/tree.pyx" + } catch(...) { -#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 212 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 618 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 212 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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 212 "root_numpy/src/tree.pyx" + } -#line 618 "root_numpy/src/tree.pyx" - } +#line 212 "root_numpy/src/tree.pyx" + try { -#line 618 "root_numpy/src/tree.pyx" - for (;;) { +#line 212 "root_numpy/src/tree.pyx" + __pyx_t_18 = std::string(__pyx_v_leaf_name); -#line 618 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_11)) { +#line 212 "root_numpy/src/tree.pyx" + } catch(...) { -#line 618 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_2))) { +#line 212 "root_numpy/src/tree.pyx" + __Pyx_CppExn2PyErr(); -#line 618 "root_numpy/src/tree.pyx" - if (__pyx_t_10 >= PyList_GET_SIZE(__pyx_t_2)) break; +#line 212 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 212 "root_numpy/src/tree.pyx" + } -#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;} + /* "root_numpy/src/tree.pyx":213 + * + * chain.AddColumn(string(branch_name), string(leaf_name), + * col) # <<<<<<<<<<<<<< + * + * elif num_requested_branches > 0: + */ -#line 618 "root_numpy/src/tree.pyx" - #else +#line 213 "root_numpy/src/tree.pyx" + __pyx_v_chain->AddColumn(__pyx_t_17, __pyx_t_18, ((BranchColumn *)__pyx_v_col)); -#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 213 "root_numpy/src/tree.pyx" + goto __pyx_L25; -#line 618 "root_numpy/src/tree.pyx" - #endif +#line 213 "root_numpy/src/tree.pyx" + } -#line 618 "root_numpy/src/tree.pyx" - } else { + /* "root_numpy/src/tree.pyx":215 + * col) + * + * elif num_requested_branches > 0: # <<<<<<<<<<<<<< + * # User explicitly requested this branch but there is no + * # converter to handle it + */ -#line 618 "root_numpy/src/tree.pyx" - if (__pyx_t_10 >= PyTuple_GET_SIZE(__pyx_t_2)) break; +#line 215 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 618 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 215 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#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;} + /* "root_numpy/src/tree.pyx":220 + * raise TypeError( + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}'".format( # <<<<<<<<<<<<<< + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName()))) + */ -#line 618 "root_numpy/src/tree.pyx" - #else +#line 220 "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 = 220; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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 220 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 618 "root_numpy/src/tree.pyx" - #endif + /* "root_numpy/src/tree.pyx":221 + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}'".format( + * branch_name, leaf_name, # <<<<<<<<<<<<<< + * resolve_type(tleaf.GetTypeName()))) + * else: + */ -#line 618 "root_numpy/src/tree.pyx" - } - } else -#line 618 "root_numpy/src/tree.pyx" -{ +#line 221 "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 = 221; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_t_11(__pyx_t_2); +#line 221 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); -#line 618 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_7)) { +#line 221 "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 = 221; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - PyObject* exc_type = PyErr_Occurred(); +#line 221 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 618 "root_numpy/src/tree.pyx" - if (exc_type) { + /* "root_numpy/src/tree.pyx":222 + * "with type '{2}'".format( + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName()))) # <<<<<<<<<<<<<< + * else: + * # Just warn that this branch cannot be converted + */ -#line 618 "root_numpy/src/tree.pyx" - if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 222 "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 = 222; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 618 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[1]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 222 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 618 "root_numpy/src/tree.pyx" - } +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_19 = NULL; -#line 618 "root_numpy/src/tree.pyx" - break; +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 618 "root_numpy/src/tree.pyx" - } +#line 222 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 618 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_8); -#line 618 "root_numpy/src/tree.pyx" - } +#line 222 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_19)) { -#line 618 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_branch, __pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 618 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 222 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_19); - /* "root_numpy/src/tree.pyx":619 - * - * for branch in branches: - * if branch in structure: # <<<<<<<<<<<<<< - * leaves = structure[branch] - * shortname = len(leaves) == 1 - */ +#line 222 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#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 222 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_8, function); -#line 619 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_t_5 != 0); +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 619 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 222 "root_numpy/src/tree.pyx" + } - /* "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 222 "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 222 "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 = 220; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 620 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 620 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_leaves, __pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + if (__pyx_t_19) { -#line 620 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 222 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 0, __pyx_t_19); __Pyx_GIVEREF(__pyx_t_19); __pyx_t_19 = NULL; - /* "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(): - */ +#line 222 "root_numpy/src/tree.pyx" + } -#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 222 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 0+__pyx_t_4, __pyx_t_10); -#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 222 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_10); -#line 621 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 1+__pyx_t_4, __pyx_t_11); -#line 621 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_shortname, __pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_11); -#line 621 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 222 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 2+__pyx_t_4, __pyx_t_9); - /* "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) - */ +#line 222 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 622 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_v_leaves)) || PyTuple_CheckExact(__pyx_v_leaves)) { +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_10 = 0; -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_7 = __pyx_v_leaves; __Pyx_INCREF(__pyx_t_7); __pyx_t_9 = 0; +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_11 = 0; -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_12 = NULL; +#line 222 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#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;} +#line 222 "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 = 220; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 222 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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 222 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 622 "root_numpy/src/tree.pyx" - } +#line 222 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 622 "root_numpy/src/tree.pyx" - for (;;) { + /* "root_numpy/src/tree.pyx":218 + * # 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 622 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_12)) { +#line 218 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - if (likely(PyList_CheckExact(__pyx_t_7))) { +#line 218 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 622 "root_numpy/src/tree.pyx" - if (__pyx_t_9 >= PyList_GET_SIZE(__pyx_t_7)) break; +#line 218 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 218 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#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 218 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 622 "root_numpy/src/tree.pyx" - #else +#line 218 "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 = 218; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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 218 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 218 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 622 "root_numpy/src/tree.pyx" - } else { +#line 218 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 622 "root_numpy/src/tree.pyx" - if (__pyx_t_9 >= PyTuple_GET_SIZE(__pyx_t_7)) break; +#line 218 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 218 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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;} +#line 218 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - #else +#line 218 "root_numpy/src/tree.pyx" + /*else*/ { -#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":225 + * else: + * # Just warn that this branch cannot be converted + * warnings.warn( # <<<<<<<<<<<<<< + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}' (skipping)".format( + */ -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 225 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } - } else -#line 622 "root_numpy/src/tree.pyx" -{ +#line 225 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_t_12(__pyx_t_7); +#line 225 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - if (unlikely(!__pyx_t_8)) { +#line 225 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 622 "root_numpy/src/tree.pyx" - PyObject* exc_type = PyErr_Occurred(); +#line 225 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 622 "root_numpy/src/tree.pyx" - if (exc_type) { + /* "root_numpy/src/tree.pyx":227 + * warnings.warn( + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}' (skipping)".format( # <<<<<<<<<<<<<< + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName())), + */ -#line 622 "root_numpy/src/tree.pyx" - if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); +#line 227 "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 = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - else {__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" - } + /* "root_numpy/src/tree.pyx":228 + * "cannot convert leaf '{0}' of branch '{1}' " + * "with type '{2}' (skipping)".format( + * branch_name, leaf_name, # <<<<<<<<<<<<<< + * resolve_type(tleaf.GetTypeName())), + * RootNumpyUnconvertibleWarning) + */ -#line 622 "root_numpy/src/tree.pyx" - break; +#line 228 "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 = 228; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } +#line 228 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 228 "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 = 228; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } +#line 228 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_10); -#line 622 "root_numpy/src/tree.pyx" - if ((likely(PyTuple_CheckExact(__pyx_t_8))) || (PyList_CheckExact(__pyx_t_8))) { + /* "root_numpy/src/tree.pyx":229 + * "with type '{2}' (skipping)".format( + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName())), # <<<<<<<<<<<<<< + * RootNumpyUnconvertibleWarning) + * + */ -#line 622 "root_numpy/src/tree.pyx" - PyObject* sequence = __pyx_t_8; +#line 229 "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 = 229; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 229 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 622 "root_numpy/src/tree.pyx" - Py_ssize_t size = Py_SIZE(sequence); +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_21 = NULL; -#line 622 "root_numpy/src/tree.pyx" - #else +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 622 "root_numpy/src/tree.pyx" - Py_ssize_t size = PySequence_Size(sequence); +#line 229 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_9))) { -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_21 = PyMethod_GET_SELF(__pyx_t_9); -#line 622 "root_numpy/src/tree.pyx" - if (unlikely(size != 2)) { +#line 229 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_21)) { -#line 622 "root_numpy/src/tree.pyx" - if (size > 2) __Pyx_RaiseTooManyValuesError(2); +#line 229 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9); -#line 622 "root_numpy/src/tree.pyx" - else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); +#line 229 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_21); -#line 622 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 229 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 622 "root_numpy/src/tree.pyx" - } +#line 229 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_9, function); -#line 622 "root_numpy/src/tree.pyx" - #if CYTHON_COMPILING_IN_CPYTHON +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 622 "root_numpy/src/tree.pyx" - if (likely(PyTuple_CheckExact(sequence))) { +#line 229 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = PyTuple_GET_ITEM(sequence, 0); +#line 229 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = PyTuple_GET_ITEM(sequence, 1); +#line 229 "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 = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - } else { +#line 229 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_22); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = PyList_GET_ITEM(sequence, 0); +#line 229 "root_numpy/src/tree.pyx" + if (__pyx_t_21) { -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = PyList_GET_ITEM(sequence, 1); +#line 229 "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 622 "root_numpy/src/tree.pyx" - } +#line 229 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_13); +#line 229 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 0+__pyx_t_4, __pyx_t_11); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_14); +#line 229 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_11); -#line 622 "root_numpy/src/tree.pyx" - #else +#line 229 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 1+__pyx_t_4, __pyx_t_10); -#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 229 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_10); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 229 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_22, 2+__pyx_t_4, __pyx_t_19); -#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 229 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_19); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_11 = 0; -#line 622 "root_numpy/src/tree.pyx" - #endif +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_10 = 0; -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 229 "root_numpy/src/tree.pyx" + __pyx_t_19 = 0; -#line 622 "root_numpy/src/tree.pyx" - } else { +#line 229 "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 = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - Py_ssize_t index = -1; +#line 229 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#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 229 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_22); __pyx_t_22 = 0; -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 229 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; + /* "root_numpy/src/tree.pyx":230 + * branch_name, leaf_name, + * resolve_type(tleaf.GetTypeName())), + * RootNumpyUnconvertibleWarning) # <<<<<<<<<<<<<< + * + * if num_requested_branches > 0: + */ -#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 230 "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 = 230; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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; +#line 230 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 230 "root_numpy/src/tree.pyx" + __pyx_t_22 = NULL; -#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 230 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_16 = NULL; +#line 230 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_20))) { -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 230 "root_numpy/src/tree.pyx" + __pyx_t_22 = PyMethod_GET_SELF(__pyx_t_20); -#line 622 "root_numpy/src/tree.pyx" - goto __pyx_L18_unpacking_done; +#line 230 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_22)) { -#line 622 "root_numpy/src/tree.pyx" - __pyx_L17_unpacking_failed:; +#line 230 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_20); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 230 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_22); -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_16 = NULL; +#line 230 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 622 "root_numpy/src/tree.pyx" - if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); +#line 230 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_20, function); -#line 622 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 230 "root_numpy/src/tree.pyx" + __pyx_t_4 = 1; -#line 622 "root_numpy/src/tree.pyx" - __pyx_L18_unpacking_done:; +#line 230 "root_numpy/src/tree.pyx" + } -#line 622 "root_numpy/src/tree.pyx" +#line 230 "root_numpy/src/tree.pyx" } -#line 622 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_leaf, __pyx_t_13); +#line 230 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_13 = 0; +#line 230 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_ltype, __pyx_t_14); +#line 230 "root_numpy/src/tree.pyx" + if (__pyx_t_22) { -#line 622 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; +#line 230 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_22); __Pyx_GIVEREF(__pyx_t_22); __pyx_t_22 = NULL; - /* "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 230 "root_numpy/src/tree.pyx" + } -#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 230 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_4, __pyx_t_8); -#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 230 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_8); -#line 623 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 230 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_4, __pyx_t_9); - /* "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 230 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#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 230 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; -#line 624 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 230 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 230 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_v_branch; +#line 230 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 624 "root_numpy/src/tree.pyx" - } else { +#line 230 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 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 230 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 230 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_15 = NULL; +#line 230 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; +#line 230 "root_numpy/src/tree.pyx" + __pyx_L25:; -#line 624 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_13))) { +#line 230 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_13); +#line 230 "root_numpy/src/tree.pyx" + __pyx_L18_continue:; -#line 624 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_15)) { +#line 230 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13); +#line 230 "root_numpy/src/tree.pyx" + __pyx_L19_break:; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_15); + /* "root_numpy/src/tree.pyx":232 + * RootNumpyUnconvertibleWarning) + * + * if num_requested_branches > 0: # <<<<<<<<<<<<<< + * # Attempt to interpret remaining "branches" as expressions + * for expression in branch_dict.keys(): + */ -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 232 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_13, function); +#line 232 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; + /* "root_numpy/src/tree.pyx":234 + * 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 624 "root_numpy/src/tree.pyx" - } +#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#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 234 "root_numpy/src/tree.pyx" + __pyx_t_19 = NULL; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 234 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_20))) { -#line 624 "root_numpy/src/tree.pyx" - if (__pyx_t_15) { +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_20); -#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 234 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_19)) { -#line 624 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_20); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_19); -#line 624 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_18, __pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_20, function); -#line 624 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaf); +#line 234 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_18, __pyx_v_leaf); +#line 234 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_leaf); +#line 234 "root_numpy/src/tree.pyx" + if (__pyx_t_19) { -#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 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 234 "root_numpy/src/tree.pyx" + } else { -#line 624 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; +#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_t_14; +#line 234 "root_numpy/src/tree.pyx" + } -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 624 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 624 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_colname, __pyx_t_8); +#line 234 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) { -#line 624 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_20 = __pyx_t_2; __Pyx_INCREF(__pyx_t_20); __pyx_t_4 = 0; - /* "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: - */ +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_12 = NULL; -#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" + } else { + __pyx_t_4 = -1; +#line 234 "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 = 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_20); -#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_12 = Py_TYPE(__pyx_t_20)->tp_iternext; if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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" + } - /* "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" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 626 "root_numpy/src/tree.pyx" - __pyx_v_columns.push_back(__pyx_v_col); +#line 234 "root_numpy/src/tree.pyx" + for (;;) { -#line 626 "root_numpy/src/tree.pyx" - goto __pyx_L19; +#line 234 "root_numpy/src/tree.pyx" + if (likely(!__pyx_t_12)) { -#line 626 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + if (likely(PyList_CheckExact(__pyx_t_20))) { - /* "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" + if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_20)) break; -#line 627 "root_numpy/src/tree.pyx" - __pyx_t_1 = (__pyx_v_user_branches != 0); +#line 234 "root_numpy/src/tree.pyx" + #if CYTHON_COMPILING_IN_CPYTHON -#line 627 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "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" + #else -#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" + __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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 234 "root_numpy/src/tree.pyx" + #endif -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_13 = NULL; +#line 234 "root_numpy/src/tree.pyx" + } else { -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; +#line 234 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_20)) break; -#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 CYTHON_COMPILING_IN_CPYTHON -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_13 = PyMethod_GET_SELF(__pyx_t_14); +#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_13)) { +#line 234 "root_numpy/src/tree.pyx" + #else -#line 630 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_14); +#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_13); +#line 234 "root_numpy/src/tree.pyx" + #endif -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 234 "root_numpy/src/tree.pyx" + } + } else +#line 234 "root_numpy/src/tree.pyx" +{ -#line 630 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_14, function); +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_12(__pyx_t_20); -#line 630 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; +#line 234 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_2)) { -#line 630 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + PyObject* exc_type = PyErr_Occurred(); -#line 630 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + if (exc_type) { -#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" + if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 234 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - if (__pyx_t_13) { +#line 234 "root_numpy/src/tree.pyx" + } -#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" + break; -#line 630 "root_numpy/src/tree.pyx" - } +#line 234 "root_numpy/src/tree.pyx" + } -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 630 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_18, __pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + } -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 234 "root_numpy/src/tree.pyx" + __Pyx_XDECREF_SET(__pyx_v_expression, __pyx_t_2); -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaf); +#line 234 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 630 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_18, __pyx_v_leaf); + /* "root_numpy/src/tree.pyx":235 + * # 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 630 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_leaf); +#line 235 "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 = 235; __pyx_clineno = __LINE__; goto __pyx_L8_error;}; -#line 630 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ltype); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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_13 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_13 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_ltype); +#line 235 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#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" + __pyx_v_branch_idx = __pyx_t_13; -#line 630 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); + /* "root_numpy/src/tree.pyx":236 + * 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 630 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 236 "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 = 236; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 630 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 236 "root_numpy/src/tree.pyx" + __pyx_v_c_string = __pyx_t_23; - /* "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)) + /* "root_numpy/src/tree.pyx":237 + * 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 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 628 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 237 "root_numpy/src/tree.pyx" + __pyx_v_formula = new TTreeFormula(__pyx_v_c_string, __pyx_v_c_string, __pyx_v_tree); -#line 628 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_8); + /* "root_numpy/src/tree.pyx":238 + * c_string = expression + * formula = new TTreeFormula(c_string, c_string, tree) + * if formula == NULL or formula.GetNdim() == 0: # <<<<<<<<<<<<<< + * del formula + * raise ValueError( + */ -#line 628 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_8); +#line 238 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_formula == NULL) != 0); -#line 628 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 238 "root_numpy/src/tree.pyx" + if (!__pyx_t_1) { -#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 238 "root_numpy/src/tree.pyx" + } else { -#line 628 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 238 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 628 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 238 "root_numpy/src/tree.pyx" + goto __pyx_L32_bool_binop_done; -#line 628 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_8, 0, 0, 0); +#line 238 "root_numpy/src/tree.pyx" + } -#line 628 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 238 "root_numpy/src/tree.pyx" + __pyx_t_1 = ((__pyx_v_formula->GetNdim() == 0) != 0); -#line 628 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 238 "root_numpy/src/tree.pyx" + __pyx_t_3 = __pyx_t_1; -#line 628 "root_numpy/src/tree.pyx" - } +#line 238 "root_numpy/src/tree.pyx" + __pyx_L32_bool_binop_done:; -#line 628 "root_numpy/src/tree.pyx" - /*else*/ { +#line 238 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "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), + /* "root_numpy/src/tree.pyx":239 + * formula = new TTreeFormula(c_string, c_string, tree) + * if formula == NULL or formula.GetNdim() == 0: + * del formula # <<<<<<<<<<<<<< + * raise ValueError( + * "the branch or expression '{0}' " */ -#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 239 "root_numpy/src/tree.pyx" + delete __pyx_v_formula; -#line 632 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); + /* "root_numpy/src/tree.pyx":242 + * raise ValueError( + * "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 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 242 "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 = 242; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 632 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 632 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; +#line 242 "root_numpy/src/tree.pyx" + __pyx_t_9 = NULL; - /* "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 242 "root_numpy/src/tree.pyx" + if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#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 242 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_19); -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 242 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_9)) { -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_15 = NULL; +#line 242 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; +#line 242 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 634 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_13))) { +#line 242 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_13); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_19, function); -#line 634 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_15)) { +#line 242 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13); +#line 242 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_15); +#line 242 "root_numpy/src/tree.pyx" + if (!__pyx_t_9) { -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 242 "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 = 242; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_13, function); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 634 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; +#line 242 "root_numpy/src/tree.pyx" + } else { -#line 634 "root_numpy/src/tree.pyx" - } +#line 242 "root_numpy/src/tree.pyx" + __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - } +#line 242 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#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 242 "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 634 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_22); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_v_expression); -#line 634 "root_numpy/src/tree.pyx" - if (__pyx_t_15) { +#line 242 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_v_expression); -#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 242 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_v_expression); -#line 634 "root_numpy/src/tree.pyx" - } +#line 242 "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 = 242; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 0+__pyx_t_18, __pyx_v_branch); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 242 "root_numpy/src/tree.pyx" + } -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_leaf); +#line 242 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 1+__pyx_t_18, __pyx_v_leaf); + /* "root_numpy/src/tree.pyx":240 + * if formula == NULL or formula.GetNdim() == 0: + * del formula + * raise ValueError( # <<<<<<<<<<<<<< + * "the branch or expression '{0}' " + * "is not present or valid".format(expression)) + */ -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_leaf); +#line 240 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_ltype); +#line 240 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 634 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_22, 2+__pyx_t_18, __pyx_v_ltype); +#line 240 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_2); -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_ltype); +#line 240 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__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 240 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 634 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_14); +#line 240 "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 = 240; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 634 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_22); __pyx_t_22 = 0; +#line 240 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 634 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; +#line 240 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - /* "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 240 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#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 240 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_13); +#line 240 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_22 = NULL; +#line 240 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_18 = 0; + /* "root_numpy/src/tree.pyx":245 + * # The chain will take care of updating the formula leaves when + * # rolling over to the next tree. + * chain.AddFormula(formula) # <<<<<<<<<<<<<< + * col = new FormulaColumn(expression, formula) + * conv = find_converter_by_typename('double') + */ -#line 635 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_19))) { +#line 245 "root_numpy/src/tree.pyx" + __pyx_v_chain->AddFormula(__pyx_v_formula); -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_22 = PyMethod_GET_SELF(__pyx_t_19); + /* "root_numpy/src/tree.pyx":246 + * # rolling over to the next tree. + * chain.AddFormula(formula) + * col = new FormulaColumn(expression, formula) # <<<<<<<<<<<<<< + * conv = find_converter_by_typename('double') + * if conv == NULL: + */ -#line 635 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_22)) { +#line 246 "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 = 246; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); +#line 246 "root_numpy/src/tree.pyx" + __pyx_v_col = new FormulaColumn(__pyx_t_18, __pyx_v_formula); -#line 635 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_22); + /* "root_numpy/src/tree.pyx":247 + * chain.AddFormula(formula) + * col = new FormulaColumn(expression, formula) + * conv = find_converter_by_typename('double') # <<<<<<<<<<<<<< + * if conv == NULL: + * # Oops, this should never happen + */ -#line 635 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 247 "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 = 247; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_19, function); +#line 247 "root_numpy/src/tree.pyx" + __pyx_v_conv = __pyx_f_13_librootnumpy_find_converter_by_typename(__pyx_t_18); -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_18 = 1; + /* "root_numpy/src/tree.pyx":248 + * col = new FormulaColumn(expression, formula) + * conv = find_converter_by_typename('double') + * if conv == NULL: # <<<<<<<<<<<<<< + * # Oops, this should never happen + * raise AssertionError( + */ -#line 635 "root_numpy/src/tree.pyx" - } +#line 248 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_conv == NULL) != 0); -#line 635 "root_numpy/src/tree.pyx" - } +#line 248 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { -#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;} + /* "root_numpy/src/tree.pyx":250 + * if conv == NULL: + * # Oops, this should never happen + * raise AssertionError( # <<<<<<<<<<<<<< + * "could not find double converter for formula") + * + */ -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 250 "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 = 250; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - if (__pyx_t_22) { +#line 250 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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 250 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 635 "root_numpy/src/tree.pyx" - } +#line 250 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 635 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0+__pyx_t_18, __pyx_t_14); +#line 250 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_14); +#line 250 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 1+__pyx_t_18, __pyx_t_13); + /* "root_numpy/src/tree.pyx":253 + * "could not find double converter for formula") + * + * column_buckets[branch_idx].push_back(col) # <<<<<<<<<<<<<< + * converter_buckets[branch_idx].push_back(conv) + * + */ -#line 635 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_13); +#line 253 "root_numpy/src/tree.pyx" + (__pyx_v_column_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_col); -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_14 = 0; + /* "root_numpy/src/tree.pyx":254 + * + * column_buckets[branch_idx].push_back(col) + * converter_buckets[branch_idx].push_back(conv) # <<<<<<<<<<<<<< + * + * # Flatten buckets into 1D vectors, thus preserving branch order + */ -#line 635 "root_numpy/src/tree.pyx" - __pyx_t_13 = 0; +#line 254 "root_numpy/src/tree.pyx" + (__pyx_v_converter_buckets[__pyx_v_branch_idx]).push_back(__pyx_v_conv); -#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;} + /* "root_numpy/src/tree.pyx":234 + * 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 635 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 234 "root_numpy/src/tree.pyx" + } -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; +#line 234 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; + /* "root_numpy/src/tree.pyx":257 + * + * # 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 635 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 257 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_v_num_requested_branches; -#line 635 "root_numpy/src/tree.pyx" - } +#line 257 "root_numpy/src/tree.pyx" + for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 635 "root_numpy/src/tree.pyx" - __pyx_L19:; +#line 257 "root_numpy/src/tree.pyx" + __pyx_v_branch_idx = __pyx_t_14; - /* "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":258 + * # 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 622 "root_numpy/src/tree.pyx" - } +#line 258 "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()); -#line 622 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + /* "root_numpy/src/tree.pyx":261 + * 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 622 "root_numpy/src/tree.pyx" - goto __pyx_L14; +#line 261 "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 622 "root_numpy/src/tree.pyx" +#line 261 "root_numpy/src/tree.pyx" } -#line 622 "root_numpy/src/tree.pyx" - /*else*/ { +#line 261 "root_numpy/src/tree.pyx" + goto __pyx_L28; - /* "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) - * if formula == NULL or formula.GetNdim() == 0: +#line 261 "root_numpy/src/tree.pyx" + } + + /* "root_numpy/src/tree.pyx":265 + * converter_buckets[branch_idx].end()) + * + * elif columns.size() == 0: # <<<<<<<<<<<<<< + * raise RuntimeError("unable to convert any branches in this tree") + * */ -#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 265 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_columns.size() == 0) != 0); -#line 638 "root_numpy/src/tree.pyx" - __pyx_v_c_string = __pyx_t_4; +#line 265 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":639 - * # Attempt to interpret as an expression - * c_string = branch - * formula = new TTreeFormula(c_string, c_string, chain.fChain) # <<<<<<<<<<<<<< - * if formula == NULL or formula.GetNdim() == 0: - * del formula + /* "root_numpy/src/tree.pyx":266 + * + * elif columns.size() == 0: + * raise RuntimeError("unable to convert any branches in this tree") # <<<<<<<<<<<<<< + * + * # Activate branches used by formulae and columns */ -#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 266 "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 = 266; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":640 - * c_string = branch - * formula = new TTreeFormula(c_string, c_string, chain.fChain) - * if formula == NULL or formula.GetNdim() == 0: # <<<<<<<<<<<<<< - * del formula - * raise ValueError( - */ +#line 266 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_formula == NULL) != 0); +#line 266 "root_numpy/src/tree.pyx" + __Pyx_Raise(__pyx_t_20, 0, 0, 0); -#line 640 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 266 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 640 "root_numpy/src/tree.pyx" - } else { +#line 266 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; +#line 266 "root_numpy/src/tree.pyx" + } -#line 640 "root_numpy/src/tree.pyx" - goto __pyx_L21_bool_binop_done; +#line 266 "root_numpy/src/tree.pyx" + __pyx_L28:; -#line 640 "root_numpy/src/tree.pyx" - } + /* "root_numpy/src/tree.pyx":270 + * # Activate branches used by formulae and columns + * # and deactivate all others + * chain.InitBranches() # <<<<<<<<<<<<<< + * + * # Now that we have all the columns we can + */ -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_5 = ((__pyx_v_formula->GetNdim() == 0) != 0); +#line 270 "root_numpy/src/tree.pyx" + __pyx_v_chain->InitBranches(); -#line 640 "root_numpy/src/tree.pyx" - __pyx_t_1 = __pyx_t_5; + /* "root_numpy/src/tree.pyx":274 + * # Now that we have all the columns we can + * # make an appropriate array structure + * dtype = [] # <<<<<<<<<<<<<< + * for icol in range(columns.size()): + * this_col = columns[icol] + */ -#line 640 "root_numpy/src/tree.pyx" - __pyx_L21_bool_binop_done:; +#line 274 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyList_New(0); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 640 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 274 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); - /* "root_numpy/src/tree.pyx":641 - * formula = new TTreeFormula(c_string, c_string, chain.fChain) - * if formula == NULL or formula.GetNdim() == 0: - * del formula # <<<<<<<<<<<<<< - * raise ValueError( - * "the branch or expression {0} " - */ +#line 274 "root_numpy/src/tree.pyx" + __pyx_v_dtype = ((PyObject*)__pyx_t_20); -#line 641 "root_numpy/src/tree.pyx" - delete __pyx_v_formula; +#line 274 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; - /* "root_numpy/src/tree.pyx":644 - * raise ValueError( - * "the branch or expression {0} " - * "is not present or valid".format(branch)) # <<<<<<<<<<<<<< - * # The chain will take care of updating the formula leaves when - * # rolling over to the next tree. + /* "root_numpy/src/tree.pyx":275 + * # make an appropriate array structure + * dtype = [] + * for icol in range(columns.size()): # <<<<<<<<<<<<<< + * this_col = columns[icol] + * this_conv = converters[icol] */ -#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 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 275 "root_numpy/src/tree.pyx" + __pyx_t_24 = __pyx_v_columns.size(); -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_19 = NULL; +#line 275 "root_numpy/src/tree.pyx" + for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { -#line 644 "root_numpy/src/tree.pyx" - if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { +#line 275 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_25; -#line 644 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_8); + /* "root_numpy/src/tree.pyx":276 + * 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 644 "root_numpy/src/tree.pyx" - if (likely(__pyx_t_19)) { +#line 276 "root_numpy/src/tree.pyx" + __pyx_v_this_col = (__pyx_v_columns[__pyx_v_icol]); -#line 644 "root_numpy/src/tree.pyx" - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); + /* "root_numpy/src/tree.pyx":277 + * 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 644 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_19); +#line 277 "root_numpy/src/tree.pyx" + __pyx_v_this_conv = (__pyx_v_converters[__pyx_v_icol]); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); + /* "root_numpy/src/tree.pyx":278 + * 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 644 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_8, function); +#line 278 "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 = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - } +#line 278 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 644 "root_numpy/src/tree.pyx" - } +#line 278 "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 = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - if (!__pyx_t_19) { +#line 278 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#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 278 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(2); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 278 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 644 "root_numpy/src/tree.pyx" - } else { +#line 278 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); -#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 278 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_20); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 278 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 1, __pyx_t_2); -#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 278 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_v_branch); +#line 278 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; -#line 644 "root_numpy/src/tree.pyx" - PyTuple_SET_ITEM(__pyx_t_15, 0+1, __pyx_v_branch); +#line 278 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_v_branch); +#line 278 "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 = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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 278 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 644 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 278 "root_numpy/src/tree.pyx" + } -#line 644 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; + /* "root_numpy/src/tree.pyx":279 + * this_conv = converters[icol] + * dtype.append((this_col.name, this_conv.get_nptype())) + * if include_weight: # <<<<<<<<<<<<<< + * dtype.append((weight_name, np.dtype('d'))) + * + */ -#line 644 "root_numpy/src/tree.pyx" - } +#line 279 "root_numpy/src/tree.pyx" + __pyx_t_3 = (__pyx_v_include_weight != 0); -#line 644 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 279 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":642 - * if formula == NULL or formula.GetNdim() == 0: - * del formula - * raise ValueError( # <<<<<<<<<<<<<< - * "the branch or expression {0} " - * "is not present or valid".format(branch)) + /* "root_numpy/src/tree.pyx":280 + * dtype.append((this_col.name, this_conv.get_nptype())) + * if include_weight: + * dtype.append((weight_name, np.dtype('d'))) # <<<<<<<<<<<<<< + * + * # Initialize the array */ -#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 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 642 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 280 "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 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 642 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_7); +#line 280 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 642 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 280 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyTuple_New(2); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#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 280 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 280 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 0, __pyx_t_19); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 280 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_19); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_7, 0, 0, 0); +#line 280 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_20, 1, __pyx_t_2); -#line 642 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 280 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_2); -#line 642 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 642; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 280 "root_numpy/src/tree.pyx" + __pyx_t_19 = 0; -#line 642 "root_numpy/src/tree.pyx" - } +#line 280 "root_numpy/src/tree.pyx" + __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":647 - * # 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) - */ +#line 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 647 "root_numpy/src/tree.pyx" - __pyx_v_chain->AddFormula(__pyx_v_formula); +#line 280 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; - /* "root_numpy/src/tree.pyx":648 - * # rolling over to the next tree. - * chain.AddFormula(formula) - * col = new FormulaColumn(branch, formula) # <<<<<<<<<<<<<< - * columns.push_back(col) - * - */ +#line 280 "root_numpy/src/tree.pyx" + goto __pyx_L39; -#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 280 "root_numpy/src/tree.pyx" + } -#line 648 "root_numpy/src/tree.pyx" - __pyx_v_col = new FormulaColumn(__pyx_t_21, __pyx_v_formula); +#line 280 "root_numpy/src/tree.pyx" + __pyx_L39:; - /* "root_numpy/src/tree.pyx":649 - * chain.AddFormula(formula) - * col = new FormulaColumn(branch, formula) - * columns.push_back(col) # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":283 + * + * # Initialize the array + * arr = np.empty(num_entries, dtype=dtype) # <<<<<<<<<<<<<< * - * if columns.size() == 0: + * # Exclude weight column in num_columns */ -#line 649 "root_numpy/src/tree.pyx" - __pyx_v_columns.push_back(__pyx_v_col); +#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 649 "root_numpy/src/tree.pyx" - } +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 649 "root_numpy/src/tree.pyx" - __pyx_L14:; +#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":618 - * user_branches = True - * - * for branch in branches: # <<<<<<<<<<<<<< - * if branch in structure: - * leaves = structure[branch] - */ +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_2); -#line 618 "root_numpy/src/tree.pyx" - } +#line 283 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 618 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":651 - * columns.push_back(col) - * - * if columns.size() == 0: # <<<<<<<<<<<<<< - * raise RuntimeError("unable to convert any branches in this tree") - * - */ +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 651 "root_numpy/src/tree.pyx" - __pyx_t_1 = ((__pyx_v_columns.size() == 0) != 0); +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_19 = PyTuple_New(1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 651 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); - /* "root_numpy/src/tree.pyx":652 - * - * if columns.size() == 0: - * raise RuntimeError("unable to convert any branches in this tree") # <<<<<<<<<<<<<< - * - * # Activate branches used by formulae and columns - */ +#line 283 "root_numpy/src/tree.pyx" + PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); -#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 283 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_20); -#line 652 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_20 = 0; -#line 652 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_20 = PyDict_New(); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 652 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 652 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L5_error;} +#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 652 "root_numpy/src/tree.pyx" - } +#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} - /* "root_numpy/src/tree.pyx":656 - * # Activate branches used by formulae and columns - * # and deactivate all others - * chain.InitBranches() # <<<<<<<<<<<<<< - * - * # Now that we have all the columns we can - */ +#line 283 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 656 "root_numpy/src/tree.pyx" - __pyx_v_chain->InitBranches(); +#line 283 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":660 - * # 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 - */ +#line 283 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#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 283 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 660 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 660 "root_numpy/src/tree.pyx" - __pyx_v_arr = ((PyArrayObject *)__pyx_t_2); +#line 283 "root_numpy/src/tree.pyx" + __pyx_v_arr = ((PyArrayObject *)__pyx_t_8); -#line 660 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 283 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":663 - * include_weight, weight_name) - * # Exclude weight column - * numcol = columns.size() # <<<<<<<<<<<<<< + /* "root_numpy/src/tree.pyx":286 * - * 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 286 "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":289 * + * # 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 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 289 "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 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 289 "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 289 "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 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 289 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_20); -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_15 = NULL; +#line 289 "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 289 "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 289 "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 289 "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 289 "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 289 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_2); -#line 665 "root_numpy/src/tree.pyx" +#line 289 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_8, function); +#line 289 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_19, function); -#line 665 "root_numpy/src/tree.pyx" +#line 289 "root_numpy/src/tree.pyx" } -#line 665 "root_numpy/src/tree.pyx" +#line 289 "root_numpy/src/tree.pyx" } -#line 665 "root_numpy/src/tree.pyx" - if (!__pyx_t_15) { +#line 289 "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 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 289 "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 289 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 665 "root_numpy/src/tree.pyx" +#line 289 "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 289 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 289 "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 289 "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 289 "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 289 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_20); -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 289 "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 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 665 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 289 "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 289 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 665 "root_numpy/src/tree.pyx" +#line 289 "root_numpy/src/tree.pyx" } -#line 665 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 289 "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 289 "root_numpy/src/tree.pyx" + __pyx_v_indices = __pyx_t_8; -#line 665 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 289 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":666 - * + /* "root_numpy/src/tree.pyx":290 + * # 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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 290 "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 290 "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 290 "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 290 "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 290 "root_numpy/src/tree.pyx" + __pyx_t_12 = NULL; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 290 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" for (;;) { -#line 666 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_11)) { +#line 290 "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 290 "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 290 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_8)) break; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" #endif -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "root_numpy/src/tree.pyx" + if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_8)) break; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" #endif -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" } } else -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" { -#line 666 "root_numpy/src/tree.pyx" - __pyx_t_8 = __pyx_t_11(__pyx_t_2); +#line 290 "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 290 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_19)) { -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" if (exc_type) { -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" break; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 290 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_19); -#line 666 "root_numpy/src/tree.pyx" +#line 290 "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 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 290 "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 290 "root_numpy/src/tree.pyx" + __pyx_v_ientry = __pyx_t_13; - /* "root_numpy/src/tree.pyx":667 + /* "root_numpy/src/tree.pyx":291 * indices = slice(start, stop, step).indices(num_entries) * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) # <<<<<<<<<<<<<< @@ -13923,10 +15308,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 291 "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":292 * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) # <<<<<<<<<<<<<< @@ -13934,16 +15319,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 292 "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 = 292; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 668 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 292 "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 292 "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":293 * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) * if entry_size == 0: # <<<<<<<<<<<<<< @@ -13951,13 +15336,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 293 "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 293 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":670 + /* "root_numpy/src/tree.pyx":294 * handle_load(entry_size) * if entry_size == 0: * raise IOError("read failure in current tree") # <<<<<<<<<<<<<< @@ -13965,25 +15350,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 294 "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 = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 670 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 294 "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 294 "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 294 "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 294 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 670 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":674 + /* "root_numpy/src/tree.pyx":298 * # 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 +15376,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 298 "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 298 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":675 + /* "root_numpy/src/tree.pyx":299 * # 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 +15390,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 299 "root_numpy/src/tree.pyx" __pyx_v_selection_formula->GetNdata(); - /* "root_numpy/src/tree.pyx":676 + /* "root_numpy/src/tree.pyx":300 * if selection_formula != NULL: * selection_formula.GetNdata() # required, as in TTreePlayer * if selection_formula.EvalInstance(0) == 0: # <<<<<<<<<<<<<< @@ -14016,13 +15401,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 300 "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 300 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":677 + /* "root_numpy/src/tree.pyx":301 * selection_formula.GetNdata() # required, as in TTreePlayer * if selection_formula.EvalInstance(0) == 0: * continue # <<<<<<<<<<<<<< @@ -14030,426 +15415,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 301 "root_numpy/src/tree.pyx" + goto __pyx_L40_continue; -#line 677 "root_numpy/src/tree.pyx" +#line 301 "root_numpy/src/tree.pyx" } -#line 677 "root_numpy/src/tree.pyx" - goto __pyx_L27; +#line 301 "root_numpy/src/tree.pyx" + goto __pyx_L43; -#line 677 "root_numpy/src/tree.pyx" +#line 301 "root_numpy/src/tree.pyx" } -#line 677 "root_numpy/src/tree.pyx" - __pyx_L27:; +#line 301 "root_numpy/src/tree.pyx" + __pyx_L43:; - /* "root_numpy/src/tree.pyx":680 + /* "root_numpy/src/tree.pyx":304 * * # 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 304 "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":305 * # 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 305 "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 305 "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 305 "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":306 + * 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 306 "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":307 + * 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 307 "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":308 * 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 308 "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":309 + * 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 309 "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 309 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":687 - * # poorman pointer magic - * dataptr = shift(dataptr, nb) + /* "root_numpy/src/tree.pyx":310 + * 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 310 "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 310 "root_numpy/src/tree.pyx" + if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":688 - * dataptr = shift(dataptr, nb) + /* "root_numpy/src/tree.pyx":311 + * 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 311 "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 311 "root_numpy/src/tree.pyx" + goto __pyx_L47; -#line 688 "root_numpy/src/tree.pyx" +#line 311 "root_numpy/src/tree.pyx" } -#line 688 "root_numpy/src/tree.pyx" - __pyx_L31:; +#line 311 "root_numpy/src/tree.pyx" + __pyx_L47:; - /* "root_numpy/src/tree.pyx":691 + /* "root_numpy/src/tree.pyx":314 * * # Increment number of selected entries last * num_entries_selected += 1 # <<<<<<<<<<<<<< + * * finally: - * del chain */ -#line 691 "root_numpy/src/tree.pyx" +#line 314 "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":290 + * # 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 290 "root_numpy/src/tree.pyx" + __pyx_L40_continue:; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" } -#line 666 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 290 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 666 "root_numpy/src/tree.pyx" +#line 290 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":693 - * num_entries_selected += 1 + /* "root_numpy/src/tree.pyx":318 * 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 318 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 693 "root_numpy/src/tree.pyx" +#line 318 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 693 "root_numpy/src/tree.pyx" +#line 318 "root_numpy/src/tree.pyx" delete __pyx_v_chain; -#line 693 "root_numpy/src/tree.pyx" - goto __pyx_L6; + /* "root_numpy/src/tree.pyx":320 + * del chain + * # Delete Columns + * for icol in range(columns.size()): # <<<<<<<<<<<<<< + * del columns[icol] + * + */ + +#line 320 "root_numpy/src/tree.pyx" + __pyx_t_24 = __pyx_v_columns.size(); + +#line 320 "root_numpy/src/tree.pyx" + for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { + +#line 320 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_25; + + /* "root_numpy/src/tree.pyx":321 + * # Delete Columns + * for icol in range(columns.size()): + * del columns[icol] # <<<<<<<<<<<<<< + * + * # Shrink the array if we selected fewer than num_entries entries + */ + +#line 321 "root_numpy/src/tree.pyx" + delete (__pyx_v_columns[__pyx_v_icol]); + +#line 321 "root_numpy/src/tree.pyx" + } + +#line 321 "root_numpy/src/tree.pyx" + goto __pyx_L9; -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" } -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 693 "root_numpy/src/tree.pyx" - __pyx_L5_error:; +#line 321 "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 321 "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 321 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_21); __pyx_t_21 = 0; + +#line 321 "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_14); __pyx_t_14 = 0; +#line 321 "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_13); __pyx_t_13 = 0; +#line 321 "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_15); __pyx_t_15 = 0; +#line 321 "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_7); __pyx_t_7 = 0; +#line 321 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; + +#line 321 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 693 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 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 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 321 "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 321 "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 321 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_29); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_30); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_31); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_32); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "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 321 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_34); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" + __pyx_t_13 = __pyx_lineno; __pyx_t_14 = __pyx_clineno; __pyx_t_28 = __pyx_filename; + +#line 321 "root_numpy/src/tree.pyx" { -#line 693 "root_numpy/src/tree.pyx" + /* "root_numpy/src/tree.pyx":318 + * finally: + * # Delete TreeChain + * del chain # <<<<<<<<<<<<<< + * # Delete Columns + * for icol in range(columns.size()): + */ + +#line 318 "root_numpy/src/tree.pyx" delete __pyx_v_chain; -#line 693 "root_numpy/src/tree.pyx" + /* "root_numpy/src/tree.pyx":320 + * del chain + * # Delete Columns + * for icol in range(columns.size()): # <<<<<<<<<<<<<< + * del columns[icol] + * + */ + +#line 320 "root_numpy/src/tree.pyx" + __pyx_t_24 = __pyx_v_columns.size(); + +#line 320 "root_numpy/src/tree.pyx" + for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { + +#line 320 "root_numpy/src/tree.pyx" + __pyx_v_icol = __pyx_t_25; + + /* "root_numpy/src/tree.pyx":321 + * # Delete Columns + * for icol in range(columns.size()): + * del columns[icol] # <<<<<<<<<<<<<< + * + * # Shrink the array if we selected fewer than num_entries entries + */ + +#line 321 "root_numpy/src/tree.pyx" + delete (__pyx_v_columns[__pyx_v_icol]); + +#line 321 "root_numpy/src/tree.pyx" + } + +#line 321 "root_numpy/src/tree.pyx" } -#line 693 "root_numpy/src/tree.pyx" +#line 321 "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 321 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_32); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "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 321 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_34); -#line 693 "root_numpy/src/tree.pyx" - } +#line 321 "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 321 "root_numpy/src/tree.pyx" + } -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_29); -#line 693 "root_numpy/src/tree.pyx" +#line 321 "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 321 "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 321 "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 321 "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 321 "root_numpy/src/tree.pyx" + __pyx_lineno = __pyx_t_13; __pyx_clineno = __pyx_t_14; __pyx_filename = __pyx_t_28; + +#line 321 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" } -#line 693 "root_numpy/src/tree.pyx" - __pyx_L6:; +#line 321 "root_numpy/src/tree.pyx" + __pyx_L9:; -#line 693 "root_numpy/src/tree.pyx" +#line 321 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":696 + /* "root_numpy/src/tree.pyx":324 * - * # 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 324 "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 324 "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":325 + * # 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 325 "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 = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 325 "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 325 "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 = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_19); +#line 325 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_7 = NULL; +#line 325 "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 325 "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 325 "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 325 "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 325 "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 325 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_20); -#line 697 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF_SET(__pyx_t_8, function); +#line 325 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_19, function); -#line 697 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" - if (!__pyx_t_7) { +#line 325 "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 325 "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 = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; +#line 325 "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 325 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 697 "root_numpy/src/tree.pyx" +#line 325 "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 325 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_15); +#line 325 "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 325 "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 325 "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 325 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 697 "root_numpy/src/tree.pyx" - __pyx_t_19 = 0; +#line 325 "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 325 "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 = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 697 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 325 "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 325 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 697 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; +#line 325 "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 325 "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 325 "root_numpy/src/tree.pyx" + goto __pyx_L54; -#line 697 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" } -#line 697 "root_numpy/src/tree.pyx" - __pyx_L34:; +#line 325 "root_numpy/src/tree.pyx" + __pyx_L54:; - /* "root_numpy/src/tree.pyx":699 + /* "root_numpy/src/tree.pyx":327 * arr.resize(num_entries_selected) * * return arr # <<<<<<<<<<<<<< @@ -14457,710 +15915,704 @@ __pyx_t_2 = PyObject_GetIter(__pyx_t_8); if (unlikely(!__pyx_t_2)) {__pyx_filena * */ -#line 699 "root_numpy/src/tree.pyx" +#line 327 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 699 "root_numpy/src/tree.pyx" +#line 327 "root_numpy/src/tree.pyx" __Pyx_INCREF(((PyObject *)__pyx_v_arr)); -#line 699 "root_numpy/src/tree.pyx" +#line 327 "root_numpy/src/tree.pyx" __pyx_r = ((PyObject *)__pyx_v_arr); -#line 699 "root_numpy/src/tree.pyx" +#line 327 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":566 + /* "root_numpy/src/tree.pyx":97 * * - * 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 97 "root_numpy/src/tree.pyx" -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" /* function exit code */ -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 566 "root_numpy/src/tree.pyx" +#line 97 "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 97 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_13); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_14); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_15); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_19); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_20); + +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_21); + +#line 97 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_22); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.tree2array", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 566 "root_numpy/src/tree.pyx" +#line 97 "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 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_leaf); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_branch_dict); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_ltype); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_expression); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_colname); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_dtype); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_indices); -#line 566 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_v_branches); +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_idx); + +#line 97 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_b); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" return __pyx_r; -#line 566 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":702 +/* "root_numpy/src/tree.pyx":330 * * - * 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 330 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "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 330 "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 330 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_treename = 0 -#line 702 "root_numpy/src/tree.pyx" + std::string __pyx_v_treename +#line 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branches = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_selection = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_start = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_stop = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_step = 0 -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_include_weight = 0 -#line 702 "root_numpy/src/tree.pyx" + bool __pyx_v_include_weight +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromFname (wrapper)", 0); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" { -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" switch (pos_args) { case 9: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[8] = PyTuple_GET_ITEM(__pyx_args, 8); case 8: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); case 5: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 0: break; default: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 0: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 1: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 2: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 3: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 4: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 5: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 6: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 7: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" case 8: -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } else if (PyTuple_GET_SIZE(__pyx_args) != 9) { -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } else { -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" values[8] = PyTuple_GET_ITEM(__pyx_args, 8); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_v_fnames = values[0]; -#line 702 "root_numpy/src/tree.pyx" - __pyx_v_treename = values[1]; +#line 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_v_branches = values[2]; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_v_selection = values[3]; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_v_start = values[4]; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_v_stop = values[5]; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_v_step = values[6]; -#line 702 "root_numpy/src/tree.pyx" - __pyx_v_include_weight = values[7]; +#line 330 "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 = 332; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" - __pyx_v_weight_name = values[8]; +#line 330 "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 = 332; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromFname", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" return NULL; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" /* function exit code */ -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" return __pyx_r; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fn = NULL -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_ret = NULL -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" ; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "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 330 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromFname", 0); - /* "root_numpy/src/tree.pyx":705 + /* "root_numpy/src/tree.pyx":333 * 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 333 "root_numpy/src/tree.pyx" __pyx_v_ttree = NULL; - /* "root_numpy/src/tree.pyx":706 - * include_weight, weight_name): + /* "root_numpy/src/tree.pyx":334 + * 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 334 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":707 + /* "root_numpy/src/tree.pyx":335 * 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 335 "root_numpy/src/tree.pyx" + __pyx_v_ttree = new TChain(__pyx_v_treename.c_str()); -#line 707 "root_numpy/src/tree.pyx" - __pyx_v_ttree = new TChain(__pyx_t_1); - - /* "root_numpy/src/tree.pyx":708 + /* "root_numpy/src/tree.pyx":336 * 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 336 "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 336 "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 336 "root_numpy/src/tree.pyx" + __pyx_t_3 = NULL; -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 336 "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 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" for (;;) { -#line 708 "root_numpy/src/tree.pyx" - if (likely(!__pyx_t_4)) { +#line 336 "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 336 "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 336 "root_numpy/src/tree.pyx" + if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break; -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" #endif -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "root_numpy/src/tree.pyx" + if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break; -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" #endif -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" } } else -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" { -#line 708 "root_numpy/src/tree.pyx" - __pyx_t_5 = __pyx_t_4(__pyx_t_2); +#line 336 "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 336 "root_numpy/src/tree.pyx" + if (unlikely(!__pyx_t_4)) { -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" if (exc_type) { -#line 708 "root_numpy/src/tree.pyx" +#line 336 "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 336 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" break; -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 336 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 708 "root_numpy/src/tree.pyx" +#line 336 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_fn, __pyx_t_5); +#line 336 "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 336 "root_numpy/src/tree.pyx" + __pyx_t_4 = 0; - /* "root_numpy/src/tree.pyx":709 - * ttree = new TChain(treename) + /* "root_numpy/src/tree.pyx":337 + * 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 337 "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 = 337; __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 337 "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 337 "root_numpy/src/tree.pyx" if (__pyx_t_6) { - /* "root_numpy/src/tree.pyx":710 + /* "root_numpy/src/tree.pyx":338 * for fn in fnames: * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( # <<<<<<<<<<<<<< @@ -15168,13 +16620,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 338 "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 = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" +#line 338 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); - /* "root_numpy/src/tree.pyx":711 + /* "root_numpy/src/tree.pyx":339 * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( * treename, fn)) # <<<<<<<<<<<<<< @@ -15182,88 +16634,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 339 "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 = 339; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_9 = 0; +#line 339 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_8); -#line 711 "root_numpy/src/tree.pyx" +#line 339 "root_numpy/src/tree.pyx" + __pyx_t_9 = NULL; + +#line 339 "root_numpy/src/tree.pyx" + __pyx_t_10 = 0; + +#line 339 "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 339 "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 339 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_9)) { -#line 711 "root_numpy/src/tree.pyx" +#line 339 "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 339 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 711 "root_numpy/src/tree.pyx" +#line 339 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 711 "root_numpy/src/tree.pyx" +#line 339 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_7, function); -#line 711 "root_numpy/src/tree.pyx" - __pyx_t_9 = 1; +#line 339 "root_numpy/src/tree.pyx" + __pyx_t_10 = 1; -#line 711 "root_numpy/src/tree.pyx" +#line 339 "root_numpy/src/tree.pyx" } -#line 711 "root_numpy/src/tree.pyx" +#line 339 "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 339 "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 = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 711 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_10); +#line 339 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_11); -#line 711 "root_numpy/src/tree.pyx" - if (__pyx_t_8) { +#line 339 "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 339 "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 339 "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 339 "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 339 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_8); -#line 711 "root_numpy/src/tree.pyx" +#line 339 "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 339 "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 339 "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 339 "root_numpy/src/tree.pyx" + __pyx_t_8 = 0; -#line 711 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 339 "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 = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 711 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; +#line 339 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); + +#line 339 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 711 "root_numpy/src/tree.pyx" +#line 339 "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":338 * for fn in fnames: * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( # <<<<<<<<<<<<<< @@ -15271,80 +16729,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 338 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" +#line 338 "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 338 "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 338 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_4); -#line 710 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 338 "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 338 "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 = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_5); +#line 338 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 710 "root_numpy/src/tree.pyx" +#line 338 "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 338 "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 338 "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 338 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 710 "root_numpy/src/tree.pyx" +#line 338 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":708 + /* "root_numpy/src/tree.pyx":336 * 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 336 "root_numpy/src/tree.pyx" } -#line 708 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 336 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "root_numpy/src/tree.pyx":342 + * ret = tree2array( + * ttree, branches, + * selection or '', start, stop, step, # <<<<<<<<<<<<<< + * include_weight, weight_name) + * finally: + */ + +#line 342 "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 = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + +#line 342 "root_numpy/src/tree.pyx" + if (!__pyx_t_6) { + +#line 342 "root_numpy/src/tree.pyx" + } else { + +#line 342 "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 = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + +#line 342 "root_numpy/src/tree.pyx" + __pyx_t_12 = __pyx_t_13; + +#line 342 "root_numpy/src/tree.pyx" + goto __pyx_L9_bool_binop_done; + +#line 342 "root_numpy/src/tree.pyx" + } + +#line 342 "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 = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} + +#line 342 "root_numpy/src/tree.pyx" + __pyx_t_12 = __pyx_t_13; + +#line 342 "root_numpy/src/tree.pyx" + __pyx_L9_bool_binop_done:; - /* "root_numpy/src/tree.pyx":712 + /* "root_numpy/src/tree.pyx":340 * 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 340 "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 = 340; __pyx_clineno = __LINE__; goto __pyx_L4_error;} -#line 712 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 340 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 712 "root_numpy/src/tree.pyx" - __pyx_v_ret = __pyx_t_2; +#line 340 "root_numpy/src/tree.pyx" + __pyx_v_ret = __pyx_t_1; -#line 712 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 340 "root_numpy/src/tree.pyx" + __pyx_t_1 = 0; -#line 712 "root_numpy/src/tree.pyx" +#line 340 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":717 + /* "root_numpy/src/tree.pyx":345 * include_weight, weight_name) * finally: * del ttree # <<<<<<<<<<<<<< @@ -15352,130 +16848,133 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * */ -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" delete __pyx_v_ttree; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" goto __pyx_L5; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 717 "root_numpy/src/tree.pyx" +#line 345 "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 345 "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 345 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "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 345 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "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 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 345 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_14); +#line 345 "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 345 "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 345 "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 345 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_17); -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_18); -#line 717 "root_numpy/src/tree.pyx" +#line 345 "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 345 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_20); + +#line 345 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_21); + +#line 345 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_22); -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" + __pyx_t_14 = __pyx_lineno; __pyx_t_15 = __pyx_clineno; __pyx_t_16 = __pyx_filename; + +#line 345 "root_numpy/src/tree.pyx" { -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" delete __pyx_v_ttree; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_17); +#line 345 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_20); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_18); +#line 345 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_21); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_19); +#line 345 "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 345 "root_numpy/src/tree.pyx" + __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22); -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_14); +#line 345 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_17); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_15); +#line 345 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_18); -#line 717 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_16); +#line 345 "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 345 "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 345 "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 345 "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 345 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" __pyx_L5:; -#line 717 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":718 + /* "root_numpy/src/tree.pyx":346 * finally: * del ttree * return ret # <<<<<<<<<<<<<< @@ -15483,656 +16982,659 @@ __pyx_t_2 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_2)) {__pyx_f * */ -#line 718 "root_numpy/src/tree.pyx" +#line 346 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 718 "root_numpy/src/tree.pyx" +#line 346 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_ret); -#line 718 "root_numpy/src/tree.pyx" +#line 346 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_ret; -#line 718 "root_numpy/src/tree.pyx" +#line 346 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":702 + /* "root_numpy/src/tree.pyx":330 * * - * 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 330 "root_numpy/src/tree.pyx" -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" /* function exit code */ -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 702 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_1); -#line 702 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_5); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_4); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); -#line 702 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_10); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); + +#line 330 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_11); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromFname", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fn); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_ret); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" return __pyx_r; -#line 702 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":721 +/* "root_numpy/src/tree.pyx":349 * * * 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 349 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "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 349 "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 349 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branches = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_selection = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_start = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_stop = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_step = 0 -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" ; - PyObject *__pyx_v_include_weight = 0 -#line 721 "root_numpy/src/tree.pyx" + bool __pyx_v_include_weight +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromCObj (wrapper)", 0); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" { -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "root_numpy/src/tree.pyx" PyObject* values[8] = {0,0,0,0,0,0,0,0}; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" switch (pos_args) { case 8: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); case 5: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 0: break; default: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 0: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 1: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 2: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 3: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 4: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 5: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 6: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" case 7: -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } else if (PyTuple_GET_SIZE(__pyx_args) != 8) { -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } else { -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_v_tree = values[0]; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_v_branches = values[1]; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_v_selection = values[2]; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_v_start = values[3]; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_v_stop = values[4]; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_v_step = values[5]; -#line 721 "root_numpy/src/tree.pyx" - __pyx_v_include_weight = values[6]; +#line 349 "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 = 351; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" - __pyx_v_weight_name = values[7]; +#line 349 "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 = 351; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" return NULL; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" /* function exit code */ -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" return __pyx_r; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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 349 "root_numpy/src/tree.pyx" ; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "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 349 "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":352 + * 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 352 "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 = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 727 "root_numpy/src/tree.pyx" - if (__pyx_t_1) { +#line 352 "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":353 + * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) + * return tree2array( # <<<<<<<<<<<<<< + * chain, branches, + * selection or '', start, stop, step, + */ + +#line 353 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_r); + + /* "root_numpy/src/tree.pyx":355 * 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 355 "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 = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 355 "root_numpy/src/tree.pyx" + if (!__pyx_t_3) { -#line 728 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 355 "root_numpy/src/tree.pyx" + } else { -#line 728 "root_numpy/src/tree.pyx" - __Pyx_Raise(__pyx_t_2, 0, 0, 0); +#line 355 "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 = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 728 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; +#line 355 "root_numpy/src/tree.pyx" + __pyx_t_2 = __pyx_t_4; -#line 728 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[1]; __pyx_lineno = 728; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 355 "root_numpy/src/tree.pyx" + goto __pyx_L3_bool_binop_done; -#line 728 "root_numpy/src/tree.pyx" +#line 355 "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 355 "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 = 355; __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 355 "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 355 "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":353 + * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) * return tree2array( # <<<<<<<<<<<<<< - * chain, branches, selection, - * start, stop, step, + * chain, branches, + * selection or '', 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) # <<<<<<<<<<<<<< - * - * - */ - -#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 353 "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 = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 733 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_2); +#line 353 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 733 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_2; +#line 353 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_5; -#line 733 "root_numpy/src/tree.pyx" - __pyx_t_2 = 0; +#line 353 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; -#line 733 "root_numpy/src/tree.pyx" +#line 353 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":721 + /* "root_numpy/src/tree.pyx":349 * * * 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 349 "root_numpy/src/tree.pyx" -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" /* function exit code */ -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 721 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_2); +#line 349 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" return __pyx_r; -#line 721 "root_numpy/src/tree.pyx" +#line 349 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":741 - * +/* "root_numpy/src/tree.pyx":365 * cdef cppclass NP2CConverter: + * * void fill_from(void* source): # <<<<<<<<<<<<<< * pass - * __dealloc__(): + * */ -#line 741 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/tree.pyx" -#line 741 "root_numpy/src/tree.pyx" +#line 365 "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 365 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("fill_from", 0); -#line 741 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/tree.pyx" -#line 741 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/tree.pyx" /* function exit code */ -#line 741 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 741 "root_numpy/src/tree.pyx" +#line 365 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":743 - * void fill_from(void* source): +/* "root_numpy/src/tree.pyx":368 * pass + * * __dealloc__(): # <<<<<<<<<<<<<< * pass * */ -#line 743 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" -#line 743 "root_numpy/src/tree.pyx" +#line 368 "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 368 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("", 0); -#line 743 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" -#line 743 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" /* function exit code */ -#line 743 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 743 "root_numpy/src/tree.pyx" +#line 368 "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":379 + * 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 379 "root_numpy/src/tree.pyx" -#line 755 "root_numpy/src/tree.pyx" +#line 379 "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 379 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_existing_type = NULL -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" ; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -16148,10 +17650,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 379 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("", 0); - /* "root_numpy/src/tree.pyx":757 + /* "root_numpy/src/tree.pyx":381 * __init__(TTree* tree, string name, string roottype, int nbytes): * cdef string leaflist * this.nbytes = nbytes # <<<<<<<<<<<<<< @@ -16159,10 +17661,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.name = name */ -#line 757 "root_numpy/src/tree.pyx" +#line 381 "root_numpy/src/tree.pyx" this->nbytes = __pyx_v_nbytes; - /* "root_numpy/src/tree.pyx":758 + /* "root_numpy/src/tree.pyx":382 * cdef string leaflist * this.nbytes = nbytes * this.roottype = roottype # <<<<<<<<<<<<<< @@ -16170,10 +17672,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 382 "root_numpy/src/tree.pyx" this->roottype = __pyx_v_roottype; - /* "root_numpy/src/tree.pyx":759 + /* "root_numpy/src/tree.pyx":383 * this.nbytes = nbytes * this.roottype = roottype * this.name = name # <<<<<<<<<<<<<< @@ -16181,10 +17683,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 383 "root_numpy/src/tree.pyx" this->name = __pyx_v_name; - /* "root_numpy/src/tree.pyx":760 + /* "root_numpy/src/tree.pyx":384 * this.roottype = roottype * this.name = name * this.value = malloc(nbytes) # <<<<<<<<<<<<<< @@ -16192,10 +17694,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 384 "root_numpy/src/tree.pyx" this->value = malloc(__pyx_v_nbytes); - /* "root_numpy/src/tree.pyx":761 + /* "root_numpy/src/tree.pyx":385 * this.name = name * this.value = malloc(nbytes) * this.branch = tree.GetBranch(this.name.c_str()) # <<<<<<<<<<<<<< @@ -16203,10 +17705,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 385 "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":386 * this.value = malloc(nbytes) * this.branch = tree.GetBranch(this.name.c_str()) * if this.branch == NULL: # <<<<<<<<<<<<<< @@ -16214,13 +17716,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 386 "root_numpy/src/tree.pyx" __pyx_t_1 = ((this->branch == NULL) != 0); -#line 762 "root_numpy/src/tree.pyx" +#line 386 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":763 + /* "root_numpy/src/tree.pyx":387 * this.branch = tree.GetBranch(this.name.c_str()) * if this.branch == NULL: * leaflist = this.name + '/' + this.roottype # <<<<<<<<<<<<<< @@ -16228,49 +17730,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 387 "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 = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 387 "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 387 "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 = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 763 "root_numpy/src/tree.pyx" +#line 387 "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 387 "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 = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 387 "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 387 "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 = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 763 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 763 "root_numpy/src/tree.pyx" +#line 387 "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 387 "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 = 387; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 763 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 763 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" __pyx_v_leaflist = __pyx_t_5; - /* "root_numpy/src/tree.pyx":764 + /* "root_numpy/src/tree.pyx":388 * if this.branch == NULL: * leaflist = this.name + '/' + this.roottype * this.branch = tree.Branch(this.name.c_str(), this.value, leaflist.c_str()) # <<<<<<<<<<<<<< @@ -16278,19 +17780,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 388 "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 388 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 764 "root_numpy/src/tree.pyx" +#line 388 "root_numpy/src/tree.pyx" } -#line 764 "root_numpy/src/tree.pyx" +#line 388 "root_numpy/src/tree.pyx" /*else*/ { - /* "root_numpy/src/tree.pyx":767 + /* "root_numpy/src/tree.pyx":391 * else: * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] # <<<<<<<<<<<<<< @@ -16298,284 +17800,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 391 "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 = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 767 "root_numpy/src/tree.pyx" +#line 391 "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 391 "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 = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 767 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 767 "root_numpy/src/tree.pyx" +#line 391 "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 391 "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 = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 767 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 767 "root_numpy/src/tree.pyx" +#line 391 "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 391 "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 = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 767 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 767 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 767 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __pyx_v_existing_type = __pyx_t_2; -#line 767 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":768 + /* "root_numpy/src/tree.pyx":392 * # 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 392 "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 = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 392 "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 392 "root_numpy/src/tree.pyx" + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 768 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" +#line 392 "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 392 "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 = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 768 "root_numpy/src/tree.pyx" +#line 392 "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 392 "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 = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 392 "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 392 "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 = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 768 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 768 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":771 + /* "root_numpy/src/tree.pyx":395 * 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 395 "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 = 395; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 771 "root_numpy/src/tree.pyx" +#line 395 "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":396 + * "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 396 "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 = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "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 = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_2))) { -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_2); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_2, function); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_8 = 1; -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" } -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "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 = 395; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" if (__pyx_t_7) { -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "root_numpy/src/tree.pyx" } -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_3); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_6); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_existing_type); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_existing_type); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_3 = 0; -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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 396 "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 = 395; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 772 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 772 "root_numpy/src/tree.pyx" +#line 396 "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":393 * 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 393 "root_numpy/src/tree.pyx" + __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 769 "root_numpy/src/tree.pyx" +#line 393 "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 393 "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 = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 769 "root_numpy/src/tree.pyx" +#line 393 "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 393 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 769 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":773 - * "with existing branch of type `{2}`".format( + /* "root_numpy/src/tree.pyx":397 + * "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 397 "root_numpy/src/tree.pyx" this->branch->SetAddress(this->value); -#line 773 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" } -#line 773 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":774 + /* "root_numpy/src/tree.pyx":398 * name, roottype, existing_type)) * this.branch.SetAddress(this.value) * this.branch.SetStatus(1) # <<<<<<<<<<<<<< @@ -16583,63 +18085,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 398 "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":379 + * 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 379 "root_numpy/src/tree.pyx" -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" /* function exit code */ -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_WriteUnraisable("ScalarNP2CConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_existing_type); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 755 "root_numpy/src/tree.pyx" +#line 379 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":776 +/* "root_numpy/src/tree.pyx":400 * this.branch.SetStatus(1) * * __del__(self): # does this do what I want? # <<<<<<<<<<<<<< @@ -16647,20 +18149,20 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * */ -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" -#line 776 "root_numpy/src/tree.pyx" +#line 400 "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 400 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("__del__", 0); - /* "root_numpy/src/tree.pyx":777 + /* "root_numpy/src/tree.pyx":401 * * __del__(self): # does this do what I want? * free(this.value) # <<<<<<<<<<<<<< @@ -16668,10 +18170,10 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * void fill_from(void* source): */ -#line 777 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" free(this->value); - /* "root_numpy/src/tree.pyx":776 + /* "root_numpy/src/tree.pyx":400 * this.branch.SetStatus(1) * * __del__(self): # does this do what I want? # <<<<<<<<<<<<<< @@ -16679,28 +18181,28 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * */ -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" /* function exit code */ -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" return __pyx_r; -#line 776 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":779 +/* "root_numpy/src/tree.pyx":403 * free(this.value) * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -16708,17 +18210,17 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * this.branch.Fill() */ -#line 779 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" -#line 779 "root_numpy/src/tree.pyx" +#line 403 "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 403 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("fill_from", 0); - /* "root_numpy/src/tree.pyx":780 + /* "root_numpy/src/tree.pyx":404 * * void fill_from(void* source): * memcpy(this.value, source, this.nbytes) # <<<<<<<<<<<<<< @@ -16726,10 +18228,10 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * */ -#line 780 "root_numpy/src/tree.pyx" +#line 404 "root_numpy/src/tree.pyx" memcpy(this->value, __pyx_v_source, this->nbytes); - /* "root_numpy/src/tree.pyx":781 + /* "root_numpy/src/tree.pyx":405 * void fill_from(void* source): * memcpy(this.value, source, this.nbytes) * this.branch.Fill() # <<<<<<<<<<<<<< @@ -16737,10 +18239,10 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * */ -#line 781 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" this->branch->Fill(); - /* "root_numpy/src/tree.pyx":779 + /* "root_numpy/src/tree.pyx":403 * free(this.value) * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -16748,39 +18250,39 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * this.branch.Fill() */ -#line 779 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" -#line 779 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" /* function exit code */ -#line 779 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 779 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":784 +/* "root_numpy/src/tree.pyx":408 * * - * 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 408 "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 408 "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 408 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_roottype = NULL -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" ; -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __pyx_t_13_librootnumpy_NP2CConverter *__pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -16794,766 +18296,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 408 "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":412 + * # 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 412 "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 = 412; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 789 "root_numpy/src/tree.pyx" +#line 412 "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 412 "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 = 412; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 789 "root_numpy/src/tree.pyx" +#line 412 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 789 "root_numpy/src/tree.pyx" +#line 412 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_t_2 != 0); -#line 789 "root_numpy/src/tree.pyx" +#line 412 "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":413 + * # 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 413 "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 = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "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 = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" PyObject* sequence = __pyx_t_4; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" #else -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" #endif -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" if (unlikely(size != 2)) { -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_5 = PyTuple_GET_ITEM(sequence, 1); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } else { -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_1 = PyList_GET_ITEM(sequence, 0); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_5 = PyList_GET_ITEM(sequence, 1); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_1); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_5); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" + __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" + __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" #endif -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } else { -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "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 = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" goto __pyx_L4_unpacking_failed; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" goto __pyx_L4_unpacking_failed; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" + if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" goto __pyx_L5_unpacking_done; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_L4_unpacking_failed:; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "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 413 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_L5_unpacking_done:; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_v_nbytes = __pyx_t_1; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_v_roottype = __pyx_t_5; -#line 790 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":791 + /* "root_numpy/src/tree.pyx":414 * 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 414 "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 = 414; __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 414 "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 = 414; __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 414 "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 = 414; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 791 "root_numpy/src/tree.pyx" +#line 414 "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 414 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 791 "root_numpy/src/tree.pyx" +#line 414 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":792 + /* "root_numpy/src/tree.pyx":415 * 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 415 "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 = 415; __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 792 "root_numpy/src/tree.pyx" +#line 415 "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 415 "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 = 415; __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 415 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_1); -#line 792 "root_numpy/src/tree.pyx" +#line 415 "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) { +#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "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 793 "root_numpy/src/tree.pyx" - __pyx_t_6 = NULL; +#line 415 "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 415 "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 415 "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 415 "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 415 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_11)) { -#line 793 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_6); +#line 415 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); -#line 793 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 415 "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 415 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 793 "root_numpy/src/tree.pyx" - } +#line 415 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_6, function); -#line 793 "root_numpy/src/tree.pyx" +#line 415 "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 415 "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 415 "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 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_5); +#line 415 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 793 "root_numpy/src/tree.pyx" - __pyx_t_5 = 0; +#line 415 "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 415 "root_numpy/src/tree.pyx" + __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 793 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 415 "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 415 "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 415 "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 415 "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 415 "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 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 794 "root_numpy/src/tree.pyx" - __pyx_r = NULL; +#line 415 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 794 "root_numpy/src/tree.pyx" - goto __pyx_L0; +#line 415 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; -#line 794 "root_numpy/src/tree.pyx" +#line 415 "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 415 "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 415 "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 415 "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 415 "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 415 "root_numpy/src/tree.pyx" + if (likely(__pyx_t_6)) { -#line 803 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_5); +#line 415 "root_numpy/src/tree.pyx" + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); -#line 803 "root_numpy/src/tree.pyx" - __Pyx_INCREF(function); +#line 415 "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 415 "root_numpy/src/tree.pyx" + __Pyx_INCREF(function); -#line 803 "root_numpy/src/tree.pyx" - } +#line 415 "root_numpy/src/tree.pyx" + __Pyx_DECREF_SET(__pyx_t_1, function); -#line 803 "root_numpy/src/tree.pyx" +#line 415 "root_numpy/src/tree.pyx" } -#line 803 "root_numpy/src/tree.pyx" - if (!__pyx_t_5) { +#line 415 "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 415 "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 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 415 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 803 "root_numpy/src/tree.pyx" - } else { +#line 415 "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 415 "root_numpy/src/tree.pyx" + } else { -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_6); +#line 415 "root_numpy/src/tree.pyx" + __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 415; __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 415 "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 415 "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 415 "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 415 "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 415 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; -#line 803 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_4); +#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +#line 415 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_4); -#line 803 "root_numpy/src/tree.pyx" - } +#line 415 "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 415 "root_numpy/src/tree.pyx" + } -#line 803 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; +#line 415 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 803 "root_numpy/src/tree.pyx" - } +#line 415 "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":416 + * 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 416 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 804 "root_numpy/src/tree.pyx" +#line 416 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":784 + /* "root_numpy/src/tree.pyx":408 * * - * 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 408 "root_numpy/src/tree.pyx" -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" /* function exit code */ -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_12); + +#line 408 "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 408 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_nbytes); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_roottype); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" return __pyx_r; -#line 784 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":807 +/* "root_numpy/src/tree.pyx":419 * * - * 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 419 "root_numpy/src/tree.pyx" -#line 807 "root_numpy/src/tree.pyx" +#line 419 "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 419 "root_numpy/src/tree.pyx" + std::string __pyx_v_name = __pyx_k__27; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "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 419 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_posarray -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_roffsetarray -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; unsigned int __pyx_v_icv -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; int __pyx_v_icol -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; long __pyx_v_arr_len -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; long __pyx_v_idata -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; unsigned long __pyx_v_pos_len -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; unsigned long __pyx_v_ipos -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; void *__pyx_v_source -#line 807 "root_numpy/src/tree.pyx" +#line 419 "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 419 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fieldnames = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fields = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fieldname = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_dtype = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_roffset = NULL -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; __pyx_t_13_librootnumpy_NP2CConverter *__pyx_v_cvt -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" ; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "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 419 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree", 0); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" if (__pyx_optional_args) { -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 0) { -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __pyx_v_name = __pyx_optional_args->name; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 1) { -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __pyx_v_tree = __pyx_optional_args->tree; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" } -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" } -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":816 + /* "root_numpy/src/tree.pyx":425 * cdef unsigned int icv * cdef int icol * cdef long arr_len = arr.shape[0] # <<<<<<<<<<<<<< @@ -17561,464 +18934,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 425 "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":429 * 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 429 "root_numpy/src/tree.pyx" __pyx_v_source = NULL; - /* "root_numpy/src/tree.pyx":821 + /* "root_numpy/src/tree.pyx":430 * cdef unsigned long ipos * cdef void* source = NULL * cdef void* thisrow = NULL # <<<<<<<<<<<<<< - * cdef NP2CConverter* tmpcv * + * try: */ -#line 821 "root_numpy/src/tree.pyx" +#line 430 "root_numpy/src/tree.pyx" __pyx_v_thisrow = NULL; - /* "root_numpy/src/tree.pyx":824 - * cdef NP2CConverter* tmpcv + /* "root_numpy/src/tree.pyx":432 + * 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 432 "root_numpy/src/tree.pyx" /*try:*/ { -#line 824 "root_numpy/src/tree.pyx" +#line 432 "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 432 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":825 + /* "root_numpy/src/tree.pyx":433 * * 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 433 "root_numpy/src/tree.pyx" __pyx_t_4 = ((__pyx_v_tree == NULL) != 0); -#line 825 "root_numpy/src/tree.pyx" +#line 433 "root_numpy/src/tree.pyx" if (__pyx_t_4) { - /* "root_numpy/src/tree.pyx":826 + /* "root_numpy/src/tree.pyx":434 * 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 434 "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 434 "root_numpy/src/tree.pyx" goto __pyx_L14; -#line 826 "root_numpy/src/tree.pyx" +#line 434 "root_numpy/src/tree.pyx" } -#line 826 "root_numpy/src/tree.pyx" +#line 434 "root_numpy/src/tree.pyx" __pyx_L14:; - /* "root_numpy/src/tree.pyx":828 - * tree = new TTree(name, name) + /* "root_numpy/src/tree.pyx":436 + * 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 436 "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 = 436; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 828 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 436 "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 436 "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 = 436; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 828 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 436 "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 436 "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 436 "root_numpy/src/tree.pyx" + __pyx_v_fieldnames = __pyx_t_6; -#line 828 "root_numpy/src/tree.pyx" - __pyx_t_8 = 0; +#line 436 "root_numpy/src/tree.pyx" + __pyx_t_6 = 0; - /* "root_numpy/src/tree.pyx":829 + /* "root_numpy/src/tree.pyx":437 * * 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 437 "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 = 437; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 829 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 437 "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 437 "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 = 437; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 829 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 437 "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 437 "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 437 "root_numpy/src/tree.pyx" + __pyx_v_fields = __pyx_t_5; -#line 829 "root_numpy/src/tree.pyx" - __pyx_t_7 = 0; +#line 437 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":832 + /* "root_numpy/src/tree.pyx":440 * - * # 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 440 "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 = 440; __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 440 "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 440 "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":441 + * # 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 441 "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 = 441; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; -#line 833 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 441 "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 441 "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 441 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":835 + /* "root_numpy/src/tree.pyx":443 * 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 443 "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 = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;}; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 443 "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 443 "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 443 "root_numpy/src/tree.pyx" + PyObject* sequence = __pyx_t_5; -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" #else -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" #endif -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" if (unlikely(size != 2)) { -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "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 443 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" } -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 835 "root_numpy/src/tree.pyx" +#line 443 "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 443 "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 443 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyTuple_GET_ITEM(sequence, 1); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" } else { -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyList_GET_ITEM(sequence, 0); +#line 443 "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 443 "root_numpy/src/tree.pyx" + __pyx_t_9 = PyList_GET_ITEM(sequence, 1); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" } -#line 835 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_8); +#line 443 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_6); -#line 835 "root_numpy/src/tree.pyx" - __Pyx_INCREF(__pyx_t_11); +#line 443 "root_numpy/src/tree.pyx" + __Pyx_INCREF(__pyx_t_9); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "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 443 "root_numpy/src/tree.pyx" + __pyx_t_6 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 443 "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 443 "root_numpy/src/tree.pyx" + __pyx_t_9 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 443 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" #endif -#line 835 "root_numpy/src/tree.pyx" - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; +#line 443 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" } else { -#line 835 "root_numpy/src/tree.pyx" +#line 443 "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 443 "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 = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_12); +#line 443 "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 443 "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 443 "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 443 "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 443 "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 443 "root_numpy/src/tree.pyx" goto __pyx_L17_unpacking_failed; -#line 835 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 443 "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 443 "root_numpy/src/tree.pyx" + if (__Pyx_IternextUnpackEndCheck(__pyx_t_11(__pyx_t_10), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" - __pyx_t_13 = NULL; +#line 443 "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 443 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" goto __pyx_L18_unpacking_done; -#line 835 "root_numpy/src/tree.pyx" +#line 443 "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 443 "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 443 "root_numpy/src/tree.pyx" + __pyx_t_11 = NULL; -#line 835 "root_numpy/src/tree.pyx" +#line 443 "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 443 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" __pyx_L18_unpacking_done:; -#line 835 "root_numpy/src/tree.pyx" +#line 443 "root_numpy/src/tree.pyx" } -#line 835 "root_numpy/src/tree.pyx" - __Pyx_XDECREF_SET(__pyx_v_dtype, __pyx_t_8); +#line 443 "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 443 "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 443 "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 443 "root_numpy/src/tree.pyx" + __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":836 + /* "root_numpy/src/tree.pyx":444 * # 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 444 "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":445 * 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 445 "root_numpy/src/tree.pyx" __pyx_t_4 = ((__pyx_v_cvt != NULL) != 0); -#line 837 "root_numpy/src/tree.pyx" +#line 445 "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":446 + * 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 446 "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 = 446; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 838 "root_numpy/src/tree.pyx" - __pyx_v_roffsetarray.push_back(__pyx_t_16); +#line 446 "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":447 + * 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 447 "root_numpy/src/tree.pyx" + __pyx_v_converters.push_back(__pyx_v_cvt); - /* "root_numpy/src/tree.pyx":840 + /* "root_numpy/src/tree.pyx":448 * 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 448 "root_numpy/src/tree.pyx" __pyx_v_posarray.push_back(__pyx_v_icol); -#line 840 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L19; -#line 840 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 840 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_L19:; -#line 840 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":843 + /* "root_numpy/src/tree.pyx":451 * * # fill in data * pos_len = posarray.size() # <<<<<<<<<<<<<< @@ -18026,10 +19366,10 @@ goto __pyx_L17_unpacking_failed; * thisrow = np.PyArray_GETPTR1(arr, idata) */ -#line 843 "root_numpy/src/tree.pyx" +#line 451 "root_numpy/src/tree.pyx" __pyx_v_pos_len = __pyx_v_posarray.size(); - /* "root_numpy/src/tree.pyx":844 + /* "root_numpy/src/tree.pyx":452 * # fill in data * pos_len = posarray.size() * for idata in range(arr_len): # <<<<<<<<<<<<<< @@ -18037,16 +19377,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 452 "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 452 "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 452 "root_numpy/src/tree.pyx" + __pyx_v_idata = __pyx_t_14; - /* "root_numpy/src/tree.pyx":845 + /* "root_numpy/src/tree.pyx":453 * pos_len = posarray.size() * for idata in range(arr_len): * thisrow = np.PyArray_GETPTR1(arr, idata) # <<<<<<<<<<<<<< @@ -18054,10 +19394,10 @@ goto __pyx_L17_unpacking_failed; * roffset = roffsetarray[ipos] */ -#line 845 "root_numpy/src/tree.pyx" +#line 453 "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":454 * for idata in range(arr_len): * thisrow = np.PyArray_GETPTR1(arr, idata) * for ipos in range(pos_len): # <<<<<<<<<<<<<< @@ -18065,67 +19405,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 454 "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 454 "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 454 "root_numpy/src/tree.pyx" + __pyx_v_ipos = __pyx_t_16; - /* "root_numpy/src/tree.pyx":847 + /* "root_numpy/src/tree.pyx":455 * 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 455 "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 = 455; __pyx_clineno = __LINE__; goto __pyx_L6_error;} -#line 847 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 455 "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 455 "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 455 "root_numpy/src/tree.pyx" + __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":848 + /* "root_numpy/src/tree.pyx":456 * 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 456 "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 = 456; __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 456 "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":457 * 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 457 "root_numpy/src/tree.pyx" + (__pyx_v_converters[__pyx_v_ipos])->fill_from(__pyx_v_source); -#line 849 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/tree.pyx" } -#line 849 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":853 + /* "root_numpy/src/tree.pyx":461 * # 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 +19473,40 @@ goto __pyx_L17_unpacking_failed; * except: */ -#line 853 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" __pyx_v_tree->SetEntries(-1); -#line 853 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" } -#line 853 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 853 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 853 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 853 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" goto __pyx_L13_try_end; -#line 853 "root_numpy/src/tree.pyx" +#line 461 "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 461 "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 461 "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 461 "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 461 "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":463 * tree.SetEntries(-1) * * except: # <<<<<<<<<<<<<< @@ -18174,25 +19514,25 @@ goto __pyx_L17_unpacking_failed; * */ -#line 855 "root_numpy/src/tree.pyx" +#line 463 "root_numpy/src/tree.pyx" /*except:*/ { -#line 855 "root_numpy/src/tree.pyx" +#line 463 "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 463 "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 = 463; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} -#line 855 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_11); +#line 463 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_5); -#line 855 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_7); +#line 463 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_9); -#line 855 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_8); +#line 463 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_6); - /* "root_numpy/src/tree.pyx":856 + /* "root_numpy/src/tree.pyx":464 * * except: * raise # <<<<<<<<<<<<<< @@ -18200,329 +19540,307 @@ goto __pyx_L17_unpacking_failed; * finally: */ -#line 856 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_11); +#line 464 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_5); -#line 856 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_t_7); +#line 464 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_t_9); -#line 856 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_8); +#line 464 "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 464 "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 464 "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 464 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 464; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;} -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" } -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" __pyx_L8_except_error:; -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_1); -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_2); -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_3); -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3); -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" goto __pyx_L4_error; -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" __pyx_L13_try_end:; -#line 856 "root_numpy/src/tree.pyx" +#line 464 "root_numpy/src/tree.pyx" } -#line 856 "root_numpy/src/tree.pyx" +#line 464 "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":467 + * + * finally: + * for icv in range(converters.size()): # <<<<<<<<<<<<<< + * del converters[icv] + * # TODO: clean up tree */ -#line 862 "root_numpy/src/tree.pyx" +#line 467 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 862 "root_numpy/src/tree.pyx" +#line 467 "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 467 "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 467 "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 467 "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":468 + * 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 468 "root_numpy/src/tree.pyx" + delete (__pyx_v_converters[__pyx_v_icv]); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" goto __pyx_L5; -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 864 "root_numpy/src/tree.pyx" +#line 468 "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 468 "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 468 "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 468 "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 468 "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 468 "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 468 "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 468 "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 468 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_3); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_2); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_1); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_24); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_20); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_25); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_XGOTREF(__pyx_t_21); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGOTREF(__pyx_t_26); +#line 468 "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 468 "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 468 "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":467 + * + * 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 467 "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 467 "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 467 "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":468 + * 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 468 "root_numpy/src/tree.pyx" + delete (__pyx_v_converters[__pyx_v_icv]); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_24); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_20); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_25); +#line 468 "root_numpy/src/tree.pyx" + __Pyx_XGIVEREF(__pyx_t_21); -#line 864 "root_numpy/src/tree.pyx" - __Pyx_XGIVEREF(__pyx_t_26); +#line 468 "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 468 "root_numpy/src/tree.pyx" + __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_3); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_2); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_1); -#line 864 "root_numpy/src/tree.pyx" +#line 468 "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 468 "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 468 "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 468 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __pyx_L5:; -#line 864 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":866 - * del tmpcv + /* "root_numpy/src/tree.pyx":471 + * # TODO: clean up tree * * return tree # <<<<<<<<<<<<<< * * */ -#line 866 "root_numpy/src/tree.pyx" +#line 471 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_tree; -#line 866 "root_numpy/src/tree.pyx" +#line 471 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":807 + /* "root_numpy/src/tree.pyx":419 * * - * 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 419 "root_numpy/src/tree.pyx" -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" /* function exit code */ -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_7); +#line 419 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_5); -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_8); +#line 419 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_6); -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_11); +#line 419 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_9); -#line 807 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_12); +#line 419 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_10); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fieldnames); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fields); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fieldname); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_dtype); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_roffset); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" return __pyx_r; -#line 807 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":869 +/* "root_numpy/src/tree.pyx":474 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -18530,254 +19848,255 @@ goto __pyx_L17_unpacking_failed; * cdef TTree* outtree = NULL */ -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "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 474 "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 474 "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 474 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_name = 0 -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_tree = 0 -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree_toCObj (wrapper)", 0); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" { -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "root_numpy/src/tree.pyx" PyObject* values[3] = {0,0,0}; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[1] = ((PyObject *)__pyx_n_s_tree); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[2] = ((PyObject *)Py_None); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" switch (pos_args) { case 3: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" case 0: break; default: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" case 0: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" case 1: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_name); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" if (value) { values[1] = value; kw_args--; } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" case 2: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" if (value) { values[2] = value; kw_args--; } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "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 = 474; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } else { -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 3: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" break; default: -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_v_arr = values[0]; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_v_name = values[1]; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_v_tree = values[2]; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree_toCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" return NULL; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "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 474 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" /* function exit code */ -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" return __pyx_r; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "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 474 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_outtree -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" ; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "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 474 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree_toCObj", 0); - /* "root_numpy/src/tree.pyx":870 + /* "root_numpy/src/tree.pyx":475 * * def array2tree_toCObj(arr, name='tree', tree=None): * cdef TTree* intree = NULL # <<<<<<<<<<<<<< @@ -18785,127 +20104,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 475 "root_numpy/src/tree.pyx" __pyx_v_intree = NULL; - /* "root_numpy/src/tree.pyx":871 + /* "root_numpy/src/tree.pyx":476 * 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 476 "root_numpy/src/tree.pyx" __pyx_v_outtree = NULL; - /* "root_numpy/src/tree.pyx":872 + /* "root_numpy/src/tree.pyx":477 * 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 477 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_tree != Py_None); -#line 872 "root_numpy/src/tree.pyx" +#line 477 "root_numpy/src/tree.pyx" __pyx_t_2 = (__pyx_t_1 != 0); -#line 872 "root_numpy/src/tree.pyx" +#line 477 "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":478 + * 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 478 "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 = 478; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 878 "root_numpy/src/tree.pyx" - __pyx_v_intree = ((TTree *)__pyx_t_4); +#line 478 "root_numpy/src/tree.pyx" + __pyx_v_intree = ((TTree *)__pyx_t_3); -#line 878 "root_numpy/src/tree.pyx" +#line 478 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 878 "root_numpy/src/tree.pyx" +#line 478 "root_numpy/src/tree.pyx" } -#line 878 "root_numpy/src/tree.pyx" +#line 478 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":879 - * raise ValueError("tree must be PyCObject") + /* "root_numpy/src/tree.pyx":479 + * 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 479 "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 = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 879 "root_numpy/src/tree.pyx" +#line 479 "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 = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 479 "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 479 "root_numpy/src/tree.pyx" + __pyx_t_6.name = __pyx_t_4; -#line 879 "root_numpy/src/tree.pyx" +#line 479 "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 479 "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 = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 879 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_outtree = __pyx_t_5; - /* "root_numpy/src/tree.pyx":880 + /* "root_numpy/src/tree.pyx":480 * intree = PyCObject_AsVoidPtr(tree) * outtree = array2tree(arr, name=name, tree=intree) * return PyCObject_FromVoidPtr(outtree, NULL) # <<<<<<<<<<<<<< @@ -18913,25 +20195,25 @@ static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyOb * */ -#line 880 "root_numpy/src/tree.pyx" +#line 480 "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 480 "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 = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 880 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_t_3); +#line 480 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); -#line 880 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_3; +#line 480 "root_numpy/src/tree.pyx" + __pyx_r = __pyx_t_7; -#line 880 "root_numpy/src/tree.pyx" - __pyx_t_3 = 0; +#line 480 "root_numpy/src/tree.pyx" + __pyx_t_7 = 0; -#line 880 "root_numpy/src/tree.pyx" +#line 480 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":869 + /* "root_numpy/src/tree.pyx":474 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -18939,306 +20221,306 @@ static PyObject *__pyx_pf_13_librootnumpy_10array2tree_toCObj(CYTHON_UNUSED PyOb * cdef TTree* outtree = NULL */ -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" /* function exit code */ -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 869 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_t_3); +#line 474 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_t_7); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree_toCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" return __pyx_r; -#line 869 "root_numpy/src/tree.pyx" +#line 474 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":883 +/* "root_numpy/src/tree.pyx":483 * * * 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 483 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "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 483 "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 483 "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 483 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_filename = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_treename = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_mode = 0 -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2root (wrapper)", 0); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" { -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "root_numpy/src/tree.pyx" PyObject* values[4] = {0,0,0,0}; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[2] = ((PyObject *)__pyx_n_s_tree); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[3] = ((PyObject *)__pyx_n_s_update); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" switch (pos_args) { case 4: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" case 0: break; default: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" case 0: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" case 1: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "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 483 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" case 2: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_treename); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" if (value) { values[2] = value; kw_args--; } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" case 3: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_mode); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" if (value) { values[3] = value; kw_args--; } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "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 = 483; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } else { -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 4: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" break; default: -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_v_arr = values[0]; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_v_filename = values[1]; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_v_treename = values[2]; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_v_mode = values[3]; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2root", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" return NULL; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "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 483 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" /* function exit code */ -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" return __pyx_r; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "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 483 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_tree -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" ; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations const char *__pyx_t_1; @@ -19248,586 +20530,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 483 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2root", 0); - /* "root_numpy/src/tree.pyx":884 + /* "root_numpy/src/tree.pyx":484 * * 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 484 "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 = 484; __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 484 "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 = 484; __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 484 "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":485 * 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 485 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((__pyx_v_rfile == NULL) != 0); -#line 885 "root_numpy/src/tree.pyx" +#line 485 "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":486 + * 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 486 "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 = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __pyx_t_6 = NULL; -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" if (likely(__pyx_t_6)) { -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_6); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" } -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" } -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "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 = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "root_numpy/src/tree.pyx" + __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_filename); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_v_filename); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "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 = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" } -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "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 = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 886 "root_numpy/src/tree.pyx" +#line 486 "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 486 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 886 "root_numpy/src/tree.pyx" +#line 486 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":887 - * if file is NULL: + /* "root_numpy/src/tree.pyx":487 + * 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 487 "root_numpy/src/tree.pyx" + __pyx_t_3 = ((!(__pyx_v_rfile->IsWritable() != 0)) != 0); -#line 887 "root_numpy/src/tree.pyx" +#line 487 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":888 + /* "root_numpy/src/tree.pyx":488 * 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 488 "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 = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "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 = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "root_numpy/src/tree.pyx" + __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_filename); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_filename); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "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 = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "root_numpy/src/tree.pyx" + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "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 = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 888 "root_numpy/src/tree.pyx" +#line 488 "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 488 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 888 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":891 - * + /* "root_numpy/src/tree.pyx":490 + * 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 490 "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 = 490; __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 490 "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":491 * # 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 491 "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 = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 491 "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 = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 892 "root_numpy/src/tree.pyx" - __pyx_t_9.__pyx_n = 2; +#line 491 "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 491 "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 491 "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 491 "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 = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 892 "root_numpy/src/tree.pyx" - __pyx_v_tree = __pyx_t_8; +#line 491 "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":492 + * 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 492 "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 = 492; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 893 "root_numpy/src/tree.pyx" +#line 492 "root_numpy/src/tree.pyx" __pyx_v_tree->Write(__pyx_t_2, 2); - /* "root_numpy/src/tree.pyx":894 + /* "root_numpy/src/tree.pyx":493 * 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 493 "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":495 + * rfile.Close() + * # TODO: clean up tree + * del rfile # <<<<<<<<<<<<<< */ -#line 896 "root_numpy/src/tree.pyx" - delete __pyx_v_file; +#line 495 "root_numpy/src/tree.pyx" + delete __pyx_v_rfile; - /* "root_numpy/src/tree.pyx":883 + /* "root_numpy/src/tree.pyx":483 * * * 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 483 "root_numpy/src/tree.pyx" -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" /* function exit code */ -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2root", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 883 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 883 "root_numpy/src/tree.pyx" +#line 483 "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 483 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 900 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 900 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" return __pyx_r; -#line 900 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } /* "root_numpy/src/array.pyx":4 @@ -19890,13 +21028,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 +21175,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 +21192,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 +21327,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 +21344,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 +21479,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 +21496,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 +21631,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 +21648,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 +21783,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 +21800,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 +21935,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 +21952,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 +22091,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 +22117,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 +22137,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 +22276,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 +22302,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 +22322,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 +22461,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 +22487,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 +22507,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 +22664,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 +22676,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 +22715,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 +22733,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 +22815,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 +22832,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 +22858,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 +23047,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 +23059,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 +23098,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 +23116,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 +23198,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 +23215,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 +23241,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 +23430,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 +23442,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 +23481,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 +23499,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 +23581,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 +23598,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 +23624,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 +23813,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 +23825,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 +23864,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 +23882,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 +23964,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 +23981,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 +24007,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 +24196,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 +24208,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 +24247,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 +24265,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 +24347,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 +24364,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 +24390,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 +24579,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 +24591,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 +24630,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 +24648,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 +24730,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 +24747,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 +24773,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 +24962,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 +24974,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 +25013,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 +25031,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 +25113,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 +25130,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 +25156,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 +25345,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 +25357,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 +25396,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 +25414,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 +25496,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 +25513,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 +25539,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 +25728,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 +25740,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 +25779,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 +25797,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 +25879,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 +25896,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 +25922,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 +26111,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 +26123,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 +26162,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 +26180,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 +26262,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 +26279,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 +26305,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 +26494,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 +26506,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 +26545,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 +26563,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 +26645,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 +26662,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 +26688,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 +26877,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 +26889,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 +26928,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 +26946,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 +27028,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 +27045,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 +27071,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 +27260,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 +27272,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 +27311,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 +27329,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 +27411,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 +27428,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 +27454,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 +27643,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 +27655,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 +27694,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 +27712,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 +27794,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 +27811,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 +27837,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 +28026,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 +28038,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 +28077,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 +28095,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 +28177,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 +28194,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 +28219,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 +28420,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 +28434,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 +28449,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 +28485,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 +28500,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 +28521,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 +28542,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 +28560,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 +28643,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 +28691,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 +28700,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 +28718,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 +28934,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 +28948,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 +28963,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 +28999,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 +29014,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 +29035,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 +29056,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 +29074,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 +29154,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 +29202,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 +29211,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 +29229,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 +29431,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 +29443,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 +29470,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 +29482,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 +29578,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 +29592,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 +29607,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 +29628,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 +29649,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 +29670,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 +29688,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 +29938,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 +29950,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 +29977,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 +29989,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 +30085,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 +30099,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 +30114,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 +30135,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 +30156,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 +30177,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 +30195,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 +30445,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 +30457,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 +30484,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 +30496,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 +30601,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 +30637,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 +30652,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 +30682,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 +30697,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 +30718,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 +30739,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 +30757,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 +31038,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 +31050,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 +31077,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 +31089,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 +31194,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 +31230,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 +31245,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 +31275,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 +31290,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 +31311,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 +31332,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 +31350,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 +31631,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 +31643,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 +31670,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 +31682,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 +31792,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 +31839,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 +31854,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 +31884,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 +31899,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 +31920,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 +31941,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 +31959,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 +32257,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 +32269,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 +32296,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 +32308,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 +32418,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 +32465,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 +32480,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 +32510,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 +32525,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 +32546,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 +32567,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 +32585,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 +32903,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 +32945,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 +32993,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 +33022,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 +33040,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 +33194,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 +33209,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 +33226,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 +33251,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 +33266,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 +33287,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 +33305,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 +33323,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 +33366,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 +33381,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 +33402,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 +33423,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 +33444,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 +33492,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 +33943,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 +33985,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 +34033,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 +34062,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 +34080,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 +34240,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 +34255,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 +34272,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 +34297,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 +34312,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 +34333,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 +34351,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 +34369,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 +34412,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 +34427,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 +34448,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 +34469,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 +34490,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 +34538,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 +35007,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 +35049,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 +35097,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 +35126,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 +35144,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 +35308,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 +35323,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 +35340,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 +35365,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 +35380,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 +35401,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 +35419,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 +35437,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 +35480,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 +35495,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 +35516,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 +35537,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 +35558,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 +35606,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 +36087,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 +36129,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 +36177,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 +36206,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 +36224,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 +36384,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 +36399,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 +36416,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 +36441,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 +36456,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 +36477,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 +36495,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 +36513,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 +36556,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 +36571,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 +36592,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 +36613,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 +36634,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 +36682,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 +37151,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 +37193,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 +37241,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 +37270,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 +37288,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 +37452,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 +37467,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 +37484,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 +37509,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 +37524,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 +37545,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 +37563,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 +37581,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 +37624,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 +37639,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 +37660,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 +37681,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 +37702,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 +37750,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 +38231,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 +38273,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 +38321,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 +38350,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 +38368,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 +38536,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 +38551,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 +38568,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 +38593,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 +38608,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 +38629,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 +38647,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 +38665,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 +38708,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 +38723,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 +38744,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 +38765,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 +38786,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 +38834,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 +39301,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 +39313,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 +39352,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 +39370,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 +39458,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 +39475,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 +39709,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 +39721,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 +39760,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 +39778,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 +39868,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 +39885,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 +40122,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 +40134,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 +40173,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 +40191,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 +40304,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 +40321,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 +40346,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 +40361,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 +40382,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 +40403,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 +40424,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 +40442,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 +40701,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 +40713,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 +40752,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 +40770,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 +40886,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 +40903,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 +40928,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 +40943,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 +40964,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 +40985,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 +41006,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 +41024,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 +41292,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 +41304,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 +41343,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 +41361,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 +41479,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 +41496,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 +41521,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 +41536,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 +41557,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 +41578,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 +41599,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 +41617,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 +41891,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 +41903,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 +41942,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 +41960,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 +42073,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 +42090,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 +42115,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 +42130,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 +42151,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 +42172,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 +42193,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 +42211,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 +42470,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 +42482,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 +42521,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 +42539,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 +42655,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 +42672,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 +42697,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 +42712,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 +42733,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 +42754,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 +42775,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 +42793,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 +43061,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 +43073,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 +43112,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 +43130,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 +43248,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 +43265,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 +43290,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 +43305,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 +43326,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 +43347,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 +43368,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 +43386,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 +43660,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 +43672,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 +43711,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 +43729,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 +43842,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 +43859,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 +43884,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 +43899,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 +43920,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 +43941,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 +43962,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 +43980,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 +44239,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 +44251,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 +44290,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 +44308,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 +44424,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 +44441,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 +44466,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 +44481,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 +44502,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 +44523,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 +44544,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 +44562,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 +44830,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 +44842,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 +44881,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 +44899,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 +45017,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 +45034,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 +45059,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 +45074,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 +45095,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 +45116,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 +45137,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 +45155,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 +45429,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 +45441,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 +45480,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 +45498,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 +45618,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 +45635,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 +45660,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 +45675,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 +45696,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 +45717,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 +45738,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 +45756,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 +46036,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 +46048,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 +46087,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 +46105,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 +46218,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 +46235,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 +46260,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 +46275,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 +46296,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 +46317,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 +46338,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 +46356,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 +46615,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 +46627,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 +46666,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 +46684,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 +46797,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 +46814,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 +46839,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 +46854,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 +46875,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 +46896,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 +46917,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 +46935,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 +47235,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 +47309,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 +47330,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 +47353,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 +47373,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 +47411,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 +47449,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 +47463,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 +47492,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 +47510,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 +47537,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 +47558,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 +47591,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 +47615,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 +47630,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 +47651,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 +47666,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 +47698,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 +47713,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 +47731,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 +47749,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 +47764,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 +47806,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 +47815,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 +47833,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 +47848,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 +47860,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 +47911,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 +47944,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 +47956,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 +47974,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 +48003,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 +48021,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 +48048,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 +48069,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 +48102,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 +48126,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 +48135,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 +48167,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 +48182,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 +48200,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 +48218,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 +48233,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 +48275,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 +48284,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 +48302,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 +48317,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 +48329,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 +48380,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 +48413,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 +48425,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 +48443,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 +48472,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 +48487,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 +48505,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 +48532,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 +48553,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 +48586,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 +48610,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 +48625,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 +48667,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 +48676,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 +48694,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 +48709,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 +48721,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 +48772,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 +48805,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 +48817,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 +48835,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 +48864,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 +48896,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 +48923,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 +48944,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 +48977,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 +49009,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 +49026,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 +49041,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 +49065,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 +49085,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 +49102,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 +49117,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 +49126,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 +49150,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 +49199,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 +49226,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 +49247,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 +49280,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 +49312,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 +49327,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 +49336,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 +49360,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 +49388,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 +49403,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 +49427,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 +49455,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 +49469,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 +49483,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 +49512,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 +49526,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 +49812,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 +49827,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 +49842,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 +49857,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 +49872,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 +49884,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 +49947,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 +50003,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 +50341,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 +50356,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 +50371,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 +50388,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 +50402,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 +50417,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 +50434,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 +50449,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 +50491,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 +50524,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 +50536,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 +50589,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 +50612,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 +50632,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 +50647,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 +50707,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 +50719,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 +50737,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 +50752,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 +50800,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 +50823,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 +50837,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 +50851,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 +50866,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 +50908,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 +50941,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 +50953,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 +50970,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 +50985,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 +51003,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 +51030,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 +51051,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 +51084,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 +51108,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 +51123,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 +51165,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 +51174,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 +51192,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 +51207,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 +51219,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 +51270,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 +51303,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 +51315,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 +51333,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 +51362,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 +51377,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 +51395,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 +51422,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 +51443,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 +51476,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 +51500,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 +51515,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 +51557,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 +51566,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 +51584,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 +51599,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 +51611,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 +51662,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 +51695,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 +51707,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 +51725,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 +51754,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 +51769,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 +51787,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 +51814,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 +51835,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 +51868,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 +51892,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 +51907,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 +51949,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 +51958,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 +51976,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 +51991,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 +52003,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 +52054,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 +52087,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 +52099,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 +52117,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 +52146,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 +52161,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 +52203,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 +52212,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 +52230,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 +52245,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 +52262,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 +52276,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 +52290,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 +52428,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 +52482,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 +52505,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 +52528,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 +52580,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 +52597,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 +52658,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 +52699,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 +52716,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 +52731,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 +52795,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 +52836,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 +52853,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 +52868,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 +52877,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 +52941,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 +52982,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 +52999,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 +53014,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 +53023,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 +53049,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 +53509,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 +53524,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 +53539,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 +53556,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 +53570,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 +53585,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 +53602,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 +53617,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 +53674,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 +53707,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 +53719,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 +53737,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 +53802,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 +53825,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 +53899,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 +53919,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 +53967,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 +53976,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 +53994,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 +54009,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 +54026,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 +54041,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 +54083,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 +54116,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 +54142,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 +54157,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 +54175,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 +54202,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 +54223,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 +54256,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 +54280,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 +54295,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 +54337,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 +54346,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 +54364,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 +54379,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 +54391,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 +54442,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 +54475,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 +54487,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 +54505,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 +54534,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 +54549,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 +54567,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 +54594,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 +54615,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 +54648,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 +54672,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 +54687,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 +54729,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 +54738,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 +54756,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 +54771,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 +54783,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 +54834,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 +54867,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 +54879,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 +54897,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 +54926,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 +54941,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 +54959,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 +54986,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 +55007,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 +55040,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 +55064,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 +55079,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 +55121,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 +55130,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 +55148,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 +55163,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 +55175,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 +55226,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 +55259,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 +55271,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 +55289,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 +55318,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 +55333,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 +55375,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 +55384,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 +55402,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 +55417,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 +55434,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 +55448,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 +55566,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 +55586,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 +55647,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 +55688,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 +55705,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 +55720,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 +55784,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 +55825,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 +55842,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 +55857,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 +55866,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 +55892,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 +56182,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 +56263,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 +56278,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 +56320,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 +56334,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 +56611,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 +56784,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 +56935,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 +57046,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 +57066,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 +57430,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 +57442,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 +57502,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 +57514,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 +57949,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 +57961,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 +58278,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 +58293,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 +58308,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 +58323,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 +58404,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 +58680,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 +58772,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 +58864,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 +58956,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 +59048,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 +59194,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 +59212,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 +59238,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 +59291,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 +59315,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 +59333,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 +59362,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 +59377,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 +59397,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 +59409,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 +59505,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 +59517,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 +59534,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 +59630,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 +59664,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 +59676,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 +59690,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 +59728,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 +59766,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 +59804,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 +59842,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 +59880,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 +59918,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 +59956,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 +59994,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 +60032,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 +60070,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 +60108,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 +60146,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 +60184,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 +60228,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 +60272,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 +60316,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 +60357,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 +60378,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 +60393,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 +60430,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 +60810,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 +60898,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 +60990,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 +61082,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 +61174,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 +61265,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 +61390,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 +61401,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 +61418,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 +61447,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 +61457,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 +61486,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 +61494,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 +61504,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 +61521,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 +61552,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 +61584,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 +61618,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 +61632,20 @@ 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_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 +61664,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 +61705,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 = 27; __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 = 48; __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 = 89; __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 = 172; __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 = 218; __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 = 250; __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 = 290; __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 = 290; __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 +61728,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 +61736,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 +61753,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 +61770,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 +61787,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 546 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__6); +#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_GIVEREF(__pyx_tuple__6); +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GOTREF(__pyx_tuple__9); - /* "root_numpy/src/tree.pyx":554 +#line 457 "root_numpy/src/converters.pyx" + __Pyx_GIVEREF(__pyx_tuple__9); + + /* "root_numpy/src/tree.pyx":85 * return * if load == -1: * raise ValueError("chain is empty") # <<<<<<<<<<<<<< @@ -60667,16 +61847,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 85 "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 = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 554 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__7); +#line 85 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__11); -#line 554 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__7); +#line 85 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__11); - /* "root_numpy/src/tree.pyx":558 + /* "root_numpy/src/tree.pyx":89 * if ignore_index: * return * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< @@ -60684,16 +61864,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 89 "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 = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 558 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__8); +#line 89 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__12); -#line 558 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__8); +#line 89 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__12); - /* "root_numpy/src/tree.pyx":560 + /* "root_numpy/src/tree.pyx":91 * raise IndexError("tree index in chain is out of bounds") * elif load == -3: * raise IOError("cannot open current file") # <<<<<<<<<<<<<< @@ -60701,16 +61881,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 91 "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 = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 560 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__9); +#line 91 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__13); -#line 560 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__9); +#line 91 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__13); - /* "root_numpy/src/tree.pyx":562 + /* "root_numpy/src/tree.pyx":93 * raise IOError("cannot open current file") * elif load == -4: * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< @@ -60718,16 +61898,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 93 "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 = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 562 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__10); +#line 93 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__14); -#line 562 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__10); +#line 93 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__14); - /* "root_numpy/src/tree.pyx":563 + /* "root_numpy/src/tree.pyx":94 * elif load == -4: * raise IOError("cannot access tree in current file") * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< @@ -60735,135 +61915,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 94 "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 = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 563 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__11); +#line 94 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__15); -#line 563 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__11); +#line 94 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__15); - /* "root_numpy/src/tree.pyx":571 + /* "root_numpy/src/tree.pyx":102 * * 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 102 "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 = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 571 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__12); +#line 102 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__16); -#line 571 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__12); +#line 102 "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":108 + * 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 108 "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 = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 601 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__13); +#line 108 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__17); -#line 601 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__13); +#line 108 "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":174 + * 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 174 "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 = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 612 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__14); +#line 174 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__18); -#line 612 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__14); +#line 174 "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":250 + * 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 250 "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 = 250; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 614 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__15); +#line 250 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__20); -#line 614 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__15); +#line 250 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__20); - /* "root_numpy/src/tree.pyx":652 + /* "root_numpy/src/tree.pyx":266 * - * 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 266 "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 = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 652 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__16); +#line 266 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__21); -#line 652 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__16); +#line 266 "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":280 + * 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 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 670 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__17); +#line 280 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__22); -#line 670 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__17); +#line 280 "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":294 + * 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 294 "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 = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 728 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__18); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__23); -#line 728 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__18); +#line 294 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__23); - /* "root_numpy/src/tree.pyx":767 + /* "root_numpy/src/tree.pyx":391 * else: * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] # <<<<<<<<<<<<<< @@ -60871,31 +62051,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 391 "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 = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#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 877 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__21); +#line 391 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__26); -#line 877 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__21); +#line 391 "root_numpy/src/tree.pyx" + __Pyx_GIVEREF(__pyx_tuple__26); /* "root_numpy/src/hist.pyx":10 * cdef TH1* _hist = PyCObject_AsVoidPtr(hist) @@ -60906,13 +62069,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 +62086,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 +62103,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 +62120,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 +62137,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 +62154,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 +62171,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 +62188,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 +62205,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 +62222,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 +62239,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 +62256,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/tree.pyx":18 + /* "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/converters.pyx":23 * * TYPES_NUMPY2ROOT = { * np.dtype(np.bool): (1, 'O'), # <<<<<<<<<<<<<< @@ -61109,16 +62289,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 +62306,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 +62323,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 +62340,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 +62357,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 +62374,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 +62391,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 +62408,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 +62425,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 +62442,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 +62459,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 +62476,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/tree.pyx":45 + /* "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); + +#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":22 * * * 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 22 "root_numpy/src/tree.pyx" + __pyx_tuple__57 = PyTuple_Pack(4, __pyx_n_s_fname, __pyx_n_s_tree, __pyx_n_s_rfile, __pyx_n_s_rtree); if (unlikely(!__pyx_tuple__57)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 63 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__48); +#line 22 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__57); -#line 63 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__48); +#line 22 "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 22 "root_numpy/src/tree.pyx" + __pyx_codeobj__58 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 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, 22, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__58)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":80 + /* "root_numpy/src/tree.pyx":38 * * * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< @@ -61353,59 +62553,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 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 80 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__50); +#line 38 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__59); -#line 80 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__50); +#line 38 "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 38 "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, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__60)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":702 + /* "root_numpy/src/tree.pyx":330 * * - * 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 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 702 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__52); +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__61); -#line 702 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__52); +#line 330 "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 330 "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, 330, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__62)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":721 + /* "root_numpy/src/tree.pyx":349 * * * 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 349 "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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 721 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__54); +#line 349 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__63); -#line 721 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__54); +#line 349 "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 349 "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, 349, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__64)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":869 + /* "root_numpy/src/tree.pyx":474 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -61413,57 +62613,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 474 "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 = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 869 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__56); +#line 474 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__65); -#line 869 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__56); +#line 474 "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 474 "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, 474, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__66)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - /* "root_numpy/src/tree.pyx":883 + /* "root_numpy/src/tree.pyx":483 * * * 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 483 "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 = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 900 "root_numpy/src/tree.pyx" - __Pyx_GOTREF(__pyx_tuple__60); +#line 483 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_tuple__67); -#line 900 "root_numpy/src/tree.pyx" - __Pyx_GIVEREF(__pyx_tuple__60); +#line 483 "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 483 "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, 483, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__68)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} /* "root_numpy/src/array.pyx":10 * @@ -61474,16 +62654,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 +62674,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 +62694,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 +62714,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 +62734,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 +62754,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 +62774,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 +62794,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 +62814,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 +62834,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 +62854,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 +62874,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 +62894,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 +62914,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 +62934,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 +62954,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 +62974,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 +62994,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 +63014,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 +63034,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 +63054,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 +63074,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 +63094,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 +63114,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 +63134,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 +63154,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 +63174,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 +63194,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 +63214,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 +63234,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 +63254,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 +63274,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 +63294,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 +63314,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 +63334,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 +63354,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 +63374,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 +63394,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 +63414,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 +63434,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 +63454,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 +63474,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 +63494,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 +63514,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 +63534,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 +63554,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 +63574,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 +63594,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 +63614,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 +63634,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 +63654,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 +63674,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 +63704,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 +63763,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 +63788,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 +63827,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 +64180,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 +64359,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 +64460,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 +64561,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 +64662,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 +64763,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 +64864,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 +64965,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 +65066,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 +65167,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 +65268,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 +65369,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 +65470,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 +65577,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 +65591,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 +65644,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 +65697,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 +65750,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 +65803,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 +65856,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 +65909,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 +65962,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 +66015,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 +66068,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 +66121,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 +66174,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 +66233,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; - - /* "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 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;} -#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 +66259,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 +66795,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 +66877,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 +66906,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 +66920,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 +66949,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 +66978,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 +66989,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 +67018,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 +67029,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 +67058,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 +67069,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 +67098,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 +67109,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 +67138,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 +67149,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 +67178,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 +67189,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 +67218,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 +67229,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 +67258,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 +67269,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 +67298,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 +67309,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 +67338,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 +67349,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 +67378,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 +67389,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 +67458,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 +67516,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 +67527,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 +67556,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 +67567,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 +67596,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 +67607,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 +67636,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 +67647,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 +67676,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 +67687,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 +67716,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 +67727,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 +67756,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 +67767,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 +67796,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 +67807,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 +67836,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 +67847,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 +67876,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 +67887,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 +67916,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 +67927,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 +67996,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 +68054,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 +68083,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 +68112,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 +68141,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 900 "root_numpy/src/tree.pyx" +#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":22 + * + * + * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< + * if tree == None: + * # automatically select single tree + */ + +#line 22 "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 = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 22 "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 = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 22 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":38 + * + * + * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< + * return list(list_structures(fname, tree).keys()) + * + */ + +#line 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 38 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":330 + * + * + * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< + * selection, start, stop, step, + * bool include_weight, string weight_name): + */ + +#line 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 330 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 330 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":349 + * + * + * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< + * start, stop, step, + * bool include_weight, string weight_name): + */ + +#line 349 "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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 349 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 349 "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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 349 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":419 + * + * + * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< + * cdef vector[NP2CConverter*] converters + * cdef vector[int] posarray + */ + +#line 419 "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 = 419; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 419 "root_numpy/src/tree.pyx" + __pyx_k__27 = __pyx_t_17; + + /* "root_numpy/src/tree.pyx":474 + * + * + * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< + * cdef TTree* intree = NULL + * cdef TTree* outtree = NULL + */ + +#line 474 "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 = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 474 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 474 "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 = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 474 "root_numpy/src/tree.pyx" + __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; + + /* "root_numpy/src/tree.pyx":483 + * + * + * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< + * cdef TFile* rfile = Open(filename, mode) + * if rfile == NULL: + */ + +#line 483 "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 = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 483 "root_numpy/src/tree.pyx" + __Pyx_GOTREF(__pyx_t_7); + +#line 483 "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 = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} + +#line 483 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; /* "root_numpy/src/array.pyx":10 @@ -67192,13 +68446,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 +68466,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 +68486,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 +68506,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 +68526,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 +68546,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 +68566,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 +68586,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 +68606,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 +68626,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 +68646,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 +68666,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 +68686,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 +68706,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 +68726,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 +68746,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 +68766,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 +68786,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 +68806,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 +68826,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 +68846,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 +68866,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 +68886,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 +68906,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 +68926,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 +68946,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 +68966,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 +68986,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 +69006,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 +69026,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 +69046,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 +69066,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 +69086,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 +69106,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 +69126,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 +69146,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 +69166,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 +69186,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 +69206,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 +69226,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 +69246,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 +69266,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 +69286,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 +69306,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 +69326,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 +69346,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 +69366,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 +69386,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 +69406,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 +69426,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 +69446,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 +69466,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 +69484,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 +69504,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 +69678,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 +69923,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 +70262,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 +70414,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 +70429,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 +70536,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 +71660,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 +71781,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 +71829,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 +71862,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 +71882,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 +71954,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..74d970d 100644 --- a/root_numpy/src/tree.pyx +++ b/root_numpy/src/tree.pyx @@ -1,58 +1,17 @@ -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': @@ -61,492 +20,64 @@ def list_trees(fname): 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)) + return get_tree_structure(rtree) 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 +94,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 +301,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 +348,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 +361,10 @@ def root2array_fromCObj(tree, branches, selection, #################################### cdef cppclass NP2CConverter: + void fill_from(void* source): pass + __dealloc__(): pass @@ -750,8 +375,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 +391,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 +405,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 +428,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 +454,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 +475,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 136414cd3b67a19c9ccf557d2e650dfc3e7044e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6050 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 delta 5307 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 bVgL87(HF?e+2sBs(0)ebRAeN51h`P(g?gHa3 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, 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 1a8a28c48a755dc2d2041304659fa67ddbb732ef..588b1e7e8f4e3c978a260337042a35792c471762 100644 GIT binary patch delta 5065 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 Yqcy2B%EQIcTJS$;_qXlB3z`J@A7$m8$p8QV delta 4989 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 literal 8008 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 I#*+y64|&ARY5)KL diff --git a/root_numpy/testdata/object2.root b/root_numpy/testdata/object2.root index 9e82b97da67a0a18e8f92ebfbe402377022e73bb..f3349f2b0315bb23bdbb314af47b1de504c3d8de 100644 GIT binary patch delta 6132 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 YIWqD;0{(wJUfw)N;0bv>c#=T>17d@xHUIzs literal 8003 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 diff --git a/root_numpy/testdata/single1.root b/root_numpy/testdata/single1.root index 8d29c2f098efca1740a5945c74a4c9e8fbad70a0..6bf7d99ec5e81d60a81a398fc7d24b5ff7f93940 100644 GIT binary patch delta 5264 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 diff --git a/root_numpy/testdata/single2.root b/root_numpy/testdata/single2.root index 7bdce7210c22ae2add43931b62465032973f35db..e84f5e70bc38d3abb8acd7bb2e52bbc476bc8998 100644 GIT binary patch delta 5265 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 I!4%N{1E3uG;{X5v delta 5245 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 diff --git a/root_numpy/testdata/string.root b/root_numpy/testdata/string.root index db1a99488c79fa1b55598e68e2015439a2427bf8..008a9c873c561f15bbb7ca14c18a9aea6f52788b 100644 GIT binary patch delta 5723 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 delta 5689 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 L`MM8(GU$H*hAXqp diff --git a/root_numpy/testdata/struct.root b/root_numpy/testdata/struct.root index a2c4cf491b02a31fa65ec4b6614bb96722afda99..859a7cede5248425694d61c9985f826bf42abfdb 100644 GIT binary patch delta 5151 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 Ws6_vRI&x2?BfJk{df)|#1^gf2=8LBQ delta 4994 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 literal 0 HcmV?d00001 diff --git a/root_numpy/testdata/vary1.root b/root_numpy/testdata/vary1.root index 747c6e5347ed1a897813c7c8eea0202e99b57272..63bd096e8f0ea3c79d9c298a226432bc3fe87c6b 100644 GIT binary patch delta 9619 zcmZvC1ymhNv+l+nf=iGf3GVLhuEE{i2|Bn-aCavV+=E*ZG`PELoZ!wQIrqGK-+lkA z)m=3`HDAqiS5<4M%9f3wvx9>x2y_?+0)b3HAoi`-RQ1Ypye5d(#0C8iLrw((VbFpg zJiF+}o|)0NQ*j|6KtShdyzmDU5XcquM@&lD66#mHGri<1`NO^zY5#$EO|Q^@E_T)b zAK{-T|2OxCI(p@m{zC2gLcPKynnU>fr8^M++?zpm|GlSz>iJ8Lp!)yPdg$+eXuTgy z4+PpD{nG!U!m%YfL1NY$!R15zm4HDw{D-+fJo<;(MDG8GDMxjOWPp_U^A)gvf9Sta z(24#F&lFBg#K^_Q%oWz2#lXrw5e*s#faL~h%fa75fTUnSpCIU`#g*PDVTEkK1x6yU z@|e)#k;ks+g%jn?SLGQt`}+r!QIWPeQ(n*FBbjWBeQnIvskPYv*6BL$I8W_Yvs+1n z%}IlI!I5Hz5@9C6F-0th)KZPxl?4#Qg@VpG(&0wfhx3x zD)y4)YV*uALrxgU?vX#Octv+AvkRS9875>~Y(JLiHrl9F9PuQ-bx-_BzucqOF1gdm zpLae%tn6v4SjN|AamlSeFH2K>#GcG~o$`~{TX84Ix9A)pSJ}>>%%{;ot#b*DM(`Ln zdF?vvr@;fRh!|Eu6+^O@My^aWz@9fbL7;49D__Res7d2w8IUp?DPvPY=jrX%#k9K5L1|7 zyHze%6QTBD!IVbTmL}PXBl{<^Y`#^RolDtBqo>;L5+n_h9eVOWQ}9m}Ku5x?wJNV} za-Wd45Ol**h&j_-epIP zzG{eeg2`mOLOXdx1uC{-<%G2uG{qVc#eCDNUe`nv*pGIjL;}JNg&7_Z-+Kq%kdb#k zlYJ2>!;Fi3Q(&w_DB?;;!=8@t0x>et`06uI%72Upk?F4s$o^}Bm=^!rc;L-h5>Va( zh~$3^=Lr(Tg!pPW9ivvCzq=6*{boEY! zIrWD3!#o}XyHt(VJ2DA2(aa^x#NN|*Cec=(UIYc=_?Yl(S*!29dEC4_JgJbAHFA+v z*^8y}VHt*D*FKQ9%}SE9HR9OP+VlbL-4t?zu9*X4wXL?HW_1_wQH`1wZ|CJx#_emX zZ1e3bJT{qP*UN}Z6z8e08?ueY7rCz;c*pg-1zUoL-9tL8=jMT9FEOu?&T?p-NtJmO zjSTuAXR0_vjdIQ+M!r5Ru z>(Tk4O75jzVvF3G6kA%pkXcI;y9M{zoMS_x1%+$2r3IA*w!>ccM%Qcn!$AR?l?CG2 z#ACCL1%YeAhi_MA4+}`Pz}xOlOU7C#yEhMYDCP#W9~Vfk33xA46#Pg+=Z;a_TVf0) z7pbo0-;Q>gInZngmu!#a7R(nU7+woyZi#jqo~ zhw$ud^MQDQFr0f6ZE$PD#D!%(EBNJH{#*}s4d_M8mPUG_roZ&j29I0j3zmlH3n6uU z#_>X@cg3N13## zcV^c3MozU>eph~ozBtkoJ^iJ%Hdt31%-%3zW0n7^cJ7x*b?HmBcS8HD%O0!-IHqAD z(=wlPN@Q#ya0Q|{OC*31W9A(C<0(r~;O=`S4`CLS#FZ>B^@@||+AEfBaVGoiFd*KIx zVD|p_4-wv9|B?IGe{fpfc@CqDCRAZo`Qb_>ZSylt*xwaxc63}U-(CMJ+liOfco4J3C)j>qW)^UWO zewA`Yz`~-|b$rcfTKx(4eGPYg#^v01!S&Z5NMwT+hvSsdG+tKACq*m%NuBE`mMlI68+P z_3o=L*EG_*6uY`OatOJ{fmlU_GwlXAU!S0kw?}q$Ku|~KACmY=ijRtQ6(t+lOq|HKdAbqW;c95qTfl zrM5tauz!K)f(Z+gXGq3&AHw32ssG>Ndl$6-0XkhTfWnOK($=d%2wr&X#T4b~(X9mI zz+EKWQD02C3Ahk7ci}n<{3|iS&s>B#G7xF+^v2>aj5yR-WKR=_pyyxzcAA=Vl}h@- zSmEP*2Ha_w3);fk_Hy6Va`)X#`hyoN-jO1*!iV|bL$z=qF&nCpH3Bu$}!>6whahpRlV#RQGIZY zO`e~G0>&QvcC-L&<9}vAh(9GEE?BoyD#w* z;koCS39m;^B)*;@^{i`9_WTsN!lv<4V^k;J1p1({jD=?Sdp#2qVjumnTo=E@i@hvC zgYjzj`JW zB>RdX<@IHFVv8oQRp8*KXB>m#Zmbx`6%lpS<8qb`hi61r;u;#FImympEP2BfiP@31 z^-`D6l^ z;pjvrH0G`W#hO$9L&N!h)PVaHJOv?PELWNq0i$P3&*2)@!8M7=u-kKioF@7I6+hUI zPc`3(zmsr{E>HUflVU8-IUm8#ze&L`o62x+332fQ0$A$gki!nAV&wru&K@GJsOD5 zaa{25UhN#MhGZ@rpt`N2heE_1i39gmn$BO`F8WG5#+oOMT}PAi*Uy ztKAexbV)sIjkx&oTCq3ltY}QVnsWQdNVP>aw*9duPFR#)%+04g|5@pc&fL8Y3Dkd3 z`keZYLF}r>E#Fudw60;>ucbQ7u!cpbv6QSED zcw1ZOO*jytKXUBt{GVI(X{_;i?7y3JAj7`Kd*dW`?}hws_2kO+#%q^Lkjo`2Re!bP z`H)NSF>b4+eJ;+u>*dyL==T`m9zZ!xxM!hAw6}N4J;vy_#Z`Tz-?jYoe4skyd7QrW zcyH@LvIq3FP}IK;tRw!+7v63Djqo&o<{5;!uhHEUMorDx%naJ~-|RJ>Yrujw-@V53 z0j(7WEOjhFR#B^+LXrl5Ay7;%^N07zLh$eAAZN%BHG$98s;Ry1)V21tNqC~jn9oqY zlXxVa*FA8)VZm_3q&<{AWIhxPmK0}so2Oacrz5uQ9u_ItD5VSB7AJeBt81-$IV&_? z8z02{$93Dlx zQH)Dgl*`NaNKDD^(S{uvh5Xha7n_Q-qv3gtTF_00GGlpxk`&$$W`+}HHe@_(`{QO1 z9{ZOJ5`9f$rLuB{0V!+VCREQiz^9V!`|)bZ(<&e)aI{ChZW>^7`)TJS>I^-o5uUZp z?^&+19BbgI*EC?biP!LOuX-`XV%EKTjrBru!{s&T?16LXY!c=iqxe@28^)ykBG$pVnr` zGF#-0Y5GPYskilwgq%K=Ipd<2q3shOSTs8YZqGxPF{Ood6_T%CK4n%#X zZ)OekYl7~!379yiwzkN7M=bbGkP@u;MRw|~me(q?N&`3@UnU#@gBF0^b9u>8#k8-j z(r7`j@Z1n66!ya||4CLW+r!(iGs%CSnZF{A?rL+gj_Ha8@QL1URTL>IBr68GYFuZXe&qh#d8-q%mN{UlFxllC zay?!UB7QGv_g!QA z$;M|r|5nIHk|rDLV$}(d$er(7m7Zqzxx@uZE{B(@W$G z)_dqras<3W0~>RWEU*FGOKmCkDNuB+>Nc}&2kW30JhC8z`?%zxH~pbLN~$@MV0 zSLB4pm}DFcmmeYQrVog`XgBa#;8H%>TzRcg!0n(CMd%4r^oczGImYq=tFBljw-e5* z(ug52zS+4ADJ5%4Do8YKO!_4$>N!qSyMu^d5bGX&$`I%xuJXsA)vR@dDcc1e`FG^s z5Q?m+S*0Mk=E`OB*gzdEsvJZ5y<<2tZwQD4w;JcRB5FvaL==!`y0oFr;k#+XA?|bdY7Zy4}k?G&W%5&}oC-QlYNWTuM#B7?- ztCoUBmtsgvl}=M$AjE2jy8bS2z4l7{c7J;%p+CJ6IaOjB4n44m4zlBa?Spo792|+} z)CIM*nw}S8H|HCr59u=4Gzcl(L=sCBuyQDd-&ORNUlCF|VR&Dy>UA`(defesBvw+` z>0_u&eUKN$5RuNDunPNe7P5Z^!NN4P4-HQQmb(M7o;8Tcy--DSI+emxNo zls+X*^a`ChS_3>hfV~`-lh(cG6ZL>WsDnb{-rX~ZrB2AJZ!adc1FaM)`tsteZh{ni zPaG&%;r2pKp82>##{*$X1#-YcdzYi&>alRS#m-9N1@4D}?>aj-3`*6WL0xfGsc0|- z5~${rQP_g~k{w(*C3ak^2?6N8V#zuyWPZTQz`nnk{sAP4b0$&VzW$WG_wnHAn!VsW z2RAck4BY4V1VW|*{Apagdjw}kAF(`#ru+w=uY2JVEAnu4$q z{2_nceYjc}Fu*J+pc;A=X(jaqdt5aLaB%Jv0W6>5<=0 zB{V3l<6rD4W$gPpPdJv#hI&Nwl2`I_u)?k7ooTpeogMioTTD3Ya|Q7!ey`rWb27@Y zUWmbDwCX>R!Ap*?>;6H#P$$tS!NVXAAoavj)J z7=aF<27gGB^+)vn{Jiq507+EPc%?rJ-OVTqaVEhJA-}=126t@`?)5$pOI9H{}8%LA}w4_dwh`gh4WveL#TRqtQlS zK#JPylGou0v$F{<#G``iin6oMDeWRo%<7$ zGk@yUM-JZ*-a!vZ-H58@%|6w6m(2Z;j zF%#`;>bvW4PK=q^=Cx&J{=}YjGI3`_u_*Z%HH@Mm=>0QnDat_WD_DURVxB|!b-%}t zVFqwAO$&~=83gwF>%`bCS+uCm1H_jF;@C0ZsSlRTew#bMSe~O%VLrOdJ3&Q-0I-uV zZ_<}6LA|hDHNNwS4Bi9E+iAD?hgzVz{c1e)D#TmBH3o91g)4zlwdhvLVk%^ldQDQI&soitKgp&8*uQ*=p@_bN`RJ_5LDMIkn?JxOIy{%6@^=#_~eA zQpTubB)_;Y9C_P9F5AS}u~ZZQk1u`?de;5%C3k&$eL{2yz%lTfzpdL@2IUsD*ea{*ryWR;Xkk zmDMM8g)gy1Dio6g{aIGRxPvCk;*CjC^%{*#+Q%9hxG`+w;cO`J=94Mr-49;JE97PBYAd6D(@sflD)vcCm8UAysWEut5qMw71`%|kg@rKyl5asfpU+lk!XJ-H z{OU1aqzl?k47*Il?h3-4rNz>l#PQEcw98&TTSlU3lojl&YJX--JU||4r=n5yK6N!U<3|q1u*#b$Gn`#ytK^}&zXV~xbmTT zi9TQGAHBVng0jj0T=CxDGz4b|>~ABAbooeVgovCA*dNTC}MX*#M5Gg0f z?`w*Fu;|qJ`-%!KGpPMEN_rgwxD|}C8OL6>uHd-L=a#3=6ia@y79H^3?WGE!Q_5-E zCiCcJ?H2S0d=mre=8w4i8QAtiyShDd2nloF6z)jqFR`x+1em>qvzyOZvfe&l2yJCl zCj^<$S+?prPVAYg)=0$6OcLv}RTbkQy@5RVk`=zm`u2?@ zeUAdg5M?0>ytEGCu|PJ}yzzd&!Y}E#VJHqiHZ2Nck||IFazn73_H^_;NL=*0!8PHz zkqM;kCTaNv&jk7c$gJ0u9PAx#%HTxbbd5IxEI9$l5g=u6bETZtst66(5K)we0naJ= zMd(XQ;94sQ|1!M^B#SE%r2c_Ph$mFeh1Yzj{Am{Vqtc7W5T45qYjvyWG{)aEUt*m; zP*GyX)b^%ko77x8SX&_$R&!S(hTlH_>Q5QZ@{^(i3|NTXG zjum{tDgMy@6g|Da3QYtVfk2nXaNNz~)mrX$2^4@WfnAw1r6?w{KA8MP{tEx| z*3?(Z!3G8$+e&oSw-@P+T(aP z0CLaZb&)u|o1YK2n~njnFGvGM(LI0z`=CBn_sv(BpI77`M959bkhb%l&8&*JMXbAX zS^C%H_hHc5zF2DogjA*WU^4{cHL6)pb2CrI`VKoOi#``QA|DaMsagj*aJ@KQIh+)o zq3LyZ8qqwkaKjX&7S&nUp03%s5R>530(GYS72%o}WV5AqwV_X}6E%}F&(!$vq%dZP zC13Y98;!`rl2P8GjjQLKXHNF_X=8h_x!kCcM>6TMZ7~M%gi6zyih((}y<~ABZ9&}O zW1-yKhmmGyF~m6-{FW*LsSzh<>~9FGFcMjc&ls--dLI_ZHdu41j@trNJu!G3McHMk4Y=2{}Y_^qcNpkP| z2jsdMUw1o@8B}2kW7&*3$vt2-n~o9rKKF2?oJFNW<=5%mjen7dWQ=gmG@cDEazyRC=^zmErV1M!x#v%~(m3O>s#5n?(y*C0{`a@Wi^l+VnKsbWv2$LWd&RHiMG#1i6epLYl@!|$DUUf@}K0t zQ@@!J-)Y6hczO;J&Mvha9MMuWtyCAo7R;6tk?bsz`PN^BT!uPCB6I|8pokt*%pLsM z{38s>{pr(1Nm~6)nDN-`m3A2^{uMXXBQauMMn~7G^(awrm7{#LpY>qDbwV@mu|xw3 zvh!0(BXTbqLw>QETR0&1@hp$$C_j6ZC#Qv+6yt2-?1vZ9!wi>qu{5vj|Iv&o^e0;M=88Vi+8Cg||l4)(gGYSRz+kg_nxJ2;3N zRjQz9aiT4J`P;RSdy^q2EiF6KU3A;=7vk=&R_I}E5Rw+K!~u|m&WJpuBxX(%2EHjB zb^fkH$36KzL8pI6h9}=>?H$~tk2={9W)ns?a>1QkNQ{^BazXwbsgwwxSuvfr^1I5? z-(9uXa>8Nu{QYH?;^U}NT0~_K4a~|YDR{XSG)d-}lQsLFc#ZplT@IvC*AridqL}hl ziw(_qMXyOS^5`a<2V$4IwZO~UHjAzQlUB}>x zh~p~FwjSp5jzm?-T;_;(@c=d>&2SqHBf>6JH1Ee&>v>*;k~I!ETr#wACd3v?MocK zat&7l>Di$<=m^e8c<%RTham)l9$veje86lZT3X^4X%5Wj{TF^;m8psISDxRRE;8XS zH%5ETF}0CI#Vb?iPzJM_1Y+k0WT%Sudn|c+R{%oyqaN6MCU3s&vFQ6Z-|)>H93L_2 zcID1PIvP4;NF(3XZ$w6ZKpz=?*qO}UvzcXuL;bBZU8uS@1XAUC#lJKC)ue z5i4BHZvL>J;-7365vGfcX-!D+iIWNoCbj_g6K`11BM$3_O-JDn2RaKP9Yc+@6ds;Pbt8QH3>& zy+(Z*j#EP8*nLri9S}bDH1HVSEqrmnOG5pGE$_RmqIe+2)Wta{z$kg&2fLv%NC_GD)G=lInhkS!1PB+&l>qxD+g delta 6379 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 Ie;Vk20Ji@|-T(jq delta 6378 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 diff --git a/root_numpy/testdata/vector.root b/root_numpy/testdata/vector.root index 978f54ea87c8fb52a1c70abb4b342578ab83e9a1..6997750031ae0633c571116b1ef2491668d848ab 100644 GIT binary patch delta 6863 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 C?Eydl diff --git a/root_numpy/tests.py b/root_numpy/tests.py index 17cbe6c..9e44c3d 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', ' Date: Wed, 20 May 2015 08:51:57 +1000 Subject: [PATCH 3/6] travis: use new ROOT builds --- .travis.yml | 2 +- ci/install.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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/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 From 42b9da77f8278deee71b3cb32742ec08e5dedb28 Mon Sep 17 00:00:00 2001 From: Noel Dawe Date: Fri, 15 May 2015 12:50:00 +1000 Subject: [PATCH 4/6] docs: note about MethodCuts requiring signal to be added first --- root_numpy/tmva/_factory.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/root_numpy/tmva/_factory.py b/root_numpy/tmva/_factory.py index dbd2525..77a390b 100644 --- a/root_numpy/tmva/_factory.py +++ b/root_numpy/tmva/_factory.py @@ -37,8 +37,19 @@ def add_classification_events(factory, events, labels, signal_label=None, Notes ----- - A TMVA::Factory requires you to add both training and test events even if - you don't intend to call ``TestAllMethods()``. + * A TMVA::Factory requires you to add both training and test events even if + you don't intend to call ``TestAllMethods()``. + + * When using MethodCuts, the first event added must be a signal event, + otherwise TMVA will fail with `` 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): From d46075fb142aa978cdee81ffd03a3a8a40bec544 Mon Sep 17 00:00:00 2001 From: Noel Dawe Date: Wed, 20 May 2015 10:56:19 +1000 Subject: [PATCH 5/6] 100% test coverage --- root_numpy/tests.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/root_numpy/tests.py b/root_numpy/tests.py index 9e44c3d..fa1bc78 100644 --- a/root_numpy/tests.py +++ b/root_numpy/tests.py @@ -245,7 +245,16 @@ def test_tree2array(): def test_tree2rec(): chain = TChain('tree') chain.Add(load('single1.root')) - check_single(rnp.tree2array(chain)) + check_single(rnp.tree2rec(chain)) + + +def test_single_branch(): + f = get_file('single1.root') + tree = f.Get('tree') + arr1_1d = rnp.tree2array(tree, branches='n_int') + arr2_1d = rnp.root2array(load('single1.root'), branches='n_int') + assert_equal(arr1_1d.dtype, np.dtype(' Date: Wed, 20 May 2015 11:24:15 +1000 Subject: [PATCH 6/6] close open files --- root_numpy/src/_librootnumpy.cpp | 7929 +++++++++++++++--------------- root_numpy/src/tree.pyx | 7 +- 2 files changed, 4004 insertions(+), 3932 deletions(-) diff --git a/root_numpy/src/_librootnumpy.cpp b/root_numpy/src/_librootnumpy.cpp index 0ba05f5..779e34f 100644 --- a/root_numpy/src/_librootnumpy.cpp +++ b/root_numpy/src/_librootnumpy.cpp @@ -1277,7 +1277,7 @@ int write(Column *, void *); #line 352 "root_numpy/src/converters.pyx" typedef std::pair __pyx_t_13_librootnumpy_CONVERTERS_ITEM; -/* "root_numpy/src/tree.pyx":60 +/* "root_numpy/src/tree.pyx":65 * * * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< @@ -1285,19 +1285,19 @@ typedef std::pair __pyx_t_13_l * cdef TBranch* branch */ -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_get_tree_structure { -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" int __pyx_n; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" PyObject *branches; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" }; -/* "root_numpy/src/tree.pyx":81 +/* "root_numpy/src/tree.pyx":86 * * * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< @@ -1305,28 +1305,28 @@ struct __pyx_opt_args_13_librootnumpy_get_tree_structure { * return */ -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_handle_load { -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" int __pyx_n; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" bool ignore_index; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" }; struct __pyx_t_13_librootnumpy_NP2CConverter -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" { virtual -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" void fill_from(void *); virtual -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" ~__pyx_t_13_librootnumpy_NP2CConverter(void); - /* "root_numpy/src/tree.pyx":363 + /* "root_numpy/src/tree.pyx":368 * #################################### * * cdef cppclass NP2CConverter: # <<<<<<<<<<<<<< @@ -1334,13 +1334,13 @@ void fill_from(void *); * void fill_from(void* source): */ -#line 363 "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 363 "root_numpy/src/tree.pyx" +#line 368 "root_numpy/src/tree.pyx" { - /* "root_numpy/src/tree.pyx":372 + /* "root_numpy/src/tree.pyx":377 * * * cdef cppclass ScalarNP2CConverter(NP2CConverter): # <<<<<<<<<<<<<< @@ -1348,34 +1348,34 @@ struct __pyx_t_13_librootnumpy_ScalarNP2CConverter : public __pyx_t_13_librootnu * string roottype */ -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" int nbytes; -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" std::string roottype; -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" std::string name; -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" void *value; -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" TBranch *branch; -#line 372 "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 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" PyObject *__del__(PyObject *); virtual -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" void fill_from(void *); virtual ~__pyx_t_13_librootnumpy_ScalarNP2CConverter() { } -#line 372 "root_numpy/src/tree.pyx" +#line 377 "root_numpy/src/tree.pyx" }; -/* "root_numpy/src/tree.pyx":419 +/* "root_numpy/src/tree.pyx":424 * * * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< @@ -1383,19 +1383,19 @@ void fill_from(void *); * cdef vector[int] posarray */ -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" struct __pyx_opt_args_13_librootnumpy_array2tree { -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" int __pyx_n; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" std::string name; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" TTree *tree; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" }; #ifndef CYTHON_REFNANNY #define CYTHON_REFNANNY 0 @@ -2432,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"; @@ -2795,6 +2796,7 @@ static PyObject *__pyx_n_s_step; static PyObject *__pyx_n_s_stop; static PyObject *__pyx_n_b_string; 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; @@ -8954,7 +8956,7 @@ static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__ * clsname = str(key.GetClassName()) * if clsname == 'TTree' or clsname == 'TNtuple': # <<<<<<<<<<<<<< * ret[str(key.GetName())] = None - * return list(ret.keys()) + * rfile.Close() */ #line 17 "root_numpy/src/tree.pyx" @@ -8991,8 +8993,8 @@ static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__ * clsname = str(key.GetClassName()) * if clsname == 'TTree' or clsname == 'TNtuple': * ret[str(key.GetName())] = None # <<<<<<<<<<<<<< - * return list(ret.keys()) - * + * rfile.Close() + * del rfile */ #line 18 "root_numpy/src/tree.pyx" @@ -9046,51 +9048,73 @@ static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__ /* "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 19 "root_numpy/src/tree.pyx" + __pyx_v_rfile->Close(); + + /* "root_numpy/src/tree.pyx":20 + * ret[str(key.GetName())] = None + * rfile.Close() + * del rfile # <<<<<<<<<<<<<< + * return list(ret.keys()) + * + */ + +#line 20 "root_numpy/src/tree.pyx" + delete __pyx_v_rfile; + + /* "root_numpy/src/tree.pyx":21 + * rfile.Close() + * del rfile * return list(ret.keys()) # <<<<<<<<<<<<<< * * */ -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 19 "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 = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 19 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 19; __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 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_3); -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __pyx_t_3 = 0; -#line 19 "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 = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __pyx_r = __pyx_t_3; -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" __pyx_t_3 = 0; -#line 19 "root_numpy/src/tree.pyx" +#line 21 "root_numpy/src/tree.pyx" goto __pyx_L0; /* "root_numpy/src/tree.pyx":4 @@ -9149,7 +9173,7 @@ static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__ #line 4 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":22 +/* "root_numpy/src/tree.pyx":24 * * * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< @@ -9157,208 +9181,211 @@ static PyObject *__pyx_pf_13_librootnumpy_2list_trees(CYTHON_UNUSED PyObject *__ * # automatically select single tree */ -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 22 "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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" {"list_structures", (PyCFunction)__pyx_pw_13_librootnumpy_5list_structures, METH_VARARGS|METH_KEYWORDS, 0}; -#line 22 "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) { PyObject *__pyx_v_fname = 0 -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_tree = 0 -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("list_structures (wrapper)", 0); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" { -#line 22 "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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" PyObject* values[2] = {0,0}; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" values[1] = ((PyObject *)Py_None); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" switch (pos_args) { case 2: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" case 0: break; default: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" case 0: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; else -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" case 1: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" if (value) { values[1] = value; kw_args--; } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 22 "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 = 22; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } else { -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 2: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" break; default: -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_v_fname = values[0]; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_v_tree = values[1]; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("list_structures", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); -#line 22 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 24 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" return NULL; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_pf_13_librootnumpy_4list_structures(__pyx_self, __pyx_v_fname, __pyx_v_tree); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" /* function exit code */ -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" return __pyx_r; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" -#line 22 "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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_rtree -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" +; + PyObject *__pyx_v_structure = NULL +#line 24 "root_numpy/src/tree.pyx" ; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -9373,13 +9400,13 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("list_structures", 0); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_tree); - /* "root_numpy/src/tree.pyx":23 + /* "root_numpy/src/tree.pyx":25 * * def list_structures(fname, tree=None): * if tree == None: # <<<<<<<<<<<<<< @@ -9387,19 +9414,19 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * tree = list_trees(fname) */ -#line 23 "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 = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 23 "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 = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 23 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 23 "root_numpy/src/tree.pyx" +#line 25 "root_numpy/src/tree.pyx" if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":25 + /* "root_numpy/src/tree.pyx":27 * if tree == None: * # automatically select single tree * tree = list_trees(fname) # <<<<<<<<<<<<<< @@ -9407,94 +9434,94 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) */ -#line 25 "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 = 25; __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 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __pyx_t_4 = NULL; -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" if (likely(__pyx_t_4)) { -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_4); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" } -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" } -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" if (!__pyx_t_4) { -#line 25 "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 = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" } else { -#line 25 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 25 "root_numpy/src/tree.pyx" +#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; -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_fname); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_fname); -#line 25 "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 = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" } -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_1); -#line 25 "root_numpy/src/tree.pyx" +#line 27 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":26 + /* "root_numpy/src/tree.pyx":28 * # automatically select single tree * tree = list_trees(fname) * if len(tree) != 1: # <<<<<<<<<<<<<< @@ -9502,16 +9529,16 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * tree = tree[0] */ -#line 26 "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 = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 26 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/tree.pyx" __pyx_t_2 = ((__pyx_t_6 != 1) != 0); -#line 26 "root_numpy/src/tree.pyx" +#line 28 "root_numpy/src/tree.pyx" if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":27 + /* "root_numpy/src/tree.pyx":29 * tree = list_trees(fname) * if len(tree) != 1: * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) # <<<<<<<<<<<<<< @@ -9519,133 +9546,133 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * cdef TFile* rfile = Open(fname, 'read') */ -#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __pyx_t_4 = NULL; -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" if (likely(__pyx_t_4)) { -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_4); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" } -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" } -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" if (!__pyx_t_4) { -#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" } else { -#line 27 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 27 "root_numpy/src/tree.pyx" +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_5); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; -#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" } -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 27 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_1); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 27 "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 = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_1, 0, 0, 0); -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 27 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 29 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 27 "root_numpy/src/tree.pyx" +#line 29 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":28 + /* "root_numpy/src/tree.pyx":30 * if len(tree) != 1: * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) * tree = tree[0] # <<<<<<<<<<<<<< @@ -9653,28 +9680,28 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * if rfile == NULL: */ -#line 28 "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 = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}; +#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 28 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 28 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_v_tree, __pyx_t_1); -#line 28 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 28 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 28 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" } -#line 28 "root_numpy/src/tree.pyx" +#line 30 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":29 + /* "root_numpy/src/tree.pyx":31 * raise ValueError("multiple trees found: {0}".format(', '.join(tree))) * tree = tree[0] * cdef TFile* rfile = Open(fname, 'read') # <<<<<<<<<<<<<< @@ -9682,13 +9709,13 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * raise IOError("cannot read {0}".format(fname)) */ -#line 29 "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 = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 29 "root_numpy/src/tree.pyx" +#line 31 "root_numpy/src/tree.pyx" __pyx_v_rfile = TFile::Open(__pyx_t_8, __pyx_k_read); - /* "root_numpy/src/tree.pyx":30 + /* "root_numpy/src/tree.pyx":32 * tree = tree[0] * cdef TFile* rfile = Open(fname, 'read') * if rfile == NULL: # <<<<<<<<<<<<<< @@ -9696,13 +9723,13 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * cdef TTree* rtree = rfile.Get(tree) */ -#line 30 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/tree.pyx" __pyx_t_2 = ((__pyx_v_rfile == NULL) != 0); -#line 30 "root_numpy/src/tree.pyx" +#line 32 "root_numpy/src/tree.pyx" if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":31 + /* "root_numpy/src/tree.pyx":33 * cdef TFile* rfile = Open(fname, 'read') * if rfile == NULL: * raise IOError("cannot read {0}".format(fname)) # <<<<<<<<<<<<<< @@ -9710,124 +9737,124 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * if rtree == NULL: */ -#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_3); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" } -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" } -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" if (!__pyx_t_7) { -#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" } else { -#line 31 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 31 "root_numpy/src/tree.pyx" +#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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_fname); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_fname); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_fname); -#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" } -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 31 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_1); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 31 "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 = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_1, 0, 0, 0); -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 31 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 33 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 31 "root_numpy/src/tree.pyx" +#line 33 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":32 + /* "root_numpy/src/tree.pyx":34 * if rfile == NULL: * raise IOError("cannot read {0}".format(fname)) * cdef TTree* rtree = rfile.Get(tree) # <<<<<<<<<<<<<< @@ -9835,184 +9862,220 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) */ -#line 32 "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 = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 32 "root_numpy/src/tree.pyx" +#line 34 "root_numpy/src/tree.pyx" __pyx_v_rtree = ((TTree *)__pyx_v_rfile->Get(__pyx_t_8)); - /* "root_numpy/src/tree.pyx":33 + /* "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)) - * return get_tree_structure(rtree) + * structure = get_tree_structure(rtree) */ -#line 33 "root_numpy/src/tree.pyx" +#line 35 "root_numpy/src/tree.pyx" __pyx_t_2 = ((__pyx_v_rtree == NULL) != 0); -#line 33 "root_numpy/src/tree.pyx" +#line 35 "root_numpy/src/tree.pyx" if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":34 + /* "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)) # <<<<<<<<<<<<<< - * return get_tree_structure(rtree) - * + * structure = get_tree_structure(rtree) + * rfile.Close() */ -#line 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __pyx_t_5 = NULL; -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __pyx_t_6 = 0; -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" if (likely(__pyx_t_5)) { -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_5); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __pyx_t_6 = 1; -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" } -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" } -#line 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" if (__pyx_t_5) { -#line 34 "root_numpy/src/tree.pyx" +#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 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" } -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_tree); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0+__pyx_t_6, __pyx_v_tree); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_tree); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_fname); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 1+__pyx_t_6, __pyx_v_fname); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_fname); -#line 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 34 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 34; __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 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_1); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 34 "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 = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_1, 0, 0, 0); -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 34 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 36 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 34 "root_numpy/src/tree.pyx" +#line 36 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":35 + /* "root_numpy/src/tree.pyx":37 * if rtree == NULL: * raise IOError("tree '{0}' not found in {1}".format(tree, fname)) - * return get_tree_structure(rtree) # <<<<<<<<<<<<<< - * - * + * structure = get_tree_structure(rtree) # <<<<<<<<<<<<<< + * rfile.Close() + * del rfile */ -#line 35 "root_numpy/src/tree.pyx" - __Pyx_XDECREF(__pyx_r); +#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;} -#line 35 "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 = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;} - -#line 35 "root_numpy/src/tree.pyx" +#line 37 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 35 "root_numpy/src/tree.pyx" - __pyx_r = __pyx_t_1; +#line 37 "root_numpy/src/tree.pyx" + __pyx_v_structure = __pyx_t_1; -#line 35 "root_numpy/src/tree.pyx" +#line 37 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 35 "root_numpy/src/tree.pyx" + /* "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 + */ + +#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 39 "root_numpy/src/tree.pyx" + delete __pyx_v_rfile; + + /* "root_numpy/src/tree.pyx":40 + * rfile.Close() + * del rfile + * return structure # <<<<<<<<<<<<<< + * + * + */ + +#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 40 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":22 + /* "root_numpy/src/tree.pyx":24 * * * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< @@ -10020,55 +10083,58 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * # automatically select single tree */ -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" /* function exit code */ -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.list_structures", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" + __Pyx_XDECREF(__pyx_v_structure); + +#line 24 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_tree); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" return __pyx_r; -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":38 +/* "root_numpy/src/tree.pyx":43 * * * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< @@ -10076,202 +10142,202 @@ static PyObject *__pyx_pf_13_librootnumpy_4list_structures(CYTHON_UNUSED PyObjec * */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 38 "root_numpy/src/tree.pyx" +#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 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" {"list_branches", (PyCFunction)__pyx_pw_13_librootnumpy_7list_branches, METH_VARARGS|METH_KEYWORDS, 0}; -#line 38 "root_numpy/src/tree.pyx" +#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 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_tree = 0 -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("list_branches (wrapper)", 0); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" { -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_fname,&__pyx_n_s_tree,0}; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" PyObject* values[2] = {0,0}; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" values[1] = ((PyObject *)Py_None); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" switch (pos_args) { case 2: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" case 0: break; default: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" case 0: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_fname)) != 0)) kw_args--; else -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" case 1: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" if (value) { values[1] = value; kw_args--; } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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;} -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } else { -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 2: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" break; default: -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_v_fname = values[0]; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_v_tree = values[1]; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("list_branches", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); -#line 38 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#line 43 "root_numpy/src/tree.pyx" +{__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L3_error;} -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" return NULL; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_pf_13_librootnumpy_6list_branches(__pyx_self, __pyx_v_fname, __pyx_v_tree); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" /* function exit code */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" return __pyx_r; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 38 "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 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -10284,10 +10350,10 @@ static PyObject *__pyx_pf_13_librootnumpy_6list_branches(CYTHON_UNUSED PyObject const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("list_branches", 0); - /* "root_numpy/src/tree.pyx":39 + /* "root_numpy/src/tree.pyx":44 * * def list_branches(fname, tree=None): * return list(list_structures(fname, tree).keys()) # <<<<<<<<<<<<<< @@ -10295,193 +10361,193 @@ static PyObject *__pyx_pf_13_librootnumpy_6list_branches(CYTHON_UNUSED PyObject * */ -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_4 = NULL; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_3))) { -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" if (likely(__pyx_t_4)) { -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_4); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_5 = 1; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" if (__pyx_t_4) { -#line 39 "root_numpy/src/tree.pyx" +#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 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_fname); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0+__pyx_t_5, __pyx_v_fname); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_fname); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_tree); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_5, __pyx_v_tree); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_tree); -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_2 = NULL; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" if (likely(__pyx_t_2)) { -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_2); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" if (__pyx_t_2) { -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } else { -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" } -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 39 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_1); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 39 "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 = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_r = __pyx_t_1; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 39 "root_numpy/src/tree.pyx" +#line 44 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":38 + /* "root_numpy/src/tree.pyx":43 * * * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< @@ -10489,52 +10555,52 @@ static PyObject *__pyx_pf_13_librootnumpy_6list_branches(CYTHON_UNUSED PyObject * */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" /* function exit code */ -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.list_branches", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" return __pyx_r; -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":42 +/* "root_numpy/src/tree.pyx":47 * * * cdef get_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< @@ -10542,25 +10608,25 @@ static PyObject *__pyx_pf_13_librootnumpy_6list_branches(CYTHON_UNUSED PyObject * cdef TLeaf* leaf */ -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" -#line 42 "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 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" ; TLeaf *__pyx_v_leaf -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" ; int __pyx_v_ileaf -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_leaflist = NULL -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" ; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -10577,10 +10643,10 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("get_branch_structure", 0); - /* "root_numpy/src/tree.pyx":46 + /* "root_numpy/src/tree.pyx":51 * cdef TLeaf* leaf * cdef int ileaf * leaves = branch.GetListOfLeaves() # <<<<<<<<<<<<<< @@ -10588,10 +10654,10 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) */ -#line 46 "root_numpy/src/tree.pyx" +#line 51 "root_numpy/src/tree.pyx" __pyx_v_leaves = __pyx_v_branch->GetListOfLeaves(); - /* "root_numpy/src/tree.pyx":47 + /* "root_numpy/src/tree.pyx":52 * cdef int ileaf * leaves = branch.GetListOfLeaves() * if leaves == NULL: # <<<<<<<<<<<<<< @@ -10599,13 +10665,13 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * leaflist = [] */ -#line 47 "root_numpy/src/tree.pyx" +#line 52 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_leaves == NULL) != 0); -#line 47 "root_numpy/src/tree.pyx" +#line 52 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":48 + /* "root_numpy/src/tree.pyx":53 * leaves = branch.GetListOfLeaves() * if leaves == NULL: * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) # <<<<<<<<<<<<<< @@ -10613,133 +10679,133 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * for ileaf in range(leaves.GetEntries()): */ -#line 48 "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 = 48; __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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 48 "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 = 48; __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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __pyx_t_5 = NULL; -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" if (likely(__pyx_t_5)) { -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_5); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" if (!__pyx_t_5) { -#line 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } else { -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 48 "root_numpy/src/tree.pyx" +#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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_4); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 48 "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 = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 48 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 48 "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 = 48; __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 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 48 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 53 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 48 "root_numpy/src/tree.pyx" +#line 53 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":49 + /* "root_numpy/src/tree.pyx":54 * if leaves == NULL: * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) * leaflist = [] # <<<<<<<<<<<<<< @@ -10747,19 +10813,19 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * leaf = leaves.At(ileaf) */ -#line 49 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 49 "root_numpy/src/tree.pyx" +#line 54 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 49 "root_numpy/src/tree.pyx" +#line 54 "root_numpy/src/tree.pyx" __pyx_v_leaflist = ((PyObject*)__pyx_t_2); -#line 49 "root_numpy/src/tree.pyx" +#line 54 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":50 + /* "root_numpy/src/tree.pyx":55 * raise RuntimeError("branch '{0}' has no leaves".format(branch.GetName())) * leaflist = [] * for ileaf in range(leaves.GetEntries()): # <<<<<<<<<<<<<< @@ -10767,16 +10833,16 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) */ -#line 50 "root_numpy/src/tree.pyx" +#line 55 "root_numpy/src/tree.pyx" __pyx_t_7 = __pyx_v_leaves->GetEntries(); -#line 50 "root_numpy/src/tree.pyx" +#line 55 "root_numpy/src/tree.pyx" for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { -#line 50 "root_numpy/src/tree.pyx" +#line 55 "root_numpy/src/tree.pyx" __pyx_v_ileaf = __pyx_t_8; - /* "root_numpy/src/tree.pyx":51 + /* "root_numpy/src/tree.pyx":56 * leaflist = [] * for ileaf in range(leaves.GetEntries()): * leaf = leaves.At(ileaf) # <<<<<<<<<<<<<< @@ -10784,10 +10850,10 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * if not leaflist: */ -#line 51 "root_numpy/src/tree.pyx" +#line 56 "root_numpy/src/tree.pyx" __pyx_v_leaf = ((TLeaf *)__pyx_v_leaves->At(__pyx_v_ileaf)); - /* "root_numpy/src/tree.pyx":52 + /* "root_numpy/src/tree.pyx":57 * for ileaf in range(leaves.GetEntries()): * leaf = leaves.At(ileaf) * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) # <<<<<<<<<<<<<< @@ -10795,52 +10861,52 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * raise RuntimeError( */ -#line 52 "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 = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 52 "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 = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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;} -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 52 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __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 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2); -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3); -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_3); -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __pyx_t_3 = 0; -#line 52 "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 = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 52 "root_numpy/src/tree.pyx" +#line 57 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":53 + /* "root_numpy/src/tree.pyx":58 * leaf = leaves.At(ileaf) * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) * if not leaflist: # <<<<<<<<<<<<<< @@ -10848,16 +10914,16 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * "leaf list for branch '{0}' is empty".format( */ -#line 53 "root_numpy/src/tree.pyx" +#line 58 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_leaflist != Py_None) && (PyList_GET_SIZE(__pyx_v_leaflist) != 0); -#line 53 "root_numpy/src/tree.pyx" +#line 58 "root_numpy/src/tree.pyx" __pyx_t_10 = ((!__pyx_t_1) != 0); -#line 53 "root_numpy/src/tree.pyx" +#line 58 "root_numpy/src/tree.pyx" if (__pyx_t_10) { - /* "root_numpy/src/tree.pyx":55 + /* "root_numpy/src/tree.pyx":60 * if not leaflist: * raise RuntimeError( * "leaf list for branch '{0}' is empty".format( # <<<<<<<<<<<<<< @@ -10865,13 +10931,13 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * return leaflist */ -#line 55 "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 = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 55 "root_numpy/src/tree.pyx" +#line 60 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); - /* "root_numpy/src/tree.pyx":56 + /* "root_numpy/src/tree.pyx":61 * raise RuntimeError( * "leaf list for branch '{0}' is empty".format( * branch.GetName())) # <<<<<<<<<<<<<< @@ -10879,91 +10945,91 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * */ -#line 56 "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 = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __pyx_t_4 = NULL; -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) { -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" if (likely(__pyx_t_4)) { -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_4); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_3, function); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" } -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" } -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" if (!__pyx_t_4) { -#line 56 "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 = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" } else { -#line 56 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 56 "root_numpy/src/tree.pyx" +#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 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_2); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 56 "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 = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" } -#line 56 "root_numpy/src/tree.pyx" +#line 61 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - /* "root_numpy/src/tree.pyx":54 + /* "root_numpy/src/tree.pyx":59 * leaflist.append((leaf.GetTitle(), resolve_type(leaf.GetTypeName()))) * if not leaflist: * raise RuntimeError( # <<<<<<<<<<<<<< @@ -10971,43 +11037,43 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * branch.GetName())) */ -#line 54 "root_numpy/src/tree.pyx" - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 54; __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 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6); -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_6); -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __pyx_t_6 = 0; -#line 54 "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 = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_6, 0, 0, 0); -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 54 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 59 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 54 "root_numpy/src/tree.pyx" +#line 59 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":57 + /* "root_numpy/src/tree.pyx":62 * "leaf list for branch '{0}' is empty".format( * branch.GetName())) * return leaflist # <<<<<<<<<<<<<< @@ -11015,19 +11081,19 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * */ -#line 57 "root_numpy/src/tree.pyx" +#line 62 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 57 "root_numpy/src/tree.pyx" +#line 62 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_leaflist); -#line 57 "root_numpy/src/tree.pyx" +#line 62 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_leaflist; -#line 57 "root_numpy/src/tree.pyx" +#line 62 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":42 + /* "root_numpy/src/tree.pyx":47 * * * cdef get_branch_structure(TBranch* branch): # <<<<<<<<<<<<<< @@ -11035,55 +11101,55 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * cdef TLeaf* leaf */ -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" /* function exit code */ -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.get_branch_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_leaflist); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" return __pyx_r; -#line 42 "root_numpy/src/tree.pyx" +#line 47 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":60 +/* "root_numpy/src/tree.pyx":65 * * * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< @@ -11091,31 +11157,31 @@ static PyObject *__pyx_f_13_librootnumpy_get_branch_structure(TBranch *__pyx_v_b * cdef TBranch* branch */ -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" -#line 60 "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 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" PyObject *__pyx_v_branches = ((PyObject *)Py_None); int __pyx_v_ibranch -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" ; TBranch *__pyx_v_branch -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_ret = NULL -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branch_name = NULL -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" ; TObjArray *__pyx_v_all_branches -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" ; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -11132,25 +11198,25 @@ static PyObject *__pyx_f_13_librootnumpy_get_tree_structure(TTree *__pyx_v_tree, const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("get_tree_structure", 0); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" if (__pyx_optional_args) { -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 0) { -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_v_branches = __pyx_optional_args->branches; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" } -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":63 + /* "root_numpy/src/tree.pyx":68 * cdef int ibranch * cdef TBranch* branch * ret = OrderedDict() # <<<<<<<<<<<<<< @@ -11158,73 +11224,73 @@ static PyObject *__pyx_f_13_librootnumpy_get_tree_structure(TTree *__pyx_v_tree, * for branch_name in branches: */ -#line 63 "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 = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __pyx_t_3 = NULL; -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_2))) { -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" if (likely(__pyx_t_3)) { -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_3); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_2, function); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" } -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" } -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" if (__pyx_t_3) { -#line 63 "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 = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" } else { -#line 63 "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 = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" } -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __pyx_v_ret = __pyx_t_1; -#line 63 "root_numpy/src/tree.pyx" +#line 68 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":64 + /* "root_numpy/src/tree.pyx":69 * cdef TBranch* branch * ret = OrderedDict() * if branches is not None: # <<<<<<<<<<<<<< @@ -11232,16 +11298,16 @@ static PyObject *__pyx_f_13_librootnumpy_get_tree_structure(TTree *__pyx_v_tree, * branch = tree.GetBranch(branch_name) */ -#line 64 "root_numpy/src/tree.pyx" +#line 69 "root_numpy/src/tree.pyx" __pyx_t_4 = (__pyx_v_branches != Py_None); -#line 64 "root_numpy/src/tree.pyx" +#line 69 "root_numpy/src/tree.pyx" __pyx_t_5 = (__pyx_t_4 != 0); -#line 64 "root_numpy/src/tree.pyx" +#line 69 "root_numpy/src/tree.pyx" if (__pyx_t_5) { - /* "root_numpy/src/tree.pyx":65 + /* "root_numpy/src/tree.pyx":70 * ret = OrderedDict() * if branches is not None: * for branch_name in branches: # <<<<<<<<<<<<<< @@ -11249,124 +11315,124 @@ static PyObject *__pyx_f_13_librootnumpy_get_tree_structure(TTree *__pyx_v_tree, * if branch == NULL: */ -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __pyx_t_1 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } else { __pyx_t_6 = -1; -#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" for (;;) { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (likely(!__pyx_t_7)) { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_1))) { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" #else -#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" #endif -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } else { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" #else -#line 65 "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 = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" #endif -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } } else -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __pyx_t_2 = __pyx_t_7(__pyx_t_1); -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (unlikely(!__pyx_t_2)) { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (exc_type) { -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 65 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 70 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" break; -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_branch_name, __pyx_t_2); -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":66 + /* "root_numpy/src/tree.pyx":71 * if branches is not None: * for branch_name in branches: * branch = tree.GetBranch(branch_name) # <<<<<<<<<<<<<< @@ -11374,13 +11440,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * continue */ -#line 66 "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 = 66; __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 66 "root_numpy/src/tree.pyx" +#line 71 "root_numpy/src/tree.pyx" __pyx_v_branch = __pyx_v_tree->GetBranch(__pyx_t_8); - /* "root_numpy/src/tree.pyx":67 + /* "root_numpy/src/tree.pyx":72 * for branch_name in branches: * branch = tree.GetBranch(branch_name) * if branch == NULL: # <<<<<<<<<<<<<< @@ -11388,13 +11454,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * ret[branch.GetName()] = get_branch_structure(branch) */ -#line 67 "root_numpy/src/tree.pyx" +#line 72 "root_numpy/src/tree.pyx" __pyx_t_5 = ((__pyx_v_branch == NULL) != 0); -#line 67 "root_numpy/src/tree.pyx" +#line 72 "root_numpy/src/tree.pyx" if (__pyx_t_5) { - /* "root_numpy/src/tree.pyx":68 + /* "root_numpy/src/tree.pyx":73 * branch = tree.GetBranch(branch_name) * if branch == NULL: * continue # <<<<<<<<<<<<<< @@ -11402,13 +11468,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * return ret */ -#line 68 "root_numpy/src/tree.pyx" +#line 73 "root_numpy/src/tree.pyx" goto __pyx_L4_continue; -#line 68 "root_numpy/src/tree.pyx" +#line 73 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":69 + /* "root_numpy/src/tree.pyx":74 * if branch == NULL: * continue * ret[branch.GetName()] = get_branch_structure(branch) # <<<<<<<<<<<<<< @@ -11416,28 +11482,28 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * # all branches */ -#line 69 "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 = 69; __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 69 "root_numpy/src/tree.pyx" +#line 74 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 69 "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 = 69; __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 69 "root_numpy/src/tree.pyx" +#line 74 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 69 "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 = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 69 "root_numpy/src/tree.pyx" +#line 74 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 69 "root_numpy/src/tree.pyx" +#line 74 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":65 + /* "root_numpy/src/tree.pyx":70 * ret = OrderedDict() * if branches is not None: * for branch_name in branches: # <<<<<<<<<<<<<< @@ -11445,16 +11511,16 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * if branch == NULL: */ -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __pyx_L4_continue:; -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" } -#line 65 "root_numpy/src/tree.pyx" +#line 70 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":70 + /* "root_numpy/src/tree.pyx":75 * continue * ret[branch.GetName()] = get_branch_structure(branch) * return ret # <<<<<<<<<<<<<< @@ -11462,22 +11528,22 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * cdef TObjArray* all_branches = tree.GetListOfBranches() */ -#line 70 "root_numpy/src/tree.pyx" +#line 75 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 70 "root_numpy/src/tree.pyx" +#line 75 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_ret); -#line 70 "root_numpy/src/tree.pyx" +#line 75 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_ret; -#line 70 "root_numpy/src/tree.pyx" +#line 75 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 70 "root_numpy/src/tree.pyx" +#line 75 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":72 + /* "root_numpy/src/tree.pyx":77 * return ret * # all branches * cdef TObjArray* all_branches = tree.GetListOfBranches() # <<<<<<<<<<<<<< @@ -11485,10 +11551,10 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * return ret */ -#line 72 "root_numpy/src/tree.pyx" +#line 77 "root_numpy/src/tree.pyx" __pyx_v_all_branches = __pyx_v_tree->GetListOfBranches(); - /* "root_numpy/src/tree.pyx":73 + /* "root_numpy/src/tree.pyx":78 * # all branches * cdef TObjArray* all_branches = tree.GetListOfBranches() * if all_branches == NULL: # <<<<<<<<<<<<<< @@ -11496,13 +11562,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * for ibranch in range(all_branches.GetEntries()): */ -#line 73 "root_numpy/src/tree.pyx" +#line 78 "root_numpy/src/tree.pyx" __pyx_t_5 = ((__pyx_v_all_branches == NULL) != 0); -#line 73 "root_numpy/src/tree.pyx" +#line 78 "root_numpy/src/tree.pyx" if (__pyx_t_5) { - /* "root_numpy/src/tree.pyx":74 + /* "root_numpy/src/tree.pyx":79 * cdef TObjArray* all_branches = tree.GetListOfBranches() * if all_branches == NULL: * return ret # <<<<<<<<<<<<<< @@ -11510,22 +11576,22 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * branch = (all_branches.At(ibranch)) */ -#line 74 "root_numpy/src/tree.pyx" +#line 79 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 74 "root_numpy/src/tree.pyx" +#line 79 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_ret); -#line 74 "root_numpy/src/tree.pyx" +#line 79 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_ret; -#line 74 "root_numpy/src/tree.pyx" +#line 79 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 74 "root_numpy/src/tree.pyx" +#line 79 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":75 + /* "root_numpy/src/tree.pyx":80 * if all_branches == NULL: * return ret * for ibranch in range(all_branches.GetEntries()): # <<<<<<<<<<<<<< @@ -11533,16 +11599,16 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * ret[branch.GetName()] = get_branch_structure(branch) */ -#line 75 "root_numpy/src/tree.pyx" +#line 80 "root_numpy/src/tree.pyx" __pyx_t_9 = __pyx_v_all_branches->GetEntries(); -#line 75 "root_numpy/src/tree.pyx" +#line 80 "root_numpy/src/tree.pyx" for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_9; __pyx_t_10+=1) { -#line 75 "root_numpy/src/tree.pyx" +#line 80 "root_numpy/src/tree.pyx" __pyx_v_ibranch = __pyx_t_10; - /* "root_numpy/src/tree.pyx":76 + /* "root_numpy/src/tree.pyx":81 * return ret * for ibranch in range(all_branches.GetEntries()): * branch = (all_branches.At(ibranch)) # <<<<<<<<<<<<<< @@ -11550,10 +11616,10 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * return ret */ -#line 76 "root_numpy/src/tree.pyx" +#line 81 "root_numpy/src/tree.pyx" __pyx_v_branch = ((TBranch *)__pyx_v_all_branches->At(__pyx_v_ibranch)); - /* "root_numpy/src/tree.pyx":77 + /* "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) # <<<<<<<<<<<<<< @@ -11561,31 +11627,31 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * */ -#line 77 "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 = 77; __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 77 "root_numpy/src/tree.pyx" +#line 82 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 77 "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 = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 77 "root_numpy/src/tree.pyx" +#line 82 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 77 "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 = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 77 "root_numpy/src/tree.pyx" +#line 82 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 77 "root_numpy/src/tree.pyx" +#line 82 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 77 "root_numpy/src/tree.pyx" +#line 82 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":78 + /* "root_numpy/src/tree.pyx":83 * branch = (all_branches.At(ibranch)) * ret[branch.GetName()] = get_branch_structure(branch) * return ret # <<<<<<<<<<<<<< @@ -11593,19 +11659,19 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * */ -#line 78 "root_numpy/src/tree.pyx" +#line 83 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 78 "root_numpy/src/tree.pyx" +#line 83 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_ret); -#line 78 "root_numpy/src/tree.pyx" +#line 83 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_ret; -#line 78 "root_numpy/src/tree.pyx" +#line 83 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":60 + /* "root_numpy/src/tree.pyx":65 * * * cdef get_tree_structure(TTree* tree, branches=None): # <<<<<<<<<<<<<< @@ -11613,52 +11679,52 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * cdef TBranch* branch */ -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" /* function exit code */ -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.get_tree_structure", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_ret); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_branch_name); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" return __pyx_r; -#line 60 "root_numpy/src/tree.pyx" +#line 65 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":81 +/* "root_numpy/src/tree.pyx":86 * * * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< @@ -11666,16 +11732,16 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_1)) {__pyx * return */ -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" -#line 81 "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 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" bool __pyx_v_ignore_index = ((bool)0); -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -11684,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 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("handle_load", 0); -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" if (__pyx_optional_args) { -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 0) { -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_v_ignore_index = __pyx_optional_args->ignore_index; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" } -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":82 + /* "root_numpy/src/tree.pyx":87 * * cdef handle_load(int load, bool ignore_index=False): * if load >= 0: # <<<<<<<<<<<<<< @@ -11710,13 +11776,13 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * if load == -1: */ -#line 82 "root_numpy/src/tree.pyx" +#line 87 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_load >= 0) != 0); -#line 82 "root_numpy/src/tree.pyx" +#line 87 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":83 + /* "root_numpy/src/tree.pyx":88 * cdef handle_load(int load, bool ignore_index=False): * if load >= 0: * return # <<<<<<<<<<<<<< @@ -11724,19 +11790,19 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise ValueError("chain is empty") */ -#line 83 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 83 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 83 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 83 "root_numpy/src/tree.pyx" +#line 88 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":92 + /* "root_numpy/src/tree.pyx":97 * elif load == -3: * raise IOError("cannot open current file") * elif load == -4: # <<<<<<<<<<<<<< @@ -11744,10 +11810,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise RuntimeError("the chain is not initialized") */ -#line 92 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" switch (__pyx_v_load) { - /* "root_numpy/src/tree.pyx":84 + /* "root_numpy/src/tree.pyx":89 * if load >= 0: * return * if load == -1: # <<<<<<<<<<<<<< @@ -11755,10 +11821,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * elif load == -2: */ -#line 84 "root_numpy/src/tree.pyx" +#line 89 "root_numpy/src/tree.pyx" case -1: - /* "root_numpy/src/tree.pyx":85 + /* "root_numpy/src/tree.pyx":90 * return * if load == -1: * raise ValueError("chain is empty") # <<<<<<<<<<<<<< @@ -11766,25 +11832,25 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * if ignore_index: */ -#line 85 "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 = 85; __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 85 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 85 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 85 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 85 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 85; __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 85 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" break; - /* "root_numpy/src/tree.pyx":86 + /* "root_numpy/src/tree.pyx":91 * if load == -1: * raise ValueError("chain is empty") * elif load == -2: # <<<<<<<<<<<<<< @@ -11792,10 +11858,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * return */ -#line 86 "root_numpy/src/tree.pyx" +#line 91 "root_numpy/src/tree.pyx" case -2: - /* "root_numpy/src/tree.pyx":87 + /* "root_numpy/src/tree.pyx":92 * raise ValueError("chain is empty") * elif load == -2: * if ignore_index: # <<<<<<<<<<<<<< @@ -11803,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 87 "root_numpy/src/tree.pyx" +#line 92 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_ignore_index != 0); -#line 87 "root_numpy/src/tree.pyx" +#line 92 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":88 + /* "root_numpy/src/tree.pyx":93 * elif load == -2: * if ignore_index: * return # <<<<<<<<<<<<<< @@ -11817,19 +11883,19 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * elif load == -3: */ -#line 88 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 88 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 88 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 88 "root_numpy/src/tree.pyx" +#line 93 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":89 + /* "root_numpy/src/tree.pyx":94 * if ignore_index: * return * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< @@ -11837,25 +11903,25 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise IOError("cannot open current file") */ -#line 89 "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 = 89; __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 89 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 89 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 89 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 89 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 89; __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 89 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" break; - /* "root_numpy/src/tree.pyx":90 + /* "root_numpy/src/tree.pyx":95 * return * raise IndexError("tree index in chain is out of bounds") * elif load == -3: # <<<<<<<<<<<<<< @@ -11863,10 +11929,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * elif load == -4: */ -#line 90 "root_numpy/src/tree.pyx" +#line 95 "root_numpy/src/tree.pyx" case -3: - /* "root_numpy/src/tree.pyx":91 + /* "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") # <<<<<<<<<<<<<< @@ -11874,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 91 "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 = 91; __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 91 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 91 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 91 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 91 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 91; __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 91 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" break; - /* "root_numpy/src/tree.pyx":92 + /* "root_numpy/src/tree.pyx":97 * elif load == -3: * raise IOError("cannot open current file") * elif load == -4: # <<<<<<<<<<<<<< @@ -11900,10 +11966,10 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * raise RuntimeError("the chain is not initialized") */ -#line 92 "root_numpy/src/tree.pyx" +#line 97 "root_numpy/src/tree.pyx" case -4: - /* "root_numpy/src/tree.pyx":93 + /* "root_numpy/src/tree.pyx":98 * raise IOError("cannot open current file") * elif load == -4: * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< @@ -11911,31 +11977,31 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * */ -#line 93 "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 = 93; __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 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 93 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 93; __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 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" break; -#line 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" default: break; -#line 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":94 + /* "root_numpy/src/tree.pyx":99 * elif load == -4: * raise IOError("cannot access tree in current file") * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< @@ -11943,22 +12009,22 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * */ -#line 94 "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 = 94; __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 94 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 94 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 94 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 94 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __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":81 + /* "root_numpy/src/tree.pyx":86 * * * cdef handle_load(int load, bool ignore_index=False): # <<<<<<<<<<<<<< @@ -11966,40 +12032,40 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * return */ -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" /* function exit code */ -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.handle_load", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" return __pyx_r; -#line 81 "root_numpy/src/tree.pyx" +#line 86 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":97 +/* "root_numpy/src/tree.pyx":102 * * * cdef object tree2array(TTree* tree, branches, string selection, # <<<<<<<<<<<<<< @@ -12007,133 +12073,133 @@ static PyObject *__pyx_f_13_librootnumpy_handle_load(int __pyx_v_load, struct __ * bool include_weight, string weight_name): */ -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" -#line 97 "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 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_num_entries -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_num_entries_selected -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TreeChain *__pyx_v_chain -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TObjArray *__pyx_v_branch_array -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TObjArray *__pyx_v_leaf_array -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TBranch *__pyx_v_tbranch -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TLeaf *__pyx_v_tleaf -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; Column *__pyx_v_col -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; __pyx_t_13_librootnumpy_Converter *__pyx_v_conv -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_columns -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; std::vector<__pyx_t_13_librootnumpy_Converter *> __pyx_v_converters -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; std::vector > __pyx_v_column_buckets -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; std::vector > __pyx_v_converter_buckets -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TTreeFormula *__pyx_v_selection_formula -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; TTreeFormula *__pyx_v_formula -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_ibranch -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_ileaf -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_ientry -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_branch_idx -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_num_branches -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; unsigned int __pyx_v_icol -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; unsigned int __pyx_v_num_columns -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyArrayObject *__pyx_v_arr = 0 -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; void *__pyx_v_data_ptr -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_num_bytes -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; int __pyx_v_entry_size -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; char *__pyx_v_c_string -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; bool __pyx_v_shortname -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; std::string __pyx_v_column_name -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; const char *__pyx_v_branch_name -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; const char *__pyx_v_leaf_name -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branch_dict = NULL -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_expression = NULL -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_dtype = NULL -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; Column *__pyx_v_this_col -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; __pyx_t_13_librootnumpy_Converter *__pyx_v_this_conv -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_indices = NULL -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_idx = NULL -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_b = NULL -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" ; -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -12174,10 +12240,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("tree2array", 0); - /* "root_numpy/src/tree.pyx":101 + /* "root_numpy/src/tree.pyx":106 * bool include_weight, string weight_name): * * if tree.GetNbranches() == 0: # <<<<<<<<<<<<<< @@ -12185,13 +12251,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 101 "root_numpy/src/tree.pyx" +#line 106 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_tree->GetNbranches() == 0) != 0); -#line 101 "root_numpy/src/tree.pyx" +#line 106 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":102 + /* "root_numpy/src/tree.pyx":107 * * if tree.GetNbranches() == 0: * raise ValueError("tree has no branches") # <<<<<<<<<<<<<< @@ -12199,25 +12265,25 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef int num_requested_branches = 0 */ -#line 102 "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 = 102; __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 102 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 102 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 102 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 102 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __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 102 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":104 + /* "root_numpy/src/tree.pyx":109 * raise ValueError("tree has no branches") * * cdef int num_requested_branches = 0 # <<<<<<<<<<<<<< @@ -12225,10 +12291,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * num_requested_branches = len(branches) */ -#line 104 "root_numpy/src/tree.pyx" +#line 109 "root_numpy/src/tree.pyx" __pyx_v_num_requested_branches = 0; - /* "root_numpy/src/tree.pyx":105 + /* "root_numpy/src/tree.pyx":110 * * cdef int num_requested_branches = 0 * if branches is not None: # <<<<<<<<<<<<<< @@ -12236,16 +12302,16 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * if num_requested_branches == 0: */ -#line 105 "root_numpy/src/tree.pyx" +#line 110 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_branches != Py_None); -#line 105 "root_numpy/src/tree.pyx" +#line 110 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_t_1 != 0); -#line 105 "root_numpy/src/tree.pyx" +#line 110 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":106 + /* "root_numpy/src/tree.pyx":111 * cdef int num_requested_branches = 0 * if branches is not None: * num_requested_branches = len(branches) # <<<<<<<<<<<<<< @@ -12253,13 +12319,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * raise ValueError("branches is an empty list") */ -#line 106 "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 = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 106 "root_numpy/src/tree.pyx" +#line 111 "root_numpy/src/tree.pyx" __pyx_v_num_requested_branches = __pyx_t_4; - /* "root_numpy/src/tree.pyx":107 + /* "root_numpy/src/tree.pyx":112 * if branches is not None: * num_requested_branches = len(branches) * if num_requested_branches == 0: # <<<<<<<<<<<<<< @@ -12267,13 +12333,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 107 "root_numpy/src/tree.pyx" +#line 112 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches == 0) != 0); -#line 107 "root_numpy/src/tree.pyx" +#line 112 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":108 + /* "root_numpy/src/tree.pyx":113 * num_requested_branches = len(branches) * if num_requested_branches == 0: * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< @@ -12281,34 +12347,34 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef int num_entries = tree.GetEntries() */ -#line 108 "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 = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 108 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 113 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" } -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" goto __pyx_L4; -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" } -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" __pyx_L4:; - /* "root_numpy/src/tree.pyx":110 + /* "root_numpy/src/tree.pyx":115 * raise ValueError("branches is an empty list") * * cdef int num_entries = tree.GetEntries() # <<<<<<<<<<<<<< @@ -12316,10 +12382,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 110 "root_numpy/src/tree.pyx" +#line 115 "root_numpy/src/tree.pyx" __pyx_v_num_entries = __pyx_v_tree->GetEntries(); - /* "root_numpy/src/tree.pyx":111 + /* "root_numpy/src/tree.pyx":116 * * cdef int num_entries = tree.GetEntries() * cdef int num_entries_selected = 0 # <<<<<<<<<<<<<< @@ -12327,10 +12393,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef TreeChain* chain = new TreeChain(tree) */ -#line 111 "root_numpy/src/tree.pyx" +#line 116 "root_numpy/src/tree.pyx" __pyx_v_num_entries_selected = 0; - /* "root_numpy/src/tree.pyx":113 + /* "root_numpy/src/tree.pyx":118 * cdef int num_entries_selected = 0 * * cdef TreeChain* chain = new TreeChain(tree) # <<<<<<<<<<<<<< @@ -12338,10 +12404,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 113 "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":114 + /* "root_numpy/src/tree.pyx":119 * * cdef TreeChain* chain = new TreeChain(tree) * handle_load(chain.Prepare(), True) # <<<<<<<<<<<<<< @@ -12349,22 +12415,22 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef TObjArray* branch_array = tree.GetListOfBranches() */ -#line 114 "root_numpy/src/tree.pyx" +#line 119 "root_numpy/src/tree.pyx" __pyx_t_5.__pyx_n = 1; -#line 114 "root_numpy/src/tree.pyx" +#line 119 "root_numpy/src/tree.pyx" __pyx_t_5.ignore_index = 1; -#line 114 "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 = 114; __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 114 "root_numpy/src/tree.pyx" +#line 119 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 114 "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":116 + /* "root_numpy/src/tree.pyx":121 * handle_load(chain.Prepare(), True) * * cdef TObjArray* branch_array = tree.GetListOfBranches() # <<<<<<<<<<<<<< @@ -12372,10 +12438,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef TBranch* tbranch */ -#line 116 "root_numpy/src/tree.pyx" +#line 121 "root_numpy/src/tree.pyx" __pyx_v_branch_array = __pyx_v_tree->GetListOfBranches(); - /* "root_numpy/src/tree.pyx":131 + /* "root_numpy/src/tree.pyx":136 * # Avoid calling FindBranch for each branch since that results in O(n^2) * * cdef TTreeFormula* selection_formula = NULL # <<<<<<<<<<<<<< @@ -12383,10 +12449,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 131 "root_numpy/src/tree.pyx" +#line 136 "root_numpy/src/tree.pyx" __pyx_v_selection_formula = NULL; - /* "root_numpy/src/tree.pyx":132 + /* "root_numpy/src/tree.pyx":137 * * cdef TTreeFormula* selection_formula = NULL * cdef TTreeFormula* formula = NULL # <<<<<<<<<<<<<< @@ -12394,10 +12460,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef int ibranch, ileaf, ientry, branch_idx = 0 */ -#line 132 "root_numpy/src/tree.pyx" +#line 137 "root_numpy/src/tree.pyx" __pyx_v_formula = NULL; - /* "root_numpy/src/tree.pyx":134 + /* "root_numpy/src/tree.pyx":139 * cdef TTreeFormula* formula = NULL * * cdef int ibranch, ileaf, ientry, branch_idx = 0 # <<<<<<<<<<<<<< @@ -12405,10 +12471,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * cdef unsigned int icol, num_columns */ -#line 134 "root_numpy/src/tree.pyx" +#line 139 "root_numpy/src/tree.pyx" __pyx_v_branch_idx = 0; - /* "root_numpy/src/tree.pyx":135 + /* "root_numpy/src/tree.pyx":140 * * cdef int ibranch, ileaf, ientry, branch_idx = 0 * cdef int num_branches = branch_array.GetEntries() # <<<<<<<<<<<<<< @@ -12416,10 +12482,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 135 "root_numpy/src/tree.pyx" +#line 140 "root_numpy/src/tree.pyx" __pyx_v_num_branches = __pyx_v_branch_array->GetEntries(); - /* "root_numpy/src/tree.pyx":149 + /* "root_numpy/src/tree.pyx":154 * cdef const_char* leaf_name * * if num_requested_branches > 0: # <<<<<<<<<<<<<< @@ -12427,13 +12493,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * converters.reserve(num_requested_branches) */ -#line 149 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 149 "root_numpy/src/tree.pyx" +#line 154 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":150 + /* "root_numpy/src/tree.pyx":155 * * if num_requested_branches > 0: * columns.reserve(num_requested_branches) # <<<<<<<<<<<<<< @@ -12441,10 +12507,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * column_buckets.assign(num_requested_branches, vector['Column*']()) */ -#line 150 "root_numpy/src/tree.pyx" +#line 155 "root_numpy/src/tree.pyx" __pyx_v_columns.reserve(__pyx_v_num_requested_branches); - /* "root_numpy/src/tree.pyx":151 + /* "root_numpy/src/tree.pyx":156 * if num_requested_branches > 0: * columns.reserve(num_requested_branches) * converters.reserve(num_requested_branches) # <<<<<<<<<<<<<< @@ -12452,10 +12518,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * converter_buckets.assign(num_requested_branches, vector['Converter*']()) */ -#line 151 "root_numpy/src/tree.pyx" +#line 156 "root_numpy/src/tree.pyx" __pyx_v_converters.reserve(__pyx_v_num_requested_branches); - /* "root_numpy/src/tree.pyx":152 + /* "root_numpy/src/tree.pyx":157 * columns.reserve(num_requested_branches) * converters.reserve(num_requested_branches) * column_buckets.assign(num_requested_branches, vector['Column*']()) # <<<<<<<<<<<<<< @@ -12463,28 +12529,28 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * else: */ -#line 152 "root_numpy/src/tree.pyx" +#line 157 "root_numpy/src/tree.pyx" try { -#line 152 "root_numpy/src/tree.pyx" +#line 157 "root_numpy/src/tree.pyx" __pyx_t_6 = std::vector (); -#line 152 "root_numpy/src/tree.pyx" +#line 157 "root_numpy/src/tree.pyx" } catch(...) { -#line 152 "root_numpy/src/tree.pyx" +#line 157 "root_numpy/src/tree.pyx" __Pyx_CppExn2PyErr(); -#line 152 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 157 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 152 "root_numpy/src/tree.pyx" +#line 157 "root_numpy/src/tree.pyx" } -#line 152 "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":153 + /* "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*']()) # <<<<<<<<<<<<<< @@ -12492,37 +12558,37 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * columns.reserve(num_branches) */ -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" try { -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" __pyx_t_7 = std::vector<__pyx_t_13_librootnumpy_Converter *> (); -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" } catch(...) { -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" __Pyx_CppExn2PyErr(); -#line 153 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#line 158 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;} -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" } -#line 153 "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 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" goto __pyx_L6; -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" } -#line 153 "root_numpy/src/tree.pyx" +#line 158 "root_numpy/src/tree.pyx" /*else*/ { - /* "root_numpy/src/tree.pyx":155 + /* "root_numpy/src/tree.pyx":160 * converter_buckets.assign(num_requested_branches, vector['Converter*']()) * else: * columns.reserve(num_branches) # <<<<<<<<<<<<<< @@ -12530,10 +12596,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * */ -#line 155 "root_numpy/src/tree.pyx" +#line 160 "root_numpy/src/tree.pyx" __pyx_v_columns.reserve(__pyx_v_num_branches); - /* "root_numpy/src/tree.pyx":156 + /* "root_numpy/src/tree.pyx":161 * else: * columns.reserve(num_branches) * converters.reserve(num_branches) # <<<<<<<<<<<<<< @@ -12541,16 +12607,16 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * try: */ -#line 156 "root_numpy/src/tree.pyx" +#line 161 "root_numpy/src/tree.pyx" __pyx_v_converters.reserve(__pyx_v_num_branches); -#line 156 "root_numpy/src/tree.pyx" +#line 161 "root_numpy/src/tree.pyx" } -#line 156 "root_numpy/src/tree.pyx" +#line 161 "root_numpy/src/tree.pyx" __pyx_L6:; - /* "root_numpy/src/tree.pyx":158 + /* "root_numpy/src/tree.pyx":163 * converters.reserve(num_branches) * * try: # <<<<<<<<<<<<<< @@ -12558,10 +12624,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * if selection.size(): */ -#line 158 "root_numpy/src/tree.pyx" +#line 163 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":160 + /* "root_numpy/src/tree.pyx":165 * try: * # Set up the selection if we have one * if selection.size(): # <<<<<<<<<<<<<< @@ -12569,13 +12635,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * if selection_formula == NULL or selection_formula.GetNdim() == 0: */ -#line 160 "root_numpy/src/tree.pyx" +#line 165 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_v_selection.size() != 0); -#line 160 "root_numpy/src/tree.pyx" +#line 165 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":161 + /* "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) # <<<<<<<<<<<<<< @@ -12583,10 +12649,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * del selection_formula */ -#line 161 "root_numpy/src/tree.pyx" +#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":162 + /* "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: # <<<<<<<<<<<<<< @@ -12594,37 +12660,37 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * raise ValueError( */ -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_selection_formula == NULL) != 0); -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" if (!__pyx_t_1) { -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" } else { -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" __pyx_t_3 = __pyx_t_1; -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" goto __pyx_L12_bool_binop_done; -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" } -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_selection_formula->GetNdim() == 0) != 0); -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" __pyx_t_3 = __pyx_t_1; -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" __pyx_L12_bool_binop_done:; -#line 162 "root_numpy/src/tree.pyx" +#line 167 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":163 + /* "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 # <<<<<<<<<<<<<< @@ -12632,10 +12698,10 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * "could not compile selection expression '{0}'".format(selection)) */ -#line 163 "root_numpy/src/tree.pyx" +#line 168 "root_numpy/src/tree.pyx" delete __pyx_v_selection_formula; - /* "root_numpy/src/tree.pyx":165 + /* "root_numpy/src/tree.pyx":170 * del selection_formula * raise ValueError( * "could not compile selection expression '{0}'".format(selection)) # <<<<<<<<<<<<<< @@ -12643,97 +12709,97 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * # rolling over to the next tree. */ -#line 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_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 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __pyx_t_10 = NULL; -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_8); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" if (likely(__pyx_t_10)) { -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_10); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_8, function); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" } -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" } -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" if (!__pyx_t_10) { -#line 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" } else { -#line 165 "root_numpy/src/tree.pyx" - __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_11); -#line 165 "root_numpy/src/tree.pyx" +#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 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_t_9); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; -#line 165 "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 = 165; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 165 "root_numpy/src/tree.pyx" +#line 170 "root_numpy/src/tree.pyx" } -#line 165 "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":164 + /* "root_numpy/src/tree.pyx":169 * if selection_formula == NULL or selection_formula.GetNdim() == 0: * del selection_formula * raise ValueError( # <<<<<<<<<<<<<< @@ -12741,43 +12807,43 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * # The chain will take care of updating the formula leaves when */ -#line 164 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 164 "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 = 164; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 164 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 169 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 164 "root_numpy/src/tree.pyx" +#line 169 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":168 + /* "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) # <<<<<<<<<<<<<< @@ -12785,19 +12851,19 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * branch_dict = None */ -#line 168 "root_numpy/src/tree.pyx" +#line 173 "root_numpy/src/tree.pyx" __pyx_v_chain->AddFormula(__pyx_v_selection_formula); -#line 168 "root_numpy/src/tree.pyx" +#line 173 "root_numpy/src/tree.pyx" goto __pyx_L10; -#line 168 "root_numpy/src/tree.pyx" +#line 173 "root_numpy/src/tree.pyx" } -#line 168 "root_numpy/src/tree.pyx" +#line 173 "root_numpy/src/tree.pyx" __pyx_L10:; - /* "root_numpy/src/tree.pyx":170 + /* "root_numpy/src/tree.pyx":175 * chain.AddFormula(selection_formula) * * branch_dict = None # <<<<<<<<<<<<<< @@ -12805,13 +12871,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * branch_dict = dict([(b, idx) for idx, b in enumerate(branches)]) */ -#line 170 "root_numpy/src/tree.pyx" +#line 175 "root_numpy/src/tree.pyx" __Pyx_INCREF(Py_None); -#line 170 "root_numpy/src/tree.pyx" +#line 175 "root_numpy/src/tree.pyx" __pyx_v_branch_dict = Py_None; - /* "root_numpy/src/tree.pyx":171 + /* "root_numpy/src/tree.pyx":176 * * branch_dict = None * if num_requested_branches > 0: # <<<<<<<<<<<<<< @@ -12819,13 +12885,13 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * if len(branch_dict) != num_requested_branches: */ -#line 171 "root_numpy/src/tree.pyx" +#line 176 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 171 "root_numpy/src/tree.pyx" +#line 176 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":172 + /* "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)]) # <<<<<<<<<<<<<< @@ -12833,226 +12899,226 @@ static PyObject *__pyx_f_13_librootnumpy_tree2array(TTree *__pyx_v_tree, PyObjec * raise ValueError("duplicate branches requested") */ -#line 172 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_int_0); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_8 = __pyx_int_0; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_v_branches)) || PyTuple_CheckExact(__pyx_v_branches)) { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_11 = __pyx_v_branches; __Pyx_INCREF(__pyx_t_11); __pyx_t_4 = 0; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_12 = NULL; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } else { __pyx_t_4 = -1; -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_11); -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" for (;;) { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (likely(!__pyx_t_12)) { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_11))) { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_11)) break; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" #else -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" #endif -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } else { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_11)) break; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" #else -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" #endif -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } } else -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_9 = __pyx_t_12(__pyx_t_11); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (unlikely(!__pyx_t_9)) { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (exc_type) { -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 172 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 177 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" break; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_9); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_8); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_idx, __pyx_t_8); -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_8 = __pyx_t_9; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; -#line 172 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(2); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_b); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_v_b); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_b); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_idx); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_v_idx); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_idx); -#line 172 "root_numpy/src/tree.pyx" - if (unlikely(__Pyx_ListComp_Append(__pyx_t_2, (PyObject*)__pyx_t_9))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" } -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 172 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 172 "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 = 172; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_v_branch_dict, __pyx_t_2); -#line 172 "root_numpy/src/tree.pyx" +#line 177 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":173 + /* "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: # <<<<<<<<<<<<<< @@ -13060,16 +13126,16 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * */ -#line 173 "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 = 173; __pyx_clineno = __LINE__; goto __pyx_L8_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 173 "root_numpy/src/tree.pyx" +#line 178 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_t_4 != __pyx_v_num_requested_branches) != 0); -#line 173 "root_numpy/src/tree.pyx" +#line 178 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":174 + /* "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") # <<<<<<<<<<<<<< @@ -13077,34 +13143,34 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # Build vector of Converters for branches */ -#line 174 "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 = 174; __pyx_clineno = __LINE__; goto __pyx_L8_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 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 174 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 179 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" } -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" goto __pyx_L14; -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" } -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" __pyx_L14:; - /* "root_numpy/src/tree.pyx":177 + /* "root_numpy/src/tree.pyx":182 * * # Build vector of Converters for branches * for ibranch in range(num_branches): # <<<<<<<<<<<<<< @@ -13112,16 +13178,16 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * branch_name = tbranch.GetName() */ -#line 177 "root_numpy/src/tree.pyx" +#line 182 "root_numpy/src/tree.pyx" __pyx_t_13 = __pyx_v_num_branches; -#line 177 "root_numpy/src/tree.pyx" +#line 182 "root_numpy/src/tree.pyx" for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 177 "root_numpy/src/tree.pyx" +#line 182 "root_numpy/src/tree.pyx" __pyx_v_ibranch = __pyx_t_14; - /* "root_numpy/src/tree.pyx":178 + /* "root_numpy/src/tree.pyx":183 * # Build vector of Converters for branches * for ibranch in range(num_branches): * tbranch = branch_array.At(ibranch) # <<<<<<<<<<<<<< @@ -13129,10 +13195,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * if num_requested_branches > 0: */ -#line 178 "root_numpy/src/tree.pyx" +#line 183 "root_numpy/src/tree.pyx" __pyx_v_tbranch = ((TBranch *)__pyx_v_branch_array->At(__pyx_v_ibranch)); - /* "root_numpy/src/tree.pyx":179 + /* "root_numpy/src/tree.pyx":184 * for ibranch in range(num_branches): * tbranch = branch_array.At(ibranch) * branch_name = tbranch.GetName() # <<<<<<<<<<<<<< @@ -13140,10 +13206,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * if len(branch_dict) == 0: */ -#line 179 "root_numpy/src/tree.pyx" +#line 184 "root_numpy/src/tree.pyx" __pyx_v_branch_name = __pyx_v_tbranch->GetName(); - /* "root_numpy/src/tree.pyx":180 + /* "root_numpy/src/tree.pyx":185 * tbranch = branch_array.At(ibranch) * branch_name = tbranch.GetName() * if num_requested_branches > 0: # <<<<<<<<<<<<<< @@ -13151,13 +13217,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # No more branches to consider */ -#line 180 "root_numpy/src/tree.pyx" +#line 185 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 180 "root_numpy/src/tree.pyx" +#line 185 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":181 + /* "root_numpy/src/tree.pyx":186 * branch_name = tbranch.GetName() * if num_requested_branches > 0: * if len(branch_dict) == 0: # <<<<<<<<<<<<<< @@ -13165,16 +13231,16 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * break */ -#line 181 "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 = 181; __pyx_clineno = __LINE__; goto __pyx_L8_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 181 "root_numpy/src/tree.pyx" +#line 186 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_t_4 == 0) != 0); -#line 181 "root_numpy/src/tree.pyx" +#line 186 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":183 + /* "root_numpy/src/tree.pyx":188 * if len(branch_dict) == 0: * # No more branches to consider * break # <<<<<<<<<<<<<< @@ -13182,13 +13248,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * if branch_idx == -1: */ -#line 183 "root_numpy/src/tree.pyx" +#line 188 "root_numpy/src/tree.pyx" goto __pyx_L19_break; -#line 183 "root_numpy/src/tree.pyx" +#line 188 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":184 + /* "root_numpy/src/tree.pyx":189 * # No more branches to consider * break * branch_idx = branch_dict.pop(branch_name, -1) # <<<<<<<<<<<<<< @@ -13196,109 +13262,109 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # This branch was not selected by the user */ -#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_11); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __pyx_t_9 = NULL; -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_8); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" if (likely(__pyx_t_9)) { -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_9); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_8, function); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __pyx_t_4 = 1; -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" } -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" } -#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_10); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" if (__pyx_t_9) { -#line 184 "root_numpy/src/tree.pyx" +#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 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" } -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_10, 0+__pyx_t_4, __pyx_t_11); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_11); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_int_neg_1); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_4, __pyx_int_neg_1); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_int_neg_1); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __pyx_t_11 = 0; -#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 184 "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 = 184; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 184 "root_numpy/src/tree.pyx" +#line 189 "root_numpy/src/tree.pyx" __pyx_v_branch_idx = __pyx_t_15; - /* "root_numpy/src/tree.pyx":185 + /* "root_numpy/src/tree.pyx":190 * break * branch_idx = branch_dict.pop(branch_name, -1) * if branch_idx == -1: # <<<<<<<<<<<<<< @@ -13306,13 +13372,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * continue */ -#line 185 "root_numpy/src/tree.pyx" +#line 190 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_branch_idx == -1) != 0); -#line 185 "root_numpy/src/tree.pyx" +#line 190 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":187 + /* "root_numpy/src/tree.pyx":192 * if branch_idx == -1: * # This branch was not selected by the user * continue # <<<<<<<<<<<<<< @@ -13320,22 +13386,22 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * leaf_array = tbranch.GetListOfLeaves() */ -#line 187 "root_numpy/src/tree.pyx" +#line 192 "root_numpy/src/tree.pyx" goto __pyx_L18_continue; -#line 187 "root_numpy/src/tree.pyx" +#line 192 "root_numpy/src/tree.pyx" } -#line 187 "root_numpy/src/tree.pyx" +#line 192 "root_numpy/src/tree.pyx" goto __pyx_L20; -#line 187 "root_numpy/src/tree.pyx" +#line 192 "root_numpy/src/tree.pyx" } -#line 187 "root_numpy/src/tree.pyx" +#line 192 "root_numpy/src/tree.pyx" __pyx_L20:; - /* "root_numpy/src/tree.pyx":189 + /* "root_numpy/src/tree.pyx":194 * continue * * leaf_array = tbranch.GetListOfLeaves() # <<<<<<<<<<<<<< @@ -13343,10 +13409,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * */ -#line 189 "root_numpy/src/tree.pyx" +#line 194 "root_numpy/src/tree.pyx" __pyx_v_leaf_array = __pyx_v_tbranch->GetListOfLeaves(); - /* "root_numpy/src/tree.pyx":190 + /* "root_numpy/src/tree.pyx":195 * * leaf_array = tbranch.GetListOfLeaves() * shortname = leaf_array.GetEntries() == 1 # <<<<<<<<<<<<<< @@ -13354,10 +13420,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * for ileaf in range(leaf_array.GetEntries()): */ -#line 190 "root_numpy/src/tree.pyx" +#line 195 "root_numpy/src/tree.pyx" __pyx_v_shortname = (__pyx_v_leaf_array->GetEntries() == 1); - /* "root_numpy/src/tree.pyx":192 + /* "root_numpy/src/tree.pyx":197 * shortname = leaf_array.GetEntries() == 1 * * for ileaf in range(leaf_array.GetEntries()): # <<<<<<<<<<<<<< @@ -13365,16 +13431,16 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * leaf_name = tleaf.GetName() */ -#line 192 "root_numpy/src/tree.pyx" +#line 197 "root_numpy/src/tree.pyx" __pyx_t_15 = __pyx_v_leaf_array->GetEntries(); -#line 192 "root_numpy/src/tree.pyx" +#line 197 "root_numpy/src/tree.pyx" for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { -#line 192 "root_numpy/src/tree.pyx" +#line 197 "root_numpy/src/tree.pyx" __pyx_v_ileaf = __pyx_t_16; - /* "root_numpy/src/tree.pyx":193 + /* "root_numpy/src/tree.pyx":198 * * for ileaf in range(leaf_array.GetEntries()): * tleaf = leaf_array.At(ileaf) # <<<<<<<<<<<<<< @@ -13382,10 +13448,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * conv = get_converter(tleaf) */ -#line 193 "root_numpy/src/tree.pyx" +#line 198 "root_numpy/src/tree.pyx" __pyx_v_tleaf = ((TLeaf *)__pyx_v_leaf_array->At(__pyx_v_ileaf)); - /* "root_numpy/src/tree.pyx":194 + /* "root_numpy/src/tree.pyx":199 * for ileaf in range(leaf_array.GetEntries()): * tleaf = leaf_array.At(ileaf) * leaf_name = tleaf.GetName() # <<<<<<<<<<<<<< @@ -13393,10 +13459,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * if conv != NULL: */ -#line 194 "root_numpy/src/tree.pyx" +#line 199 "root_numpy/src/tree.pyx" __pyx_v_leaf_name = __pyx_v_tleaf->GetName(); - /* "root_numpy/src/tree.pyx":195 + /* "root_numpy/src/tree.pyx":200 * tleaf = leaf_array.At(ileaf) * leaf_name = tleaf.GetName() * conv = get_converter(tleaf) # <<<<<<<<<<<<<< @@ -13404,10 +13470,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # A converter exists for this leaf */ -#line 195 "root_numpy/src/tree.pyx" +#line 200 "root_numpy/src/tree.pyx" __pyx_v_conv = __pyx_f_13_librootnumpy_get_converter(__pyx_v_tleaf); - /* "root_numpy/src/tree.pyx":196 + /* "root_numpy/src/tree.pyx":201 * leaf_name = tleaf.GetName() * conv = get_converter(tleaf) * if conv != NULL: # <<<<<<<<<<<<<< @@ -13415,13 +13481,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * column_name = string(branch_name) */ -#line 196 "root_numpy/src/tree.pyx" +#line 201 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_conv != NULL) != 0); -#line 196 "root_numpy/src/tree.pyx" +#line 201 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":198 + /* "root_numpy/src/tree.pyx":203 * if conv != NULL: * # A converter exists for this leaf * column_name = string(branch_name) # <<<<<<<<<<<<<< @@ -13429,28 +13495,28 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * column_name.append( '_') */ -#line 198 "root_numpy/src/tree.pyx" +#line 203 "root_numpy/src/tree.pyx" try { -#line 198 "root_numpy/src/tree.pyx" +#line 203 "root_numpy/src/tree.pyx" __pyx_t_17 = std::string(__pyx_v_branch_name); -#line 198 "root_numpy/src/tree.pyx" +#line 203 "root_numpy/src/tree.pyx" } catch(...) { -#line 198 "root_numpy/src/tree.pyx" +#line 203 "root_numpy/src/tree.pyx" __Pyx_CppExn2PyErr(); -#line 198 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 203 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 203; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 198 "root_numpy/src/tree.pyx" +#line 203 "root_numpy/src/tree.pyx" } -#line 198 "root_numpy/src/tree.pyx" +#line 203 "root_numpy/src/tree.pyx" __pyx_v_column_name = __pyx_t_17; - /* "root_numpy/src/tree.pyx":199 + /* "root_numpy/src/tree.pyx":204 * # A converter exists for this leaf * column_name = string(branch_name) * if not shortname: # <<<<<<<<<<<<<< @@ -13458,13 +13524,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * column_name.append(leaf_name) */ -#line 199 "root_numpy/src/tree.pyx" +#line 204 "root_numpy/src/tree.pyx" __pyx_t_3 = ((!(__pyx_v_shortname != 0)) != 0); -#line 199 "root_numpy/src/tree.pyx" +#line 204 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":200 + /* "root_numpy/src/tree.pyx":205 * column_name = string(branch_name) * if not shortname: * column_name.append( '_') # <<<<<<<<<<<<<< @@ -13472,13 +13538,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # Create a column for this branch/leaf pair */ -#line 200 "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 = 200; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 200 "root_numpy/src/tree.pyx" +#line 205 "root_numpy/src/tree.pyx" __pyx_v_column_name.append(((std::string)__pyx_t_17)); - /* "root_numpy/src/tree.pyx":201 + /* "root_numpy/src/tree.pyx":206 * if not shortname: * column_name.append( '_') * column_name.append(leaf_name) # <<<<<<<<<<<<<< @@ -13486,19 +13552,19 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * col = new BranchColumn(column_name, tleaf) */ -#line 201 "root_numpy/src/tree.pyx" +#line 206 "root_numpy/src/tree.pyx" __pyx_v_column_name.append(__pyx_v_leaf_name); -#line 201 "root_numpy/src/tree.pyx" +#line 206 "root_numpy/src/tree.pyx" goto __pyx_L26; -#line 201 "root_numpy/src/tree.pyx" +#line 206 "root_numpy/src/tree.pyx" } -#line 201 "root_numpy/src/tree.pyx" +#line 206 "root_numpy/src/tree.pyx" __pyx_L26:; - /* "root_numpy/src/tree.pyx":203 + /* "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) # <<<<<<<<<<<<<< @@ -13506,10 +13572,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * if num_requested_branches > 0: */ -#line 203 "root_numpy/src/tree.pyx" +#line 208 "root_numpy/src/tree.pyx" __pyx_v_col = new BranchColumn(__pyx_v_column_name, __pyx_v_tleaf); - /* "root_numpy/src/tree.pyx":205 + /* "root_numpy/src/tree.pyx":210 * col = new BranchColumn(column_name, tleaf) * * if num_requested_branches > 0: # <<<<<<<<<<<<<< @@ -13517,13 +13583,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * converter_buckets[branch_idx].push_back(conv) */ -#line 205 "root_numpy/src/tree.pyx" +#line 210 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 205 "root_numpy/src/tree.pyx" +#line 210 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":206 + /* "root_numpy/src/tree.pyx":211 * * if num_requested_branches > 0: * column_buckets[branch_idx].push_back(col) # <<<<<<<<<<<<<< @@ -13531,10 +13597,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * else: */ -#line 206 "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); - /* "root_numpy/src/tree.pyx":207 + /* "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) # <<<<<<<<<<<<<< @@ -13542,19 +13608,19 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * columns.push_back(col) */ -#line 207 "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 207 "root_numpy/src/tree.pyx" +#line 212 "root_numpy/src/tree.pyx" goto __pyx_L27; -#line 207 "root_numpy/src/tree.pyx" +#line 212 "root_numpy/src/tree.pyx" } -#line 207 "root_numpy/src/tree.pyx" +#line 212 "root_numpy/src/tree.pyx" /*else*/ { - /* "root_numpy/src/tree.pyx":209 + /* "root_numpy/src/tree.pyx":214 * converter_buckets[branch_idx].push_back(conv) * else: * columns.push_back(col) # <<<<<<<<<<<<<< @@ -13562,10 +13628,10 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * */ -#line 209 "root_numpy/src/tree.pyx" +#line 214 "root_numpy/src/tree.pyx" __pyx_v_columns.push_back(__pyx_v_col); - /* "root_numpy/src/tree.pyx":210 + /* "root_numpy/src/tree.pyx":215 * else: * columns.push_back(col) * converters.push_back(conv) # <<<<<<<<<<<<<< @@ -13573,16 +13639,16 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * chain.AddColumn(string(branch_name), string(leaf_name), */ -#line 210 "root_numpy/src/tree.pyx" +#line 215 "root_numpy/src/tree.pyx" __pyx_v_converters.push_back(__pyx_v_conv); -#line 210 "root_numpy/src/tree.pyx" +#line 215 "root_numpy/src/tree.pyx" } -#line 210 "root_numpy/src/tree.pyx" +#line 215 "root_numpy/src/tree.pyx" __pyx_L27:; - /* "root_numpy/src/tree.pyx":212 + /* "root_numpy/src/tree.pyx":217 * converters.push_back(conv) * * chain.AddColumn(string(branch_name), string(leaf_name), # <<<<<<<<<<<<<< @@ -13590,43 +13656,43 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * */ -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" try { -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" __pyx_t_17 = std::string(__pyx_v_branch_name); -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" } catch(...) { -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" __Pyx_CppExn2PyErr(); -#line 212 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 217 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" } -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" try { -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" __pyx_t_18 = std::string(__pyx_v_leaf_name); -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" } catch(...) { -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" __Pyx_CppExn2PyErr(); -#line 212 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 217 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 212 "root_numpy/src/tree.pyx" +#line 217 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":213 + /* "root_numpy/src/tree.pyx":218 * * chain.AddColumn(string(branch_name), string(leaf_name), * col) # <<<<<<<<<<<<<< @@ -13634,16 +13700,16 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * elif num_requested_branches > 0: */ -#line 213 "root_numpy/src/tree.pyx" +#line 218 "root_numpy/src/tree.pyx" __pyx_v_chain->AddColumn(__pyx_t_17, __pyx_t_18, ((BranchColumn *)__pyx_v_col)); -#line 213 "root_numpy/src/tree.pyx" +#line 218 "root_numpy/src/tree.pyx" goto __pyx_L25; -#line 213 "root_numpy/src/tree.pyx" +#line 218 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":215 + /* "root_numpy/src/tree.pyx":220 * col) * * elif num_requested_branches > 0: # <<<<<<<<<<<<<< @@ -13651,13 +13717,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # converter to handle it */ -#line 215 "root_numpy/src/tree.pyx" +#line 220 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 215 "root_numpy/src/tree.pyx" +#line 220 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":220 + /* "root_numpy/src/tree.pyx":225 * raise TypeError( * "cannot convert leaf '{0}' of branch '{1}' " * "with type '{2}'".format( # <<<<<<<<<<<<<< @@ -13665,13 +13731,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * resolve_type(tleaf.GetTypeName()))) */ -#line 220 "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 = 220; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 220 "root_numpy/src/tree.pyx" +#line 225 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); - /* "root_numpy/src/tree.pyx":221 + /* "root_numpy/src/tree.pyx":226 * "cannot convert leaf '{0}' of branch '{1}' " * "with type '{2}'".format( * branch_name, leaf_name, # <<<<<<<<<<<<<< @@ -13679,19 +13745,19 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * else: */ -#line 221 "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 = 221; __pyx_clineno = __LINE__; goto __pyx_L8_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 221 "root_numpy/src/tree.pyx" +#line 226 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_10); -#line 221 "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 = 221; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 221 "root_numpy/src/tree.pyx" +#line 226 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_11); - /* "root_numpy/src/tree.pyx":222 + /* "root_numpy/src/tree.pyx":227 * "with type '{2}'".format( * branch_name, leaf_name, * resolve_type(tleaf.GetTypeName()))) # <<<<<<<<<<<<<< @@ -13699,103 +13765,103 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * # Just warn that this branch cannot be converted */ -#line 222 "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 = 222; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_19 = NULL; -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_8))) { -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_8); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" if (likely(__pyx_t_19)) { -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_19); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_8, function); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_4 = 1; -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" } -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" } -#line 222 "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 = 220; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" if (__pyx_t_19) { -#line 222 "root_numpy/src/tree.pyx" +#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 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" } -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_20, 0+__pyx_t_4, __pyx_t_10); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_10); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_20, 1+__pyx_t_4, __pyx_t_11); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_11); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_20, 2+__pyx_t_4, __pyx_t_9); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_10 = 0; -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_11 = 0; -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; -#line 222 "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 = 220; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 222 "root_numpy/src/tree.pyx" +#line 227 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":218 + /* "root_numpy/src/tree.pyx":223 * # User explicitly requested this branch but there is no * # converter to handle it * raise TypeError( # <<<<<<<<<<<<<< @@ -13803,46 +13869,46 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * "with type '{2}'".format( */ -#line 218 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_2); -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 218 "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 = 218; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 218 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 223 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" } -#line 218 "root_numpy/src/tree.pyx" +#line 223 "root_numpy/src/tree.pyx" /*else*/ { - /* "root_numpy/src/tree.pyx":225 + /* "root_numpy/src/tree.pyx":230 * else: * # Just warn that this branch cannot be converted * warnings.warn( # <<<<<<<<<<<<<< @@ -13850,22 +13916,22 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * "with type '{2}' (skipping)".format( */ -#line 225 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 225 "root_numpy/src/tree.pyx" +#line 230 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 225 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 225 "root_numpy/src/tree.pyx" +#line 230 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 225 "root_numpy/src/tree.pyx" +#line 230 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":227 + /* "root_numpy/src/tree.pyx":232 * warnings.warn( * "cannot convert leaf '{0}' of branch '{1}' " * "with type '{2}' (skipping)".format( # <<<<<<<<<<<<<< @@ -13873,13 +13939,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * resolve_type(tleaf.GetTypeName())), */ -#line 227 "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 = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 227 "root_numpy/src/tree.pyx" +#line 232 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); - /* "root_numpy/src/tree.pyx":228 + /* "root_numpy/src/tree.pyx":233 * "cannot convert leaf '{0}' of branch '{1}' " * "with type '{2}' (skipping)".format( * branch_name, leaf_name, # <<<<<<<<<<<<<< @@ -13887,19 +13953,19 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * RootNumpyUnconvertibleWarning) */ -#line 228 "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 = 228; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 228 "root_numpy/src/tree.pyx" +#line 233 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_11); -#line 228 "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 = 228; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 228 "root_numpy/src/tree.pyx" +#line 233 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_10); - /* "root_numpy/src/tree.pyx":229 + /* "root_numpy/src/tree.pyx":234 * "with type '{2}' (skipping)".format( * branch_name, leaf_name, * resolve_type(tleaf.GetTypeName())), # <<<<<<<<<<<<<< @@ -13907,103 +13973,103 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * */ -#line 229 "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 = 229; __pyx_clineno = __LINE__; goto __pyx_L8_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 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_21 = NULL; -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_9))) { -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_21 = PyMethod_GET_SELF(__pyx_t_9); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" if (likely(__pyx_t_21)) { -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_21); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_9, function); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_4 = 1; -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" } -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" } -#line 229 "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 = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_22); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" if (__pyx_t_21) { -#line 229 "root_numpy/src/tree.pyx" +#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 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" } -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_22, 0+__pyx_t_4, __pyx_t_11); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_11); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_22, 1+__pyx_t_4, __pyx_t_10); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_10); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_22, 2+__pyx_t_4, __pyx_t_19); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_19); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_11 = 0; -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_10 = 0; -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __pyx_t_19 = 0; -#line 229 "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 = 227; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_22); __pyx_t_22 = 0; -#line 229 "root_numpy/src/tree.pyx" +#line 234 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":230 + /* "root_numpy/src/tree.pyx":235 * branch_name, leaf_name, * resolve_type(tleaf.GetTypeName())), * RootNumpyUnconvertibleWarning) # <<<<<<<<<<<<<< @@ -14011,115 +14077,115 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * if num_requested_branches > 0: */ -#line 230 "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 = 230; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_t_22 = NULL; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_20))) { -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_t_22 = PyMethod_GET_SELF(__pyx_t_20); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" if (likely(__pyx_t_22)) { -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_20); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_22); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_20, function); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_t_4 = 1; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" } -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" } -#line 230 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" if (__pyx_t_22) { -#line 230 "root_numpy/src/tree.pyx" +#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 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" } -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_19, 0+__pyx_t_4, __pyx_t_8); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_4, __pyx_t_9); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; -#line 230 "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 = 225; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" } -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_L25:; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" } -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_L18_continue:; -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" } -#line 230 "root_numpy/src/tree.pyx" +#line 235 "root_numpy/src/tree.pyx" __pyx_L19_break:; - /* "root_numpy/src/tree.pyx":232 + /* "root_numpy/src/tree.pyx":237 * RootNumpyUnconvertibleWarning) * * if num_requested_branches > 0: # <<<<<<<<<<<<<< @@ -14127,13 +14193,13 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * for expression in branch_dict.keys(): */ -#line 232 "root_numpy/src/tree.pyx" +#line 237 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_requested_branches > 0) != 0); -#line 232 "root_numpy/src/tree.pyx" +#line 237 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":234 + /* "root_numpy/src/tree.pyx":239 * if num_requested_branches > 0: * # Attempt to interpret remaining "branches" as expressions * for expression in branch_dict.keys(): # <<<<<<<<<<<<<< @@ -14141,187 +14207,187 @@ __pyx_t_11 = PyObject_GetIter(__pyx_v_branches); if (unlikely(!__pyx_t_11)) {__p * c_string = expression */ -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __pyx_t_19 = NULL; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_20))) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __pyx_t_19 = PyMethod_GET_SELF(__pyx_t_20); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (likely(__pyx_t_19)) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_20); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_19); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_20, function); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (__pyx_t_19) { -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } else { -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __pyx_t_20 = __pyx_t_2; __Pyx_INCREF(__pyx_t_20); __pyx_t_4 = 0; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __pyx_t_12 = NULL; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } else { __pyx_t_4 = -1; -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" for (;;) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (likely(!__pyx_t_12)) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_20))) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_20)) break; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" #else -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" #endif -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } else { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_20)) break; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" #else -#line 234 "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 = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" #endif -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } } else -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __pyx_t_2 = __pyx_t_12(__pyx_t_20); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (unlikely(!__pyx_t_2)) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (exc_type) { -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); -#line 234 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 239 "root_numpy/src/tree.pyx" + else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" break; -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_expression, __pyx_t_2); -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":235 + /* "root_numpy/src/tree.pyx":240 * # Attempt to interpret remaining "branches" as expressions * for expression in branch_dict.keys(): * branch_idx = branch_dict[expression] # <<<<<<<<<<<<<< @@ -14329,22 +14395,22 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * formula = new TTreeFormula(c_string, c_string, tree) */ -#line 235 "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 = 235; __pyx_clineno = __LINE__; goto __pyx_L8_error;}; +#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 235 "root_numpy/src/tree.pyx" +#line 240 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 235 "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 = 235; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 235 "root_numpy/src/tree.pyx" +#line 240 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 235 "root_numpy/src/tree.pyx" +#line 240 "root_numpy/src/tree.pyx" __pyx_v_branch_idx = __pyx_t_13; - /* "root_numpy/src/tree.pyx":236 + /* "root_numpy/src/tree.pyx":241 * for expression in branch_dict.keys(): * branch_idx = branch_dict[expression] * c_string = expression # <<<<<<<<<<<<<< @@ -14352,13 +14418,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * if formula == NULL or formula.GetNdim() == 0: */ -#line 236 "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 = 236; __pyx_clineno = __LINE__; goto __pyx_L8_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 236 "root_numpy/src/tree.pyx" +#line 241 "root_numpy/src/tree.pyx" __pyx_v_c_string = __pyx_t_23; - /* "root_numpy/src/tree.pyx":237 + /* "root_numpy/src/tree.pyx":242 * branch_idx = branch_dict[expression] * c_string = expression * formula = new TTreeFormula(c_string, c_string, tree) # <<<<<<<<<<<<<< @@ -14366,10 +14432,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * del formula */ -#line 237 "root_numpy/src/tree.pyx" +#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":238 + /* "root_numpy/src/tree.pyx":243 * c_string = expression * formula = new TTreeFormula(c_string, c_string, tree) * if formula == NULL or formula.GetNdim() == 0: # <<<<<<<<<<<<<< @@ -14377,37 +14443,37 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * raise ValueError( */ -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_formula == NULL) != 0); -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" if (!__pyx_t_1) { -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" } else { -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" __pyx_t_3 = __pyx_t_1; -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" goto __pyx_L32_bool_binop_done; -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" } -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" __pyx_t_1 = ((__pyx_v_formula->GetNdim() == 0) != 0); -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" __pyx_t_3 = __pyx_t_1; -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" __pyx_L32_bool_binop_done:; -#line 238 "root_numpy/src/tree.pyx" +#line 243 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":239 + /* "root_numpy/src/tree.pyx":244 * formula = new TTreeFormula(c_string, c_string, tree) * if formula == NULL or formula.GetNdim() == 0: * del formula # <<<<<<<<<<<<<< @@ -14415,10 +14481,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * "the branch or expression '{0}' " */ -#line 239 "root_numpy/src/tree.pyx" +#line 244 "root_numpy/src/tree.pyx" delete __pyx_v_formula; - /* "root_numpy/src/tree.pyx":242 + /* "root_numpy/src/tree.pyx":247 * raise ValueError( * "the branch or expression '{0}' " * "is not present or valid".format(expression)) # <<<<<<<<<<<<<< @@ -14426,88 +14492,88 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # rolling over to the next tree. */ -#line 242 "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 = 242; __pyx_clineno = __LINE__; goto __pyx_L8_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 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __pyx_t_9 = NULL; -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_19); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" if (likely(__pyx_t_9)) { -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_9); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_19, function); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" if (!__pyx_t_9) { -#line 242 "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 = 242; __pyx_clineno = __LINE__; goto __pyx_L8_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 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } else { -#line 242 "root_numpy/src/tree.pyx" - __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L8_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 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 242 "root_numpy/src/tree.pyx" +#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 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_expression); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_v_expression); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_expression); -#line 242 "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 = 242; __pyx_clineno = __LINE__; goto __pyx_L8_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 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" } -#line 242 "root_numpy/src/tree.pyx" +#line 247 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - /* "root_numpy/src/tree.pyx":240 + /* "root_numpy/src/tree.pyx":245 * if formula == NULL or formula.GetNdim() == 0: * del formula * raise ValueError( # <<<<<<<<<<<<<< @@ -14515,43 +14581,43 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * "is not present or valid".format(expression)) */ -#line 240 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyTuple_New(1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L8_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 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_2); -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 240 "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 = 240; __pyx_clineno = __LINE__; goto __pyx_L8_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 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 240 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 245 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 240 "root_numpy/src/tree.pyx" +#line 245 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":245 + /* "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) # <<<<<<<<<<<<<< @@ -14559,10 +14625,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * conv = find_converter_by_typename('double') */ -#line 245 "root_numpy/src/tree.pyx" +#line 250 "root_numpy/src/tree.pyx" __pyx_v_chain->AddFormula(__pyx_v_formula); - /* "root_numpy/src/tree.pyx":246 + /* "root_numpy/src/tree.pyx":251 * # rolling over to the next tree. * chain.AddFormula(formula) * col = new FormulaColumn(expression, formula) # <<<<<<<<<<<<<< @@ -14570,13 +14636,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * if conv == NULL: */ -#line 246 "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 = 246; __pyx_clineno = __LINE__; goto __pyx_L8_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 246 "root_numpy/src/tree.pyx" +#line 251 "root_numpy/src/tree.pyx" __pyx_v_col = new FormulaColumn(__pyx_t_18, __pyx_v_formula); - /* "root_numpy/src/tree.pyx":247 + /* "root_numpy/src/tree.pyx":252 * chain.AddFormula(formula) * col = new FormulaColumn(expression, formula) * conv = find_converter_by_typename('double') # <<<<<<<<<<<<<< @@ -14584,13 +14650,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Oops, this should never happen */ -#line 247 "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 = 247; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 247 "root_numpy/src/tree.pyx" +#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":248 + /* "root_numpy/src/tree.pyx":253 * col = new FormulaColumn(expression, formula) * conv = find_converter_by_typename('double') * if conv == NULL: # <<<<<<<<<<<<<< @@ -14598,13 +14664,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * raise AssertionError( */ -#line 248 "root_numpy/src/tree.pyx" +#line 253 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_conv == NULL) != 0); -#line 248 "root_numpy/src/tree.pyx" +#line 253 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":250 + /* "root_numpy/src/tree.pyx":255 * if conv == NULL: * # Oops, this should never happen * raise AssertionError( # <<<<<<<<<<<<<< @@ -14612,25 +14678,25 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * */ -#line 250 "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 = 250; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 250 "root_numpy/src/tree.pyx" +#line 255 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 250 "root_numpy/src/tree.pyx" +#line 255 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_2, 0, 0, 0); -#line 250 "root_numpy/src/tree.pyx" +#line 255 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 250 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 250; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 255 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 250 "root_numpy/src/tree.pyx" +#line 255 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":253 + /* "root_numpy/src/tree.pyx":258 * "could not find double converter for formula") * * column_buckets[branch_idx].push_back(col) # <<<<<<<<<<<<<< @@ -14638,10 +14704,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * */ -#line 253 "root_numpy/src/tree.pyx" +#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":254 + /* "root_numpy/src/tree.pyx":259 * * column_buckets[branch_idx].push_back(col) * converter_buckets[branch_idx].push_back(conv) # <<<<<<<<<<<<<< @@ -14649,10 +14715,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Flatten buckets into 1D vectors, thus preserving branch order */ -#line 254 "root_numpy/src/tree.pyx" +#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":234 + /* "root_numpy/src/tree.pyx":239 * if num_requested_branches > 0: * # Attempt to interpret remaining "branches" as expressions * for expression in branch_dict.keys(): # <<<<<<<<<<<<<< @@ -14660,13 +14726,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * c_string = expression */ -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" } -#line 234 "root_numpy/src/tree.pyx" +#line 239 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; - /* "root_numpy/src/tree.pyx":257 + /* "root_numpy/src/tree.pyx":262 * * # Flatten buckets into 1D vectors, thus preserving branch order * for branch_idx in range(num_requested_branches): # <<<<<<<<<<<<<< @@ -14674,16 +14740,16 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * column_buckets[branch_idx].begin(), */ -#line 257 "root_numpy/src/tree.pyx" +#line 262 "root_numpy/src/tree.pyx" __pyx_t_13 = __pyx_v_num_requested_branches; -#line 257 "root_numpy/src/tree.pyx" +#line 262 "root_numpy/src/tree.pyx" for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 257 "root_numpy/src/tree.pyx" +#line 262 "root_numpy/src/tree.pyx" __pyx_v_branch_idx = __pyx_t_14; - /* "root_numpy/src/tree.pyx":258 + /* "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(), # <<<<<<<<<<<<<< @@ -14691,10 +14757,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * column_buckets[branch_idx].end()) */ -#line 258 "root_numpy/src/tree.pyx" +#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":261 + /* "root_numpy/src/tree.pyx":266 * column_buckets[branch_idx].begin(), * column_buckets[branch_idx].end()) * converters.insert(converters.end(), # <<<<<<<<<<<<<< @@ -14702,19 +14768,19 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * converter_buckets[branch_idx].end()) */ -#line 261 "root_numpy/src/tree.pyx" +#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 261 "root_numpy/src/tree.pyx" +#line 266 "root_numpy/src/tree.pyx" } -#line 261 "root_numpy/src/tree.pyx" +#line 266 "root_numpy/src/tree.pyx" goto __pyx_L28; -#line 261 "root_numpy/src/tree.pyx" +#line 266 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":265 + /* "root_numpy/src/tree.pyx":270 * converter_buckets[branch_idx].end()) * * elif columns.size() == 0: # <<<<<<<<<<<<<< @@ -14722,13 +14788,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * */ -#line 265 "root_numpy/src/tree.pyx" +#line 270 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_columns.size() == 0) != 0); -#line 265 "root_numpy/src/tree.pyx" +#line 270 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":266 + /* "root_numpy/src/tree.pyx":271 * * elif columns.size() == 0: * raise RuntimeError("unable to convert any branches in this tree") # <<<<<<<<<<<<<< @@ -14736,28 +14802,28 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Activate branches used by formulae and columns */ -#line 266 "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 = 266; __pyx_clineno = __LINE__; goto __pyx_L8_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 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_20, 0, 0, 0); -#line 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 266 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 271 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" } -#line 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" __pyx_L28:; - /* "root_numpy/src/tree.pyx":270 + /* "root_numpy/src/tree.pyx":275 * # Activate branches used by formulae and columns * # and deactivate all others * chain.InitBranches() # <<<<<<<<<<<<<< @@ -14765,10 +14831,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Now that we have all the columns we can */ -#line 270 "root_numpy/src/tree.pyx" +#line 275 "root_numpy/src/tree.pyx" __pyx_v_chain->InitBranches(); - /* "root_numpy/src/tree.pyx":274 + /* "root_numpy/src/tree.pyx":279 * # Now that we have all the columns we can * # make an appropriate array structure * dtype = [] # <<<<<<<<<<<<<< @@ -14776,19 +14842,19 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * this_col = columns[icol] */ -#line 274 "root_numpy/src/tree.pyx" - __pyx_t_20 = PyList_New(0); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 274 "root_numpy/src/tree.pyx" +#line 279 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 274 "root_numpy/src/tree.pyx" +#line 279 "root_numpy/src/tree.pyx" __pyx_v_dtype = ((PyObject*)__pyx_t_20); -#line 274 "root_numpy/src/tree.pyx" +#line 279 "root_numpy/src/tree.pyx" __pyx_t_20 = 0; - /* "root_numpy/src/tree.pyx":275 + /* "root_numpy/src/tree.pyx":280 * # make an appropriate array structure * dtype = [] * for icol in range(columns.size()): # <<<<<<<<<<<<<< @@ -14796,16 +14862,16 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * this_conv = converters[icol] */ -#line 275 "root_numpy/src/tree.pyx" +#line 280 "root_numpy/src/tree.pyx" __pyx_t_24 = __pyx_v_columns.size(); -#line 275 "root_numpy/src/tree.pyx" +#line 280 "root_numpy/src/tree.pyx" for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { -#line 275 "root_numpy/src/tree.pyx" +#line 280 "root_numpy/src/tree.pyx" __pyx_v_icol = __pyx_t_25; - /* "root_numpy/src/tree.pyx":276 + /* "root_numpy/src/tree.pyx":281 * dtype = [] * for icol in range(columns.size()): * this_col = columns[icol] # <<<<<<<<<<<<<< @@ -14813,10 +14879,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * dtype.append((this_col.name, this_conv.get_nptype())) */ -#line 276 "root_numpy/src/tree.pyx" +#line 281 "root_numpy/src/tree.pyx" __pyx_v_this_col = (__pyx_v_columns[__pyx_v_icol]); - /* "root_numpy/src/tree.pyx":277 + /* "root_numpy/src/tree.pyx":282 * for icol in range(columns.size()): * this_col = columns[icol] * this_conv = converters[icol] # <<<<<<<<<<<<<< @@ -14824,10 +14890,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * if include_weight: */ -#line 277 "root_numpy/src/tree.pyx" +#line 282 "root_numpy/src/tree.pyx" __pyx_v_this_conv = (__pyx_v_converters[__pyx_v_icol]); - /* "root_numpy/src/tree.pyx":278 + /* "root_numpy/src/tree.pyx":283 * this_col = columns[icol] * this_conv = converters[icol] * dtype.append((this_col.name, this_conv.get_nptype())) # <<<<<<<<<<<<<< @@ -14835,52 +14901,52 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * dtype.append((weight_name, np.dtype('d'))) */ -#line 278 "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 = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 278 "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 = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 278 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyTuple_New(2); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_20); -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_19, 1, __pyx_t_2); -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __pyx_t_20 = 0; -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 278 "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 = 278; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 278 "root_numpy/src/tree.pyx" +#line 283 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":279 + /* "root_numpy/src/tree.pyx":284 * this_conv = converters[icol] * dtype.append((this_col.name, this_conv.get_nptype())) * if include_weight: # <<<<<<<<<<<<<< @@ -14888,13 +14954,13 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * */ -#line 279 "root_numpy/src/tree.pyx" +#line 284 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_v_include_weight != 0); -#line 279 "root_numpy/src/tree.pyx" +#line 284 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":280 + /* "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'))) # <<<<<<<<<<<<<< @@ -14902,58 +14968,58 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Initialize the array */ -#line 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 280 "root_numpy/src/tree.pyx" - __pyx_t_20 = PyTuple_New(2); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_20, 0, __pyx_t_19); -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_19); -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_20, 1, __pyx_t_2); -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __pyx_t_19 = 0; -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 280 "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 = 280; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" goto __pyx_L39; -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" } -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __pyx_L39:; - /* "root_numpy/src/tree.pyx":283 + /* "root_numpy/src/tree.pyx":288 * * # Initialize the array * arr = np.empty(num_entries, dtype=dtype) # <<<<<<<<<<<<<< @@ -14961,76 +15027,76 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Exclude weight column in num_columns */ -#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_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 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 283 "root_numpy/src/tree.pyx" - __pyx_t_19 = PyTuple_New(1); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_20); -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __pyx_t_20 = 0; -#line 283 "root_numpy/src/tree.pyx" - __pyx_t_20 = PyDict_New(); if (unlikely(!__pyx_t_20)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 283 "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 = 283; __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 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 283 "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 = 283; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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;} -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __pyx_v_arr = ((PyArrayObject *)__pyx_t_8); -#line 283 "root_numpy/src/tree.pyx" +#line 288 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":286 + /* "root_numpy/src/tree.pyx":291 * * # Exclude weight column in num_columns * num_columns = columns.size() # <<<<<<<<<<<<<< @@ -15038,10 +15104,10 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * # Loop on entries in the tree and write the data in the array */ -#line 286 "root_numpy/src/tree.pyx" +#line 291 "root_numpy/src/tree.pyx" __pyx_v_num_columns = __pyx_v_columns.size(); - /* "root_numpy/src/tree.pyx":289 + /* "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) # <<<<<<<<<<<<<< @@ -15049,112 +15115,112 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * entry_size = chain.GetEntry(ientry) */ -#line 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_20); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __pyx_t_2 = NULL; -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_19); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" if (likely(__pyx_t_2)) { -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_2); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_19, function); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" if (!__pyx_t_2) { -#line 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } else { -#line 289 "root_numpy/src/tree.pyx" - __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L8_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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 289 "root_numpy/src/tree.pyx" +#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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_t_20); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_20); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __pyx_t_20 = 0; -#line 289 "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 = 289; __pyx_clineno = __LINE__; goto __pyx_L8_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 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" } -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __pyx_v_indices = __pyx_t_8; -#line 289 "root_numpy/src/tree.pyx" +#line 294 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; - /* "root_numpy/src/tree.pyx":290 + /* "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): # <<<<<<<<<<<<<< @@ -15162,145 +15228,145 @@ __pyx_t_20 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_20)) {__pyx_file * handle_load(entry_size) */ -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_19)) || PyTuple_CheckExact(__pyx_t_19)) { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __pyx_t_8 = __pyx_t_19; __Pyx_INCREF(__pyx_t_8); __pyx_t_4 = 0; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __pyx_t_12 = NULL; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } else { __pyx_t_4 = -1; -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" for (;;) { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (likely(!__pyx_t_12)) { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_8))) { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_8)) break; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #else -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #endif -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } else { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_8)) break; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #else -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" #endif -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } } else -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __pyx_t_19 = __pyx_t_12(__pyx_t_8); -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (unlikely(!__pyx_t_19)) { -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" if (exc_type) { -#line 290 "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 290 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" break; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 290 "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 = 290; __pyx_clineno = __LINE__; goto __pyx_L8_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 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __pyx_v_ientry = __pyx_t_13; - /* "root_numpy/src/tree.pyx":291 + /* "root_numpy/src/tree.pyx":296 * indices = slice(start, stop, step).indices(num_entries) * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) # <<<<<<<<<<<<<< @@ -15308,10 +15374,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * if entry_size == 0: */ -#line 291 "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":292 + /* "root_numpy/src/tree.pyx":297 * for ientry in xrange(*indices): * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) # <<<<<<<<<<<<<< @@ -15319,16 +15385,16 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * raise IOError("read failure in current tree") */ -#line 292 "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 = 292; __pyx_clineno = __LINE__; goto __pyx_L8_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 292 "root_numpy/src/tree.pyx" +#line 297 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 292 "root_numpy/src/tree.pyx" +#line 297 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - /* "root_numpy/src/tree.pyx":293 + /* "root_numpy/src/tree.pyx":298 * entry_size = chain.GetEntry(ientry) * handle_load(entry_size) * if entry_size == 0: # <<<<<<<<<<<<<< @@ -15336,13 +15402,13 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 293 "root_numpy/src/tree.pyx" +#line 298 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_entry_size == 0) != 0); -#line 293 "root_numpy/src/tree.pyx" +#line 298 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":294 + /* "root_numpy/src/tree.pyx":299 * handle_load(entry_size) * if entry_size == 0: * raise IOError("read failure in current tree") # <<<<<<<<<<<<<< @@ -15350,25 +15416,25 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * # Determine if this entry passes the selection, */ -#line 294 "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 = 294; __pyx_clineno = __LINE__; goto __pyx_L8_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 294 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 294 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_19, 0, 0, 0); -#line 294 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 294 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L8_error;} +#line 299 "root_numpy/src/tree.pyx" + {__pyx_filename = __pyx_f[2]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L8_error;} -#line 294 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":298 + /* "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: # <<<<<<<<<<<<<< @@ -15376,13 +15442,13 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * if selection_formula.EvalInstance(0) == 0: */ -#line 298 "root_numpy/src/tree.pyx" +#line 303 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_selection_formula != NULL) != 0); -#line 298 "root_numpy/src/tree.pyx" +#line 303 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":299 + /* "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 # <<<<<<<<<<<<<< @@ -15390,10 +15456,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * continue */ -#line 299 "root_numpy/src/tree.pyx" +#line 304 "root_numpy/src/tree.pyx" __pyx_v_selection_formula->GetNdata(); - /* "root_numpy/src/tree.pyx":300 + /* "root_numpy/src/tree.pyx":305 * if selection_formula != NULL: * selection_formula.GetNdata() # required, as in TTreePlayer * if selection_formula.EvalInstance(0) == 0: # <<<<<<<<<<<<<< @@ -15401,13 +15467,13 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 300 "root_numpy/src/tree.pyx" +#line 305 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_selection_formula->EvalInstance(0) == 0.0) != 0); -#line 300 "root_numpy/src/tree.pyx" +#line 305 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":301 + /* "root_numpy/src/tree.pyx":306 * selection_formula.GetNdata() # required, as in TTreePlayer * if selection_formula.EvalInstance(0) == 0: * continue # <<<<<<<<<<<<<< @@ -15415,22 +15481,22 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * # Copy the values into the array */ -#line 301 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" goto __pyx_L40_continue; -#line 301 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" } -#line 301 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" goto __pyx_L43; -#line 301 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" } -#line 301 "root_numpy/src/tree.pyx" +#line 306 "root_numpy/src/tree.pyx" __pyx_L43:; - /* "root_numpy/src/tree.pyx":304 + /* "root_numpy/src/tree.pyx":309 * * # Copy the values into the array * data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) # <<<<<<<<<<<<<< @@ -15438,10 +15504,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * col = columns[icol] */ -#line 304 "root_numpy/src/tree.pyx" +#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":305 + /* "root_numpy/src/tree.pyx":310 * # Copy the values into the array * data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) * for icol in range(num_columns): # <<<<<<<<<<<<<< @@ -15449,16 +15515,16 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * conv = converters[icol] */ -#line 305 "root_numpy/src/tree.pyx" +#line 310 "root_numpy/src/tree.pyx" __pyx_t_25 = __pyx_v_num_columns; -#line 305 "root_numpy/src/tree.pyx" +#line 310 "root_numpy/src/tree.pyx" for (__pyx_t_27 = 0; __pyx_t_27 < __pyx_t_25; __pyx_t_27+=1) { -#line 305 "root_numpy/src/tree.pyx" +#line 310 "root_numpy/src/tree.pyx" __pyx_v_icol = __pyx_t_27; - /* "root_numpy/src/tree.pyx":306 + /* "root_numpy/src/tree.pyx":311 * data_ptr = np.PyArray_GETPTR1(arr, num_entries_selected) * for icol in range(num_columns): * col = columns[icol] # <<<<<<<<<<<<<< @@ -15466,10 +15532,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * num_bytes = conv.write(col, data_ptr) */ -#line 306 "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":307 + /* "root_numpy/src/tree.pyx":312 * for icol in range(num_columns): * col = columns[icol] * conv = converters[icol] # <<<<<<<<<<<<<< @@ -15477,10 +15543,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * data_ptr = shift(data_ptr, num_bytes) */ -#line 307 "root_numpy/src/tree.pyx" +#line 312 "root_numpy/src/tree.pyx" __pyx_v_conv = (__pyx_v_converters[__pyx_v_icol]); - /* "root_numpy/src/tree.pyx":308 + /* "root_numpy/src/tree.pyx":313 * col = columns[icol] * conv = converters[icol] * num_bytes = conv.write(col, data_ptr) # <<<<<<<<<<<<<< @@ -15488,10 +15554,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * if include_weight: */ -#line 308 "root_numpy/src/tree.pyx" +#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":309 + /* "root_numpy/src/tree.pyx":314 * conv = converters[icol] * num_bytes = conv.write(col, data_ptr) * data_ptr = shift(data_ptr, num_bytes) # <<<<<<<<<<<<<< @@ -15499,13 +15565,13 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * ( data_ptr)[0] = tree.GetWeight() */ -#line 309 "root_numpy/src/tree.pyx" +#line 314 "root_numpy/src/tree.pyx" __pyx_v_data_ptr = shift(__pyx_v_data_ptr, __pyx_v_num_bytes); -#line 309 "root_numpy/src/tree.pyx" +#line 314 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":310 + /* "root_numpy/src/tree.pyx":315 * num_bytes = conv.write(col, data_ptr) * data_ptr = shift(data_ptr, num_bytes) * if include_weight: # <<<<<<<<<<<<<< @@ -15513,13 +15579,13 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 310 "root_numpy/src/tree.pyx" +#line 315 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_v_include_weight != 0); -#line 310 "root_numpy/src/tree.pyx" +#line 315 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":311 + /* "root_numpy/src/tree.pyx":316 * data_ptr = shift(data_ptr, num_bytes) * if include_weight: * ( data_ptr)[0] = tree.GetWeight() # <<<<<<<<<<<<<< @@ -15527,19 +15593,19 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * # Increment number of selected entries last */ -#line 311 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/tree.pyx" (((double *)__pyx_v_data_ptr)[0]) = __pyx_v_tree->GetWeight(); -#line 311 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/tree.pyx" goto __pyx_L47; -#line 311 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/tree.pyx" } -#line 311 "root_numpy/src/tree.pyx" +#line 316 "root_numpy/src/tree.pyx" __pyx_L47:; - /* "root_numpy/src/tree.pyx":314 + /* "root_numpy/src/tree.pyx":319 * * # Increment number of selected entries last * num_entries_selected += 1 # <<<<<<<<<<<<<< @@ -15547,10 +15613,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * finally: */ -#line 314 "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":290 + /* "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): # <<<<<<<<<<<<<< @@ -15558,19 +15624,19 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * handle_load(entry_size) */ -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __pyx_L40_continue:; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 290 "root_numpy/src/tree.pyx" +#line 295 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":318 + /* "root_numpy/src/tree.pyx":323 * finally: * # Delete TreeChain * del chain # <<<<<<<<<<<<<< @@ -15578,16 +15644,16 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * for icol in range(columns.size()): */ -#line 318 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 318 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 318 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" delete __pyx_v_chain; - /* "root_numpy/src/tree.pyx":320 + /* "root_numpy/src/tree.pyx":325 * del chain * # Delete Columns * for icol in range(columns.size()): # <<<<<<<<<<<<<< @@ -15595,16 +15661,16 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 320 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" __pyx_t_24 = __pyx_v_columns.size(); -#line 320 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { -#line 320 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" __pyx_v_icol = __pyx_t_25; - /* "root_numpy/src/tree.pyx":321 + /* "root_numpy/src/tree.pyx":326 * # Delete Columns * for icol in range(columns.size()): * del columns[icol] # <<<<<<<<<<<<<< @@ -15612,85 +15678,85 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * # Shrink the array if we selected fewer than num_entries entries */ -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" delete (__pyx_v_columns[__pyx_v_icol]); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" goto __pyx_L9; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __pyx_L8_error:; -#line 321 "root_numpy/src/tree.pyx" +#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 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_21); __pyx_t_21 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_22); __pyx_t_22 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_20); __pyx_t_20 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_32, &__pyx_t_33, &__pyx_t_34); -#line 321 "root_numpy/src/tree.pyx" +#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 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_29); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_30); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_31); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_32); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_33); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_34); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __pyx_t_13 = __pyx_lineno; __pyx_t_14 = __pyx_clineno; __pyx_t_28 = __pyx_filename; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" { - /* "root_numpy/src/tree.pyx":318 + /* "root_numpy/src/tree.pyx":323 * finally: * # Delete TreeChain * del chain # <<<<<<<<<<<<<< @@ -15698,10 +15764,10 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * for icol in range(columns.size()): */ -#line 318 "root_numpy/src/tree.pyx" +#line 323 "root_numpy/src/tree.pyx" delete __pyx_v_chain; - /* "root_numpy/src/tree.pyx":320 + /* "root_numpy/src/tree.pyx":325 * del chain * # Delete Columns * for icol in range(columns.size()): # <<<<<<<<<<<<<< @@ -15709,16 +15775,16 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 320 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" __pyx_t_24 = __pyx_v_columns.size(); -#line 320 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" for (__pyx_t_25 = 0; __pyx_t_25 < __pyx_t_24; __pyx_t_25+=1) { -#line 320 "root_numpy/src/tree.pyx" +#line 325 "root_numpy/src/tree.pyx" __pyx_v_icol = __pyx_t_25; - /* "root_numpy/src/tree.pyx":321 + /* "root_numpy/src/tree.pyx":326 * # Delete Columns * for icol in range(columns.size()): * del columns[icol] # <<<<<<<<<<<<<< @@ -15726,64 +15792,64 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * # Shrink the array if we selected fewer than num_entries entries */ -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" delete (__pyx_v_columns[__pyx_v_icol]); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_32); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_33); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_34); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_ExceptionReset(__pyx_t_32, __pyx_t_33, __pyx_t_34); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_29); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_30); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_31); -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __Pyx_ErrRestore(__pyx_t_29, __pyx_t_30, __pyx_t_31); -#line 321 "root_numpy/src/tree.pyx" +#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 321 "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 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" __pyx_L9:; -#line 321 "root_numpy/src/tree.pyx" +#line 326 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":324 + /* "root_numpy/src/tree.pyx":329 * * # Shrink the array if we selected fewer than num_entries entries * if num_entries_selected < num_entries: # <<<<<<<<<<<<<< @@ -15791,13 +15857,13 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 324 "root_numpy/src/tree.pyx" +#line 329 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_num_entries_selected < __pyx_v_num_entries) != 0); -#line 324 "root_numpy/src/tree.pyx" +#line 329 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":325 + /* "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) # <<<<<<<<<<<<<< @@ -15805,109 +15871,109 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * return arr */ -#line 325 "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 = 325; __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 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_19); -#line 325 "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 = 325; __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 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_t_20 = NULL; -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_19))) { -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_t_20 = PyMethod_GET_SELF(__pyx_t_19); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" if (likely(__pyx_t_20)) { -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_19); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_20); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_19, function); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" if (!__pyx_t_20) { -#line 325 "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 = 325; __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 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } else { -#line 325 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 325; __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 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 325 "root_numpy/src/tree.pyx" +#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 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_2, 0+1, __pyx_t_9); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; -#line 325 "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 = 325; __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 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" goto __pyx_L54; -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" } -#line 325 "root_numpy/src/tree.pyx" +#line 330 "root_numpy/src/tree.pyx" __pyx_L54:; - /* "root_numpy/src/tree.pyx":327 + /* "root_numpy/src/tree.pyx":332 * arr.resize(num_entries_selected) * * return arr # <<<<<<<<<<<<<< @@ -15915,19 +15981,19 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * */ -#line 327 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 327 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" __Pyx_INCREF(((PyObject *)__pyx_v_arr)); -#line 327 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" __pyx_r = ((PyObject *)__pyx_v_arr); -#line 327 "root_numpy/src/tree.pyx" +#line 332 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":97 + /* "root_numpy/src/tree.pyx":102 * * * cdef object tree2array(TTree* tree, branches, string selection, # <<<<<<<<<<<<<< @@ -15935,85 +16001,85 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * bool include_weight, string weight_name): */ -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" /* function exit code */ -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_10); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_19); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_20); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_21); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_22); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.tree2array", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF((PyObject *)__pyx_v_arr); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_branch_dict); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_expression); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_dtype); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_indices); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_idx); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_b); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" return __pyx_r; -#line 97 "root_numpy/src/tree.pyx" +#line 102 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":330 +/* "root_numpy/src/tree.pyx":335 * * * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< @@ -16021,391 +16087,391 @@ __pyx_t_8 = PyObject_GetIter(__pyx_t_19); if (unlikely(!__pyx_t_8)) {__pyx_filen * bool include_weight, string weight_name): */ -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 330 "root_numpy/src/tree.pyx" +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" {"root2array_fromFname", (PyCFunction)__pyx_pw_13_librootnumpy_9root2array_fromFname, METH_VARARGS|METH_KEYWORDS, 0}; -#line 330 "root_numpy/src/tree.pyx" +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; std::string __pyx_v_treename -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branches = 0 -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_selection = 0 -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_start = 0 -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_stop = 0 -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_step = 0 -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; bool __pyx_v_include_weight -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; std::string __pyx_v_weight_name -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromFname (wrapper)", 0); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" { -#line 330 "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 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" switch (pos_args) { case 9: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[8] = PyTuple_GET_ITEM(__pyx_args, 8); case 8: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); case 5: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 0: break; default: -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 0: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 1: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 1); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 2: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 2); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 3: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 3); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 4: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 4); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 5: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 5); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 6: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 6); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 7: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 7); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" case 8: -#line 330 "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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromFname", 1, 9, 9, 8); -#line 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 330 "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 = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } else if (PyTuple_GET_SIZE(__pyx_args) != 9) { -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } else { -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" values[8] = PyTuple_GET_ITEM(__pyx_args, 8); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_fnames = values[0]; -#line 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_branches = values[2]; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_selection = values[3]; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_start = values[4]; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_stop = values[5]; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_v_step = values[6]; -#line 330 "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 = 332; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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 330 "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 = 332; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 330 "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 330 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromFname", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" return NULL; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 330 "root_numpy/src/tree.pyx" +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" /* function exit code */ -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" return __pyx_r; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 330 "root_numpy/src/tree.pyx" +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fn = NULL -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_ret = NULL -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" ; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -16434,10 +16500,10 @@ static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED Py const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromFname", 0); - /* "root_numpy/src/tree.pyx":333 + /* "root_numpy/src/tree.pyx":338 * selection, start, stop, step, * bool include_weight, string weight_name): * cdef TChain* ttree = NULL # <<<<<<<<<<<<<< @@ -16445,10 +16511,10 @@ static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED Py * ttree = new TChain(treename.c_str()) */ -#line 333 "root_numpy/src/tree.pyx" +#line 338 "root_numpy/src/tree.pyx" __pyx_v_ttree = NULL; - /* "root_numpy/src/tree.pyx":334 + /* "root_numpy/src/tree.pyx":339 * bool include_weight, string weight_name): * cdef TChain* ttree = NULL * try: # <<<<<<<<<<<<<< @@ -16456,10 +16522,10 @@ static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED Py * for fn in fnames: */ -#line 334 "root_numpy/src/tree.pyx" +#line 339 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":335 + /* "root_numpy/src/tree.pyx":340 * cdef TChain* ttree = NULL * try: * ttree = new TChain(treename.c_str()) # <<<<<<<<<<<<<< @@ -16467,10 +16533,10 @@ static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED Py * if ttree.Add(fn, -1) == 0: */ -#line 335 "root_numpy/src/tree.pyx" +#line 340 "root_numpy/src/tree.pyx" __pyx_v_ttree = new TChain(__pyx_v_treename.c_str()); - /* "root_numpy/src/tree.pyx":336 + /* "root_numpy/src/tree.pyx":341 * try: * ttree = new TChain(treename.c_str()) * for fn in fnames: # <<<<<<<<<<<<<< @@ -16478,124 +16544,124 @@ static PyObject *__pyx_pf_13_librootnumpy_8root2array_fromFname(CYTHON_UNUSED Py * raise IOError("unable to access tree '{0}' in {1}".format( */ -#line 336 "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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __pyx_t_1 = __pyx_v_fnames; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0; -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __pyx_t_3 = NULL; -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } else { __pyx_t_2 = -1; -#line 336 "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 = 336; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 336 "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 = 336; __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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" for (;;) { -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (likely(!__pyx_t_3)) { -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (likely(PyList_CheckExact(__pyx_t_1))) { -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break; -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 336 "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 = 336; __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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #else -#line 336 "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 = 336; __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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #endif -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } else { -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break; -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 336 "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 = 336; __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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #else -#line 336 "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 = 336; __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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" #endif -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } } else -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" { -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __pyx_t_4 = __pyx_t_3(__pyx_t_1); -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (unlikely(!__pyx_t_4)) { -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" PyObject* exc_type = PyErr_Occurred(); -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" if (exc_type) { -#line 336 "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 336 "root_numpy/src/tree.pyx" - else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 336; __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 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" break; -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_fn, __pyx_t_4); -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; - /* "root_numpy/src/tree.pyx":337 + /* "root_numpy/src/tree.pyx":342 * ttree = new TChain(treename.c_str()) * for fn in fnames: * if ttree.Add(fn, -1) == 0: # <<<<<<<<<<<<<< @@ -16603,16 +16669,16 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * treename, fn)) */ -#line 337 "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 = 337; __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 337 "root_numpy/src/tree.pyx" +#line 342 "root_numpy/src/tree.pyx" __pyx_t_6 = ((__pyx_v_ttree->Add(__pyx_t_5, -1) == 0) != 0); -#line 337 "root_numpy/src/tree.pyx" +#line 342 "root_numpy/src/tree.pyx" if (__pyx_t_6) { - /* "root_numpy/src/tree.pyx":338 + /* "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( # <<<<<<<<<<<<<< @@ -16620,13 +16686,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * ret = tree2array( */ -#line 338 "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 = 338; __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 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); - /* "root_numpy/src/tree.pyx":339 + /* "root_numpy/src/tree.pyx":344 * if ttree.Add(fn, -1) == 0: * raise IOError("unable to access tree '{0}' in {1}".format( * treename, fn)) # <<<<<<<<<<<<<< @@ -16634,94 +16700,94 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * ttree, branches, */ -#line 339 "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 = 339; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#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 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_8); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __pyx_t_9 = NULL; -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __pyx_t_10 = 0; -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_7))) { -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_7); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" if (likely(__pyx_t_9)) { -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_9); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_7, function); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __pyx_t_10 = 1; -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" } -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" } -#line 339 "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 = 338; __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 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_11); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" if (__pyx_t_9) { -#line 339 "root_numpy/src/tree.pyx" +#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 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" } -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_11, 0+__pyx_t_10, __pyx_t_8); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_8); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_fn); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_11, 1+__pyx_t_10, __pyx_v_fn); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_fn); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; -#line 339 "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 = 338; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#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 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 339 "root_numpy/src/tree.pyx" +#line 344 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 339 "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":338 + /* "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( # <<<<<<<<<<<<<< @@ -16729,43 +16795,43 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * ret = tree2array( */ -#line 338 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 338; __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 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); -#line 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 338 "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 = 338; __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 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 338 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 338; __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 338 "root_numpy/src/tree.pyx" +#line 343 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":336 + /* "root_numpy/src/tree.pyx":341 * try: * ttree = new TChain(treename.c_str()) * for fn in fnames: # <<<<<<<<<<<<<< @@ -16773,13 +16839,13 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * raise IOError("unable to access tree '{0}' in {1}".format( */ -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" } -#line 336 "root_numpy/src/tree.pyx" +#line 341 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "root_numpy/src/tree.pyx":342 + /* "root_numpy/src/tree.pyx":347 * ret = tree2array( * ttree, branches, * selection or '', start, stop, step, # <<<<<<<<<<<<<< @@ -16787,37 +16853,37 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * finally: */ -#line 342 "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 = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#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 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" if (!__pyx_t_6) { -#line 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" } else { -#line 342 "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 = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#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 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" __pyx_t_12 = __pyx_t_13; -#line 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" goto __pyx_L9_bool_binop_done; -#line 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" } -#line 342 "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 = 342; __pyx_clineno = __LINE__; goto __pyx_L4_error;} +#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 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" __pyx_t_12 = __pyx_t_13; -#line 342 "root_numpy/src/tree.pyx" +#line 347 "root_numpy/src/tree.pyx" __pyx_L9_bool_binop_done:; - /* "root_numpy/src/tree.pyx":340 + /* "root_numpy/src/tree.pyx":345 * raise IOError("unable to access tree '{0}' in {1}".format( * treename, fn)) * ret = tree2array( # <<<<<<<<<<<<<< @@ -16825,22 +16891,22 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * selection or '', start, stop, step, */ -#line 340 "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 = 340; __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 340 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 340 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" __pyx_v_ret = __pyx_t_1; -#line 340 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 340 "root_numpy/src/tree.pyx" +#line 345 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":345 + /* "root_numpy/src/tree.pyx":350 * include_weight, weight_name) * finally: * del ttree # <<<<<<<<<<<<<< @@ -16848,133 +16914,133 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * */ -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" delete __pyx_v_ttree; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" goto __pyx_L5; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __pyx_L4_error:; -#line 345 "root_numpy/src/tree.pyx" +#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 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22); -#line 345 "root_numpy/src/tree.pyx" +#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 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_17); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_18); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_19); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_20); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_21); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_22); -#line 345 "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 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" { -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" delete __pyx_v_ttree; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_20); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_21); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_22); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_17); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_18); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_19); -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __Pyx_ErrRestore(__pyx_t_17, __pyx_t_18, __pyx_t_19); -#line 345 "root_numpy/src/tree.pyx" +#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 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __pyx_lineno = __pyx_t_14; __pyx_clineno = __pyx_t_15; __pyx_filename = __pyx_t_16; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" __pyx_L5:; -#line 345 "root_numpy/src/tree.pyx" +#line 350 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":346 + /* "root_numpy/src/tree.pyx":351 * finally: * del ttree * return ret # <<<<<<<<<<<<<< @@ -16982,19 +17048,19 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * */ -#line 346 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 346 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_ret); -#line 346 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_ret; -#line 346 "root_numpy/src/tree.pyx" +#line 351 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":330 + /* "root_numpy/src/tree.pyx":335 * * * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< @@ -17002,61 +17068,61 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * bool include_weight, string weight_name): */ -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" /* function exit code */ -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_8); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromFname", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fn); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_ret); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" return __pyx_r; -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":349 +/* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< @@ -17064,358 +17130,358 @@ __pyx_t_1 = PyObject_GetIter(__pyx_v_fnames); if (unlikely(!__pyx_t_1)) {__pyx_f * bool include_weight, string weight_name): */ -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 349 "root_numpy/src/tree.pyx" +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" {"root2array_fromCObj", (PyCFunction)__pyx_pw_13_librootnumpy_11root2array_fromCObj, METH_VARARGS|METH_KEYWORDS, 0}; -#line 349 "root_numpy/src/tree.pyx" +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_branches = 0 -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_selection = 0 -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_start = 0 -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_stop = 0 -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_step = 0 -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; bool __pyx_v_include_weight -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; std::string __pyx_v_weight_name -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromCObj (wrapper)", 0); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" { -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" PyObject* values[8] = {0,0,0,0,0,0,0,0}; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" switch (pos_args) { case 8: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); case 7: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); case 6: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); case 5: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); case 4: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 0: break; default: -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 0: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 1: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 1); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 2: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 2); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 3: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 3); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 4: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 4); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 5: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 5); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 6: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 6); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" case 7: -#line 349 "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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("root2array_fromCObj", 1, 8, 8, 7); -#line 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 349 "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 = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } else if (PyTuple_GET_SIZE(__pyx_args) != 8) { -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } else { -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[4] = PyTuple_GET_ITEM(__pyx_args, 4); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[5] = PyTuple_GET_ITEM(__pyx_args, 5); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[6] = PyTuple_GET_ITEM(__pyx_args, 6); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" values[7] = PyTuple_GET_ITEM(__pyx_args, 7); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_tree = values[0]; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_branches = values[1]; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_selection = values[2]; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_start = values[3]; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_stop = values[4]; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_v_step = values[5]; -#line 349 "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 = 351; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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 349 "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 = 351; __pyx_clineno = __LINE__; goto __pyx_L3_error;} +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 349 "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 349 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" return NULL; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 349 "root_numpy/src/tree.pyx" +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" /* function exit code */ -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" return __pyx_r; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 349 "root_numpy/src/tree.pyx" +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" ; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations void *__pyx_t_1; @@ -17427,10 +17493,10 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("root2array_fromCObj", 0); - /* "root_numpy/src/tree.pyx":352 + /* "root_numpy/src/tree.pyx":357 * start, stop, step, * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) # <<<<<<<<<<<<<< @@ -17438,13 +17504,13 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py * chain, branches, */ -#line 352 "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 = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 352 "root_numpy/src/tree.pyx" +#line 357 "root_numpy/src/tree.pyx" __pyx_v_chain = ((TTree *)__pyx_t_1); - /* "root_numpy/src/tree.pyx":353 + /* "root_numpy/src/tree.pyx":358 * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) * return tree2array( # <<<<<<<<<<<<<< @@ -17452,10 +17518,10 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py * selection or '', start, stop, step, */ -#line 353 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); - /* "root_numpy/src/tree.pyx":355 + /* "root_numpy/src/tree.pyx":360 * return tree2array( * chain, branches, * selection or '', start, stop, step, # <<<<<<<<<<<<<< @@ -17463,37 +17529,37 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py * */ -#line 355 "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 = 355; __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 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" if (!__pyx_t_3) { -#line 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" } else { -#line 355 "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 = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" __pyx_t_2 = __pyx_t_4; -#line 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" goto __pyx_L3_bool_binop_done; -#line 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" } -#line 355 "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 = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" __pyx_t_2 = __pyx_t_4; -#line 355 "root_numpy/src/tree.pyx" +#line 360 "root_numpy/src/tree.pyx" __pyx_L3_bool_binop_done:; - /* "root_numpy/src/tree.pyx":353 + /* "root_numpy/src/tree.pyx":358 * bool include_weight, string weight_name): * cdef TTree* chain = PyCObject_AsVoidPtr(tree) * return tree2array( # <<<<<<<<<<<<<< @@ -17501,22 +17567,22 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py * selection or '', start, stop, step, */ -#line 353 "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 = 353; __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 353 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 353 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/tree.pyx" __pyx_r = __pyx_t_5; -#line 353 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; -#line 353 "root_numpy/src/tree.pyx" +#line 358 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":349 + /* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< @@ -17524,40 +17590,40 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py * bool include_weight, string weight_name): */ -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" /* function exit code */ -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.root2array_fromCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" return __pyx_r; -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":365 +/* "root_numpy/src/tree.pyx":370 * cdef cppclass NP2CConverter: * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -17565,29 +17631,29 @@ static PyObject *__pyx_pf_13_librootnumpy_10root2array_fromCObj(CYTHON_UNUSED Py * */ -#line 365 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" -#line 365 "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 365 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("fill_from", 0); -#line 365 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" -#line 365 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" /* function exit code */ -#line 365 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 365 "root_numpy/src/tree.pyx" +#line 370 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":368 +/* "root_numpy/src/tree.pyx":373 * pass * * __dealloc__(): # <<<<<<<<<<<<<< @@ -17595,29 +17661,29 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * */ -#line 368 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" -#line 368 "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 368 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("", 0); -#line 368 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" -#line 368 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" /* function exit code */ -#line 368 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 368 "root_numpy/src/tree.pyx" +#line 373 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":379 +/* "root_numpy/src/tree.pyx":384 * TBranch* branch * * __init__(TTree* tree, string name, string roottype, int nbytes): # <<<<<<<<<<<<<< @@ -17625,16 +17691,16 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.nbytes = nbytes */ -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" -#line 379 "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 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_existing_type = NULL -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" ; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -17650,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 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("", 0); - /* "root_numpy/src/tree.pyx":381 + /* "root_numpy/src/tree.pyx":386 * __init__(TTree* tree, string name, string roottype, int nbytes): * cdef string leaflist * this.nbytes = nbytes # <<<<<<<<<<<<<< @@ -17661,10 +17727,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.name = name */ -#line 381 "root_numpy/src/tree.pyx" +#line 386 "root_numpy/src/tree.pyx" this->nbytes = __pyx_v_nbytes; - /* "root_numpy/src/tree.pyx":382 + /* "root_numpy/src/tree.pyx":387 * cdef string leaflist * this.nbytes = nbytes * this.roottype = roottype # <<<<<<<<<<<<<< @@ -17672,10 +17738,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.value = malloc(nbytes) */ -#line 382 "root_numpy/src/tree.pyx" +#line 387 "root_numpy/src/tree.pyx" this->roottype = __pyx_v_roottype; - /* "root_numpy/src/tree.pyx":383 + /* "root_numpy/src/tree.pyx":388 * this.nbytes = nbytes * this.roottype = roottype * this.name = name # <<<<<<<<<<<<<< @@ -17683,10 +17749,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.branch = tree.GetBranch(this.name.c_str()) */ -#line 383 "root_numpy/src/tree.pyx" +#line 388 "root_numpy/src/tree.pyx" this->name = __pyx_v_name; - /* "root_numpy/src/tree.pyx":384 + /* "root_numpy/src/tree.pyx":389 * this.roottype = roottype * this.name = name * this.value = malloc(nbytes) # <<<<<<<<<<<<<< @@ -17694,10 +17760,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * if this.branch == NULL: */ -#line 384 "root_numpy/src/tree.pyx" +#line 389 "root_numpy/src/tree.pyx" this->value = malloc(__pyx_v_nbytes); - /* "root_numpy/src/tree.pyx":385 + /* "root_numpy/src/tree.pyx":390 * this.name = name * this.value = malloc(nbytes) * this.branch = tree.GetBranch(this.name.c_str()) # <<<<<<<<<<<<<< @@ -17705,10 +17771,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * leaflist = this.name + '/' + this.roottype */ -#line 385 "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":386 + /* "root_numpy/src/tree.pyx":391 * this.value = malloc(nbytes) * this.branch = tree.GetBranch(this.name.c_str()) * if this.branch == NULL: # <<<<<<<<<<<<<< @@ -17716,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 386 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" __pyx_t_1 = ((this->branch == NULL) != 0); -#line 386 "root_numpy/src/tree.pyx" +#line 391 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":387 + /* "root_numpy/src/tree.pyx":392 * this.branch = tree.GetBranch(this.name.c_str()) * if this.branch == NULL: * leaflist = this.name + '/' + this.roottype # <<<<<<<<<<<<<< @@ -17730,49 +17796,49 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * else: */ -#line 387 "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 = 387; __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 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 387 "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 = 387; __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 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 387 "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 = 387; __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 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 387 "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 = 387; __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 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 387 "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 = 387; __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 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 387 "root_numpy/src/tree.pyx" +#line 392 "root_numpy/src/tree.pyx" __pyx_v_leaflist = __pyx_t_5; - /* "root_numpy/src/tree.pyx":388 + /* "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()) # <<<<<<<<<<<<<< @@ -17780,19 +17846,19 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * # check type compatibility of existing branch */ -#line 388 "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 388 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 388 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" } -#line 388 "root_numpy/src/tree.pyx" +#line 393 "root_numpy/src/tree.pyx" /*else*/ { - /* "root_numpy/src/tree.pyx":391 + /* "root_numpy/src/tree.pyx":396 * else: * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] # <<<<<<<<<<<<<< @@ -17800,46 +17866,46 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * raise TypeError( */ -#line 391 "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 = 391; __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 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 391 "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 = 391; __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 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 391 "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 = 391; __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 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 391 "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 = 391; __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 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_v_existing_type = __pyx_t_2; -#line 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; - /* "root_numpy/src/tree.pyx":392 + /* "root_numpy/src/tree.pyx":397 * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] * if str(roottype) != existing_type: # <<<<<<<<<<<<<< @@ -17847,52 +17913,52 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * "field '{0}' of type '{1}' is not compatible " */ -#line 392 "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 = 392; __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 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 392 "root_numpy/src/tree.pyx" - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 392; __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 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2); -#line 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_2); -#line 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __pyx_t_2 = 0; -#line 392 "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 = 392; __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 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 392 "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 = 392; __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 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 392 "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 = 392; __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 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 392 "root_numpy/src/tree.pyx" +#line 397 "root_numpy/src/tree.pyx" if (__pyx_t_1) { - /* "root_numpy/src/tree.pyx":395 + /* "root_numpy/src/tree.pyx":400 * raise TypeError( * "field '{0}' of type '{1}' is not compatible " * "with existing branch of type '{2}'".format( # <<<<<<<<<<<<<< @@ -17900,13 +17966,13 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.branch.SetAddress(this.value) */ -#line 395 "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 = 395; __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 395 "root_numpy/src/tree.pyx" +#line 400 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); - /* "root_numpy/src/tree.pyx":396 + /* "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)) # <<<<<<<<<<<<<< @@ -17914,109 +17980,109 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.branch.SetStatus(1) */ -#line 396 "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 = 396; __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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_3); -#line 396 "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 = 396; __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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_8 = 0; -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_2))) { -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_2); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_2, function); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_8 = 1; -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" } -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" } -#line 396 "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 = 395; __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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" if (__pyx_t_7) { -#line 396 "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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" } -#line 396 "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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_3); -#line 396 "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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_6); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_existing_type); -#line 396 "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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_existing_type); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_3 = 0; -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __pyx_t_6 = 0; -#line 396 "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 = 395; __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 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 396 "root_numpy/src/tree.pyx" +#line 401 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 396 "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":393 + /* "root_numpy/src/tree.pyx":398 * existing_type = this.branch.GetTitle().rpartition('/')[-1] * if str(roottype) != existing_type: * raise TypeError( # <<<<<<<<<<<<<< @@ -18024,43 +18090,43 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * "with existing branch of type '{2}'".format( */ -#line 393 "root_numpy/src/tree.pyx" - __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 393; __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 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_2); -#line 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); -#line 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 393 "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 = 393; __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 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 393 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 393; __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 393 "root_numpy/src/tree.pyx" +#line 398 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":397 + /* "root_numpy/src/tree.pyx":402 * "with existing branch of type '{2}'".format( * name, roottype, existing_type)) * this.branch.SetAddress(this.value) # <<<<<<<<<<<<<< @@ -18068,16 +18134,16 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * */ -#line 397 "root_numpy/src/tree.pyx" +#line 402 "root_numpy/src/tree.pyx" this->branch->SetAddress(this->value); -#line 397 "root_numpy/src/tree.pyx" +#line 402 "root_numpy/src/tree.pyx" } -#line 397 "root_numpy/src/tree.pyx" +#line 402 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":398 + /* "root_numpy/src/tree.pyx":403 * name, roottype, existing_type)) * this.branch.SetAddress(this.value) * this.branch.SetStatus(1) # <<<<<<<<<<<<<< @@ -18085,10 +18151,10 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * __del__(self): # does this do what I want? */ -#line 398 "root_numpy/src/tree.pyx" +#line 403 "root_numpy/src/tree.pyx" this->branch->SetStatus(1); - /* "root_numpy/src/tree.pyx":379 + /* "root_numpy/src/tree.pyx":384 * TBranch* branch * * __init__(TTree* tree, string name, string roottype, int nbytes): # <<<<<<<<<<<<<< @@ -18096,52 +18162,52 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * this.nbytes = nbytes */ -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" /* function exit code */ -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_WriteUnraisable("ScalarNP2CConverter.", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_existing_type); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 379 "root_numpy/src/tree.pyx" +#line 384 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":400 +/* "root_numpy/src/tree.pyx":405 * this.branch.SetStatus(1) * * __del__(self): # does this do what I want? # <<<<<<<<<<<<<< @@ -18149,20 +18215,20 @@ void __pyx_t_13_librootnumpy_NP2CConverter::fill_from(CYTHON_UNUSED void *__pyx_ * */ -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" -#line 400 "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 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("__del__", 0); - /* "root_numpy/src/tree.pyx":401 + /* "root_numpy/src/tree.pyx":406 * * __del__(self): # does this do what I want? * free(this.value) # <<<<<<<<<<<<<< @@ -18170,10 +18236,10 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * void fill_from(void* source): */ -#line 401 "root_numpy/src/tree.pyx" +#line 406 "root_numpy/src/tree.pyx" free(this->value); - /* "root_numpy/src/tree.pyx":400 + /* "root_numpy/src/tree.pyx":405 * this.branch.SetStatus(1) * * __del__(self): # does this do what I want? # <<<<<<<<<<<<<< @@ -18181,28 +18247,28 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * */ -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" /* function exit code */ -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" return __pyx_r; -#line 400 "root_numpy/src/tree.pyx" +#line 405 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":403 +/* "root_numpy/src/tree.pyx":408 * free(this.value) * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -18210,17 +18276,17 @@ PyObject *__pyx_t_13_librootnumpy_ScalarNP2CConverter::__del__(CYTHON_UNUSED PyO * this.branch.Fill() */ -#line 403 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" -#line 403 "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 403 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("fill_from", 0); - /* "root_numpy/src/tree.pyx":404 + /* "root_numpy/src/tree.pyx":409 * * void fill_from(void* source): * memcpy(this.value, source, this.nbytes) # <<<<<<<<<<<<<< @@ -18228,10 +18294,10 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * */ -#line 404 "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":405 + /* "root_numpy/src/tree.pyx":410 * void fill_from(void* source): * memcpy(this.value, source, this.nbytes) * this.branch.Fill() # <<<<<<<<<<<<<< @@ -18239,10 +18305,10 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * */ -#line 405 "root_numpy/src/tree.pyx" +#line 410 "root_numpy/src/tree.pyx" this->branch->Fill(); - /* "root_numpy/src/tree.pyx":403 + /* "root_numpy/src/tree.pyx":408 * free(this.value) * * void fill_from(void* source): # <<<<<<<<<<<<<< @@ -18250,19 +18316,19 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * this.branch.Fill() */ -#line 403 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" -#line 403 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" /* function exit code */ -#line 403 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 403 "root_numpy/src/tree.pyx" +#line 408 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":408 +/* "root_numpy/src/tree.pyx":413 * * * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype): # <<<<<<<<<<<<<< @@ -18270,19 +18336,19 @@ void __pyx_t_13_librootnumpy_ScalarNP2CConverter::fill_from(void *__pyx_v_source * # np.float16 needs special treatment. ROOT doesn't support 16-bit floats. */ -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" -#line 408 "root_numpy/src/tree.pyx" +#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 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_roottype = NULL -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" ; -#line 408 "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; @@ -18301,10 +18367,10 @@ static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_ const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("find_np2c_converter", 0); - /* "root_numpy/src/tree.pyx":412 + /* "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: # <<<<<<<<<<<<<< @@ -18312,25 +18378,25 @@ static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_ * return new ScalarNP2CConverter(tree, name, roottype, nbytes) */ -#line 412 "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 = 412; __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 412 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 412 "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 = 412; __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 412 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 412 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" __pyx_t_3 = (__pyx_t_2 != 0); -#line 412 "root_numpy/src/tree.pyx" +#line 417 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":413 + /* "root_numpy/src/tree.pyx":418 * # Handle np.object (array) columns * if dtype in TYPES_NUMPY2ROOT: * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] # <<<<<<<<<<<<<< @@ -18338,184 +18404,184 @@ static __pyx_t_13_librootnumpy_NP2CConverter *__pyx_f_13_librootnumpy_find_np2c_ * warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) */ -#line 413 "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 = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 413 "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 = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 413 "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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" PyObject* sequence = __pyx_t_4; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #else -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #endif -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (unlikely(size != 2)) { -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); -#line 413 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_5 = PyTuple_GET_ITEM(sequence, 1); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } else { -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_1 = PyList_GET_ITEM(sequence, 0); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_5 = PyList_GET_ITEM(sequence, 1); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_1); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_5); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #else -#line 413 "root_numpy/src/tree.pyx" - __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 413 "root_numpy/src/tree.pyx" - __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" #endif -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } else { -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" Py_ssize_t index = -1; -#line 413 "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 = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 413 "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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" goto __pyx_L4_unpacking_failed; -#line 413 "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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" goto __pyx_L4_unpacking_failed; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 413 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" goto __pyx_L5_unpacking_done; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_L4_unpacking_failed:; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); -#line 413 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 413; __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 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_L5_unpacking_done:; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" } -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_v_nbytes = __pyx_t_1; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_1 = 0; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_v_roottype = __pyx_t_5; -#line 413 "root_numpy/src/tree.pyx" +#line 418 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":414 + /* "root_numpy/src/tree.pyx":419 * if dtype in TYPES_NUMPY2ROOT: * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] * return new ScalarNP2CConverter(tree, name, roottype, nbytes) # <<<<<<<<<<<<<< @@ -18523,25 +18589,25 @@ goto __pyx_L4_unpacking_failed; * return NULL */ -#line 414 "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 = 414; __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 414 "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 = 414; __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 414 "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 = 414; __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 414 "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 414 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 414 "root_numpy/src/tree.pyx" +#line 419 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":415 + /* "root_numpy/src/tree.pyx":420 * nbytes, roottype = TYPES_NUMPY2ROOT[dtype] * return new ScalarNP2CConverter(tree, name, roottype, nbytes) * warnings.warn("converter for {!r} is not implemented (skipping)".format(dtype)) # <<<<<<<<<<<<<< @@ -18549,184 +18615,184 @@ goto __pyx_L4_unpacking_failed; * */ -#line 415 "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 = 415; __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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_1); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __pyx_t_11 = NULL; -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_6))) { -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __pyx_t_11 = PyMethod_GET_SELF(__pyx_t_6); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" if (likely(__pyx_t_11)) { -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_11); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_6, function); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" if (!__pyx_t_11) { -#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } else { -#line 415 "root_numpy/src/tree.pyx" - __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 415; __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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_12); -#line 415 "root_numpy/src/tree.pyx" +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_dtype); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_12, 0+1, __pyx_v_dtype); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_dtype); -#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __pyx_t_6 = NULL; -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && unlikely(PyMethod_Check(__pyx_t_1))) { -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" if (likely(__pyx_t_6)) { -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_6); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_1, function); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" if (!__pyx_t_6) { -#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } else { -#line 415 "root_numpy/src/tree.pyx" - __pyx_t_12 = PyTuple_New(1+1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 415; __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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_12); -#line 415 "root_numpy/src/tree.pyx" +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_12, 0+1, __pyx_t_5); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; -#line 415 "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 = 415; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" } -#line 415 "root_numpy/src/tree.pyx" +#line 420 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 415 "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":416 + /* "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 # <<<<<<<<<<<<<< @@ -18734,13 +18800,13 @@ goto __pyx_L4_unpacking_failed; * */ -#line 416 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 416 "root_numpy/src/tree.pyx" +#line 421 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":408 + /* "root_numpy/src/tree.pyx":413 * * * cdef NP2CConverter* find_np2c_converter(TTree* tree, name, dtype): # <<<<<<<<<<<<<< @@ -18748,58 +18814,58 @@ goto __pyx_L4_unpacking_failed; * # np.float16 needs special treatment. ROOT doesn't support 16-bit floats. */ -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" /* function exit code */ -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_11); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_12); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_WriteUnraisable("_librootnumpy.find_np2c_converter", __pyx_clineno, __pyx_lineno, __pyx_filename, 0); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_nbytes); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_roottype); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" return __pyx_r; -#line 408 "root_numpy/src/tree.pyx" +#line 413 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":419 +/* "root_numpy/src/tree.pyx":424 * * * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< @@ -18807,70 +18873,70 @@ goto __pyx_L4_unpacking_failed; * cdef vector[int] posarray */ -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" -#line 419 "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 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" std::string __pyx_v_name = __pyx_k__27; -#line 419 "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_converters -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_posarray -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; std::vector __pyx_v_roffsetarray -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; unsigned int __pyx_v_icv -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; int __pyx_v_icol -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; long __pyx_v_arr_len -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; long __pyx_v_idata -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; unsigned long __pyx_v_pos_len -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; unsigned long __pyx_v_ipos -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; void *__pyx_v_source -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; void *__pyx_v_thisrow -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fieldnames = NULL -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fields = NULL -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_fieldname = NULL -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_dtype = NULL -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_roffset = NULL -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; __pyx_t_13_librootnumpy_NP2CConverter *__pyx_v_cvt -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" ; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" TTree *__pyx_r; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -18899,34 +18965,34 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree", 0); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" if (__pyx_optional_args) { -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 0) { -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_v_name = __pyx_optional_args->name; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" if (__pyx_optional_args->__pyx_n > 1) { -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_v_tree = __pyx_optional_args->tree; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":425 + /* "root_numpy/src/tree.pyx":430 * cdef unsigned int icv * cdef int icol * cdef long arr_len = arr.shape[0] # <<<<<<<<<<<<<< @@ -18934,10 +19000,10 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * cdef unsigned long pos_len */ -#line 425 "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":429 + /* "root_numpy/src/tree.pyx":434 * cdef unsigned long pos_len * cdef unsigned long ipos * cdef void* source = NULL # <<<<<<<<<<<<<< @@ -18945,10 +19011,10 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * */ -#line 429 "root_numpy/src/tree.pyx" +#line 434 "root_numpy/src/tree.pyx" __pyx_v_source = NULL; - /* "root_numpy/src/tree.pyx":430 + /* "root_numpy/src/tree.pyx":435 * cdef unsigned long ipos * cdef void* source = NULL * cdef void* thisrow = NULL # <<<<<<<<<<<<<< @@ -18956,10 +19022,10 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * try: */ -#line 430 "root_numpy/src/tree.pyx" +#line 435 "root_numpy/src/tree.pyx" __pyx_v_thisrow = NULL; - /* "root_numpy/src/tree.pyx":432 + /* "root_numpy/src/tree.pyx":437 * cdef void* thisrow = NULL * * try: # <<<<<<<<<<<<<< @@ -18967,20 +19033,20 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * tree = new TTree(name.c_str(), name.c_str()) */ -#line 432 "root_numpy/src/tree.pyx" +#line 437 "root_numpy/src/tree.pyx" /*try:*/ { -#line 432 "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 432 "root_numpy/src/tree.pyx" +#line 437 "root_numpy/src/tree.pyx" /*try:*/ { - /* "root_numpy/src/tree.pyx":433 + /* "root_numpy/src/tree.pyx":438 * * try: * if tree == NULL: # <<<<<<<<<<<<<< @@ -18988,13 +19054,13 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * */ -#line 433 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/tree.pyx" __pyx_t_4 = ((__pyx_v_tree == NULL) != 0); -#line 433 "root_numpy/src/tree.pyx" +#line 438 "root_numpy/src/tree.pyx" if (__pyx_t_4) { - /* "root_numpy/src/tree.pyx":434 + /* "root_numpy/src/tree.pyx":439 * try: * if tree == NULL: * tree = new TTree(name.c_str(), name.c_str()) # <<<<<<<<<<<<<< @@ -19002,19 +19068,19 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * fieldnames = arr.dtype.names */ -#line 434 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" __pyx_v_tree = new TTree(__pyx_v_name.c_str(), __pyx_v_name.c_str()); -#line 434 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" goto __pyx_L14; -#line 434 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" } -#line 434 "root_numpy/src/tree.pyx" +#line 439 "root_numpy/src/tree.pyx" __pyx_L14:; - /* "root_numpy/src/tree.pyx":436 + /* "root_numpy/src/tree.pyx":441 * tree = new TTree(name.c_str(), name.c_str()) * * fieldnames = arr.dtype.names # <<<<<<<<<<<<<< @@ -19022,28 +19088,28 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * */ -#line 436 "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 = 436; __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 436 "root_numpy/src/tree.pyx" +#line 441 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 436 "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 = 436; __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 436 "root_numpy/src/tree.pyx" +#line 441 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 436 "root_numpy/src/tree.pyx" +#line 441 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 436 "root_numpy/src/tree.pyx" +#line 441 "root_numpy/src/tree.pyx" __pyx_v_fieldnames = __pyx_t_6; -#line 436 "root_numpy/src/tree.pyx" +#line 441 "root_numpy/src/tree.pyx" __pyx_t_6 = 0; - /* "root_numpy/src/tree.pyx":437 + /* "root_numpy/src/tree.pyx":442 * * fieldnames = arr.dtype.names * fields = arr.dtype.fields # <<<<<<<<<<<<<< @@ -19051,28 +19117,28 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * # determine the structure */ -#line 437 "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 = 437; __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 437 "root_numpy/src/tree.pyx" +#line 442 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 437 "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 = 437; __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 437 "root_numpy/src/tree.pyx" +#line 442 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 437 "root_numpy/src/tree.pyx" +#line 442 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 437 "root_numpy/src/tree.pyx" +#line 442 "root_numpy/src/tree.pyx" __pyx_v_fields = __pyx_t_5; -#line 437 "root_numpy/src/tree.pyx" +#line 442 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":440 + /* "root_numpy/src/tree.pyx":445 * * # determine the structure * for icol in range(len(fieldnames)): # <<<<<<<<<<<<<< @@ -19080,16 +19146,16 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * # roffset is an offset of particular field in each record */ -#line 440 "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 = 440; __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 440 "root_numpy/src/tree.pyx" +#line 445 "root_numpy/src/tree.pyx" for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { -#line 440 "root_numpy/src/tree.pyx" +#line 445 "root_numpy/src/tree.pyx" __pyx_v_icol = __pyx_t_8; - /* "root_numpy/src/tree.pyx":441 + /* "root_numpy/src/tree.pyx":446 * # determine the structure * for icol in range(len(fieldnames)): * fieldname = fieldnames[icol] # <<<<<<<<<<<<<< @@ -19097,19 +19163,19 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * dtype, roffset = fields[fieldname] */ -#line 441 "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 = 441; __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 441 "root_numpy/src/tree.pyx" +#line 446 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 441 "root_numpy/src/tree.pyx" +#line 446 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_fieldname, __pyx_t_5); -#line 441 "root_numpy/src/tree.pyx" +#line 446 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":443 + /* "root_numpy/src/tree.pyx":448 * fieldname = fieldnames[icol] * # roffset is an offset of particular field in each record * dtype, roffset = fields[fieldname] # <<<<<<<<<<<<<< @@ -19117,175 +19183,175 @@ static TTree *__pyx_f_13_librootnumpy_array2tree(PyArrayObject *__pyx_v_arr, str * if cvt != NULL: */ -#line 443 "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 = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if ((likely(PyTuple_CheckExact(__pyx_t_5))) || (PyList_CheckExact(__pyx_t_5))) { -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" PyObject* sequence = __pyx_t_5; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" Py_ssize_t size = Py_SIZE(sequence); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #else -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" Py_ssize_t size = PySequence_Size(sequence); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #endif -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (unlikely(size != 2)) { -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (size > 2) __Pyx_RaiseTooManyValuesError(2); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size); -#line 443 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #if CYTHON_COMPILING_IN_CPYTHON -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (likely(PyTuple_CheckExact(sequence))) { -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_6 = PyTuple_GET_ITEM(sequence, 0); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_9 = PyTuple_GET_ITEM(sequence, 1); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } else { -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_6 = PyList_GET_ITEM(sequence, 0); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_9 = PyList_GET_ITEM(sequence, 1); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_6); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_9); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #else -#line 443 "root_numpy/src/tree.pyx" - __pyx_t_6 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 443 "root_numpy/src/tree.pyx" - __pyx_t_9 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" #endif -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } else { -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" Py_ssize_t index = -1; -#line 443 "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 = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_10); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 443 "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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L17_unpacking_failed; -#line 443 "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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L17_unpacking_failed; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 443 "root_numpy/src/tree.pyx" - if (__Pyx_IternextUnpackEndCheck(__pyx_t_11(__pyx_t_10), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_11 = NULL; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" goto __pyx_L18_unpacking_done; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_L17_unpacking_failed:; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_11 = NULL; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index); -#line 443 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 443; __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 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_L18_unpacking_done:; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" } -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_dtype, __pyx_t_6); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_6 = 0; -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_roffset, __pyx_t_9); -#line 443 "root_numpy/src/tree.pyx" +#line 448 "root_numpy/src/tree.pyx" __pyx_t_9 = 0; - /* "root_numpy/src/tree.pyx":444 + /* "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) # <<<<<<<<<<<<<< @@ -19293,10 +19359,10 @@ goto __pyx_L17_unpacking_failed; * roffsetarray.push_back(roffset) */ -#line 444 "root_numpy/src/tree.pyx" +#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":445 + /* "root_numpy/src/tree.pyx":450 * dtype, roffset = fields[fieldname] * cvt = find_np2c_converter(tree, fieldname, dtype) * if cvt != NULL: # <<<<<<<<<<<<<< @@ -19304,13 +19370,13 @@ goto __pyx_L17_unpacking_failed; * converters.push_back(cvt) */ -#line 445 "root_numpy/src/tree.pyx" +#line 450 "root_numpy/src/tree.pyx" __pyx_t_4 = ((__pyx_v_cvt != NULL) != 0); -#line 445 "root_numpy/src/tree.pyx" +#line 450 "root_numpy/src/tree.pyx" if (__pyx_t_4) { - /* "root_numpy/src/tree.pyx":446 + /* "root_numpy/src/tree.pyx":451 * cvt = find_np2c_converter(tree, fieldname, dtype) * if cvt != NULL: * roffsetarray.push_back(roffset) # <<<<<<<<<<<<<< @@ -19318,13 +19384,13 @@ goto __pyx_L17_unpacking_failed; * posarray.push_back(icol) */ -#line 446 "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 = 446; __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 446 "root_numpy/src/tree.pyx" +#line 451 "root_numpy/src/tree.pyx" __pyx_v_roffsetarray.push_back(__pyx_t_12); - /* "root_numpy/src/tree.pyx":447 + /* "root_numpy/src/tree.pyx":452 * if cvt != NULL: * roffsetarray.push_back(roffset) * converters.push_back(cvt) # <<<<<<<<<<<<<< @@ -19332,10 +19398,10 @@ goto __pyx_L17_unpacking_failed; * */ -#line 447 "root_numpy/src/tree.pyx" +#line 452 "root_numpy/src/tree.pyx" __pyx_v_converters.push_back(__pyx_v_cvt); - /* "root_numpy/src/tree.pyx":448 + /* "root_numpy/src/tree.pyx":453 * roffsetarray.push_back(roffset) * converters.push_back(cvt) * posarray.push_back(icol) # <<<<<<<<<<<<<< @@ -19343,22 +19409,22 @@ goto __pyx_L17_unpacking_failed; * # fill in data */ -#line 448 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" __pyx_v_posarray.push_back(__pyx_v_icol); -#line 448 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" goto __pyx_L19; -#line 448 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" } -#line 448 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" __pyx_L19:; -#line 448 "root_numpy/src/tree.pyx" +#line 453 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":451 + /* "root_numpy/src/tree.pyx":456 * * # fill in data * pos_len = posarray.size() # <<<<<<<<<<<<<< @@ -19366,10 +19432,10 @@ goto __pyx_L17_unpacking_failed; * thisrow = np.PyArray_GETPTR1(arr, idata) */ -#line 451 "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":452 + /* "root_numpy/src/tree.pyx":457 * # fill in data * pos_len = posarray.size() * for idata in range(arr_len): # <<<<<<<<<<<<<< @@ -19377,16 +19443,16 @@ goto __pyx_L17_unpacking_failed; * for ipos in range(pos_len): */ -#line 452 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/tree.pyx" __pyx_t_13 = __pyx_v_arr_len; -#line 452 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/tree.pyx" for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) { -#line 452 "root_numpy/src/tree.pyx" +#line 457 "root_numpy/src/tree.pyx" __pyx_v_idata = __pyx_t_14; - /* "root_numpy/src/tree.pyx":453 + /* "root_numpy/src/tree.pyx":458 * pos_len = posarray.size() * for idata in range(arr_len): * thisrow = np.PyArray_GETPTR1(arr, idata) # <<<<<<<<<<<<<< @@ -19394,10 +19460,10 @@ goto __pyx_L17_unpacking_failed; * roffset = roffsetarray[ipos] */ -#line 453 "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":454 + /* "root_numpy/src/tree.pyx":459 * for idata in range(arr_len): * thisrow = np.PyArray_GETPTR1(arr, idata) * for ipos in range(pos_len): # <<<<<<<<<<<<<< @@ -19405,16 +19471,16 @@ goto __pyx_L17_unpacking_failed; * source = shift(thisrow, roffset) */ -#line 454 "root_numpy/src/tree.pyx" +#line 459 "root_numpy/src/tree.pyx" __pyx_t_15 = __pyx_v_pos_len; -#line 454 "root_numpy/src/tree.pyx" +#line 459 "root_numpy/src/tree.pyx" for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { -#line 454 "root_numpy/src/tree.pyx" +#line 459 "root_numpy/src/tree.pyx" __pyx_v_ipos = __pyx_t_16; - /* "root_numpy/src/tree.pyx":455 + /* "root_numpy/src/tree.pyx":460 * thisrow = np.PyArray_GETPTR1(arr, idata) * for ipos in range(pos_len): * roffset = roffsetarray[ipos] # <<<<<<<<<<<<<< @@ -19422,19 +19488,19 @@ goto __pyx_L17_unpacking_failed; * converters[ipos].fill_from(source) */ -#line 455 "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 = 455; __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 455 "root_numpy/src/tree.pyx" +#line 460 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 455 "root_numpy/src/tree.pyx" +#line 460 "root_numpy/src/tree.pyx" __Pyx_XDECREF_SET(__pyx_v_roffset, __pyx_t_5); -#line 455 "root_numpy/src/tree.pyx" +#line 460 "root_numpy/src/tree.pyx" __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":456 + /* "root_numpy/src/tree.pyx":461 * for ipos in range(pos_len): * roffset = roffsetarray[ipos] * source = shift(thisrow, roffset) # <<<<<<<<<<<<<< @@ -19442,13 +19508,13 @@ goto __pyx_L17_unpacking_failed; * */ -#line 456 "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 = 456; __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 456 "root_numpy/src/tree.pyx" +#line 461 "root_numpy/src/tree.pyx" __pyx_v_source = shift(__pyx_v_thisrow, __pyx_t_8); - /* "root_numpy/src/tree.pyx":457 + /* "root_numpy/src/tree.pyx":462 * roffset = roffsetarray[ipos] * source = shift(thisrow, roffset) * converters[ipos].fill_from(source) # <<<<<<<<<<<<<< @@ -19456,16 +19522,16 @@ goto __pyx_L17_unpacking_failed; * # need to update the number of entries in the tree to match */ -#line 457 "root_numpy/src/tree.pyx" +#line 462 "root_numpy/src/tree.pyx" (__pyx_v_converters[__pyx_v_ipos])->fill_from(__pyx_v_source); -#line 457 "root_numpy/src/tree.pyx" +#line 462 "root_numpy/src/tree.pyx" } -#line 457 "root_numpy/src/tree.pyx" +#line 462 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":461 + /* "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) # <<<<<<<<<<<<<< @@ -19473,40 +19539,40 @@ goto __pyx_L17_unpacking_failed; * except: */ -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __pyx_v_tree->SetEntries(-1); -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" } -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" goto __pyx_L13_try_end; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __pyx_L6_error:; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 461 "root_numpy/src/tree.pyx" +#line 466 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "root_numpy/src/tree.pyx":463 + /* "root_numpy/src/tree.pyx":468 * tree.SetEntries(-1) * * except: # <<<<<<<<<<<<<< @@ -19514,25 +19580,25 @@ goto __pyx_L17_unpacking_failed; * */ -#line 463 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" /*except:*/ { -#line 463 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 463 "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 = 463; __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 463 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 463 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_9); -#line 463 "root_numpy/src/tree.pyx" +#line 468 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); - /* "root_numpy/src/tree.pyx":464 + /* "root_numpy/src/tree.pyx":469 * * except: * raise # <<<<<<<<<<<<<< @@ -19540,55 +19606,55 @@ goto __pyx_L17_unpacking_failed; * finally: */ -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_5); -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_9); -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_6); -#line 464 "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 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" -#line 464 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 464; __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 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" } -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __pyx_L8_except_error:; -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_1); -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_2); -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_3); -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3); -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" goto __pyx_L4_error; -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" __pyx_L13_try_end:; -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" } -#line 464 "root_numpy/src/tree.pyx" +#line 469 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":467 + /* "root_numpy/src/tree.pyx":472 * * finally: * for icv in range(converters.size()): # <<<<<<<<<<<<<< @@ -19596,22 +19662,22 @@ goto __pyx_L17_unpacking_failed; * # TODO: clean up tree */ -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" /*finally:*/ { -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" /*normal exit:*/{ -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" __pyx_t_17 = __pyx_v_converters.size(); -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" for (__pyx_t_18 = 0; __pyx_t_18 < __pyx_t_17; __pyx_t_18+=1) { -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" __pyx_v_icv = __pyx_t_18; - /* "root_numpy/src/tree.pyx":468 + /* "root_numpy/src/tree.pyx":473 * finally: * for icv in range(converters.size()): * del converters[icv] # <<<<<<<<<<<<<< @@ -19619,70 +19685,70 @@ goto __pyx_L17_unpacking_failed; * */ -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" delete (__pyx_v_converters[__pyx_v_icv]); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" goto __pyx_L5; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" /*exception exit:*/{ -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __pyx_L4_error:; -#line 468 "root_numpy/src/tree.pyx" +#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 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22); -#line 468 "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 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_3); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_2); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_1); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_20); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_21); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGOTREF(__pyx_t_22); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __pyx_t_8 = __pyx_lineno; __pyx_t_12 = __pyx_clineno; __pyx_t_19 = __pyx_filename; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" { - /* "root_numpy/src/tree.pyx":467 + /* "root_numpy/src/tree.pyx":472 * * finally: * for icv in range(converters.size()): # <<<<<<<<<<<<<< @@ -19690,16 +19756,16 @@ goto __pyx_L17_unpacking_failed; * # TODO: clean up tree */ -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" __pyx_t_17 = __pyx_v_converters.size(); -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" for (__pyx_t_18 = 0; __pyx_t_18 < __pyx_t_17; __pyx_t_18+=1) { -#line 467 "root_numpy/src/tree.pyx" +#line 472 "root_numpy/src/tree.pyx" __pyx_v_icv = __pyx_t_18; - /* "root_numpy/src/tree.pyx":468 + /* "root_numpy/src/tree.pyx":473 * finally: * for icv in range(converters.size()): * del converters[icv] # <<<<<<<<<<<<<< @@ -19707,64 +19773,64 @@ goto __pyx_L17_unpacking_failed; * */ -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" delete (__pyx_v_converters[__pyx_v_icv]); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" if (PY_MAJOR_VERSION >= 3) { -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_20); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_21); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_22); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_ExceptionReset(__pyx_t_20, __pyx_t_21, __pyx_t_22); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_3); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_2); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_t_1); -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __Pyx_ErrRestore(__pyx_t_3, __pyx_t_2, __pyx_t_1); -#line 468 "root_numpy/src/tree.pyx" +#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 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __pyx_lineno = __pyx_t_8; __pyx_clineno = __pyx_t_12; __pyx_filename = __pyx_t_19; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" goto __pyx_L1_error; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" __pyx_L5:; -#line 468 "root_numpy/src/tree.pyx" +#line 473 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":471 + /* "root_numpy/src/tree.pyx":476 * # TODO: clean up tree * * return tree # <<<<<<<<<<<<<< @@ -19772,13 +19838,13 @@ goto __pyx_L17_unpacking_failed; * */ -#line 471 "root_numpy/src/tree.pyx" +#line 476 "root_numpy/src/tree.pyx" __pyx_r = __pyx_v_tree; -#line 471 "root_numpy/src/tree.pyx" +#line 476 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":419 + /* "root_numpy/src/tree.pyx":424 * * * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< @@ -19786,61 +19852,61 @@ goto __pyx_L17_unpacking_failed; * cdef vector[int] posarray */ -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" /* function exit code */ -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_9); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_10); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_r = 0; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fieldnames); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fields); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_fieldname); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_dtype); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_v_roffset); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" return __pyx_r; -#line 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":474 +/* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -19848,238 +19914,238 @@ goto __pyx_L17_unpacking_failed; * cdef TTree* outtree = NULL */ -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 474 "root_numpy/src/tree.pyx" +#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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" {"array2tree_toCObj", (PyCFunction)__pyx_pw_13_librootnumpy_13array2tree_toCObj, METH_VARARGS|METH_KEYWORDS, 0}; -#line 474 "root_numpy/src/tree.pyx" +#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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_name = 0 -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_tree = 0 -#line 474 "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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree_toCObj (wrapper)", 0); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" { -#line 474 "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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject* values[3] = {0,0,0}; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[1] = ((PyObject *)__pyx_n_s_tree); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[2] = ((PyObject *)Py_None); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" switch (pos_args) { case 3: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 0: break; default: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 0: -#line 474 "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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 1: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_name); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (value) { values[1] = value; kw_args--; } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" case 2: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_tree); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (value) { values[2] = value; kw_args--; } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 474 "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 = 474; __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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } else { -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 3: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" break; default: -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_arr = values[0]; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_name = values[1]; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_v_tree = values[2]; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 474 "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 474 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 474; __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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree_toCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" return NULL; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 474 "root_numpy/src/tree.pyx" +#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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" /* function exit code */ -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" return __pyx_r; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 474 "root_numpy/src/tree.pyx" +#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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_outtree -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" ; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -20093,10 +20159,10 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2tree_toCObj", 0); - /* "root_numpy/src/tree.pyx":475 + /* "root_numpy/src/tree.pyx":480 * * def array2tree_toCObj(arr, name='tree', tree=None): * cdef TTree* intree = NULL # <<<<<<<<<<<<<< @@ -20104,10 +20170,10 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * if tree is not None: */ -#line 475 "root_numpy/src/tree.pyx" +#line 480 "root_numpy/src/tree.pyx" __pyx_v_intree = NULL; - /* "root_numpy/src/tree.pyx":476 + /* "root_numpy/src/tree.pyx":481 * def array2tree_toCObj(arr, name='tree', tree=None): * cdef TTree* intree = NULL * cdef TTree* outtree = NULL # <<<<<<<<<<<<<< @@ -20115,10 +20181,10 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * intree = PyCObject_AsVoidPtr(tree) */ -#line 476 "root_numpy/src/tree.pyx" +#line 481 "root_numpy/src/tree.pyx" __pyx_v_outtree = NULL; - /* "root_numpy/src/tree.pyx":477 + /* "root_numpy/src/tree.pyx":482 * cdef TTree* intree = NULL * cdef TTree* outtree = NULL * if tree is not None: # <<<<<<<<<<<<<< @@ -20126,16 +20192,16 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * outtree = array2tree(arr, name=name, tree=intree) */ -#line 477 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/tree.pyx" __pyx_t_1 = (__pyx_v_tree != Py_None); -#line 477 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/tree.pyx" __pyx_t_2 = (__pyx_t_1 != 0); -#line 477 "root_numpy/src/tree.pyx" +#line 482 "root_numpy/src/tree.pyx" if (__pyx_t_2) { - /* "root_numpy/src/tree.pyx":478 + /* "root_numpy/src/tree.pyx":483 * cdef TTree* outtree = NULL * if tree is not None: * intree = PyCObject_AsVoidPtr(tree) # <<<<<<<<<<<<<< @@ -20143,22 +20209,22 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * return PyCObject_FromVoidPtr(outtree, NULL) */ -#line 478 "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 = 478; __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 478 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_v_intree = ((TTree *)__pyx_t_3); -#line 478 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" goto __pyx_L3; -#line 478 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" } -#line 478 "root_numpy/src/tree.pyx" +#line 483 "root_numpy/src/tree.pyx" __pyx_L3:; - /* "root_numpy/src/tree.pyx":479 + /* "root_numpy/src/tree.pyx":484 * if tree is not None: * intree = PyCObject_AsVoidPtr(tree) * outtree = array2tree(arr, name=name, tree=intree) # <<<<<<<<<<<<<< @@ -20166,28 +20232,28 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * */ -#line 479 "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 = 479; __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 479 "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 = 479; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 479 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" __pyx_t_6.__pyx_n = 2; -#line 479 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" __pyx_t_6.name = __pyx_t_4; -#line 479 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" __pyx_t_6.tree = __pyx_v_intree; -#line 479 "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 = 479; __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 479 "root_numpy/src/tree.pyx" +#line 484 "root_numpy/src/tree.pyx" __pyx_v_outtree = __pyx_t_5; - /* "root_numpy/src/tree.pyx":480 + /* "root_numpy/src/tree.pyx":485 * intree = PyCObject_AsVoidPtr(tree) * outtree = array2tree(arr, name=name, tree=intree) * return PyCObject_FromVoidPtr(outtree, NULL) # <<<<<<<<<<<<<< @@ -20195,25 +20261,25 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * */ -#line 480 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_r); -#line 480 "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 = 480; __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 480 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 480 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" __pyx_r = __pyx_t_7; -#line 480 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" __pyx_t_7 = 0; -#line 480 "root_numpy/src/tree.pyx" +#line 485 "root_numpy/src/tree.pyx" goto __pyx_L0; - /* "root_numpy/src/tree.pyx":474 + /* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -20221,40 +20287,40 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * cdef TTree* outtree = NULL */ -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" /* function exit code */ -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2tree_toCObj", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" return __pyx_r; -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" } -/* "root_numpy/src/tree.pyx":483 +/* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< @@ -20262,265 +20328,265 @@ static PyObject *__pyx_pf_13_librootnumpy_12array2tree_toCObj(CYTHON_UNUSED PyOb * if rfile == NULL: */ -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" /* Python wrapper */ -#line 483 "root_numpy/src/tree.pyx" +#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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" {"array2root", (PyCFunction)__pyx_pw_13_librootnumpy_15array2root, METH_VARARGS|METH_KEYWORDS, 0}; -#line 483 "root_numpy/src/tree.pyx" +#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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_filename = 0 -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_treename = 0 -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; PyObject *__pyx_v_mode = 0 -#line 483 "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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject *__pyx_r = 0; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyDeclarations -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2root (wrapper)", 0); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" { -#line 483 "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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* values[4] = {0,0,0,0}; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[2] = ((PyObject *)__pyx_n_s_tree); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[3] = ((PyObject *)__pyx_n_s_update); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (unlikely(__pyx_kwds)) { -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" Py_ssize_t kw_args; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" switch (pos_args) { case 4: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); case 1: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 0: break; default: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" kw_args = PyDict_Size(__pyx_kwds); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" switch (pos_args) { -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 0: -#line 483 "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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 1: -#line 483 "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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" else { __Pyx_RaiseArgtupleInvalid("array2root", 0, 2, 4, 1); -#line 483 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 2: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_treename); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (value) { values[2] = value; kw_args--; } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" case 3: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (kw_args > 0) { -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_mode); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (value) { values[3] = value; kw_args--; } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" if (unlikely(kw_args > 0)) { -#line 483 "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 = 483; __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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } else { -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" switch (PyTuple_GET_SIZE(__pyx_args)) { case 4: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[3] = PyTuple_GET_ITEM(__pyx_args, 3); case 3: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[2] = PyTuple_GET_ITEM(__pyx_args, 2); case 2: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[1] = PyTuple_GET_ITEM(__pyx_args, 1); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" values[0] = PyTuple_GET_ITEM(__pyx_args, 0); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" break; default: -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L5_argtuple_error; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_arr = values[0]; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_filename = values[1]; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_treename = values[2]; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_v_mode = values[3]; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L4_argument_unpacking_done; -#line 483 "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 483 "root_numpy/src/tree.pyx" -{__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L3_error:; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2root", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" return NULL; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L4_argument_unpacking_done:; __pyx_r = -#line 483 "root_numpy/src/tree.pyx" +#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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" /* function exit code */ -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" return __pyx_r; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 483 "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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; TTree *__pyx_v_tree -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" ; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations const char *__pyx_t_1; @@ -20537,10 +20603,10 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ const char *__pyx_filename = NULL; int __pyx_clineno = 0; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannySetupContext("array2root", 0); - /* "root_numpy/src/tree.pyx":484 + /* "root_numpy/src/tree.pyx":489 * * def array2root(arr, filename, treename='tree', mode='update'): * cdef TFile* rfile = Open(filename, mode) # <<<<<<<<<<<<<< @@ -20548,16 +20614,16 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * raise IOError("cannot open file {0}".format(filename)) */ -#line 484 "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 = 484; __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 484 "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 = 484; __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 484 "root_numpy/src/tree.pyx" +#line 489 "root_numpy/src/tree.pyx" __pyx_v_rfile = TFile::Open(__pyx_t_1, __pyx_t_2); - /* "root_numpy/src/tree.pyx":485 + /* "root_numpy/src/tree.pyx":490 * def array2root(arr, filename, treename='tree', mode='update'): * cdef TFile* rfile = Open(filename, mode) * if rfile == NULL: # <<<<<<<<<<<<<< @@ -20565,13 +20631,13 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * if not rfile.IsWritable(): */ -#line 485 "root_numpy/src/tree.pyx" +#line 490 "root_numpy/src/tree.pyx" __pyx_t_3 = ((__pyx_v_rfile == NULL) != 0); -#line 485 "root_numpy/src/tree.pyx" +#line 490 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":486 + /* "root_numpy/src/tree.pyx":491 * cdef TFile* rfile = Open(filename, mode) * if rfile == NULL: * raise IOError("cannot open file {0}".format(filename)) # <<<<<<<<<<<<<< @@ -20579,124 +20645,124 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * raise IOError("file {0} is not writable".format(filename)) */ -#line 486 "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 = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __pyx_t_6 = NULL; -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" if (likely(__pyx_t_6)) { -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_6); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" if (!__pyx_t_6) { -#line 486 "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 = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } else { -#line 486 "root_numpy/src/tree.pyx" - __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 486 "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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_filename); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_v_filename); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_filename); -#line 486 "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 = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 486 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 486 "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 = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 486 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __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 486 "root_numpy/src/tree.pyx" +#line 491 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":487 + /* "root_numpy/src/tree.pyx":492 * if rfile == NULL: * raise IOError("cannot open file {0}".format(filename)) * if not rfile.IsWritable(): # <<<<<<<<<<<<<< @@ -20704,13 +20770,13 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * # If a tree with that name exists, we want to update it */ -#line 487 "root_numpy/src/tree.pyx" +#line 492 "root_numpy/src/tree.pyx" __pyx_t_3 = ((!(__pyx_v_rfile->IsWritable() != 0)) != 0); -#line 487 "root_numpy/src/tree.pyx" +#line 492 "root_numpy/src/tree.pyx" if (__pyx_t_3) { - /* "root_numpy/src/tree.pyx":488 + /* "root_numpy/src/tree.pyx":493 * raise IOError("cannot open file {0}".format(filename)) * if not rfile.IsWritable(): * raise IOError("file {0} is not writable".format(filename)) # <<<<<<<<<<<<<< @@ -20718,124 +20784,124 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * cdef TTree* tree = rfile.Get(treename) */ -#line 488 "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 = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __pyx_t_7 = NULL; -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) { -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_5); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" if (likely(__pyx_t_7)) { -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_t_7); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_INCREF(function); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF_SET(__pyx_t_5, function); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" if (!__pyx_t_7) { -#line 488 "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 = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } else { -#line 488 "root_numpy/src/tree.pyx" - __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_6); -#line 488 "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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_INCREF(__pyx_v_filename); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_filename); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_v_filename); -#line 488 "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 = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 488 "root_numpy/src/tree.pyx" - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_5); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_t_4); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __pyx_t_4 = 0; -#line 488 "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 = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_4); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_Raise(__pyx_t_4, 0, 0, 0); -#line 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; -#line 488 "root_numpy/src/tree.pyx" - {__pyx_filename = __pyx_f[2]; __pyx_lineno = 488; __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 488 "root_numpy/src/tree.pyx" +#line 493 "root_numpy/src/tree.pyx" } - /* "root_numpy/src/tree.pyx":490 + /* "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 = rfile.Get(treename) # <<<<<<<<<<<<<< @@ -20843,13 +20909,13 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * tree.Write(treename, 2) # TObject::kOverwrite */ -#line 490 "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 = 490; __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 490 "root_numpy/src/tree.pyx" +#line 495 "root_numpy/src/tree.pyx" __pyx_v_tree = ((TTree *)__pyx_v_rfile->Get(__pyx_t_2)); - /* "root_numpy/src/tree.pyx":491 + /* "root_numpy/src/tree.pyx":496 * # If a tree with that name exists, we want to update it * cdef TTree* tree = rfile.Get(treename) * tree = array2tree(arr, name=treename, tree=tree) # <<<<<<<<<<<<<< @@ -20857,28 +20923,28 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * rfile.Close() */ -#line 491 "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 = 491; __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 491 "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 = 491; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 491 "root_numpy/src/tree.pyx" +#line 496 "root_numpy/src/tree.pyx" __pyx_t_10.__pyx_n = 2; -#line 491 "root_numpy/src/tree.pyx" +#line 496 "root_numpy/src/tree.pyx" __pyx_t_10.name = __pyx_t_8; -#line 491 "root_numpy/src/tree.pyx" +#line 496 "root_numpy/src/tree.pyx" __pyx_t_10.tree = __pyx_v_tree; -#line 491 "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 = 491; __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 491 "root_numpy/src/tree.pyx" +#line 496 "root_numpy/src/tree.pyx" __pyx_v_tree = __pyx_t_9; - /* "root_numpy/src/tree.pyx":492 + /* "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 # <<<<<<<<<<<<<< @@ -20886,13 +20952,13 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * # TODO: clean up tree */ -#line 492 "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 = 492; __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 492 "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":493 + /* "root_numpy/src/tree.pyx":498 * tree = array2tree(arr, name=treename, tree=tree) * tree.Write(treename, 2) # TObject::kOverwrite * rfile.Close() # <<<<<<<<<<<<<< @@ -20900,19 +20966,19 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * del rfile */ -#line 493 "root_numpy/src/tree.pyx" +#line 498 "root_numpy/src/tree.pyx" __pyx_v_rfile->Close(); - /* "root_numpy/src/tree.pyx":495 + /* "root_numpy/src/tree.pyx":500 * rfile.Close() * # TODO: clean up tree * del rfile # <<<<<<<<<<<<<< */ -#line 495 "root_numpy/src/tree.pyx" +#line 500 "root_numpy/src/tree.pyx" delete __pyx_v_rfile; - /* "root_numpy/src/tree.pyx":483 + /* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< @@ -20920,52 +20986,52 @@ static PyObject *__pyx_pf_13_librootnumpy_14array2root(CYTHON_UNUSED PyObject *_ * if rfile == NULL: */ -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" /* function exit code */ -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_r = Py_None; __Pyx_INCREF(Py_None); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" goto __pyx_L0; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L1_error:; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_4); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_5); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_6); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XDECREF(__pyx_t_7); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_AddTraceback("_librootnumpy.array2root", __pyx_clineno, __pyx_lineno, __pyx_filename); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_r = NULL; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __pyx_L0:; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_XGIVEREF(__pyx_r); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_RefNannyFinishContext(); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" return __pyx_r; -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" } /* "root_numpy/src/array.pyx":4 @@ -61638,6 +61704,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__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_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}, @@ -61707,16 +61774,16 @@ 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_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 = 27; __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 = 48; __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 = 89; __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 = 172; __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 = 218; __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 = 250; __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[2]; __pyx_lineno = 290; __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[2]; __pyx_lineno = 290; __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[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;} return 0; @@ -61839,7 +61906,7 @@ static int __Pyx_InitCachedConstants(void) { #line 457 "root_numpy/src/converters.pyx" __Pyx_GIVEREF(__pyx_tuple__9); - /* "root_numpy/src/tree.pyx":85 + /* "root_numpy/src/tree.pyx":90 * return * if load == -1: * raise ValueError("chain is empty") # <<<<<<<<<<<<<< @@ -61847,16 +61914,16 @@ static int __Pyx_InitCachedConstants(void) { * if ignore_index: */ -#line 85 "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 = 85; __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 85 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__11); -#line 85 "root_numpy/src/tree.pyx" +#line 90 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__11); - /* "root_numpy/src/tree.pyx":89 + /* "root_numpy/src/tree.pyx":94 * if ignore_index: * return * raise IndexError("tree index in chain is out of bounds") # <<<<<<<<<<<<<< @@ -61864,16 +61931,16 @@ static int __Pyx_InitCachedConstants(void) { * raise IOError("cannot open current file") */ -#line 89 "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 = 89; __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 89 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__12); -#line 89 "root_numpy/src/tree.pyx" +#line 94 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__12); - /* "root_numpy/src/tree.pyx":91 + /* "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") # <<<<<<<<<<<<<< @@ -61881,16 +61948,16 @@ static int __Pyx_InitCachedConstants(void) { * raise IOError("cannot access tree in current file") */ -#line 91 "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 = 91; __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 91 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__13); -#line 91 "root_numpy/src/tree.pyx" +#line 96 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__13); - /* "root_numpy/src/tree.pyx":93 + /* "root_numpy/src/tree.pyx":98 * raise IOError("cannot open current file") * elif load == -4: * raise IOError("cannot access tree in current file") # <<<<<<<<<<<<<< @@ -61898,16 +61965,16 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 93 "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 = 93; __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 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__14); -#line 93 "root_numpy/src/tree.pyx" +#line 98 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__14); - /* "root_numpy/src/tree.pyx":94 + /* "root_numpy/src/tree.pyx":99 * elif load == -4: * raise IOError("cannot access tree in current file") * raise RuntimeError("the chain is not initialized") # <<<<<<<<<<<<<< @@ -61915,16 +61982,16 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 94 "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 = 94; __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 94 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__15); -#line 94 "root_numpy/src/tree.pyx" +#line 99 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__15); - /* "root_numpy/src/tree.pyx":102 + /* "root_numpy/src/tree.pyx":107 * * if tree.GetNbranches() == 0: * raise ValueError("tree has no branches") # <<<<<<<<<<<<<< @@ -61932,16 +61999,16 @@ static int __Pyx_InitCachedConstants(void) { * cdef int num_requested_branches = 0 */ -#line 102 "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 = 102; __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 102 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__16); -#line 102 "root_numpy/src/tree.pyx" +#line 107 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__16); - /* "root_numpy/src/tree.pyx":108 + /* "root_numpy/src/tree.pyx":113 * num_requested_branches = len(branches) * if num_requested_branches == 0: * raise ValueError("branches is an empty list") # <<<<<<<<<<<<<< @@ -61949,16 +62016,16 @@ static int __Pyx_InitCachedConstants(void) { * cdef int num_entries = tree.GetEntries() */ -#line 108 "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 = 108; __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 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__17); -#line 108 "root_numpy/src/tree.pyx" +#line 113 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__17); - /* "root_numpy/src/tree.pyx":174 + /* "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") # <<<<<<<<<<<<<< @@ -61966,16 +62033,16 @@ static int __Pyx_InitCachedConstants(void) { * # Build vector of Converters for branches */ -#line 174 "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 = 174; __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 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__18); -#line 174 "root_numpy/src/tree.pyx" +#line 179 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__18); - /* "root_numpy/src/tree.pyx":250 + /* "root_numpy/src/tree.pyx":255 * if conv == NULL: * # Oops, this should never happen * raise AssertionError( # <<<<<<<<<<<<<< @@ -61983,16 +62050,16 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 250 "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 = 250; __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 250 "root_numpy/src/tree.pyx" +#line 255 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__20); -#line 250 "root_numpy/src/tree.pyx" +#line 255 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__20); - /* "root_numpy/src/tree.pyx":266 + /* "root_numpy/src/tree.pyx":271 * * elif columns.size() == 0: * raise RuntimeError("unable to convert any branches in this tree") # <<<<<<<<<<<<<< @@ -62000,16 +62067,16 @@ static int __Pyx_InitCachedConstants(void) { * # Activate branches used by formulae and columns */ -#line 266 "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 = 266; __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 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__21); -#line 266 "root_numpy/src/tree.pyx" +#line 271 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__21); - /* "root_numpy/src/tree.pyx":280 + /* "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'))) # <<<<<<<<<<<<<< @@ -62017,16 +62084,16 @@ static int __Pyx_InitCachedConstants(void) { * # Initialize the array */ -#line 280 "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 = 280; __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 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__22); -#line 280 "root_numpy/src/tree.pyx" +#line 285 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__22); - /* "root_numpy/src/tree.pyx":294 + /* "root_numpy/src/tree.pyx":299 * handle_load(entry_size) * if entry_size == 0: * raise IOError("read failure in current tree") # <<<<<<<<<<<<<< @@ -62034,16 +62101,16 @@ static int __Pyx_InitCachedConstants(void) { * # Determine if this entry passes the selection, */ -#line 294 "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 = 294; __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 294 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__23); -#line 294 "root_numpy/src/tree.pyx" +#line 299 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__23); - /* "root_numpy/src/tree.pyx":391 + /* "root_numpy/src/tree.pyx":396 * else: * # check type compatibility of existing branch * existing_type = this.branch.GetTitle().rpartition('/')[-1] # <<<<<<<<<<<<<< @@ -62051,13 +62118,13 @@ static int __Pyx_InitCachedConstants(void) { * raise TypeError( */ -#line 391 "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 = 391; __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 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__26); -#line 391 "root_numpy/src/tree.pyx" +#line 396 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__26); /* "root_numpy/src/hist.pyx":10 @@ -62525,7 +62592,7 @@ static int __Pyx_InitCachedConstants(void) { #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":22 + /* "root_numpy/src/tree.pyx":24 * * * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< @@ -62533,19 +62600,19 @@ static int __Pyx_InitCachedConstants(void) { * # automatically select single tree */ -#line 22 "root_numpy/src/tree.pyx" - __pyx_tuple__57 = PyTuple_Pack(4, __pyx_n_s_fname, __pyx_n_s_tree, __pyx_n_s_rfile, __pyx_n_s_rtree); if (unlikely(!__pyx_tuple__57)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__57); -#line 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__57); -#line 22 "root_numpy/src/tree.pyx" - __pyx_codeobj__58 = (PyObject*)__Pyx_PyCode_New(2, 0, 4, 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, 22, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__58)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __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":38 + /* "root_numpy/src/tree.pyx":43 * * * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< @@ -62553,19 +62620,19 @@ static int __Pyx_InitCachedConstants(void) { * */ -#line 38 "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 = 38; __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 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__59); -#line 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__59); -#line 38 "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, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__60)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 38; __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":330 + /* "root_numpy/src/tree.pyx":335 * * * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< @@ -62573,19 +62640,19 @@ static int __Pyx_InitCachedConstants(void) { * bool include_weight, string weight_name): */ -#line 330 "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 = 330; __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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__61); -#line 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__61); -#line 330 "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, 330, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__62)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 330; __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":349 + /* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< @@ -62593,19 +62660,19 @@ static int __Pyx_InitCachedConstants(void) { * bool include_weight, string weight_name): */ -#line 349 "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 = 349; __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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__63); -#line 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__63); -#line 349 "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, 349, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__64)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 349; __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":474 + /* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -62613,19 +62680,19 @@ static int __Pyx_InitCachedConstants(void) { * cdef TTree* outtree = NULL */ -#line 474 "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 = 474; __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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__65); -#line 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__65); -#line 474 "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, 474, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__66)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 474; __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":483 + /* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< @@ -62633,17 +62700,17 @@ static int __Pyx_InitCachedConstants(void) { * if rfile == NULL: */ -#line 483 "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 = 483; __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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_tuple__67); -#line 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GIVEREF(__pyx_tuple__67); -#line 483 "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, 483, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__68)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 483; __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 * @@ -68303,7 +68370,7 @@ goto __pyx_L16_unpacking_failed; #line 4 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":22 + /* "root_numpy/src/tree.pyx":24 * * * def list_structures(fname, tree=None): # <<<<<<<<<<<<<< @@ -68311,19 +68378,19 @@ goto __pyx_L16_unpacking_failed; * # automatically select single tree */ -#line 22 "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 = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 22 "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 = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 22 "root_numpy/src/tree.pyx" +#line 24 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":38 + /* "root_numpy/src/tree.pyx":43 * * * def list_branches(fname, tree=None): # <<<<<<<<<<<<<< @@ -68331,19 +68398,19 @@ goto __pyx_L16_unpacking_failed; * */ -#line 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 38 "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 = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 38 "root_numpy/src/tree.pyx" +#line 43 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":330 + /* "root_numpy/src/tree.pyx":335 * * * def root2array_fromFname(fnames, string treename, branches, # <<<<<<<<<<<<<< @@ -68351,19 +68418,19 @@ goto __pyx_L16_unpacking_failed; * bool include_weight, string weight_name): */ -#line 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 330 "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 = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 330 "root_numpy/src/tree.pyx" +#line 335 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":349 + /* "root_numpy/src/tree.pyx":354 * * * def root2array_fromCObj(tree, branches, selection, # <<<<<<<<<<<<<< @@ -68371,19 +68438,19 @@ goto __pyx_L16_unpacking_failed; * bool include_weight, string weight_name): */ -#line 349 "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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 349 "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 = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 349 "root_numpy/src/tree.pyx" +#line 354 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":419 + /* "root_numpy/src/tree.pyx":424 * * * cdef TTree* array2tree(np.ndarray arr, string name='tree', TTree* tree=NULL) except *: # <<<<<<<<<<<<<< @@ -68391,13 +68458,13 @@ goto __pyx_L16_unpacking_failed; * cdef vector[int] posarray */ -#line 419 "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 = 419; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 419 "root_numpy/src/tree.pyx" +#line 424 "root_numpy/src/tree.pyx" __pyx_k__27 = __pyx_t_17; - /* "root_numpy/src/tree.pyx":474 + /* "root_numpy/src/tree.pyx":479 * * * def array2tree_toCObj(arr, name='tree', tree=None): # <<<<<<<<<<<<<< @@ -68405,19 +68472,19 @@ goto __pyx_L16_unpacking_failed; * cdef TTree* outtree = NULL */ -#line 474 "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 = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 474 "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 = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 474 "root_numpy/src/tree.pyx" +#line 479 "root_numpy/src/tree.pyx" __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - /* "root_numpy/src/tree.pyx":483 + /* "root_numpy/src/tree.pyx":488 * * * def array2root(arr, filename, treename='tree', mode='update'): # <<<<<<<<<<<<<< @@ -68425,16 +68492,16 @@ goto __pyx_L16_unpacking_failed; * if rfile == NULL: */ -#line 483 "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 = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 483 "root_numpy/src/tree.pyx" +#line 488 "root_numpy/src/tree.pyx" __Pyx_GOTREF(__pyx_t_7); -#line 483 "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 = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;} +#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 483 "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 diff --git a/root_numpy/src/tree.pyx b/root_numpy/src/tree.pyx index 74d970d..83a2485 100644 --- a/root_numpy/src/tree.pyx +++ b/root_numpy/src/tree.pyx @@ -16,6 +16,8 @@ def list_trees(fname): clsname = str(key.GetClassName()) if clsname == 'TTree' or clsname == 'TNtuple': ret[str(key.GetName())] = None + rfile.Close() + del rfile return list(ret.keys()) @@ -32,7 +34,10 @@ def list_structures(fname, tree=None): cdef TTree* rtree = rfile.Get(tree) if rtree == NULL: raise IOError("tree '{0}' not found in {1}".format(tree, fname)) - return get_tree_structure(rtree) + structure = get_tree_structure(rtree) + rfile.Close() + del rfile + return structure def list_branches(fname, tree=None):