Changeset 42166 for branches/eam_branches/ipp-20220316/Ohana/src/addstar/include/WISE.h

Timestamp:

Apr 8, 2022, 5:04:42 PM (4 years ago)

Author:

eugene

Message:

merge changes from trunk (UKIRT addstar, relphot mods, dvomerge mods, ippCheck work, mlayer

Location:

branches/eam_branches/ipp-20220316

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/include/WISE.h (modified) (3 diffs)

branches/eam_branches/ipp-20220316/Ohana/src/addstar/include/WISE.h

@@ -21 +21 @@
 short WISE_W1, WISE_W2, WISE_W3, WISE_W4;
 
-enum {MODE_NONE, MODE_ALLWISE, MODE_ALLSKY, MODE_PRELIM};
+enum {MODE_NONE, MODE_CATWISE, MODE_ALLWISE, MODE_ALLSKY, MODE_PRELIM};
 int MODE;
 
-AddstarClientOptions args_loadwise (int argc, char **argv, AddstarClientOptions options);
+AddstarClientOptions args_loadwise (int *argc, char **argv, AddstarClientOptions options);
 
 int loadwise_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options);
@@ -38 +38 @@
 int loadwise_star_allsky  (Measure *measure, char *line, int Nmax);
 int loadwise_star_allwise (Measure *measure, char *line, int Nmax);
-
+int loadwise_star_catwise (Measure *measure, char *line, int Nmax, double Rs, double Ds);
 
 char *nextWISEfield (char *line);
@@ -49 +49 @@
 int setWISE_dup_flag (Measure *measure, char qual);
 int setWISE_use_flag (Measure *measure, char qual);
+int setWISE_sat_flag (Measure *measure, char *ptr);
+
+int setCatWISE_sat_flag (Measure *measure, char *ptr, int start, int end);
+int setCatWISE_blend_flag (Measure *measure, char *line);
 
 char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
+
+char *getLineSegment (char *line, int start, int end);
+double getDoubleRAW (char *line, int start, int end);
+double getDoubleNAN (char *line, int start, int end);