Changeset 34891

Timestamp:

Jan 7, 2013, 4:38:41 PM (13 years ago)

Author:

eugene

Message:

add ubercal dist to imextract fields; clip absurd values from averages; merge changes from trunk

Location:

branches/eam_branches/ipp-20121219/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/dvodb.h (modified) (1 diff)
• src/libdvo/src/dbExtractImages.c (modified) (1 diff)
• src/libdvo/src/dbFields.c (modified) (1 diff)
• src/libohana/src (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/cmd.astro (modified) (1 prop)
• src/opihi/cmd.data (modified) (1 prop)
• src/relphot/src/StarOps.c (modified) (1 diff)
• src/relphot/src/args.c (modified) (1 diff)
• src/relphot/src/reload_catalogs.c (modified) (1 diff)
• src/relphot/src/relphot_objects.c (modified) (1 diff)
• src/relphot/src/setMrelCatalog.c (modified) (2 diffs)

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

@@ -250 +250 @@
       IMAGE_Y_ERR_SYS,
       IMAGE_MAG_ERR_SYS,
+      IMAGE_UBERCAL_DIST,
       IMAGE_NFIT_PHOTOM,
       IMAGE_NFIT_ASTROM,

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

@@ -328 +328 @@
       break;
 
+    case IMAGE_UBERCAL_DIST:
+      value.Int = image[N].ubercalDist;
+      break;
+
     case IMAGE_NFIT_PHOTOM:
       value.Int = image[N].nFitPhotom;

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

@@ -473 +473 @@
   if (!strcasecmp (fieldName, "dY_SYS"  )) ESCAPE (IMAGE_Y_ERR_SYS,  MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "dM_SYS"  )) ESCAPE (IMAGE_MAG_ERR_SYS,MAG_NONE, OPIHI_FLT);
+
+  if (!strcasecmp (fieldName, "UBERCAL_DIST")) ESCAPE (IMAGE_UBERCAL_DIST,MAG_NONE, OPIHI_INT);
+  if (!strcasecmp (fieldName, "UCDIST")) ESCAPE (IMAGE_UBERCAL_DIST,MAG_NONE, OPIHI_INT);
+
   if (!strcasecmp (fieldName, "NFIT_PHOTOM")) ESCAPE (IMAGE_NFIT_PHOTOM,MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "NFIT_ASTROM")) ESCAPE (IMAGE_NFIT_ASTROM,MAG_NONE, OPIHI_INT);

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/StarOps.c

@@ -451 +451 @@
         }
 
+        // skip some absurd values NAN, < 0.0, > 30.0
         Msys = PhotSysTiny (&catalog[Nc].measureT[m], &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt]);
         if (isnan(Msys)) SKIP_THIS_MEAS(Nsys);
+        if (Msys <  0.0) SKIP_THIS_MEAS(Nsys);
+        if (Msys > 30.0) SKIP_THIS_MEAS(Nsys);
 
         int myUbercalDist = getUbercalDist(m,Nc);

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/args.c

@@ -176 +176 @@
   }
 
+  SET_MREL_VERSION = 1;
+  if ((N = get_argument (argc, argv, "-set-mrel-version"))) {
+    remove_argument (N, &argc, argv);
+    SET_MREL_VERSION = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   UPDATE = FALSE;
   if ((N = get_argument (argc, argv, "-update"))) {

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/reload_catalogs.c

@@ -187 +187 @@
     if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }
     if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }
+    if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", command, SET_MREL_VERSION);                  strcpy (command, tmpline); }
     if (AreaSelect)       { snprintf (tmpline, 1024, "%s -area %f %f %f %f",    command, AreaXmin, AreaXmax, AreaYmin, AreaYmax); strcpy (command, tmpline); }
     if (TimeSelect) { 

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/relphot_objects.c

@@ -165 +165 @@
     if (UPDATE)        { snprintf (tmpline, 1024, "%s -update",         command);                    strcpy (command, tmpline); }
     if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }
+    if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", command, SET_MREL_VERSION); strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);

branches/eam_branches/ipp-20121219/Ohana/src/relphot/src/setMrelCatalog.c

@@ -48 +48 @@
 
   for (j = 0; j < catalog[Nc].Naverage; j++) {
-    off_t m = catalog[Nc].average[j].measureOffset;
-    setMrelAverageExposure (m, Nc, pass, flatcorr, results, &catalog[Nc].average[j], &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt], &catalog[Nc].measure[m], &catalog[Nc].measureT[m], &catalog[Nc].found[Nsecfilt*j]);
+    // we are guaranteed to have averageT, but not average
+    off_t m = catalog[Nc].averageT[j].measureOffset;
+    Average *average = catalog[Nc].average ? &catalog[Nc].average[j] : NULL;
+    Measure *measure = catalog[Nc].measure ? &catalog[Nc].measure[m] : NULL;
+    setMrelAverageExposure (m, Nc, pass, flatcorr, results, average, &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt], measure, &catalog[Nc].measureT[m], &catalog[Nc].found[Nsecfilt*j]);
 
     // only apply Stack operation on setMrelFinal in first pass 
@@ -147 +150 @@
       }
 
+      // skip some absurd values NAN, < 0.0, > 30.0
       Msys = PhotSysTiny (&measureT[k], &averageT[0], &secfilt[0]);
       if (isnan(Msys)) SKIP_THIS_MEAS(Nsys);
+      if (Msys <  0.0) SKIP_THIS_MEAS(Nsys);
+      if (Msys > 30.0) SKIP_THIS_MEAS(Nsys);
 
       int myUbercalDist = getUbercalDist(meas, cat);