Changeset 36833 for trunk/Ohana/src/relastro/include/relastro.h

Timestamp:

Jun 7, 2014, 6:33:11 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20140423: add dcr-color option, ref_color, bad detection clipping to relastro; fix RA,DEC for mosaics in imextract; allow photdbc to restrict images to output region; change PHOTCODE_SKIP_LIST to PHOTCODE_KEEP_LIST in photdbc; add -reset-to-photcode option to relastro; ensure relastro child processes get the complete set of options; allow relastro region hosts to continue after load-object clients are done, but before the data is loaded; invalidate extreme proper motion; limit relastro catalog density on a grid; require more detections for higher order fits; option to delete duplicate images based on exp time/date and photcode; have kapa use XSync instead of XFlush to avoid flashing; handle some cases to avoid crashing kapa; extend kapa connection timeout; allow kapa to handle > 2GB images; ensure dvomerge works even if incoming db has no images; add dvo fuctions coordmosaic & psastro_model

File:

• trunk/Ohana/src/relastro/include/relastro.h (modified) (7 diffs)

trunk/Ohana/src/relastro/include/relastro.h

@@ -83 +83 @@
   double L, M;  /* Focal Plane   - pixels  */
   double X, Y;  /* Chip Coords   - pixels  */
-  double Mag;
-  double dMag;
-  double dPos;
+  float Mag;
+  float Color;
+  float dMag;
+  float dPos;
   int mask;
   int Nmeas;
@@ -207 +208 @@
 double MaxDensityValue;
 
-char          *PHOTCODE_KEEP_LIST, *PHOTCODE_SKIP_LIST;
-int           NphotcodesKeep,      NphotcodesSkip;
-PhotCode     **photcodesKeep,     **photcodesSkip;
+char          *PHOTCODE_KEEP_LIST, *PHOTCODE_SKIP_LIST, *PHOTCODE_RESET_LIST;
+int           NphotcodesKeep,      NphotcodesSkip,      NphotcodesReset;
+PhotCode     **photcodesKeep,     **photcodesSkip,     **photcodesReset;
 
 char          *PHOTCODE_A_LIST,  *PHOTCODE_B_LIST;
@@ -217 +218 @@
 SkyRegionSelection SELECTION;
 
+char         *DCR_COLOR_POS,    *DCR_COLOR_NEG;
+PhotCode     *DCR_PHOTCODE_POS, *DCR_PHOTCODE_NEG; 
+int           DCR_NSEC_POS,      DCR_NSEC_NEG; 
+
 int ImagSelect;
 double ImagMin, ImagMax;
@@ -233 +238 @@
 int    CLIP_THRESH;
 int USE_BASIC_CHECK;
+
+int ExcludeBogus;
+double ExcludeBogusRadius;
 
 FitMode FIT_MODE;
@@ -307 +315 @@
 int           liststats           PROTO((double *value, double *dvalue, int N, StatType *stats));
 int           liststats_pos       PROTO((double *value, double *dvalue, int N, StatType *stats, int XVERB));
-Catalog      *load_catalogs       PROTO((SkyList *skylist, int *Ncatalog, int subselect, int hostID, char *hostpath));
+Catalog      *load_catalogs       PROTO((SkyList *skylist, int *Ncatalog, int subselect, int hostID, char *hostpath, char *syncfile));
 int           load_images         PROTO((FITS_DB *db, SkyList *skylist, int UseFullOverlap));
 Image        *select_images       PROTO((SkyList *skylist, Image *timage, off_t Ntimage, off_t **LineNumber, off_t *Nimage, int UseFullOverlap));
@@ -417 +425 @@
 int setMeanR (double ra_fit, MeasureTiny *measure, Average *average, SecFilt *secfilt);
 int setMeanD (double dec_fit, MeasureTiny *measure, Average *average, SecFilt *secfilt);
+double getMeanR_Big (Measure *measure, Average *average, SecFilt *secfilt);
+double getMeanD_Big (Measure *measure, Average *average, SecFilt *secfilt);
 int setMeanR_Big (double ra_fit, Measure *measure, Average *average, SecFilt *secfilt);
 int setMeanD_Big (double dec_fit, Measure *measure, Average *average, SecFilt *secfilt);
@@ -521 +531 @@
 int ImageTableSave (char *filename, Image *images, off_t Nimages);
 int select_mosaics_hostregion (RegionHostTable *regionHosts, Image *image, off_t Nimage);
+
+float getColor (off_t meas, int cat);
+
+int strextend (char *input, char *format,...);
+
+int areImagesLoaded ();
+int areImagesMatched ();