diff --git a/firecrown/likelihood/number_counts.py b/firecrown/likelihood/number_counts.py index 39bc96d1..34adb6ea 100644 --- a/firecrown/likelihood/number_counts.py +++ b/firecrown/likelihood/number_counts.py @@ -477,6 +477,7 @@ def get_scale(self): assert self.current_tracer_args return self.current_tracer_args.scale + class LinearBiasSystematicFactory(BaseModel): """Factory class for LinearBiasSystematic objects.""" diff --git a/firecrown/likelihood/source.py b/firecrown/likelihood/source.py index 22a314a6..fab7aff6 100644 --- a/firecrown/likelihood/source.py +++ b/firecrown/likelihood/source.py @@ -33,6 +33,7 @@ class SourceSystematic(Updatable): def read(self, sacc_data: sacc.Sacc): """Call to allow this object to read from the appropriate sacc data.""" + class Source(Updatable): """An abstract source class (e.g., a sample of lenses). @@ -248,6 +249,7 @@ def apply(self, tools: ModelingTools, tracer_arg: _SourceGalaxyArgsT): dndz=dndz, ) + class PhotoZShiftFactory(BaseModel): """Factory class for PhotoZShift objects.""" @@ -312,9 +314,9 @@ def __init__( self.sacc_tracer = sacc_tracer self.current_tracer_args: None | _SourceGalaxyArgsT = None - self.systematics: UpdatableCollection[SourceGalaxySystematic] = ( - UpdatableCollection(systematics) - ) + self.systematics: UpdatableCollection[ + SourceGalaxySystematic + ] = UpdatableCollection(systematics) self.tracer_args: _SourceGalaxyArgsT def _read(self, sacc_data: sacc.Sacc): diff --git a/firecrown/likelihood/weak_lensing.py b/firecrown/likelihood/weak_lensing.py index a92fbc95..978c9080 100644 --- a/firecrown/likelihood/weak_lensing.py +++ b/firecrown/likelihood/weak_lensing.py @@ -431,6 +431,7 @@ def create_global(self) -> TattAlignmentSystematic: """ return TattAlignmentSystematic(None) + WeakLensingSystematicFactory = Annotated[ MultiplicativeShearBiasFactory | LinearAlignmentSystematicFactory @@ -446,9 +447,9 @@ class WeakLensingFactory(BaseModel): model_config = ConfigDict(extra="forbid", frozen=True) _cache: dict[int, WeakLensing] = PrivateAttr() - _global_systematics_instances: Sequence[SourceGalaxySystematic[WeakLensingArgs]] = ( - PrivateAttr() - ) + _global_systematics_instances: Sequence[ + SourceGalaxySystematic[WeakLensingArgs] + ] = PrivateAttr() per_bin_systematics: Sequence[WeakLensingSystematicFactory] global_systematics: Sequence[WeakLensingSystematicFactory]