From bc476c4856b4d2754d4ef27ce6b459c00f6ea773 Mon Sep 17 00:00:00 2001 From: David Hammer <dhammer@mailbox.org> Date: Mon, 16 Aug 2021 16:39:53 +0200 Subject: [PATCH] Renaming to DsscCorrection --- setup.py | 2 +- src/{DsscCorrection => Correction}/cuda_pipeline.py | 0 .../dssc_correction.py} | 6 +++--- src/{DsscCorrection => Correction}/gpu-dssc-correct.cpp | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename src/{DsscCorrection => Correction}/cuda_pipeline.py (100%) rename src/{DsscCorrection/combined_correction_dssc.py => Correction/dssc_correction.py} (99%) rename src/{DsscCorrection => Correction}/gpu-dssc-correct.cpp (100%) diff --git a/setup.py b/setup.py index 39bac723..7b9037aa 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 a0452368..a9582b03 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 -- GitLab