Skip to content

Commit b604634

Browse files
committed
Merge branch 'fix-and-standardize-logging-in-geecs-scanner' of https://github.com/ag6520/GEECS-Plugins into fix-and-standardize-logging-in-geecs-scanner
2 parents 0998843 + e60652b commit b604634

File tree

8 files changed

+27
-6
lines changed

8 files changed

+27
-6
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"""Init for geecs scanner."""
2+
3+
import logging
4+
5+
logger = logging.getLogger(__name__)
6+
logger.addHandler(logging.NullHandler())

GEECS-Scanner-GUI/geecs_scanner/app/action_library.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
# Module-level logger
5050
# ---------------------------------------------------------------------------
5151
logger = logging.getLogger(__name__)
52-
logger.addHandler(logging.NullHandler())
5352

5453

5554
def get_default_action() -> dict:

GEECS-Scanner-GUI/geecs_scanner/app/geecs_scanner.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
# Module-level logger
6262
# ---------------------------------------------------------------------------
6363
logger = logging.getLogger(__name__)
64-
logger.addHandler(logging.NullHandler())
6564

6665
CURRENT_VERSION = "v" + version(
6766
"geecs-scanner-gui"

GEECS-Scanner-GUI/geecs_scanner/data_acquisition/__init__.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
"""
2+
Data acquisition package for GEECS-Scanner.
3+
4+
This package re-exports common classes so callers can write:
5+
from geecs_scanner.data_acquisition import ScanManager, DataLogger, ActionManager
6+
"""
7+
8+
__all__ = [
9+
"ActionManager",
10+
"DeviceManager",
11+
"DataLogger",
12+
"ScanStepExecutor",
13+
"DatabaseDictLookup",
14+
"ScanDataManager",
15+
"ScanManager",
16+
"ConsoleLogger",
17+
"get_full_config_path",
18+
"visa_config_generator",
19+
]
20+
121
from .action_manager import ActionManager
222
from .device_manager import DeviceManager
323
from .data_logger import DataLogger

GEECS-Scanner-GUI/geecs_scanner/data_acquisition/device_manager.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
# Module-level logger
7575
# -----------------------------------------------------------------------------
7676
logger = logging.getLogger(__name__)
77-
logger.addHandler(logging.NullHandler())
7877

7978

8079
class DeviceManager:

GEECS-Scanner-GUI/geecs_scanner/data_acquisition/scan_data_manager.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
# Module-level logger
6464
# -----------------------------------------------------------------------------
6565
logger = logging.getLogger(__name__)
66-
logger.addHandler(logging.NullHandler())
6766

6867
DeviceSavePaths = Dict[str, Dict[str, Union[Path, str]]]
6968

GEECS-Scanner-GUI/geecs_scanner/data_acquisition/scan_executor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
from geecs_python_api.controls.devices.geecs_device import GeecsDevice
7575

7676
# -----------------------------------------------------------------------------
77-
# Module-level logger (no NullHandler for internal app modules)
77+
# Module-level logger
7878
# -----------------------------------------------------------------------------
7979
logger = logging.getLogger(__name__)
8080

GEECS-Scanner-GUI/geecs_scanner/optimization/base_evaluator.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444

4545
# Module-level logger
4646
logger = logging.getLogger(__name__)
47-
logger.addHandler(logging.NullHandler())
4847

4948

5049
class BaseEvaluator(ABC):

0 commit comments

Comments
 (0)