Fix conflicts following merge of PR #163

src/nectarchain/data/container/__init__.py

@@ -9,6 +9,7 @@
     get_array_keys,
     merge_map_ArrayDataContainer,
 )
+from .flatfield_container import FlatFieldContainer
 from .gain_container import GainContainer, SPEfitContainer
 from .pedestal_container import (
     NectarCAMPedestalContainer,
@@ -32,5 +33,5 @@
     "NectarCAMPedestalContainer",
     "NectarCAMPedestalContainers",
     "PedestalFlagBits",
+    "FlatFieldContainer",
 ]
-from .flatfieldContainer import *

src/nectarchain/makers/calibration/flatfield_makers.py

@@ -7,14 +7,10 @@
 from nectarchain.makers import EventsLoopNectarCAMCalibrationTool
 from nectarchain.makers.component import NectarCAMComponent
 
-from .core import NectarCAMCalibrationTool
-
 logging.basicConfig(format="%(asctime)s %(name)s %(levelname)s %(message)s")
 log = logging.getLogger(__name__)
 log.handlers = logging.getLogger("__main__").handlers
 
-from .core import NectarCAMCalibrationTool
-
 __all__ = ["FlatfieldNectarCAMCalibrationTool"]
 
 
@@ -23,7 +19,7 @@ class FlatfieldNectarCAMCalibrationTool(EventsLoopNectarCAMCalibrationTool):
 
     componentsList = ComponentNameList(
         NectarCAMComponent,
-        default_value=["preFlatFieldComponent"],
+        default_value=["PreFlatFieldComponent"],
         help="List of Component names to be apply, the order will be respected",
     ).tag(config=True)
 
@@ -35,4 +31,3 @@ def _init_output_path(self):
         self.output_path = pathlib.Path(
             f"{os.environ.get('NECTARCAMDATA','/tmp')}/FlatFieldTests/{filename}"
         )
-

src/nectarchain/makers/component/__init__.py

@@ -11,10 +11,9 @@
 from .pedestal_component import PedestalEstimationComponent
 from .photostatistic_algorithm import PhotoStatisticAlgorithm
 from .photostatistic_component import PhotoStatisticNectarCAMComponent
+from .preflatfield_component import PreFlatFieldComponent
 from .spe import SPECombinedalgorithm, SPEHHValgorithm, SPEHHVStdalgorithm
 from .waveforms_component import WaveformsComponent
-from .preFlatFieldComponent impor
-
 
 __all__ = [
     "ArrayDataComponent",
@@ -34,5 +33,5 @@
     "PhotoStatisticNectarCAMComponent",
     "PhotoStatisticAlgorithm",
     "GainNectarCAMComponent",
-    "preFlatFieldComponent",
+    "PreFlatFieldComponent",
 ]

src/nectarchain/makers/component/preFlatFieldComponent.py → src/nectarchain/makers/component/preflatfield_component.py

@@ -13,10 +13,10 @@
 log = logging.getLogger(__name__)
 log.handlers = logging.getLogger("__main__").handlers
 
-__all__ = ["preFlatFieldComponent"]
+__all__ = ["PreFlatFieldComponent"]
 
 
-class preFlatFieldComponent(NectarCAMComponent):
+class PreFlatFieldComponent(NectarCAMComponent):
     """
     Component that computes flat field coefficients from raw data.