diff --git a/setup.py b/setup.py index 39bac723a05dee5bc1facbf5dab2f900077adc8f..7b9037aa7a664082b728ed1ea1e57f99dfe234fd 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( packages=find_packages("src"), entry_points={ "karabo.bound_device": [ - "DsscCombinedCorrection = DsscCorrection.combined_correction_dssc:DsscCombinedCorrection", + "DsscCorrection = Correction.dssc_correction:DsscCorrection", ], }, package_data={}, diff --git a/src/DsscCorrection/cuda_pipeline.py b/src/Correction/cuda_pipeline.py similarity index 100% rename from src/DsscCorrection/cuda_pipeline.py rename to src/Correction/cuda_pipeline.py diff --git a/src/DsscCorrection/combined_correction_dssc.py b/src/Correction/dssc_correction.py similarity index 99% rename from src/DsscCorrection/combined_correction_dssc.py rename to src/Correction/dssc_correction.py index a0452368bc9c9b1ce18075aee88321c95d5f7dfb..a9582b037a1f3b207d592af35e23949c24005ef4 100644 --- a/src/DsscCorrection/combined_correction_dssc.py +++ b/src/Correction/dssc_correction.py @@ -18,8 +18,8 @@ from karabo.common.states import State from .cuda_pipeline import PyCudaPipeline -@bound.KARABO_CLASSINFO("DsscCombinedCorrection", "0.0.0") -class DsscCombinedCorrection(calibrationBase.CalibrationReceiverBaseDevice): +@bound.KARABO_CLASSINFO("DsscCorrection", "0.0.0") +class DsscCorrection(calibrationBase.CalibrationReceiverBaseDevice): _dict_cache_slots = { "applyCorrection", "doAnything", @@ -37,7 +37,7 @@ class DsscCombinedCorrection(calibrationBase.CalibrationReceiverBaseDevice): @staticmethod def expectedParameters(expected): - DsscCombinedCorrection.addConstant( + DsscCorrection.addConstant( "Offset", "Dark", expected, optional=True, mandatoryForIteration=True ) diff --git a/src/DsscCorrection/gpu-dssc-correct.cpp b/src/Correction/gpu-dssc-correct.cpp similarity index 100% rename from src/DsscCorrection/gpu-dssc-correct.cpp rename to src/Correction/gpu-dssc-correct.cpp