Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-24696: Flatten AP alert schemas #18

Merged
merged 8 commits into from
Jun 12, 2020
Merged

DM-24696: Flatten AP alert schemas #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1f357e
migrate 3.0 schemas from v2.1
ebellm Jun 5, 2020
8913fbc
remove unnecessary cutout schema
ebellm Jun 5, 2020
8ebb732
flatten schemas
ebellm Jun 5, 2020
bd259b9
remove alert namespacing
ebellm Jun 9, 2020
4952f0c
set latest to 3.0
ebellm Jun 9, 2020
7f0467c
add sample data
ebellm Jun 9, 2020
5344bec
change Sigma to Err where appropriate
ebellm Jun 10, 2020
e3b9b45
remove duplicated psFluxErr
ebellm Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions python/lsst/alert/packet/schema/3/0/lsst.alert.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"namespace": "lsst",
"type": "record",
"name": "alert",
"doc": "sample avro alert schema v3.0",
"fields": [
{"name": "alertId", "type": "long", "doc": "unique alert identifer"},
{"name": "diaSource", "type": "lsst.diaSource"},
{"name": "prvDiaSources", "type": ["null", {
"type": "array",
"items": "lsst.diaSource"}], "default": null},
{"name": "prvDiaForcedSources", "type": ["null", {
"type": "array",
"items": "lsst.diaForcedSource"}], "default": null},
{"name": "prvDiaNondetectionLimits", "type": ["null", {
"type": "array",
"items": "lsst.diaNondetectionLimit"}], "default": null},
{"name": "diaObject", "type": ["null", "lsst.diaObject"], "default": null},
{"name": "ssObject", "type": ["null", "lsst.ssObject"], "default": null},
{"name": "cutoutDifference", "type": ["null", "bytes"], "default": null},
{"name": "cutoutTemplate", "type": ["null", "bytes"], "default": null}
]
}
16 changes: 16 additions & 0 deletions python/lsst/alert/packet/schema/3/0/lsst.diaForcedSource.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"namespace": "lsst",
"name": "diaForcedSource",
"type": "record",
"fields": [
{"name": "diaForcedSourceId", "type": "long"},
{"name": "ccdVisitId", "type": "long"},
{"name": "diaObjectId", "type": "long"},
{"name": "midPointTai", "type": "double"},
{"name": "filterName", "type": "string"},
{"name": "psFlux", "type": "float"},
{"name": "psFluxErr", "type": "float"},
{"name": "totFlux", "type": "float"},
{"name": "totFluxErr", "type":"float"}
]
}
11 changes: 11 additions & 0 deletions python/lsst/alert/packet/schema/3/0/lsst.diaNondetectionLimit.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"namespace": "lsst",
"name": "diaNondetectionLimit",
"type": "record",
"fields": [
{"name": "ccdVisitId", "type": "long"},
{"name": "midPointTai", "type": "double"},
{"name": "filterName", "type": "string"},
{"name": "diaNoise", "type": "float"}
]
}
396 changes: 396 additions & 0 deletions python/lsst/alert/packet/schema/3/0/lsst.diaObject.avsc
View file
Open in desktop

Large diffs are not rendered by default.

