Changeset 38581

Timestamp:

Jul 8, 2015, 12:05:45 AM (11 years ago)

Author:

eugene

Message:

adding expname to imextract

Location:

branches/eam_branches/ipp-20150625/Ohana/src/libdvo

Files:

• include/dvodb.h (modified) (1 diff)
• src/dbExtractImages.c (modified) (1 diff)
• src/dbFields.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/dvodb.h

@@ -340 +340 @@
       IMAGE_FWHM_MEDIAN, 
       IMAGE_EXPTIME, 
+      IMAGE_EXPNAME_AS_INT,
       IMAGE_NSTAR, 
       IMAGE_NCAL, 

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dbExtractImages.c

@@ -233 +233 @@
       value.Flt = image[N].exptime;
       break;
+
+    case IMAGE_EXPNAME_AS_INT:
+      // XXX NOTE this does not handle gpc2 images
+      if ((image[N].name[0] == 'o') && (image->name[5] == 'g') && (image->name[10] == 'o')) {
+        int mjd  = atoi(&image->name[1]);
+        int Nexp = atoi(&image->name[6]);
+        value.Int = mjd * 10000 + Nexp;
+      }
+      break;
+
     case IMAGE_SIDTIME:
       value.Flt = image[N].sidtime;

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dbFields.c

@@ -771 +771 @@
   if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE,  OPIHI_INT);
   if (!strcasecmp (fieldName, "exptime"  )) ESCAPE (IMAGE_EXPTIME,   OPIHI_FLT);
+  if (!strcasecmp (fieldName, "expname"  )) ESCAPE (IMAGE_EXPNAME_AS_INT, OPIHI_INT);
   if (!strcasecmp (fieldName, "sidtime"  )) ESCAPE (IMAGE_SIDTIME,   OPIHI_FLT);