Merge pull request #1171 from lsst/tickets/DM-49453

DM-49453 : DRP solar system ephemeris generation

Author: Gerenjie

data/eph.ini

@@ -0,0 +1,130 @@
+# Sorcha Configuration File
+
+
+[INPUT]
+
+# The simulation used for the ephemeris input.
+# Options: "ar", "external"
+ephemerides_type = ar
+
+# Format for ephemeris simulation output file. If reading from an existing temporary ephemeris
+# database, this will be ignored.
+# Options: csv, whitespace, hdf5
+eph_format = csv
+
+# SSPP chunks processing by object: how many objects should be processed at once?
+size_serial_chunk = 2000
+
+# Format for orbit/colour/brightness/cometary data files.
+# Options: comma, csv or whitespace
+aux_format = csv
+
+# SQL query for extracting data from the pointing database.
+pointing_sql_query = SELECT observationId, observationStartMJD as observationStartMJD_TAI, visitTime, visitExposureTime, filter, seeingFwhmGeom as seeingFwhmGeom_arcsec, seeingFwhmEff as seeingFwhmEff_arcsec, fiveSigmaDepth as fieldFiveSigmaDepth_mag, fieldRA as fieldRA_deg, fieldDec as fieldDec_deg, rotSkyPos as fieldRotSkyPos_deg FROM observations order by observationId
+
+
+[FILTERS]
+
+# Filters of the observations you are interested in, comma-separated.
+# Your physical parameters file must have H calculated in one of these filters
+# and colour offset columns defined relative to that filter.
+observing_filters = r
+
+
+[SATURATION]
+
+# Upper magnitude limit on sources that will overfill the detector pixels/have
+# counts above the non-linearity regime of the pixels where one can’t do 
+# photometry. Objects brighter than this limit (in magnitude) will be cut. 
+# Comment out for no saturation limit.
+# Two formats are accepted:
+# Single float: applies same saturation limit to observations in all filters.
+# Comma-separated list of floats: applies saturation limit per filter, in order as
+# given in observing_filters keyword.
+bright_limit = -9999
+
+
+[PHASECURVES]
+
+# The phase function used to calculate apparent magnitude. The physical parameters input
+# file must contain the columns needed to calculate the phase function.
+# Options: HG, HG1G2, HG12, linear, none.
+phase_function = HG
+
+
+[FOV]
+
+camera_model = circle
+fill_factor = 1.0
+
+# Radius of the circle for a circular footprint (in degrees). Float.
+# Comment out or do not include if using footprint camera model.
+circle_radius = {FOV}
+
+
+[FADINGFUNCTION]
+
+# Detection efficiency fading function on or off. Uses the fading function as outlined in
+# Chelsey and Vereš (2017) to remove observations.
+fading_function_on = True
+
+# Width parameter for fading function. Should be greater than zero and less than 0.5.
+# Suggested value is 0.1 after Chelsey and Vereš (2017).
+fading_function_width = 0.1
+
+# Peak efficiency for the fading function, called the 'fill factor' in Chelsey and Veres (2017).
+# Suggested value is 1. Do not change this unless you are sure of what you are doing.
+fading_function_peak_efficiency = 1.
+
+
+[SIMULATION]
+# Configuration for running the ASSIST+REBOUND ephemerides generator.
+
+# the field of view of our search field, in degrees
+ar_ang_fov = {FOV}
+
+# the buffer zone around the field of view we want to include, in degrees
+ar_fov_buffer = 0.2
+
+# the "picket" is our imprecise discretization of time that allows us to move progress
+# our simulations forward without getting too granular when we don't have to.
+# the unit is number of days.
+ar_picket = 1
+
+# the obscode is the MPC observatory code for the provided telescope.
+ar_obs_code = {OBSCODE}
+
+# the order of healpix which we will use for the healpy portions of the code.
+# the nside is equivalent to 2**ar_healpix_order
+ar_healpix_order = 6
+
+
+[OUTPUT]
+
+# Output format.
+# Options: csv, sqlite3, hdf5
+output_format = csv
+
+# Controls which columns are in the output files.
+# Options are "basic" and "all", which returns all columns.
+output_columns = all
+
+
+[LIGHTCURVE]
+
+# The unique name of the lightcurve model to use. Defined in the ``name_id`` method 
+# of the subclasses of AbstractLightCurve. If not none, the complex physical parameters 
+# file must be specified at the command line.lc_model = none
+lc_model = none
+
+
+[ACTIVITY]
+
+# The unique name of the actvity model to use. Defined in the ``name_id`` method
+#  of the subclasses of AbstractCometaryActivity.  If not none, a complex physical parameters 
+# file must be specified at the command line.
+comet_activity = none
+
+[EXPERT]
+
+default_SNR_cut=False

python/lsst/pipe/tasks/drpAssociationPipe.py

@@ -58,9 +58,9 @@ class DrpAssociationPipeConnections(pipeBase.PipelineTaskConnections,
     ssObjectTableRefs = pipeBase.connectionTypes.Input(
         doc="Reference to catalogs of SolarSolarSystem objects expected to be "
             "observable in each (visit, detector).",
-        name="preloaded_DRP_SsObjects",
+        name="preloaded_ss_object_visit",
         storageClass="ArrowAstropy",
-        dimensions=("instrument", "visit", "detector"),
+        dimensions=("instrument", "visit"),
         minimum=0,
         deferLoad=True,
         multiple=True
@@ -236,7 +236,7 @@ def visitDetectorPair(dataRef):
             diaIdDict[visitDetectorPair(diaCatRef)] = diaCatRef
         if self.config.doSolarSystemAssociation:
             for ssCatRef in ssObjectTableRefs:
-                ssObjectIdDict[visitDetectorPair(ssCatRef)] = ssCatRef
+                ssObjectIdDict[ssCatRef.dataId["visit"]] = ssCatRef
             for finalVisitSummaryRef in finalVisitSummaryRefs:
                 finalVisitSummaryIdDict[finalVisitSummaryRef.dataId["visit"]] = finalVisitSummaryRef
 
@@ -247,9 +247,9 @@ def visitDetectorPair(dataRef):
             associatedSsSources, unassociatedSsObjects = None, None
             nSsSrc, nSsObj = 0, 0
             # Always false if ! self.config.doSolarSystemAssociation
-            if all([(visit, detector) in ssObjectIdDict and visit in finalVisitSummaryIdDict]):
+            if (visit in ssObjectIdDict) and (visit in finalVisitSummaryIdDict):
                 # Get the ssCat and finalVisitSummary
-                ssCat = ssObjectIdDict[(visit, detector)].get()
+                ssCat = ssObjectIdDict[visit].get()
                 finalVisitSummary = finalVisitSummaryIdDict[visit].get()
                 # Get the exposure metadata from the detector's row in the finalVisitSummary table.
                 visitInfo = finalVisitSummary.find(detector).visitInfo