From b996ce5fe6a9cde798b1e2ee8fc5cda5cdce5b4a Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 30 May 2023 16:49:44 +0200 Subject: [PATCH] minor --- examples/hist.py | 11 ++++++++--- src/creader_module.c | 16 ++-------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/examples/hist.py b/examples/hist.py index 500286b..74aff53 100644 --- a/examples/hist.py +++ b/examples/hist.py @@ -13,10 +13,15 @@ except: fname = "Moench_LGAD_SIM_Nov22/moenchLGAD202211/clustW17new/beam_En800eV_-40deg_300V_10us_d0_f5_0.clust" r = ClusterFileReader((base/fname).as_posix()) -cl = r.read(10000) - hist1 = bh.Histogram(bh.axis.Regular(40, -2, 2**14)) -hist1.fill(cl['data'].flat) +i = 0 +while (cl:=r.read(100000)).size: + hist1.fill(cl['data'].flat) + print(i) + i+=1 + + + fig, ax = plt.subplots() ax.bar(hist1.axes[0].centers, hist1.values(), width=hist1.axes[0].widths) ax.set_yscale('log') diff --git a/src/creader_module.c b/src/creader_module.c index 1856dfc..baebb3c 100644 --- a/src/creader_module.c +++ b/src/creader_module.c @@ -211,23 +211,11 @@ static struct PyModuleDef creader_def = { }; PyMODINIT_FUNC PyInit_creader(void) { - PyObject *m; - // if (PyType_Ready(&ClusterFileReaderType) < 0) - // return NULL; - m = PyModule_Create(&creader_def); + PyObject *m = PyModule_Create(&creader_def); if (m == NULL) return NULL; - // add numpy functionallity - import_array(); init_ClusterFileReader(m); - // add the cluster reader - // Py_INCREF(&ClusterFileReaderType); - // if (PyModule_AddObject(m, "ClusterFileReader", - // (PyObject *)&ClusterFileReaderType) < 0) { - // Py_DECREF(&ClusterFileReaderType); - // Py_DECREF(m); - // return NULL; - // } + return m; }