diff --git a/xlens/__init__.py b/xlens/__init__.py index 63f95c2..8a33ced 100644 --- a/xlens/__init__.py +++ b/xlens/__init__.py @@ -1,8 +1,8 @@ from . import ( catalog, - putils, process_pipe, processor, + putils, sim_pipe, simulator, summary_pipe, diff --git a/xlens/process_pipe/__init__.py b/xlens/process_pipe/__init__.py index 50a7c55..3384417 100644 --- a/xlens/process_pipe/__init__.py +++ b/xlens/process_pipe/__init__.py @@ -1,10 +1,10 @@ from . import ( + detect_multiband, + force_multiband, fpfs_force, fpfs_joint, - systematics_multiband, hsc, - detect_multiband, - force_multiband, + systematics_multiband, ) __all__ = [ diff --git a/xlens/process_pipe/detect_multiband.py b/xlens/process_pipe/detect_multiband.py index 62d08a0..381cb73 100644 --- a/xlens/process_pipe/detect_multiband.py +++ b/xlens/process_pipe/detect_multiband.py @@ -1,15 +1,15 @@ +import lsst.afw.math as afwMath +import lsst.afw.table as afwTable +import lsst.pipe.base.connectionTypes as cT +from lsst.meas.algorithms import DynamicDetectionTask +from lsst.meas.base import SkyMapIdGeneratorConfig +from lsst.pex.config import ConfigurableField from lsst.pipe.base import ( - Struct, PipelineTask, PipelineTaskConfig, PipelineTaskConnections, + Struct, ) -import lsst.pipe.base.connectionTypes as cT -from lsst.pex.config import ConfigurableField -from lsst.meas.algorithms import DynamicDetectionTask -from lsst.meas.base import SkyMapIdGeneratorConfig -import lsst.afw.table as afwTable -import lsst.afw.math as afwMath class DetectCoaddSourcesConnections( diff --git a/xlens/process_pipe/measure_multiband.py b/xlens/process_pipe/measure_multiband.py index e44cb86..ebbb0a6 100644 --- a/xlens/process_pipe/measure_multiband.py +++ b/xlens/process_pipe/measure_multiband.py @@ -1,21 +1,21 @@ -from lsst.pipe.base import ( - Struct, - PipelineTask, - PipelineTaskConfig, - PipelineTaskConnections, -) +import lsst.afw.table as afwTable import lsst.pipe.base.connectionTypes as cT -from lsst.pex.config import Field, ConfigurableField +from lsst.daf.base import PropertyList from lsst.meas.algorithms import SetPrimaryFlagsTask from lsst.meas.astrom import DirectMatchTask from lsst.meas.base import ( - SingleFrameMeasurementTask, CatalogCalculationTask, + SingleFrameMeasurementTask, SkyMapIdGeneratorConfig, ) from lsst.meas.extensions.scarlet.io import updateCatalogFootprints -import lsst.afw.table as afwTable -from lsst.daf.base import PropertyList +from lsst.pex.config import ConfigurableField, Field +from lsst.pipe.base import ( + PipelineTask, + PipelineTaskConfig, + PipelineTaskConnections, + Struct, +) from lsst.skymap import BaseSkyMap diff --git a/xlens/processor/fpfs.py b/xlens/processor/fpfs.py index e92d43a..7e88c67 100644 --- a/xlens/processor/fpfs.py +++ b/xlens/processor/fpfs.py @@ -5,8 +5,8 @@ from lsst.afw.image import ExposureF from lsst.pex.config import Config, Field, FieldValidationError, ListField from numpy.typing import NDArray -from ..simulator.random import get_noise_seed, num_rot +from ..simulator.random import get_noise_seed, num_rot from . import utils from .base import MeasBaseTask diff --git a/xlens/processor/fpfs_simplesim.py b/xlens/processor/fpfs_simplesim.py index 5beb14c..c80659f 100644 --- a/xlens/processor/fpfs_simplesim.py +++ b/xlens/processor/fpfs_simplesim.py @@ -39,8 +39,8 @@ from lsst.pipe.base import Task from numpy.typing import NDArray -from .fpfs import FpfsMeasurementTask from ..simulator.simplesim import SimpleSimShearTask +from .fpfs import FpfsMeasurementTask class FpfsSimpleSimConfig(Config): @@ -78,8 +78,10 @@ def validate(self): ) if not os.path.isdir(self.simulator.root_dir): raise FileNotFoundError("Cannot find root_dir") - if self.simulator.draw_image_noise != \ - self.fpfs.do_noise_bias_correction: + if ( + self.simulator.draw_image_noise + != self.fpfs.do_noise_bias_correction + ): raise ValueError( "simulator.draw_image noise not equal" "fpfs.do_noise_bias_correction" @@ -148,7 +150,9 @@ def run(self, ifield: int) -> NDArray: if os.path.isfile(name): res = fitsio.read(name) else: - res = self.process_data(ifield=ifield, mode=mode, rotId=rotId) + res = self.process_data( + ifield=ifield, mode=mode, rotId=rotId + ) self.write_fpfs_src( ifield=ifield, mode=mode, diff --git a/xlens/putils/__init__.py b/xlens/putils/__init__.py index 9829395..f101408 100644 --- a/xlens/putils/__init__.py +++ b/xlens/putils/__init__.py @@ -1,9 +1,11 @@ import os -from . import torque import subprocess + import numpy as np from astropy.table import Table +from . import torque + def chunk_list(lst, num_chunks): lst = lst.astype("str") diff --git a/xlens/putils/torque/__init__.py b/xlens/putils/torque/__init__.py index 4982817..4805200 100644 --- a/xlens/putils/torque/__init__.py +++ b/xlens/putils/torque/__init__.py @@ -1,7 +1,8 @@ +import subprocess import time -from .template import template_string from string import Template -import subprocess + +from .template import template_string gw_node_list = [ "hpcs005", diff --git a/xlens/sim_pipe/__init__.py b/xlens/sim_pipe/__init__.py index 10a4036..59d18e1 100644 --- a/xlens/sim_pipe/__init__.py +++ b/xlens/sim_pipe/__init__.py @@ -1,3 +1,3 @@ -from . import multibandSim, addNoise +from . import addNoise, multibandSim __all__ = ["multibandSim", "addNoise"] diff --git a/xlens/sim_pipe/addNoise.py b/xlens/sim_pipe/addNoise.py index ecfd6f9..1ad3488 100644 --- a/xlens/sim_pipe/addNoise.py +++ b/xlens/sim_pipe/addNoise.py @@ -14,22 +14,22 @@ # GNU General Public License for more details. # from typing import Any -import numpy as np -import lsst.afw.image as afwImage +import lsst.afw.image as afwImage import lsst.pipe.base.connectionTypes as cT +import numpy as np from lsst.meas.base import SkyMapIdGeneratorConfig +from lsst.pex.config import Field, FieldValidationError from lsst.pipe.base import ( - Struct, PipelineTask, PipelineTaskConfig, PipelineTaskConnections, + Struct, ) -from lsst.pex.config import Field, FieldValidationError + from ..simulator.multiband import get_noise_array -from ..simulator.random import get_noise_seed, num_rot from ..simulator.multiband_defaults import noise_variance_defaults - +from ..simulator.random import get_noise_seed, num_rot class MultibandSimPipeConnections( @@ -59,7 +59,7 @@ class MultibandSimPipeConnections( ) outputExposure = cT.Output( doc="Output simulated coadd exposure", - name="{outputCoaddName}_{mode}_rot{rotId}_noise{noiseId}_Coadd_calexp", + name="{outputCoaddName}_noise{noiseId}_{mode}_rot{rotId}_Coadd_calexp", storageClass="ExposureF", dimensions=("skymap", "tract", "patch", "band"), ) @@ -94,9 +94,7 @@ def validate(self): ) if self.noiseId < 0 or self.noiseId >= 10: raise FieldValidationError( - self.__class__.noiseId, - self, - "We require 0 <= noiseId < 10" + self.__class__.noiseId, self, "We require 0 <= noiseId < 10" ) def setDefaults(self): @@ -169,6 +167,4 @@ def run( exposure.getMaskedImage().image.array[:, :] + noise_array ) - return Struct( - outputExposure=exposure - ) + return Struct(outputExposure=exposure) diff --git a/xlens/sim_pipe/multibandSim.py b/xlens/sim_pipe/multibandSim.py index eff880c..d1c12b3 100644 --- a/xlens/sim_pipe/multibandSim.py +++ b/xlens/sim_pipe/multibandSim.py @@ -26,10 +26,7 @@ from lsst.pipe.tasks.coaddBase import makeSkyInfo from lsst.skymap import BaseSkyMap -from ..simulator.multiband import ( - MultibandSimShearTask, - MultibandSimHaloTask, -) +from ..simulator.multiband import MultibandSimHaloTask, MultibandSimShearTask class MultibandSimPipeConnections( diff --git a/xlens/simulator/__init__.py b/xlens/simulator/__init__.py index 6a249d8..b9c2821 100644 --- a/xlens/simulator/__init__.py +++ b/xlens/simulator/__init__.py @@ -1,5 +1,11 @@ -from . import base, multiband, multiband_defaults, perturbation, simplesim -from . import random +from . import ( + base, + multiband, + multiband_defaults, + perturbation, + random, + simplesim, +) __all__ = [ "base", diff --git a/xlens/simulator/multiband.py b/xlens/simulator/multiband.py index a2ed0a3..6ab119e 100644 --- a/xlens/simulator/multiband.py +++ b/xlens/simulator/multiband.py @@ -30,11 +30,7 @@ from numpy.typing import NDArray from ..processor.utils import resize_array -from ..simulator.random import ( - get_noise_seed, - gal_seed_base, - num_rot, -) +from ..simulator.random import gal_seed_base, get_noise_seed, num_rot from .base import SimBaseTask from .multiband_defaults import ( mag_zero_defaults, @@ -117,9 +113,7 @@ def validate(self): super().validate() if self.galId >= 10 or self.galId < 0: raise FieldValidationError( - self.__class__.galId, - self, - "We require 0 <= galId < 10" + self.__class__.galId, self, "We require 0 <= galId < 10" ) if self.rotId >= num_rot: raise FieldValidationError( @@ -127,9 +121,7 @@ def validate(self): ) if self.noiseId < 0 or self.noiseId >= 10: raise FieldValidationError( - self.__class__.noiseId, - self, - "We require 0 <= noiseId < 10" + self.__class__.noiseId, self, "We require 0 <= noiseId < 10" ) def setDefaults(self): diff --git a/xlens/simulator/random.py b/xlens/simulator/random.py index d2fc0d0..c86923d 100644 --- a/xlens/simulator/random.py +++ b/xlens/simulator/random.py @@ -1,4 +1,3 @@ - image_noise_base = 20 gal_seed_base = 10