removed prints, bumped version

.github/workflows/build_docs.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-     - v1
+     - main
 
 permissions:
   contents: read

.github/workflows/build_pkg.yml

@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
   push:
     branches:
-     - v1
+     - main
+     - developer
     #run on PRs as well?
 
 jobs:

.gitignore

@@ -0,0 +1,24 @@
+install/
+.cproject
+.project
+bin/
+.settings
+*.aux
+*.log
+*.out
+*.toc
+*.o
+*.so
+.*
+build/
+RELEASE.txt
+Testing/
+
+ctbDict.cpp
+ctbDict.h
+
+
+
+*.pyc
+*/__pycache__/*
+

conda-recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: aare
-  version: 2024.11.07.dev0 #TODO! how to not duplicate this?
+  version: 2024.11.11.dev0 #TODO! how to not duplicate this?
 
 source:
   path: ..

include/aare/NDArray.hpp

@@ -341,6 +341,19 @@ template <typename T, int64_t Ndim> void NDArray<T, Ndim>::Print() {
     else
         Print_some();
 }
+
+template <typename T, int64_t Ndim>
+std::ostream& operator <<(std::ostream& os, const NDArray<T, Ndim>& arr){
+    for (auto row = 0; row < arr.shape(0); ++row) {
+        for (auto col = 0; col < arr.shape(1); ++col) {
+            os << std::setw(3);
+            os << arr(row, col) << " ";
+        }
+        os << "\n";
+    }
+    return os;
+}
+
 template <typename T, int64_t Ndim> void NDArray<T, Ndim>::Print_all() {
     for (auto row = 0; row < shape_[0]; ++row) {
         for (auto col = 0; col < shape_[1]; ++col) {

include/aare/NDView.hpp

@@ -156,4 +156,16 @@ template <typename T, int64_t Ndim> void NDView<T, Ndim>::print_all() const {
     }
 }
 
+template <typename T, int64_t Ndim>
+std::ostream& operator <<(std::ostream& os, const NDView<T, Ndim>& arr){
+    for (auto row = 0; row < arr.shape(0); ++row) {
+        for (auto col = 0; col < arr.shape(1); ++col) {
+            os << std::setw(3);
+            os << arr(row, col) << " ";
+        }
+        os << "\n";
+    }
+    return os;
+}
+
 } // namespace aare

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "aare"
-version = "2024.11.07.dev0"
+version = "2024.11.11.dev0"
 
 [tool.scikit-build]
 cmake.verbose = true

python/src/file.hpp

@@ -219,7 +219,6 @@ void define_file_io_bindings(py::module &m) {
              [](RawFile &self) {
                  size_t image_size = self.bytes_per_frame();
                  const uint8_t item_size = self.bytes_per_pixel();
-                 fmt::print("Image size in bytes: {}\n", image_size);
                  py::array image;
                  std::vector<ssize_t> shape;
                  shape.reserve(2);

src/RawMasterFile.cpp

@@ -247,7 +247,6 @@ void RawMasterFile::parse_json(const std::filesystem::path &fpath) {
     try{
         ROI tmp_roi;
         auto obj = j.at("Receiver Roi");
-        fmt::print("Receiver ROI: {}\n", obj.dump());
         tmp_roi.xmin = obj.at("xmin");
         tmp_roi.xmax = obj.at("xmax");
         tmp_roi.ymin = obj.at("ymin");

src/RawSubFile.cpp

@@ -53,11 +53,9 @@ size_t RawSubFile::tell() {
 
 void RawSubFile::read_into(std::byte *image_buf, DetectorHeader *header) {
     if(header){
-        fmt::print("Reading header\n");
          m_file.read(reinterpret_cast<char *>(header), sizeof(DetectorHeader));
     } else {
         m_file.seekg(sizeof(DetectorHeader), std::ios::cur);
-        fmt::print("Skipping heading header\n");
     }
 
     //TODO! expand support for different bitdepths