Skip to content

Commit

Permalink
Merge pull request #343 from lsst/tickets/DM-39490-all
Browse files Browse the repository at this point in the history
  • Loading branch information
rhiannonlynne committed Jul 20, 2023
2 parents d069e1c + 25a84e5 commit fa1a08b
Show file tree
Hide file tree
Showing 307 changed files with 941 additions and 1,071 deletions.
4 changes: 2 additions & 2 deletions doc/metric_list.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
__all__ = ("make_metric_list", )

import inspect

import rubin_sim.maf.maf_contrib as maf_contrib
import rubin_sim.maf.metrics as metrics

__all__ = ["make_metric_list"]


def make_metric_list(outfile):
f = open(outfile, "w")
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/data/data_sets.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
__all__ = ("get_data_dir", "data_versions", "get_baseline")

import glob
import os
import subprocess
import warnings

__all__ = ["get_data_dir", "data_versions", "get_baseline"]


def get_data_dir():
"""Get the location of the rubin_sim data directory.
Expand Down
3 changes: 2 additions & 1 deletion rubin_sim/data/rs_download_data.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
__all__ = ("data_dict", "rs_download_data")

import argparse
import os
import warnings
Expand Down
3 changes: 2 additions & 1 deletion rubin_sim/data/rs_download_sky.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env python
__all__ = ("MyHTMLParser", "rs_download_sky")

import argparse
import os
from html.parser import HTMLParser
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/altaz_batch.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
__all__ = ("altazHealpix", "altazLambert")

import rubin_sim.maf.metric_bundles as mb
import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.plots as plots
Expand All @@ -6,8 +8,6 @@
from .col_map_dict import col_map_dict
from .common import filter_list

__all__ = ["altazHealpix", "altazLambert"]


def basicSetup(metric_name, colmap=None, nside=64):
if colmap is None:
Expand Down
2 changes: 1 addition & 1 deletion rubin_sim/maf/batches/col_map_dict.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__all__ = ["get_col_map", "col_map_dict"]
__all__ = ("get_col_map", "col_map_dict")


def get_col_map(opsdb):
Expand Down
16 changes: 7 additions & 9 deletions rubin_sim/maf/batches/common.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
from __future__ import print_function

import inspect

import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.stackers as stackers

__all__ = [
__all__ = (
"combine_info_labels",
"filter_list",
"radec_cols",
Expand All @@ -19,7 +12,12 @@
"summary_completeness_over_h",
"fraction_population_at_threshold",
"microlensing_summary",
]
)

import inspect

import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.stackers as stackers


def combine_info_labels(info1, info2):
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/ddf_batch.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
__all__ = ("ddfBatch", )

import healpy as hp
import numpy as np

Expand All @@ -6,8 +8,6 @@

from .common import lightcurve_summary

__all__ = ["ddfBatch"]


def ddfBatch(
run_name="run_name",
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/filterchange_batch.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
__all__ = ("filtersPerNight", "filtersWholeSurvey")

import rubin_sim.maf.metric_bundles as mb
import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.slicers as slicers

from .col_map_dict import col_map_dict
from .common import standard_summary

__all__ = ["filtersPerNight", "filtersWholeSurvey"]


def setupMetrics(colmap, wholesurvey=False):
metric_list = []
Expand Down
4 changes: 1 addition & 3 deletions rubin_sim/maf/batches/glance_batch.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import print_function
__all__ = ("glanceBatch", )

import warnings

Expand All @@ -15,8 +15,6 @@
from .hourglass_batch import hourglassPlots
from .slew_batch import slewBasics

__all__ = ["glanceBatch"]


def glanceBatch(
colmap=None,
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/hourglass_batch.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"""Run the hourglass metric.
"""
__all__ = ("hourglassPlots", )

import rubin_sim.maf.metric_bundles as mb
import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.slicers as slicers

from .col_map_dict import col_map_dict

__all__ = ["hourglassPlots"]


def hourglassPlots(colmap=None, runName="opsim", nyears=10, extraSql=None, extraInfoLabel=None):
"""Run the hourglass metric, for each individual year.
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/info_batch.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
__all__ = ("metadata_bundle_dicts", )

import numpy as np

import rubin_sim.maf.batches as batches

__all__ = ["metadata_bundle_dicts"]


def metadata_bundle_dicts(allsky_slicer, wfd_slicer, opsim="opsim", colmap=batches.col_map_dict("FBS")):
# Set up the bundle dicts
Expand Down
16 changes: 8 additions & 8 deletions rubin_sim/maf/batches/metadata_batch.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
"""Some basic physical quantity metrics.
"""
__all__ = (
"metadataBasics",
"metadataBasicsAngle",
"allMetadata",
"metadataMaps",
"firstYearMetadata",
)

import rubin_sim.maf.metric_bundles as mb
import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.plots as plots
Expand All @@ -16,14 +24,6 @@
standard_summary,
)

__all__ = [
"metadataBasics",
"metadataBasicsAngle",
"allMetadata",
"metadataMaps",
"firstYearMetadata",
]


