Changeset 37035 for trunk/Ohana/src/libdvo/include/dvo.h
- Timestamp:
- Jul 17, 2014, 10:10:16 AM (12 years ago)
- File:
-
- 1 edited
-
trunk/Ohana/src/libdvo/include/dvo.h (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Ohana/src/libdvo/include/dvo.h
r36833 r37035 28 28 DVO_FORMAT_PS1_V3, 29 29 DVO_FORMAT_PS1_V4, 30 DVO_FORMAT_PS1_V5, 30 31 } DVOTableFormat; 31 32 … … 78 79 79 80 /* catalog values to be loaded */ 80 # define LOAD_NONE 0x00 81 # define LOAD_AVES 0x01 82 # define LOAD_MEAS 0x02 83 # define LOAD_MISS 0x04 84 # define LOAD_SECF 0x08 85 # define SKIP_AVES 0x10 86 # define SKIP_MEAS 0x20 87 # define SKIP_MISS 0x40 88 # define SKIP_SECF 0x80 89 90 // # define LOAD_MEAS_META 0x100 -- is this used?? 81 # define LOAD_NONE 0x000 82 # define LOAD_AVES 0x001 83 # define LOAD_MEAS 0x002 84 # define LOAD_MISS 0x004 85 # define LOAD_SECF 0x008 86 # define SKIP_AVES 0x010 87 # define SKIP_MEAS 0x020 88 # define SKIP_MISS 0x040 89 # define SKIP_SECF 0x080 90 # define LOAD_LENSING 0x100 91 # define LOAD_LENSOBJ 0x200 92 # define SKIP_LENSING 0x400 93 # define SKIP_LENSOBJ 0x800 91 94 92 95 /* photometry code types */ … … 334 337 // another special case : does not match byte-boundaries 335 338 # include "cmf-ps1-dv3.h" 339 # include "cmf-ps1-sv3.h" 340 # include "cmf-ps1-v5.h" 341 # include "cmf-ps1-v5-lensing.h" 336 342 337 343 typedef struct { … … 434 440 // a reduced-subset structure for relphot & relastro 435 441 typedef struct { 436 float dR;437 float dD;442 double R; 443 double D; 438 444 float M; 439 445 float Mcal; … … 548 554 549 555 Measure_PS1_V4alt *gfits_table_get_Measure_PS1_V4alt (FTable *table, off_t *Ndata, char *swapped); 550 Measure *Measure_PS1_V4alt_ToInternal (Measure_PS1_V4alt *in, off_t Nvalues); 556 Measure *Measure_PS1_V4alt_ToInternal (Average *ave, Measure_PS1_V4alt *in, off_t Nvalues); 557 558 /* for some reason I have merged the set of tables and the file description, 559 so I need to have an internal structure to point to the separate files */ 551 560 552 561 /* a catalog contains this data */ … … 562 571 SecFilt *secfilt; 563 572 573 // lensing data (optional?) 574 Lensing *lensing; 575 Lensobj *lensobj; 576 564 577 int Nsecfilt; /* number of secfilt entries for each average entry */ 565 off_t Naverage, Nmeasure, Nmissing, N secf_mem; /* current number of each component in memory */566 off_t Naves_disk, Nmeas_disk, Nmiss_disk, N secf_disk; /* current number of each component on disk */567 off_t Naves_off, Nmeas_off, Nmiss_off, N secf_off; /* index of first loaded data value */578 off_t Naverage, Nmeasure, Nmissing, Nlensing, Nlensobj, Nsecf_mem; /* current number of each component in memory */ 579 off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nsecf_disk; /* current number of each component on disk */ 580 off_t Naves_off, Nmeas_off, Nmiss_off, Nlensing_off, Nlensobj_off, Nsecf_off; /* index of first loaded data value */ 568 581 569 582 // note that we use these for the full-sky relphot analysis … … 584 597 struct Catalog *missing_catalog; /* missing catalog data (split) */ 585 598 struct Catalog *secfilt_catalog; /* secfilt catalog data (split) */ 599 struct Catalog *lensing_catalog; /* lensing catalog data (split) */ 600 struct Catalog *lensobj_catalog; /* lensobj catalog data (split) */ 586 601 587 602 unsigned int objID; … … 592 607 char catmode; /* storage mode (raw, mef, split, mysql) */ 593 608 char catformat; /* storage format (elixir, panstarrs, etc) */ 594 char catflags; /* choices to be loaded */ 595 char sorted; /* is measure table average-sorted? */ 609 int sorted; /* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */ 596 610 611 short catflags; /* choices to be loaded */ 612 597 613 /* pointers for data manipulation */ 598 off_t *found; 599 off_t *image; 600 off_t *mosaic; 601 float *X; 602 float *Y; 603 int *nOwn; // relastro uses this to count owned detections per object 614 off_t *found_t; 615 off_t *foundWarp_t; 616 // off_t *image_t; 617 // off_t *mosaic_t; 618 // float *X_t; 619 // float *Y_t; 620 int *nOwn_t; // relastro uses this to count owned detections per object 604 621 605 622 } Catalog; … … 661 678 char *GetPhotcodeNamebyCode (int code); 662 679 663 float PhotInst (Measure *measure); 664 float PhotCat (Measure *measure); 665 float PhotSys (Measure *measure, Average *average, SecFilt *secfilt); 666 float PhotRel (Measure *measure, Average *average, SecFilt *secfilt); 667 float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); 668 float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt); 669 float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); 670 float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt); 671 672 float PhotAperInst (Measure *measure); 673 float PhotAperCat (Measure *measure); 674 float PhotAperSys (Measure *measure, Average *average, SecFilt *secfilt); 675 float PhotAperRel (Measure *measure, Average *average, SecFilt *secfilt); 676 float PhotAperCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); 677 float PhotAperAve (PhotCode *code, Average *average, SecFilt *secfilt); 678 float PhotAperRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); 679 680 float PhotKronInst (Measure *measure); 681 float PhotKronCat (Measure *measure); 682 float PhotKronSys (Measure *measure, Average *average, SecFilt *secfilt); 683 float PhotKronRel (Measure *measure, Average *average, SecFilt *secfilt); 684 float PhotKronCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); 685 float PhotKronAve (PhotCode *code, Average *average, SecFilt *secfilt); 686 float PhotKronRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); 687 float PhotKronAveErr (PhotCode *code, Average *average, SecFilt *secfilt); 680 float PhotInst (Measure *measure, dvoMagClassType class); 681 float PhotCat (Measure *measure, dvoMagClassType class); 682 float PhotSys (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class); 683 float PhotRel (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class); 684 float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code, dvoMagClassType class); 685 float PhotErr (Measure *measure, dvoMagClassType class); 686 float PhotCalErr (Measure *measure, dvoMagClassType class); 687 688 float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source); 689 float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure, dvoMagClassType class, dvoMagSourceType source); 690 float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source); 691 692 float PhotInstTiny (MeasureTiny *measure, dvoMagClassType class); 693 float PhotCatTiny (MeasureTiny *measure, dvoMagClassType class); 694 float PhotSysTiny (MeasureTiny *measure, AverageTiny *average, SecFilt *secfilt, dvoMagClassType class); 695 float PhotRelTiny (MeasureTiny *measure, AverageTiny *average, SecFilt *secfilt, dvoMagClassType class); 696 float PhotCalTiny (MeasureTiny *thisone, AverageTiny *average, SecFilt *secfilt, MeasureTiny *measure, PhotCode *code, dvoMagClassType class); 697 698 float PhotAveTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source); 699 float PhotRefTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt, MeasureTiny *measure, dvoMagClassType class, dvoMagSourceType source); 700 701 float PhotFluxInst (Measure *measure, dvoMagClassType class); 702 float PhotFluxCat (Measure *measure, dvoMagClassType class); 703 float PhotFluxSys (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class); 704 float PhotFluxRel (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class); 705 float PhotFluxCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code, dvoMagClassType class); 706 707 float PhotFluxAve (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source); 708 float PhotFluxRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure, dvoMagClassType class, dvoMagSourceType source); 709 710 float PhotFluxInstErr (Measure *measure, dvoMagClassType class); 711 float PhotFluxCatErr (Measure *measure, dvoMagClassType class); 688 712 689 713 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt); 690 691 714 float PhotZeroPoint (Measure *measure, Average *average, SecFilt *secfilt); 692 float PhotAveFluxPSF (PhotCode *code, Average *average, SecFilt *secfilt);693 float PhotAvedFluxPSF (PhotCode *code, Average *average, SecFilt *secfilt);694 float PhotAveFluxKron (PhotCode *code, Average *average, SecFilt *secfilt);695 float PhotAvedFluxKron (PhotCode *code, Average *average, SecFilt *secfilt);696 715 697 716 float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt); 698 float PhotM 20(PhotCode *code, Average *average, SecFilt *secfilt);699 float PhotM 80(PhotCode *code, Average *average, SecFilt *secfilt);717 float PhotMmin (PhotCode *code, Average *average, SecFilt *secfilt); 718 float PhotMmax (PhotCode *code, Average *average, SecFilt *secfilt); 700 719 float PhotUCdist (PhotCode *code, Average *average, SecFilt *secfilt); 701 720 unsigned int PhotStackID (PhotCode *code, Average *average, SecFilt *secfilt); … … 704 723 int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color); 705 724 706 float PhotInstTiny (MeasureTiny *measure);707 float PhotCatTiny (MeasureTiny *measure);708 float PhotAperTiny (MeasureTiny *measure);709 float PhotSysTiny (MeasureTiny *measure, AverageTiny *average, SecFilt *secfilt);710 float PhotRelTiny (MeasureTiny *measure, AverageTiny *average, SecFilt *secfilt);711 float PhotCalTiny (MeasureTiny *thisone, AverageTiny *average, SecFilt *secfilt, MeasureTiny *measure, PhotCode *code);712 float PhotAveTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt);713 float PhotRefTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt, MeasureTiny *measure);714 725 float PhotXmTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt); 715 726 float PhotdMTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt); … … 782 793 /*** conversion functions / I/O conversions ***/ 783 794 Average *ReadRawAverage (FILE *f, off_t Naverage, char format, SecFilt **primary); 784 Measure *ReadRawMeasure (FILE *f, off_t Nmeasure, char format);795 Measure *ReadRawMeasure (FILE *f, Average *average, off_t Nmeasure, char format); 785 796 SecFilt *ReadRawSecFilt (FILE *f, off_t Nsecfilt, char format); 786 797 int WriteRawAverage (FILE *f, Average *average, off_t Naverage, char format, SecFilt *primary); 787 int WriteRawMeasure (FILE *f, Measure *measure, off_t Nmeasure, char format);798 int WriteRawMeasure (FILE *f, Average *average, Measure *measure, off_t Nmeasure, char format); 788 799 int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format); 789 800 … … 791 802 792 803 Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary); 793 Measure *FtableToMeasure (FTable *ftable, off_t *Nmeasure, char *format);804 Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, char *format); 794 805 SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format); 806 Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, char *format); 807 Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, char *format); 795 808 int FtableToImage (FTable *ftable, Header *theader, char *format); 796 809 797 810 int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary); 798 int MeasureToFtable (FTable *ftable, Measure *measure, off_t Nmeasure, char format);811 int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, char format); 799 812 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format); 813 int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, char format); 814 int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, char format); 800 815 int ImageToFtable (FTable *ftable, Header *theader, char format); 801 816 int ImageToVtable (VTable *vtable, Header *theader, char format); … … 812 827 # include "ps1_v3_defs.h" 813 828 # include "ps1_v4_defs.h" 829 # include "ps1_v5_defs.h" 814 830 # include "ps1_ref_defs.h" 815 831 … … 906 922 void TessellationTableInit (TessellationTable *tess, int Ntess); 907 923 924 float dvoOffsetR (Measure *measure, Average *average); 925 float dvoOffsetD (Measure *measure, Average *average); 926 double dvoMeanR (float dR, Average *average); 927 double dvoMeanD (float dD, Average *average); 928 908 929 void dvo_average_init (Average *average); 909 930 void dvo_averageT_init (AverageTiny *average); … … 911 932 void dvo_measure_init (Measure *measure); 912 933 void dvo_measureT_init (MeasureTiny *measure); 934 935 void dvo_lensing_init (Lensing *lensing); 936 void dvo_lensobj_init (Lensobj *lensobj); 913 937 914 938 void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);
Note:
See TracChangeset
for help on using the changeset viewer.
