ci: update to numpy 2.0

Peter-Barrow · Jun 21, 2024 · 7a6094a · 7a6094a
1 parent 4b9f50a
commit 7a6094a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tangy"
-version = "0.5.3"
+version = "0.5.4"
 description = "Timetag analysing library"
 authors = [
     {name = "Peter Thomas Barrow", email = "peter.barrow.93@gmail.com"}

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@
             os.path.join(cython_dir, "_tangy.py"),
         ],
         define_macros=[('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')],
-        include_dirs=[get_include(), cython_dir + "./src"],
+        include_dirs=[get_include(), cython_dir + "/src"],
         extra_compile_args=compiler_flags,
         extra_link_args=link_args,
         optional=os.environ.get('CIBUILDWHEEL', '0') != '1',

diff --git a/tangy_src/src/picoquant_reader.h b/tangy_src/src/picoquant_reader.h
@@ -85,16 +85,19 @@ Parse_HH2_T2(u32 record, Record_HH2_T2* Rec_struct, res* out) {
             };
 
             if ((ch >= 1) & (ch <= 15)) {
+                // marker
                 tt += out->overflow;
                 ++photon;
             };
             if (ch == 0) {
+                // sync
                 tt += out->overflow;
                 ++photon;
             };
         };
 
     } else {
+        // photon
         tt += out->overflow;
         ++photon;
         ch += 1;