114 changes: 114 additions & 0 deletions python/lsst/alert/packet/schema/3/0/lsst.diaSource.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{
"namespace": "lsst",
"name": "diaSource",
"type": "record",
"fields": [
{"name": "diaSourceId", "type": "long"},
{"name": "ccdVisitId", "type": "long"},
{"name": "diaObjectId", "type": ["null", "long"], "default": null},
{"name": "ssObjectId", "type": ["null", "long"], "default": null},
{"name": "parentDiaSourceId", "type": ["null", "long"], "default": null},
{"name": "midPointTai", "type": "double"},
{"name": "filterName", "type": "string"},
{"name": "programId", "type": "int"},
{"name": "ra", "type": "double"},
{"name": "decl", "type": "double"},
{"name": "raErr", "type": ["null", "float"], "default": null},
{"name": "declErr", "type": ["null", "float"], "default": null},
{"name": "ra_decl_Cov", "type": ["null", "float"], "default": null},
{"name": "x", "type": "float"},
{"name": "y", "type": "float"},
{"name": "xErr", "type": ["null", "float"], "default": null},
{"name": "yErr", "type": ["null", "float"], "default": null},
{"name": "x_y_Cov", "type": ["null", "float"], "default": null},
{"name": "apFlux", "type": "float"},
{"name": "apFluxErr", "type": "float"},
{"name": "snr", "type": "float"},
{"name": "psFlux", "type": "float"},
{"name": "psFluxErr", "type": "float"},
{"name": "psRa", "type": ["null", "double"], "default": null},
{"name": "psDecl", "type": ["null", "double"], "default": null},
{"name": "psRaErr", "type": ["null", "float"], "default": null},
{"name": "psDeclErr", "type": ["null", "float"], "default": null},
{"name": "psFlux_psRa_Cov", "type": ["null", "float"], "default": null},
{"name": "psFlux_psDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "psRa_psDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "psLnL", "type": ["null", "float"], "default": null},
{"name": "psChi2", "type": ["null", "float"], "default": null},
{"name": "psNdata", "type": ["null", "int"], "default": null},
{"name": "trailFlux", "type": ["null", "float"], "default": null},
{"name": "trailRa", "type": ["null", "double"], "default": null},
{"name": "trailDecl", "type": ["null", "double"], "default": null},
{"name": "trailLength", "type": ["null", "float"], "default": null},
{"name": "trailAngle", "type": ["null", "float"], "default": null},
{"name": "trailFluxErr", "type": ["null", "float"], "default": null},
{"name": "trailRaErr", "type": ["null", "float"], "default": null},
{"name": "trailDeclErr", "type": ["null", "float"], "default": null},
{"name": "trailLengthErr", "type": ["null", "float"], "default": null},
{"name": "trailAngleErr", "type": ["null", "float"], "default": null},
{"name": "trailFlux_trailRa_Cov", "type": ["null", "float"], "default": null},
{"name": "trailFlux_trailDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "trailFlux_trailLength_Cov", "type": ["null", "float"], "default": null},
{"name": "trailFlux_trailAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "trailRa_trailDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "trailRa_trailLength_Cov", "type": ["null", "float"], "default": null},
{"name": "trailRa_trailAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "trailDecl_trailLength_Cov", "type": ["null", "float"], "default": null},
{"name": "trailDecl_trailAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "trailLength_trailAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "trailLnL", "type": ["null", "float"], "default": null},
{"name": "trailChi2", "type": ["null", "float"], "default": null},
{"name": "trailNdata", "type": ["null", "int"], "default": null},
{"name": "dipMeanFlux", "type": ["null", "float"], "default": null},
{"name": "dipFluxDiff", "type": ["null", "float"], "default": null},
{"name": "dipRa", "type": ["null", "double"], "default": null},
{"name": "dipDecl", "type": ["null", "double"], "default": null},
{"name": "dipLength", "type": ["null", "float"], "default": null},
{"name": "dipAngle", "type": ["null", "float"], "default": null},
{"name": "dipMeanFluxErr", "type": ["null", "float"], "default": null},
{"name": "dipFluxDiffErr", "type": ["null", "float"], "default": null},
{"name": "dipRaErr", "type": ["null", "float"], "default": null},
{"name": "dipDeclErr", "type": ["null", "float"], "default": null},
{"name": "dipLengthErr", "type": ["null", "float"], "default": null},
{"name": "dipAngleErr", "type": ["null", "float"], "default": null},
{"name": "dipMeanFlux_dipFluxDiff_Cov", "type": ["null", "float"], "default": null},
{"name": "dipMeanFlux_dipRa_Cov", "type": ["null", "float"], "default": null},
{"name": "dipMeanFlux_dipDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "dipMeanFlux_dipLength_Cov", "type": ["null", "float"], "default": null},
{"name": "dipMeanFlux_dipAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "dipFluxDiff_dipRa_Cov", "type": ["null", "float"], "default": null},
{"name": "dipFluxDiff_dipDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "dipFluxDiff_dipLength_Cov", "type": ["null", "float"], "default": null},
{"name": "dipFluxDiff_dipAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "dipRa_dipDecl_Cov", "type": ["null", "float"], "default": null},
{"name": "dipRa_dipLength_Cov", "type": ["null", "float"], "default": null},
{"name": "dipRa_dipAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "dipDecl_dipLength_Cov", "type": ["null", "float"], "default": null},
{"name": "dipDecl_dipAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "dipLength_dipAngle_Cov", "type": ["null", "float"], "default": null},
{"name": "dipLnL", "type": ["null", "float"], "default": null},
{"name": "dipChi2", "type": ["null", "float"], "default": null},
{"name": "dipNdata", "type": ["null", "int"], "default": null},
{"name": "totFlux", "aliases": ["fpFlux"], "type": ["null", "float"], "default": null},
{"name": "totFluxErr", "type": ["null", "float"], "default": null},
{"name": "diffFlux", "type": ["null", "float"], "default": null},
{"name": "diffFluxErr", "type": ["null", "float"], "default": null},
{"name": "fpBkgd", "aliases": ["fpSky"], "type": ["null", "float"], "default": null},
{"name": "fpBkgdErr", "type": ["null", "float"], "default": null},
{"name": "ixx", "type": ["null", "float"], "default": null},
{"name": "iyy", "type": ["null", "float"], "default": null},
{"name": "ixy", "type": ["null", "float"], "default": null},
{"name": "ixxErr", "type": ["null", "float"], "default": null},
{"name": "iyyErr", "type": ["null", "float"], "default": null},
{"name": "ixyErr", "type": ["null", "float"], "default": null},
{"name": "ixx_iyy_Cov", "type": ["null", "float"], "default": null},
{"name": "ixx_ixy_Cov", "type": ["null", "float"], "default": null},
{"name": "iyy_ixy_Cov", "type": ["null", "float"], "default": null},
{"name": "ixxPSF", "type": ["null", "float"], "default": null},
{"name": "iyyPSF", "type": ["null", "float"], "default": null},
{"name": "ixyPSF", "type": ["null", "float"], "default": null},
{"name": "extendedness", "type": ["null", "float"], "default": null},
{"name": "spuriousness", "type": ["null", "float"], "default": null},
{"name": "flags", "type": "long"}
]
}
88 changes: 88 additions & 0 deletions python/lsst/alert/packet/schema/3/0/lsst.ssObject.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{
"namespace": "lsst",
"name": "ssObject",
"type": "record",
"fields": [
{"name": "ssObjectId", "type": "long"},
{"name": "q", "type": ["null", "double"], "default": null},
{"name": "e", "type": ["null", "double"], "default": null},
{"name": "i", "type": ["null", "double"], "default": null},
{"name": "lan", "type": ["null", "double"], "default": null},
{"name": "aop", "type": ["null", "double"], "default": null},
{"name": "M", "type": ["null", "double"], "default": null},
{"name": "epoch", "type": ["null", "double"], "default": null},
{"name": "qSigma", "type": ["null", "double"], "default": null},
{"name": "eSigma", "type": ["null", "double"], "default": null},
{"name": "iSigma", "type": ["null", "double"], "default": null},
{"name": "lanSigma", "type": ["null", "double"], "default": null},
{"name": "aopSigma", "type": ["null", "double"], "default": null},
{"name": "MSigma", "type": ["null", "double"], "default": null},
{"name": "epochSigma", "type": ["null", "double"], "default": null},
{"name": "q_e_Cov", "type": ["null", "double"], "default": null},
{"name": "q_i_Cov", "type": ["null", "double"], "default": null},
{"name": "q_lan_Cov", "type": ["null", "double"], "default": null},
{"name": "q_aop_Cov", "type": ["null", "double"], "default": null},
{"name": "q_M_Cov", "type": ["null", "double"], "default": null},
{"name": "q_epoch_Cov", "type": ["null", "double"], "default": null},
{"name": "e_i_Cov", "type": ["null", "double"], "default": null},
{"name": "e_lan_Cov", "type": ["null", "double"], "default": null},
{"name": "e_aop_Cov", "type": ["null", "double"], "default": null},
{"name": "e_M_Cov", "type": ["null", "double"], "default": null},
{"name": "e_epoch_Cov", "type": ["null", "double"], "default": null},
{"name": "i_lan_Cov", "type": ["null", "double"], "default": null},
{"name": "i_aop_Cov", "type": ["null", "double"], "default": null},
{"name": "i_M_Cov", "type": ["null", "double"], "default": null},
{"name": "i_epoch_Cov", "type": ["null", "double"], "default": null},
{"name": "lan_aop_Cov", "type": ["null", "double"], "default": null},
{"name": "lan_M_Cov", "type": ["null", "double"], "default": null},
{"name": "lan_epoch_Cov", "type": ["null", "double"], "default": null},
{"name": "aop_M_Cov", "type": ["null", "double"], "default": null},
{"name": "aop_epoch_Cov", "type": ["null", "double"], "default": null},
{"name": "M_epoch_Cov", "type": ["null", "double"], "default": null},
{"name": "arc", "type": ["null", "float"], "default": null},
{"name": "orbFitLnL", "type": ["null", "float"], "default": null},
{"name": "orbFitChi2", "type": ["null", "float"], "default": null},
{"name": "orbFitNdata", "type": ["null", "int"], "default": null},
{"name": "MOID1", "type": ["null", "float"], "default": null},
{"name": "MOID2", "type": ["null", "float"], "default": null},
{"name": "moidLon1", "type": ["null", "double"], "default": null},
{"name": "moidLon2", "type": ["null", "double"], "default": null},
{"name": "uH", "type": ["null", "float"], "default": null},
{"name": "uHErr", "type": ["null", "float"], "default": null},
{"name": "uG1", "type": ["null", "float"], "default": null},
{"name": "uG1Err", "type": ["null", "float"], "default": null},
{"name": "uG2", "type": ["null", "float"], "default": null},
{"name": "uG2Err", "type": ["null", "float"], "default": null},
{"name": "gH", "type": ["null", "float"], "default": null},
{"name": "gHErr", "type": ["null", "float"], "default": null},
{"name": "gG1", "type": ["null", "float"], "default": null},
{"name": "gG1Err", "type": ["null", "float"], "default": null},
{"name": "gG2", "type": ["null", "float"], "default": null},
{"name": "gG2Err", "type": ["null", "float"], "default": null},
{"name": "rH", "type": ["null", "float"], "default": null},
{"name": "rHErr", "type": ["null", "float"], "default": null},
{"name": "rG1", "type": ["null", "float"], "default": null},
{"name": "rG1Err", "type": ["null", "float"], "default": null},
{"name": "rG2", "type": ["null", "float"], "default": null},
{"name": "rG2Err", "type": ["null", "float"], "default": null},
{"name": "iH", "type": ["null", "float"], "default": null},
{"name": "iHErr", "type": ["null", "float"], "default": null},
{"name": "iG1", "type": ["null", "float"], "default": null},
{"name": "iG1Err", "type": ["null", "float"], "default": null},
{"name": "iG2", "type": ["null", "float"], "default": null},
{"name": "iG2Err", "type": ["null", "float"], "default": null},
{"name": "zH", "type": ["null", "float"], "default": null},
{"name": "zHErr", "type": ["null", "float"], "default": null},
{"name": "zG1", "type": ["null", "float"], "default": null},
{"name": "zG1Err", "type": ["null", "float"], "default": null},
{"name": "zG2", "type": ["null", "float"], "default": null},
{"name": "zG2Err", "type": ["null", "float"], "default": null},
{"name": "yH", "type": ["null", "float"], "default": null},
{"name": "yHErr", "type": ["null", "float"], "default": null},
{"name": "yG1", "type": ["null", "float"], "default": null},
{"name": "yG1Err", "type": ["null", "float"], "default": null},
{"name": "yG2", "type": ["null", "float"], "default": null},
{"name": "yG2Err", "type": ["null", "float"], "default": null},
{"name": "flags", "type": "long"}
]
}
123 changes: 123 additions & 0 deletions python/lsst/alert/packet/schema/3/0/sample_data/alert.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
{
"alertId": 1231321321,
"l1dbId": 222222222,
"diaSource":
{
"diaSourceId": 281323062375219200,
"ccdVisitId": 111111,
"midPointTai": 1480360995,
"filterName": "r",
"programId": 1,
"ra": 351.570546978,
"decl": 0.126243049656,
"raSigma": 0.00028,
"declSigma": 0.00028,
"ra_decl_Cov": 0.00029,
"x": 112.1,
"y": 121.1,
"xSigma": 1.2,
"ySigma": 1.1,
"x_y_Cov": 1.2,
"apFlux": 1241.0,
"apFluxErr": 12.0,
"snr": 41.1,
"psFlux": 1241.0,
"psFluxErr": 12.0,
"flags": 0
},
"prvDiaSources": [
{
"diaSourceId": 281323062375219198,
"ccdVisitId": 111111,
"midPointTai": 1480360995,
"filterName": "r",
"programId": 1,
"ra": 351.570546978,
"decl": 0.126243049656,
"raSigma": 0.00028,
"declSigma": 0.00028,
"ra_decl_Cov": 0.00029,
"x": 112.1,
"y": 121.1,
"xSigma": 1.2,
"ySigma": 1.1,
"x_y_Cov": 1.2,
"apFlux": 1241.0,
"apFluxErr": 12.0,
"snr": 41.1,
"psFlux": 1241.0,
"psFluxErr": 12.0,
"flags": 0
},
{
"diaSourceId": 281323062375219199,
"ccdVisitId": 111111,
"midPointTai": 1480360995,
"filterName": "r",
"programId": 1,
"ra": 351.570546978,
"decl": 0.126243049656,
"raSigma": 0.00028,
"declSigma": 0.00028,
"ra_decl_Cov": 0.00029,
"x": 112.1,
"y": 121.1,
"xSigma": 1.2,
"ySigma": 1.1,
"x_y_Cov": 1.2,
"apFlux": 1241.0,
"apFluxErr": 12.0,
"snr": 41.1,
"psFlux": 1241.0,
"psFluxErr": 12.0,
"flags": 0
}
],
"diaObject": {
"diaObjectId": 281323062375219201,
"ra": 351.570546978,
"decl": 0.126243049656,
"raSigma": 0.00028,
"declSigma": 0.00028,
"ra_decl_Cov": 0.00029,
"radecTai": 1480360995,
"pmRa": 0.00013,
"pmDecl": 0.00014,
"parallax": 2.124124,
"pmRaSigma": 0.00013,
"pmDeclSigma": 0.00013,
"parallaxSigma": 0.00013,
"pmRa_pmDecl_Cov": 0.00013,
"pmRa_parallax_Cov": 0.00013,
"pmDecl_parallax_Cov": 0.00013,
"pmParallaxLnL": 0.00013,
"pmParallaxChi2": 0.00013,
"pmParallaxNdata": 1214,
"flags": 0
},
"ssObject": {
"ssObjectId":5364546,
"q": 6654.14,
"e": 636.121,
"i": 5436.2344,
"lan": 54325.34,
"aop": 344243.3,
"M": 131.1241,
"epoch": 134141,
"arc":2.124124,
"orbFitLnL": 1343141.0341,
"orbFitChi2": 1341421.2414,
"orbFitNdata": 1214,
"MOID1": 3141.0,
"MOID2": 23432.423,
"moidLon1": 2143.213,
"moidLon2": 3142.23123,
"uH": 13231.231,
"uHErr": 13213.213,
"uG1": 32131.312,
"uG1Err": 31232.2132,
"uG2": 231.2313,
"uG2Err": 23132.231,
"flags": 0
}
}
4 changes: 4 additions & 0 deletions python/lsst/alert/packet/schema/3/0/sample_data/fakeAlert.avro
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion python/lsst/alert/packet/schema/latest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1
3.0