Merge pull request #320 from zhujun98/dev

Minor improvement
zhujun98 · Aug 9, 2024 · cff4d8e · cff4d8e
2 parents b429b3f + b8c99a7
commit cff4d8e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/recon/include/recon/reconstructor.hpp b/recon/include/recon/reconstructor.hpp
@@ -50,9 +50,7 @@ class AstraReconstructor : public Reconstructor {
 
 public:
 
-    AstraReconstructor(const ProjectionGeometry& p_geom, 
-                       const VolumeGeometry& s_geom, 
-                       const VolumeGeometry& v_geom);
+    AstraReconstructor(const VolumeGeometry& s_geom, const VolumeGeometry& v_geom);
 
     ~AstraReconstructor() override;
 

diff --git a/recon/src/application.cpp b/recon/src/application.cpp
@@ -430,6 +430,9 @@ void Application::stopProcessing() {
 
     daq_client_->setAcquiring(false);
 
+    // TODO: find a better solution to empty the DAQ buffer
+    std::this_thread::sleep_for(std::chrono::microseconds(1000));
+
     server_state_ = rpc::ServerState_State_READY;
     spdlog::info("Stopping acquiring and processing data");
 

diff --git a/recon/src/reconstructor.cpp b/recon/src/reconstructor.cpp
@@ -34,9 +34,7 @@ std::string astraInfo(const astra::CProjectionGeometry3D& geom) {
 
 // class Reconstructor
 
-AstraReconstructor::AstraReconstructor(const ProjectionGeometry& p_geom, 
-                                       const VolumeGeometry& s_geom, 
-                                       const VolumeGeometry& v_geom)
+AstraReconstructor::AstraReconstructor(const VolumeGeometry& s_geom, const VolumeGeometry& v_geom)
     : Reconstructor(),
       slice_recon_(s_geom),
       volume_recon_(v_geom) {
@@ -60,7 +58,7 @@ ParallelBeamReconstructor::ParallelBeamReconstructor(const ProjectionGeometry& p
                                                      const VolumeGeometry& s_geom,
                                                      const VolumeGeometry& v_geom,
                                                      bool double_buffering)
-        : AstraReconstructor(p_geom, s_geom, v_geom) {
+        : AstraReconstructor(s_geom, v_geom) {
     uint32_t col_count = p_geom.col_count;
     uint32_t row_count = p_geom.row_count;
     auto& angles = p_geom.angles;
@@ -168,7 +166,7 @@ ConeBeamReconstructor::ConeBeamReconstructor(const ProjectionGeometry& p_geom,
                                              const VolumeGeometry& s_geom,
                                              const VolumeGeometry& v_geom,
                                              bool double_buffering)
-        : AstraReconstructor(p_geom, s_geom, v_geom) {
+        : AstraReconstructor(s_geom, v_geom) {
 
     uint32_t col_count = p_geom.col_count;
     uint32_t row_count = p_geom.row_count;