Changeset 30516
- Timestamp:
- Feb 8, 2011, 8:49:06 AM (15 years ago)
- Location:
- branches/eam_branches/ipp-20101205/Ohana/src
- Files:
-
- 24 edited
-
libautocode/def/image-elixir.d (modified) (1 diff)
-
libautocode/def/image-loneos.d (modified) (1 diff)
-
libautocode/def/image-panstarrs-dev-0.d (modified) (1 diff)
-
libautocode/def/image-panstarrs-dev-1.d (modified) (1 diff)
-
libautocode/def/image-ps1-dev-1.d (modified) (1 diff)
-
libautocode/def/image-ps1-dev-2.d (modified) (1 diff)
-
libautocode/def/image-ps1-dev-3.d (modified) (1 diff)
-
libautocode/def/image-ps1-ref.d (modified) (1 diff)
-
libautocode/def/image-ps1-v1.d (modified) (1 diff)
-
libautocode/def/image-ps1-v2.d (modified) (1 diff)
-
libautocode/def/image.d (modified) (1 diff)
-
libdvo/src/dvo_convert_PS1_DEV_1.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_PS1_DEV_2.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_PS1_DEV_3.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_PS1_REF.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_PS1_V1.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_PS1_V2.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_elixir.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_loneos.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_panstarrs_DEV_0.c (modified) (2 diffs)
-
libdvo/src/dvo_convert_panstarrs_DEV_1.c (modified) (2 diffs)
-
opihi/dvo/dbExtractImages.c (modified) (1 diff)
-
opihi/dvo/dbFields.c (modified) (1 diff)
-
opihi/include/dvoshell.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-elixir.d
r30501 r30516 44 44 FIELD dummy, DUMMY, char[20], unused 45 45 46 FIELD dummy1, DUMMY1, short, place holder for byte boundaries47 FIELD dummy2, DUMMY2, short, place holder for byte boundaries46 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 47 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 48 48 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 49 49 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-loneos.d
r30501 r30516 44 44 FIELD dummy, DUMMY, char[20], unused 45 45 46 FIELD dummy1, DUMMY1, short, place holder for byte boundaries47 FIELD dummy2, DUMMY2, short, place holder for byte boundaries46 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 47 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 48 48 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 49 49 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-0.d
r30501 r30516 53 53 54 54 FIELD dummy, DUMMY, char[10], unused 55 FIELD dummy1, DUMMY1, short, place holder for byte boundaries56 FIELD dummy2, DUMMY2, short, place holder for byte boundaries55 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 56 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 57 57 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 58 58 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-panstarrs-dev-1.d
r30501 r30516 53 53 54 54 FIELD dummy, DUMMY, char[10], unused 55 FIELD dummy1, DUMMY1, short, place holder for byte boundaries56 FIELD dummy2, DUMMY2, short, place holder for byte boundaries55 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 56 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 57 57 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 58 58 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-1.d
r30501 r30516 53 53 54 54 # 40 bytes 55 FIELD dummy1, DUMMY1, short, place holder for byte boundaries56 FIELD dummy2, DUMMY2, short, place holder for byte boundaries55 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 56 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 57 57 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 58 58 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-2.d
r30501 r30516 53 53 # 48 bytes 54 54 55 FIELD dummy1, DUMMY1, short, place holder for byte boundaries56 FIELD dummy2, DUMMY2, short, place holder for byte boundaries55 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 56 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 57 57 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 58 58 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-dev-3.d
r30501 r30516 54 54 # 48 bytes 55 55 56 FIELD dummy1, DUMMY1, short, place holder for byte boundaries57 FIELD dummy2, DUMMY2, short, place holder for byte boundaries56 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 57 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 58 58 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 59 59 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-ref.d
r30501 r30516 56 56 57 57 # 40 bytes 58 FIELD dummy1, DUMMY1, short, place holder for byte boundaries59 FIELD dummy2, DUMMY2, short, place holder for byte boundaries58 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 59 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 60 60 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 61 61 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v1.d
r30501 r30516 55 55 # 48 bytes 56 56 57 FIELD dummy1, DUMMY1, short, place holder for byte boundaries58 FIELD dummy2, DUMMY2, short, place holder for byte boundaries57 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 58 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 59 59 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 60 60 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image-ps1-v2.d
r30501 r30516 60 60 # 48 bytes 61 61 62 FIELD dummy1, DUMMY1, short, place holder for byte boundaries63 FIELD dummy2, DUMMY2, short, place holder for byte boundaries62 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 63 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 64 64 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 65 65 -
branches/eam_branches/ipp-20101205/Ohana/src/libautocode/def/image.d
r30501 r30516 61 61 # 48 bytes 62 62 63 FIELD dummy1, DUMMY1, short, place holder for byte boundaries64 FIELD dummy2, DUMMY2, short, place holder for byte boundaries63 FIELD nLinkAstrom, NLINK_ASTROM, short, mean number of matched measurements for astrometry 64 FIELD nLinkPhotom, NLINK_PHOTOM, short, mean number of matched measurements for astrometry 65 65 FIELD dummy3, DUMMY3, short, place holder for byte boundaries 66 66 -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c
r30502 r30516 266 266 // with the following. (no real databases used those values -- see 267 267 // libdvo/doc/dvo-images.txt) 268 out[i]. dummy1 = in[i].dummy1;269 out[i]. dummy2 = in[i].dummy2;268 out[i].nLinkAstrom = in[i].nLinkAstrom; 269 out[i].nLinkPhotom = in[i].nLinkPhotom; 270 270 out[i].dummy3 = in[i].dummy3; 271 271 out[i].dXpixSys = in[i].dXpixSys; … … 333 333 // with the following. (no real databases used those values -- see 334 334 // libdvo/doc/dvo-images.txt) 335 out[i]. dummy1 = in[i].dummy1;336 out[i]. dummy2 = in[i].dummy2;335 out[i].nLinkAstrom = in[i].nLinkAstrom; 336 out[i].nLinkPhotom = in[i].nLinkPhotom; 337 337 out[i].dummy3 = in[i].dummy3; 338 338 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c
r30502 r30516 262 262 // with the following. (no real databases used those values -- see 263 263 // libdvo/doc/dvo-images.txt) 264 out[i]. dummy1 = in[i].dummy1;265 out[i]. dummy2 = in[i].dummy2;264 out[i].nLinkAstrom = in[i].nLinkAstrom; 265 out[i].nLinkPhotom = in[i].nLinkPhotom; 266 266 out[i].dummy3 = in[i].dummy3; 267 267 out[i].dXpixSys = in[i].dXpixSys; … … 327 327 // with the following. (no real databases used those values -- see 328 328 // libdvo/doc/dvo-images.txt) 329 out[i]. dummy1 = in[i].dummy1;330 out[i]. dummy2 = in[i].dummy2;329 out[i].nLinkAstrom = in[i].nLinkAstrom; 330 out[i].nLinkPhotom = in[i].nLinkPhotom; 331 331 out[i].dummy3 = in[i].dummy3; 332 332 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c
r30502 r30516 46 46 // with the following. (no real databases used those values -- see 47 47 // libdvo/doc/dvo-images.txt) 48 out[i]. dummy1 = in[i].dummy1;49 out[i]. dummy2 = in[i].dummy2;48 out[i].nLinkAstrom = in[i].nLinkAstrom; 49 out[i].nLinkPhotom = in[i].nLinkPhotom; 50 50 out[i].dummy3 = in[i].dummy3; 51 51 out[i].dXpixSys = in[i].dXpixSys; … … 105 105 // with the following. (no real databases used those values -- see 106 106 // libdvo/doc/dvo-images.txt) 107 out[i]. dummy1 = in[i].dummy1;108 out[i]. dummy2 = in[i].dummy2;107 out[i].nLinkAstrom = in[i].nLinkAstrom; 108 out[i].nLinkPhotom = in[i].nLinkPhotom; 109 109 out[i].dummy3 = in[i].dummy3; 110 110 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c
r30502 r30516 221 221 // with the following. (no real databases used those values -- see 222 222 // libdvo/doc/dvo-images.txt) 223 out[i]. dummy1 = in[i].dummy1;224 out[i]. dummy2 = in[i].dummy2;223 out[i].nLinkAstrom = in[i].nLinkAstrom; 224 out[i].nLinkPhotom = in[i].nLinkPhotom; 225 225 out[i].dummy3 = in[i].dummy3; 226 226 out[i].dXpixSys = in[i].dXpixSys; … … 283 283 // with the following. (no real databases used those values -- see 284 284 // libdvo/doc/dvo-images.txt) 285 out[i]. dummy1 = in[i].dummy1;286 out[i]. dummy2 = in[i].dummy2;285 out[i].nLinkAstrom = in[i].nLinkAstrom; 286 out[i].nLinkPhotom = in[i].nLinkPhotom; 287 287 out[i].dummy3 = in[i].dummy3; 288 288 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c
r30502 r30516 270 270 // with the following. (no real databases used those values -- see 271 271 // libdvo/doc/dvo-images.txt) 272 out[i]. dummy1 = in[i].dummy1;273 out[i]. dummy2 = in[i].dummy2;272 out[i].nLinkAstrom = in[i].nLinkAstrom; 273 out[i].nLinkPhotom = in[i].nLinkPhotom; 274 274 out[i].dummy3 = in[i].dummy3; 275 275 out[i].dXpixSys = in[i].dXpixSys; … … 334 334 // with the following. (no real databases used those values -- see 335 335 // libdvo/doc/dvo-images.txt) 336 out[i]. dummy1 = in[i].dummy1;337 out[i]. dummy2 = in[i].dummy2;336 out[i].nLinkAstrom = in[i].nLinkAstrom; 337 out[i].nLinkPhotom = in[i].nLinkPhotom; 338 338 out[i].dummy3 = in[i].dummy3; 339 339 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c
r30502 r30516 279 279 // with the following. (no real databases used those values -- see 280 280 // libdvo/doc/dvo-images.txt) 281 out[i]. dummy1 = in[i].dummy1;282 out[i]. dummy2 = in[i].dummy2;281 out[i].nLinkAstrom = in[i].nLinkAstrom; 282 out[i].nLinkPhotom = in[i].nLinkPhotom; 283 283 out[i].dummy3 = in[i].dummy3; 284 284 out[i].dXpixSys = in[i].dXpixSys; … … 341 341 // with the following. (no real databases used those values -- see 342 342 // libdvo/doc/dvo-images.txt) 343 out[i]. dummy1 = in[i].dummy1;344 out[i]. dummy2 = in[i].dummy2;343 out[i].nLinkAstrom = in[i].nLinkAstrom; 344 out[i].nLinkPhotom = in[i].nLinkPhotom; 345 345 out[i].dummy3 = in[i].dummy3; 346 346 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_elixir.c
r30502 r30516 269 269 // with the following. (no real databases used those values -- see 270 270 // libdvo/doc/dvo-images.txt) 271 out[i]. dummy1 = in[i].dummy1;272 out[i]. dummy2 = in[i].dummy2;271 out[i].nLinkAstrom = in[i].nLinkAstrom; 272 out[i].nLinkPhotom = in[i].nLinkPhotom; 273 273 out[i].dummy3 = in[i].dummy3; 274 274 out[i].dXpixSys = in[i].dXpixSys; … … 339 339 // with the following. (no real databases used those values -- see 340 340 // libdvo/doc/dvo-images.txt) 341 out[i]. dummy1 = in[i].dummy1;342 out[i]. dummy2 = in[i].dummy2;341 out[i].nLinkAstrom = in[i].nLinkAstrom; 342 out[i].nLinkPhotom = in[i].nLinkPhotom; 343 343 out[i].dummy3 = in[i].dummy3; 344 344 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_loneos.c
r30502 r30516 262 262 // with the following. (no real databases used those values -- see 263 263 // libdvo/doc/dvo-images.txt) 264 out[i]. dummy1 = in[i].dummy1;265 out[i]. dummy2 = in[i].dummy2;264 out[i].nLinkAstrom = in[i].nLinkAstrom; 265 out[i].nLinkPhotom = in[i].nLinkPhotom; 266 266 out[i].dummy3 = in[i].dummy3; 267 267 out[i].dXpixSys = in[i].dXpixSys; … … 332 332 // with the following. (no real databases used those values -- see 333 333 // libdvo/doc/dvo-images.txt) 334 out[i]. dummy1 = in[i].dummy1;335 out[i]. dummy2 = in[i].dummy2;334 out[i].nLinkAstrom = in[i].nLinkAstrom; 335 out[i].nLinkPhotom = in[i].nLinkPhotom; 336 336 out[i].dummy3 = in[i].dummy3; 337 337 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c
r30502 r30516 276 276 // with the following. (no real databases used those values -- see 277 277 // libdvo/doc/dvo-images.txt) 278 out[i]. dummy1 = in[i].dummy1;279 out[i]. dummy2 = in[i].dummy2;278 out[i].nLinkAstrom = in[i].nLinkAstrom; 279 out[i].nLinkPhotom = in[i].nLinkPhotom; 280 280 out[i].dummy3 = in[i].dummy3; 281 281 out[i].dXpixSys = in[i].dXpixSys; … … 345 345 // with the following. (no real databases used those values -- see 346 346 // libdvo/doc/dvo-images.txt) 347 out[i]. dummy1 = in[i].dummy1;348 out[i]. dummy2 = in[i].dummy2;347 out[i].nLinkAstrom = in[i].nLinkAstrom; 348 out[i].nLinkPhotom = in[i].nLinkPhotom; 349 349 out[i].dummy3 = in[i].dummy3; 350 350 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c
r30502 r30516 276 276 // with the following. (no real databases used those values -- see 277 277 // libdvo/doc/dvo-images.txt) 278 out[i]. dummy1 = in[i].dummy1;279 out[i]. dummy2 = in[i].dummy2;278 out[i].nLinkAstrom = in[i].nLinkAstrom; 279 out[i].nLinkPhotom = in[i].nLinkPhotom; 280 280 out[i].dummy3 = in[i].dummy3; 281 281 out[i].dXpixSys = in[i].dXpixSys; … … 345 345 // with the following. (no real databases used those values -- see 346 346 // libdvo/doc/dvo-images.txt) 347 out[i]. dummy1 = in[i].dummy1;348 out[i]. dummy2 = in[i].dummy2;347 out[i].nLinkAstrom = in[i].nLinkAstrom; 348 out[i].nLinkPhotom = in[i].nLinkPhotom; 349 349 out[i].dummy3 = in[i].dummy3; 350 350 out[i].dXpixSys = in[i].dXpixSys; -
branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractImages.c
r30508 r30516 316 316 value.Int = image[N].nFitAstrom; 317 317 break; 318 case IMAGE_NLINK_PHOTOM: 319 value.Int = image[N].nLinkPhotom; 320 break; 321 case IMAGE_NLINK_ASTROM: 322 value.Int = image[N].nLinkAstrom; 323 break; 318 324 } 319 325 return (value); -
branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbFields.c
r30508 r30516 433 433 if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM,MAG_NONE, OPIHI_INT); 434 434 if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM,MAG_NONE, OPIHI_INT); 435 if (!strcasecmp (fieldName, "NLINK_PHOTOM")) ESCAPE (IMAGE_NLINK_PHOTOM,MAG_NONE, OPIHI_INT); 436 if (!strcasecmp (fieldName, "NLINK_ASTROM")) ESCAPE (IMAGE_NLINK_ASTROM,MAG_NONE, OPIHI_INT); 435 437 436 438 // for words that don't parse, try a photcode -
branches/eam_branches/ipp-20101205/Ohana/src/opihi/include/dvoshell.h
r30508 r30516 224 224 IMAGE_MAG_ERR_SYS, 225 225 IMAGE_NFIT_PHOTOM, 226 IMAGE_NFIT_ASTROM 226 IMAGE_NFIT_ASTROM, 227 IMAGE_NLINK_PHOTOM, 228 IMAGE_NLINK_ASTROM 227 229 }; 228 230
Note:
See TracChangeset
for help on using the changeset viewer.
