diff --git a/src/toolbox_scs/detectors/__init__.py b/src/toolbox_scs/detectors/__init__.py
index a34b0b9fb6dd0f3ae3b6a4b6868c615ecb5dcff9..32b941f3f4614f2d710951907452c0895aa7d704 100644
--- a/src/toolbox_scs/detectors/__init__.py
+++ b/src/toolbox_scs/detectors/__init__.py
@@ -1,82 +1,21 @@
-from .xgm import (
- get_xgm, calibrate_xgm)
-from .digitizers import (
- get_peaks, get_tim_peaks, get_laser_peaks, get_digitizer_peaks,
- check_peak_params)
-from .bam_detectors import get_bam
-from .pes import get_pes_tof, get_pes_params
-from .dssc_data import (
- save_xarray, load_xarray, get_data_formatted, save_attributes_h5)
-from .dssc_misc import (
- load_dssc_info, create_dssc_bins, quickmask_DSSC_ASIC,
- get_xgm_formatted, load_mask)
-from .dssc_processing import (
- process_dssc_data)
-from .dssc import (
- DSSCBinner, DSSCFormatter)
-from .azimuthal_integrator import (
- AzimuthalIntegrator, AzimuthalIntegratorDSSC)
+from .azimuthal_integrator import *
+from .bam_detectors import *
+from .digitizers import *
+from .dssc import *
+from .dssc_data import *
+from .dssc_misc import *
+from .dssc_plot import *
+from .dssc_processing import *
+from .fccd import *
+from .xgm import *
__all__ = (
- # Functions
- "get_xgm",
- "calibrate_xgm",
- "get_peaks",
- "get_tim_peaks",
- "get_laser_peaks",
- "get_digitizer_peaks",
- "check_peak_params",
- "get_bam",
- "get_pes_tof",
- "get_pes_params",
- "save_xarray",
- "load_xarray",
- "get_data_formatted",
- "save_attributes_h5",
- "load_dssc_info",
- "create_dssc_bins",
- "quickmask_DSSC_ASIC",
- "get_xgm_formatted",
- "load_mask",
- "calc_xgm_frame_indices",
- "process_dssc_data",
- # Classes
- "DSSCBinner",
- "DSSCFormatter",
- "AzimuthalIntegrator",
- "AzimuthalIntegratorDSSC",
- # Variables
+ azimuthal_integrator.__all__
+ + bam_detectors.__all__
+ + digitizers.__all__
+ + dssc.__all__
+ + dssc_data.__all__
+ + dssc_misc.__all__
+ + dssc_processing.__all__
+ + xgm.__all__
)
-
-
-# -----------------------------------------------------------------------------
-# Clean namespace
-# -> certain filenames we dont need in the namespace. Especially not those
-# that are marked as private by using an underscore (_<filename>.py).
-# -----------------------------------------------------------------------------
-
-clean_ns = [
- # filenames
- 'DSSC_bkp',
- 'DSSC1module',
- 'dssc',
- 'dssc_routines',
- 'dssc_processing',
- 'dssc_data',
- 'dssc_misc',
- 'dssc_plot',
- 'azimuthal_integrator',
- 'FastCCD',
- 'xgm',
- 'digitizers',
- 'bam_detectors',
- 'pes'
- ]
-
-
-for name in dir():
- if name in clean_ns:
- del globals()[name]
-
-del globals()['clean_ns']
-del globals()['name']
diff --git a/src/toolbox_scs/detectors/azimuthal_integrator.py b/src/toolbox_scs/detectors/azimuthal_integrator.py
index d6326dfc77a83c8f7daea565b6d3ef21b4d919e4..235c9584faf86b4a355dcde726af3c951c8e9ab0 100644
--- a/src/toolbox_scs/detectors/azimuthal_integrator.py
+++ b/src/toolbox_scs/detectors/azimuthal_integrator.py
@@ -1,6 +1,11 @@
import logging
import numpy as np
+__all__ = [
+ 'AzimuthalIntegrator',
+ 'AzimuthalIntegratorDSSC'
+]
+
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/bam_detectors.py b/src/toolbox_scs/detectors/bam_detectors.py
index 12d6ef1b2abaf1cf69df1a42efbb88fea9a94892..667d20afb4fa39b2626664d9ce7ecc6cada2096f 100644
--- a/src/toolbox_scs/detectors/bam_detectors.py
+++ b/src/toolbox_scs/detectors/bam_detectors.py
@@ -15,6 +15,9 @@ from ..misc.bunch_pattern_external import is_pulse_at
from ..mnemonics_machinery import (mnemonics_to_process,
mnemonics_for_run)
+__all__ = [
+ 'get_bam',
+]
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/digitizers.py b/src/toolbox_scs/detectors/digitizers.py
index b67732336174509374ec5f1c2b9374c30968e0dc..339d17a90ec6448bdb095573e5af590adc0a73e6 100644
--- a/src/toolbox_scs/detectors/digitizers.py
+++ b/src/toolbox_scs/detectors/digitizers.py
@@ -18,6 +18,14 @@ from ..util.exceptions import ToolBoxValueError
from ..mnemonics_machinery import (mnemonics_to_process,
mnemonics_for_run)
+__all__ = [
+ 'check_peak_params',
+ 'get_digitizer_peaks',
+ 'get_laser_peaks',
+ 'get_peaks',
+ 'get_tim_peaks',
+]
+
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/dssc.py b/src/toolbox_scs/detectors/dssc.py
index aaa80bf7f4ff77451146a440e570ed9df4eba508..7aa93a9f4697e2506bb92c117014139ef87ba784 100644
--- a/src/toolbox_scs/detectors/dssc.py
+++ b/src/toolbox_scs/detectors/dssc.py
@@ -29,7 +29,10 @@ from .dssc_misc import (
from .dssc_processing import (
process_dssc_data, create_empty_dataset)
-__all__ = ["DSSCBinner", "DSSCFormatter"]
+__all__ = [
+ "DSSCBinner",
+ "DSSCFormatter"]
+
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/dssc_data.py b/src/toolbox_scs/detectors/dssc_data.py
index 078117727a8daabe88c6be50c9f3f92725801adc..94b23366c08097c42d4f2c98423289e12325ea6f 100644
--- a/src/toolbox_scs/detectors/dssc_data.py
+++ b/src/toolbox_scs/detectors/dssc_data.py
@@ -6,6 +6,13 @@ import xarray as xr
from ..util.exceptions import ToolBoxFileError
+__all__ = [
+ 'get_data_formatted',
+ 'load_xarray',
+ 'save_attributes_h5',
+ 'save_xarray',
+]
+
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/dssc_misc.py b/src/toolbox_scs/detectors/dssc_misc.py
index 96f5254d4e1c4af936f2a87da42bea19573441e0..db89aa76db27e22545ab23662a25ee2ec50ec483 100644
--- a/src/toolbox_scs/detectors/dssc_misc.py
+++ b/src/toolbox_scs/detectors/dssc_misc.py
@@ -14,6 +14,14 @@ import extra_data as ed
from .xgm import get_xgm
from .digitizers import get_tim_peaks
+__all__ = [
+ 'create_dssc_bins',
+ 'get_xgm_formatted',
+ 'load_dssc_info',
+ 'load_mask',
+ 'quickmask_DSSC_ASIC',
+]
+
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/dssc_processing.py b/src/toolbox_scs/detectors/dssc_processing.py
index 2858308f6da108605b4d8950c3b0b317ff95d71c..a95607db058883662eb332041f72083fc374b210 100644
--- a/src/toolbox_scs/detectors/dssc_processing.py
+++ b/src/toolbox_scs/detectors/dssc_processing.py
@@ -15,6 +15,10 @@ import extra_data as ed
from ..mnemonics_machinery import mnemonics_for_run
from .dssc_data import save_xarray
+__all__ = [
+ 'process_dssc_data'
+]
+
log = logging.getLogger(__name__)
diff --git a/src/toolbox_scs/detectors/fccd.py b/src/toolbox_scs/detectors/fccd.py
index 0396df5549d8d3c4c476d351fe8627a0d1c9d8d6..f0cb5de04f8f5c3846ebe4331ac3a05a4d19abee 100644
--- a/src/toolbox_scs/detectors/fccd.py
+++ b/src/toolbox_scs/detectors/fccd.py
@@ -1,6 +1,5 @@
from joblib import Parallel, delayed, parallel_backend
from time import strftime
-import tempfile
import shutil
from tqdm.auto import tqdm
import os
@@ -17,11 +16,11 @@ import h5py
from glob import glob
from imageio import imread
-import ToolBox as tb
from ..constants import mnemonics as _mnemonics
from .azimuthal_integrator import AzimuthalIntegrator
from ..misc.laser_utils import positionToDelay
+
class FastCCD:
def __init__(self, proposal, distance=1, raw=False):
diff --git a/src/toolbox_scs/detectors/xgm.py b/src/toolbox_scs/detectors/xgm.py
index cdb84dc20ccf05410d18078634fb5f3acccc297f..944dcc501130ca9cdc7cf340982c11c3bc8f23ee 100644
--- a/src/toolbox_scs/detectors/xgm.py
+++ b/src/toolbox_scs/detectors/xgm.py
@@ -16,6 +16,11 @@ from ..misc.bunch_pattern_external import is_sase_1, is_sase_3
from ..mnemonics_machinery import (mnemonics_to_process,
mnemonics_for_run)
+__all__ = [
+ 'calibrate_xgm',
+ 'get_xgm',
+]
+
log = logging.getLogger(__name__)