fix (Memory): removed memory profiler module and some minor fixes

mariolukas · May 19, 2021 · 1e65cfe · 1e65cfe
1 parent 4a4159c
commit 1e65cfe
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 15 deletions.
diff --git a/src/fabscan/FSEvents.py b/src/fabscan/FSEvents.py
@@ -5,8 +5,6 @@
 __email__ = "info@mariolukas.de"
 
 import multiprocessing
-import json
-from memory_profiler import profile
 
 try:
    from queue import Empty

diff --git a/src/fabscan/FSScanner.py b/src/fabscan/FSScanner.py
@@ -22,8 +22,6 @@
 from fabscan.lib.util.FSUpdate import upgrade_is_available, do_upgrade
 from fabscan.lib.util.FSDiscovery import register_to_discovery
 from fabscan.lib.util.FSSystemWatch import get_cpu_temperature
-from fabscan.lib.util.FSMemoryProfiler import FSMemoryProfiler
-
 
 class FSState(object):
     IDLE = "IDLE"
@@ -100,9 +98,6 @@ def __init__(self, settings, config, eventmanager, scanActor, calibrationActor):
             self.scheduler.add_job(self.run_discovery_service, 'interval', minutes=30, id='register_discovery_service')
             self._logger.info("Added discovery scheduling job.")
 
-        #mem_debugger = FSMemoryProfiler()
-        #self.scheduler.add_job(mem_debugger.debug_memory, 'interval', minutes=1, id='memory_profiler')
-
         self.scheduler.add_job(self.run_temperature_watch_service, 'interval', minutes=1, id='cpu_temperature_service')
 
     def run(self):

diff --git a/src/fabscan/config/default.config.json b/src/fabscan/config/default.config.json
@@ -41,7 +41,7 @@
     },
     "process_numbers": 3,
     "turntable": {
-        "steps": 6400,
+        "steps": 3200,
         "radius": 70,
         "height": 155
     },

diff --git a/src/fabscan/scanner/laserscanner/FSHardwareController.py b/src/fabscan/scanner/laserscanner/FSHardwareController.py
@@ -20,7 +20,6 @@
 from fabscan.scanner.laserscanner.driver.FSLed import Led
 from fabscan.scanner.interfaces.FSHardwareConnectorFactory import FSHardwareConnectorFactory
 from fabscan.scanner.interfaces.FSCameraFactory import FSCameraFactory
-from memory_profiler import profile
 
 @singleton(
     config=ConfigInterface,

diff --git a/src/fabscan/scanner/laserscanner/FSImageProcessor.py b/src/fabscan/scanner/laserscanner/FSImageProcessor.py
@@ -222,6 +222,7 @@ def compute_line_segmentation(self, image, index=0, roi_mask=False):
 
             return image
 
+    # Savitzky-Golay-Filter
     def _sgf(self, u, v, s):
         if len(u) > 1:
             i = 0
@@ -242,7 +243,6 @@ def _sgf(self, u, v, s):
             return u, v
 
     # RANSAC implementation: https://github.com/ahojnnes/numpy-snippets/blob/master/ransac.py
-
     def _ransac(self, u, v):
         if len(u) > 1:
             data = np.vstack((v.ravel(), u.ravel())).T

diff --git a/src/fabscan/scanner/laserscanner/FSScanActor.py b/src/fabscan/scanner/laserscanner/FSScanActor.py
@@ -392,7 +392,8 @@ def init_texture_scan(self):
         self.hardwareController.led.on(self.config.file.texture_illumination, self.config.file.texture_illumination, self.config.file.texture_illumination)
 
         #let thee camera settle after turning on the led
-        time.sleep(1)
+        self._logger.debug("Waiting for camera while settling...")
+        time.sleep(3)
 
 
     def scan_next_texture_position(self):

diff --git a/src/fabscan/scanner/laserscanner/driver/FSLaser.py b/src/fabscan/scanner/laserscanner/driver/FSLaser.py
@@ -4,7 +4,6 @@
 __maintainer__ = "Mario Lukas"
 __email__ = "info@mariolukas.de"
 import time
-from memory_profiler import profile
 
 class Laser:
     def __init__(self, hardware_connector):

diff --git a/src/fabscan/scanner/laserscanner/driver/FSSerial.py b/src/fabscan/scanner/laserscanner/driver/FSSerial.py
@@ -14,7 +14,6 @@
 from fabscan.lib.util.FSInject import inject
 from fabscan.FSConfig import ConfigInterface
 from fabscan.scanner.interfaces.FSHardwareConnector import FSHardwareConnectorInterface
-from memory_profiler import profile
 
 @inject(
     config=ConfigInterface

diff --git a/src/fabscan/worker/FSImageWorker.py b/src/fabscan/worker/FSImageWorker.py
@@ -217,8 +217,9 @@ def run(self):
                             #self._logger.debug('Image Processing starts.')
                             try:
                                 #TODO: Save image here for creating debug information.
-                                #self.image.save_image(image_task.image, image_task.progress, image_task.prefix,
-                                #                      dir_name=image_task.prefix + '/raw_' + image_task.raw_dir)
+                                if bool(self.config.file.keep_raw_images):
+                                    self.image.save_image(image_task.image, image_task.progress, image_task.prefix,
+                                                          dir_name=image_task.prefix + '/raw_laser_' + image_task.raw_dir)
                                 color_image = None
                                 image_task.image = self.image_processor.reorientate_image(image_task.image)
                                 angle = float(image_task.progress * 360) / float(image_task.resolution)