def metadataBasics(
value,
Expand Down
32 changes: 15 additions & 17 deletions rubin_sim/maf/batches/moving_objects_batch.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
from __future__ import division, print_function
__all__ = (
"ss_population_defaults",
"quick_discovery_batch",
"discovery_batch",
"run_completeness_summary",
"plot_completeness",
"characterization_inner_batch",
"characterization_outer_batch",
"run_fraction_summary",
"plot_fractions",
"plot_single",
"plot_activity",
"read_and_combine",
"combine_subsets",
)

import os
from copy import deepcopy
Expand All @@ -20,22 +34,6 @@
summary_completeness_over_h,
)

__all__ = [
"ss_population_defaults",
"quick_discovery_batch",
"discovery_batch",
"run_completeness_summary",
"plot_completeness",
"characterization_inner_batch",
"characterization_outer_batch",
"run_fraction_summary",
"plot_fractions",
"plot_single",
"plot_activity",
"read_and_combine",
"combine_subsets",
]


def ss_population_defaults(objtype):
"Provide useful default ranges for H, based on objtype of population type."
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/openshutter_batch.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""Evaluate the open shutter fraction.
"""
__all__ = ("openshutterFractions", )

import rubin_sim.maf.metric_bundles as mb
import rubin_sim.maf.metrics as metrics
import rubin_sim.maf.slicers as slicers

from .col_map_dict import col_map_dict
from .common import standard_summary

__all__ = ["openshutterFractions"]


def openshutterFractions(colmap=None, runName="opsim", extraSql=None, extraInfoLabel=None):
"""Evaluate open shutter fraction over whole survey and per night.
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/science_radar_batch.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
__all__ = ("science_radar_batch", )

import astropy.units as u
import healpy as hp
import numpy as np
Expand All @@ -11,8 +13,6 @@

from .common import extended_summary, filter_list, lightcurve_summary, standard_summary

__all__ = ["science_radar_batch"]


def science_radar_batch(
runName="run name",
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/skycoverage.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Evaluate some bulk properties of the sky coverage
"""
__all__ = ("meanRADec", "eastWestBias")

import numpy as np

import rubin_sim.maf.metric_bundles as mb
Expand All @@ -8,8 +10,6 @@

from .col_map_dict import col_map_dict

__all__ = ["meanRADec", "eastWestBias"]


def meanRADec(colmap=None, runName="opsim", extraSql=None, extraInfoLabel=None):
"""Plot the range of RA/Dec as a function of night.
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/slew_batch.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Sets of slew metrics.
"""
__all__ = ("slewBasics", "slewAngles", "slewSpeeds", "slewActivities")

import warnings

import numpy as np
Expand All @@ -11,8 +13,6 @@
from .col_map_dict import col_map_dict
from .common import combine_info_labels, standard_metrics

__all__ = ["slewBasics", "slewAngles", "slewSpeeds", "slewActivities"]


def slewBasics(colmap=None, runName="opsim", sqlConstraint=None):
"""Generate a simple set of statistics about the slew times and distances.
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/srd_batch.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
"""Metrics to investigate quantities related to SRD.
Potentially could diverge from versions in scienceRadar.
"""
__all__ = ("fOBatch", "astrometryBatch", "rapidRevisitBatch")

import warnings

import healpy as hp
Expand All @@ -15,8 +17,6 @@
from .col_map_dict import col_map_dict
from .common import combine_info_labels, radec_cols, standard_summary

__all__ = ["fOBatch", "astrometryBatch", "rapidRevisitBatch"]


def fOBatch(
colmap=None,
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/time_batch.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Sets of metrics to look at time between visits/pairs, etc.
"""
__all__ = ("intraNight", "interNight", "timeGaps", "seasons")

import numpy as np

import rubin_sim.maf.metric_bundles as mb
Expand All @@ -10,8 +12,6 @@
from .col_map_dict import col_map_dict
from .common import combine_info_labels, extended_summary, filter_list, radec_cols, standard_summary

__all__ = ["intraNight", "interNight", "timeGaps", "seasons"]


def intraNight(
colmap=None,
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/time_sci_batch.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Sets of metrics to look at impact of cadence on science
"""
__all__ = ("phaseGap", )

import numpy as np

import rubin_sim.maf.metric_bundles as mb
Expand All @@ -10,8 +12,6 @@
from .col_map_dict import col_map_dict
from .common import combine_info_labels, filter_list, radec_cols, standard_summary

__all__ = ["phaseGap"]


def phaseGap(
colmap=None,
Expand Down
4 changes: 2 additions & 2 deletions rubin_sim/maf/batches/visitdepth_batch.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"""Sets of metrics to look at general sky coverage - nvisits/coadded depth/Teff.
"""
__all__ = ("nvisitsM5Maps", "tEffMetrics", "nvisitsPerNight", "nvisitsPerSubset")

import copy

import numpy as np
Expand All @@ -13,8 +15,6 @@
from .col_map_dict import col_map_dict, get_col_map
from .common import combine_info_labels, filter_list, radec_cols, standard_summary

__all__ = ["nvisitsM5Maps", "tEffMetrics", "nvisitsPerNight", "nvisitsPerSubset"]


def nvisitsM5Maps(
colmap=None,
Expand Down
2 changes: 1 addition & 1 deletion rubin_sim/maf/db/add_run.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
__all__ = ("add_run", )

import argparse

Expand Down
Loading

0 comments on commit fa1a08b

Please sign in to comment.