diff --git a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml index 561d1da0..deb7a63c 100644 --- a/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml +++ b/src/rad/resources/schemas/mosaic_basic-1.0.0.yaml @@ -79,7 +79,7 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.segment] - pass: + pass_plan: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. type: integer @@ -89,7 +89,7 @@ properties: origin: TBD archive_catalog: datatype: smallint - destination: [ScienceCommon.pass] + destination: [ScienceCommon.pass_plan] program: title: Program number, defined range is 1..18445; included in obs_id and visit_id as 'PPPPP'. @@ -150,10 +150,10 @@ properties: datatype: nvarchar(25) destination: [ScienceCommon.product_type] propertyOrder: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, program, survey, optical_element, + mean_exposure_time, visit, segment, pass_plan, program, survey, optical_element, instrument, telescope, location_name, product_type ] flowStyle: block required: [ time_first_mjd, time_last_mjd, time_mean_mjd, max_exposure_time, - mean_exposure_time, visit, segment, pass, program, survey, optical_element, + mean_exposure_time, visit, segment, pass_plan, program, survey, optical_element, instrument, telescope, location_name, product_type ] ... diff --git a/src/rad/resources/schemas/observation-1.0.0.yaml b/src/rad/resources/schemas/observation-1.0.0.yaml index c30c4274..eaccc332 100644 --- a/src/rad/resources/schemas/observation-1.0.0.yaml +++ b/src/rad/resources/schemas/observation-1.0.0.yaml @@ -55,7 +55,7 @@ properties: archive_catalog: datatype: smallint destination: [ScienceCommon.execution_plan, GuideWindow.execution_plan] - pass: + pass_plan: title: Pass number within execution plan, defined range is 1..999; included in obs_id and visit_id as 'AA'. type: integer @@ -65,7 +65,7 @@ properties: origin: TBD archive_catalog: datatype: smallint - destination: [ScienceCommon.pass, GuideWindow.pass] + destination: [ScienceCommon.pass_plan, GuideWindow.pass_plan] segment: title: Segment Number within pass, defined range is 1..999; included in obs_id and visit_id as 'SSS'. @@ -171,13 +171,13 @@ properties: datatype: nvarchar(15) destination: [ScienceCommon.survey, GuideWindow.survey] propertyOrder: [obs_id, visit_id, program, - execution_plan, pass, observation, segment, + execution_plan, pass_plan, observation, segment, visit, visit_file_group, visit_file_sequence, visit_file_activity, exposure, template, observation_label, survey] flowStyle: block required: [obs_id, visit_id, program, - execution_plan, pass, observation, segment, + execution_plan, pass_plan, observation, segment, visit, visit_file_group, visit_file_sequence, visit_file_activity, exposure, template, observation_label, survey]