Changeset 42212

Timestamp:

May 18, 2022, 4:04:14 PM (4 years ago)

Author:

eugene

Message:

adding ingest for UHS2022 (J + K)

Location:

branches/eam_branches/ipp-20220316/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• include/ukirt_uhs.h (modified) (2 diffs)
• src/args_loadukirt_uhs.c (modified) (2 diffs)
• src/loadukirt_uhs_readstars.c (modified) (1 diff)
• src/loadukirt_uhs_readstars_uhs2022.c (added)

branches/eam_branches/ipp-20220316/Ohana/src/addstar/Makefile

@@ -358 +358 @@
 $(SRC)/loadukirt_uhs_readstars_ugps.$(ARCH).o \
 $(SRC)/loadukirt_uhs_readstars_ulas.$(ARCH).o \
+$(SRC)/loadukirt_uhs_readstars_uhs2022.$(ARCH).o \
 $(SRC)/loadukirt_uhs_table.$(ARCH).o \
 $(SRC)/parse_csv.$(ARCH).o \

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

@@ -1 +1 @@
 
-typedef enum {UKIRT_MODE_NONE, UKIRT_MODE_UHS, UKIRT_MODE_UGCS, UKIRT_MODE_UGPS, UKIRT_MODE_ULAS} UkirtMode;
+typedef enum {UKIRT_MODE_NONE, UKIRT_MODE_UHS, UKIRT_MODE_UGCS, UKIRT_MODE_UGPS, UKIRT_MODE_ULAS, UKIRT_MODE_UHS2022} UkirtMode;
 
 # define NSTARS_MAX 10000000
@@ -55 +55 @@
 UKIRT_Stars *loadukirt_uhs_readstars_ulas (FILE *f, char *buffer, int *nstart, AddstarClientOptions *options, int *nstars);
 UKIRT_Stars *loadukirt_uhs_readstars_uhs (FILE *f, char *buffer, int *nstart, AddstarClientOptions *options, int *nstars);
+UKIRT_Stars *loadukirt_uhs_readstars_uhs2022 (FILE *f, char *buffer, int *nstart, AddstarClientOptions *options, int *nstars);
 
 

branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/args_loadukirt_uhs.c

@@ -34 +34 @@
     UKIRT_MODE = UKIRT_MODE_ULAS;
     UKIRT_NFILTER = 5;
+    remove_argument (N, argc, argv);
+  }
+  if ((N = get_argument (*argc, argv, "-uhs2022"))) {
+    UKIRT_MODE = UKIRT_MODE_UHS2022;
+    UKIRT_NFILTER = 2;
     remove_argument (N, argc, argv);
   }
@@ -152 +157 @@
 static void help () {
 
-  fprintf (stderr, "USAGE: loadukirt_uhs [options] (file) [-uhs | -ugcs | -ulas | -ugps] [..more files]\n");
+  fprintf (stderr, "USAGE: loadukirt_uhs [options] (file) [-uhs | -ugcs | -ulas | -ugps | -uhs2022] [..more files]\n");
   fprintf (stderr, "  add data from UKIRT CSV file to DVO\n");
-  fprintf (stderr, "  mode is required : -uhs | -ugcs | -ulas | -ugps\n\n");
+  fprintf (stderr, "  mode is required : -uhs | -ugcs | -ulas | -ugps | -uhs2022\n\n");
 
   fprintf (stderr, "  optional flags:\n");

branches/eam_branches/ipp-20220316/Ohana/src/addstar/src/loadukirt_uhs_readstars.c

@@ -22 +22 @@
     case UKIRT_MODE_ULAS: {
       UKIRT_Stars *stars = loadukirt_uhs_readstars_ulas (f, buffer, nstart, options, nstars);
+      return stars;
+    }
+      
+    case UKIRT_MODE_UHS2022: {
+      UKIRT_Stars *stars = loadukirt_uhs_readstars_uhs2022 (f, buffer, nstart, options, nstars);
       return stars;
     }