Skip to content

Commit

Permalink
Resolve conflicts with main following merge of PR cta-observatory#168
Browse files Browse the repository at this point in the history
  • Loading branch information
jlenain committed Jan 22, 2025
1 parent bb2c95b commit d877494
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion src/nectarchain/makers/component/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
from .photostatistic_algorithm import PhotoStatisticAlgorithm
from .photostatistic_component import PhotoStatisticNectarCAMComponent
from .preflatfield_component import PreFlatFieldComponent
from .spe import SPECombinedalgorithm, SPEHHValgorithm, SPEHHVStdalgorithm
from .spe import (
SPECombinedalgorithm,
SPEHHValgorithm,
SPEHHVStdalgorithm,
SPEnominalalgorithm,
SPEnominalStdalgorithm,
)
from .waveforms_component import WaveformsComponent

__all__ = [
Expand All @@ -21,6 +27,8 @@
"SPEHHValgorithm",
"SPEHHVStdalgorithm",
"SPECombinedalgorithm",
"SPEnominalStdalgorithm",
"SPEnominalalgorithm",
"FlatFieldSingleHHVSPENectarCAMComponent",
"FlatFieldSingleHHVSPEStdNectarCAMComponent",
"FlatFieldSingleNominalSPENectarCAMComponent",
Expand Down

0 comments on commit d877494

Please sign in to comment.