Changeset 38167

Timestamp:

Apr 23, 2015, 2:41:17 PM (11 years ago)

Author:

eugene

Message:

adding UKIRT ingest

Location:

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

Files:

• include/addstar.h (modified) (1 diff)
• src/GetFileMode.c (modified) (1 diff)
• src/LoadDataUKIRT.c (added)
• src/LoadHeaders.c (modified) (1 diff)
• src/LoadStars.c (modified) (1 diff)
• src/MatchHeaders.c (modified) (2 diffs)
• src/ReadStarsUKIRT.c (added)

branches/eam_branches/ipp-20150419/Ohana/src/addstar/include/addstar.h

@@ -77 +77 @@
 
 enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT, ADDSTAR_MODE_CREATE_ID};
-enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ};
+enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ, UKIRT_OBJ};
 /* note: MEF implies CMF */
 

branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/GetFileMode.c

@@ -24 +24 @@
     if (VERBOSE) fprintf (stderr, "found SDSS objects\n");
     return SDSS_OBJ;
+  }
+
+    
+  // UKIRT files have TELESCOP = UKIRT and INSTRUME = WFCAM:
+  char telescope[81], instrument[81];
+  int have_TELESCOPE  = gfits_scan (header, "TELESCOP", "%s", 1, telescope);
+  int have_INSTRUMENT = gfits_scan (header, "INSTRUME", "%s", 1, instrument);
+  if (haveTELESCOPE && have_INSTRUMENT && !strcmp(telescope, "UKIRT"), && !strcmp(instrument, "WFCAM")) {
+    if (VERBOSE) fprintf (stderr, "found UKIRT data\n");
+    return UKIRT_OBJ;
   }
 

branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/LoadHeaders.c

@@ -24 +24 @@
     if (i == 0) {
       *mode = GetFileMode (headers[0]);
+      // CMP mode has no binary table, just image header and text blocks
       if ((*mode == SIMPLE_CMP) || (*mode == MOSAIC_CMP)) {
         *Nheaders = i;

branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/LoadStars.c

@@ -100 +100 @@
     }
 
+    // if these are SDSS data, load with SDSS-specific wrapper
+    if (headerSets[0].exttype && !strcmp (headerSets[0].exttype, "UKIRT_OBJ")) {
+      LoadDataUKIRT (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets);
+      continue;
+    }
+
     LoadData (f, file[i], images, Nimages, &stars, Nstars, headers, extsize, headerSets, NheaderSets, options);
 

branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/MatchHeaders.c

@@ -39 +39 @@
   }
 
+  // check for ukirt mode
+  if (Nheaders == 5) { 
+    int myMode = GetFileMode (headers[1]);
+    if (myMode != UKIRT_OBJ) goto other_modes;
+    for (i = 2; i < 5; i++) {
+      myMode = GetFileMode (headers[i]);
+      if (myMode != UKIRT_OBJ) {
+        fprintf (stderr, "inconsistent headers for UKIRT\n");
+        exit (2);
+      }
+    }
+
+    for (i = 1; i < Nheaders; i++) {
+      extsize[0][i] = headers[i][0].datasize + gfits_data_size (headers[i]);
+
+      gfits_scan (headers[i], ExtnameKeyword, "%s", 1, extname);
+      headerSets[Nimage].exttype = strcreate ("UKIRT_OBJ");
+      headerSets[Nimage].extdata = strcreate (extname);
+      headerSets[Nimage].exthead = strcreate (extname);
+      headerSets[Nimage].extxrad = NULL;
+      headerSets[Nimage].extnum_data = i;
+      headerSets[Nimage].extnum_head = i;
+      headerSets[Nimage].extnum_xrad = -1;
+      Nimage ++;
+    }
+    *nimage = Nimage;
+    return headerSets;
+  }
+
+other_modes:
+
   // now examine the headers, count the table entries, find corresponding headers
   for (i = 0; i < Nheaders; i++) {
@@ -71 +102 @@
     if (!strcmp (exttype, "PS1_DV4")) goto keep;
     if (!strcmp (exttype, "PS1_DV5")) goto keep;
+
     continue;