Changeset 33887 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 17, 2012, 11:14:15 AM (14 years ago)

Author:

eugene

Message:

force synthetic photometry for bright (saturated) objects; write out log points for client

Location:

branches/eam_branches/ipp-20120405/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/StarOps.c (modified) (3 diffs)
• src/relphot_client.c (modified) (7 diffs)

branches/eam_branches/ipp-20120405/Ohana/src/relphot/include/relphot.h

@@ -336 +336 @@
 int ImageSubsetSave(char *filename, ImageSubset *image, off_t Nimage);
 ImageSubset *ImageSubsetLoad(char *filename, off_t *nimage);
+
+int client_logger_init ();
+int client_logger_message (char *format,...);
+

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

@@ -354 +354 @@
       int Next = 0;
       int haveSynth = FALSE;
+
+      int forceSynth = FALSE;
+      int forceSynthEntry = -1;
+
       int haveUbercal = FALSE;
 
@@ -425 +429 @@
             }
           }
-          // ignore SYNTH photocdes until PASS == 4 (where we also accept saturated stars)
+
+          // Blindly accepth the SYNTH mags if we are above saturation, otherwise, 
+          // ignore SYNTH photcodes until PASS == 4 (where we also accept saturated stars)
           if ((catalog[Nc].measure[m].photcode >= 3001) && (catalog[Nc].measure[m].photcode <= 3005)) {
-            if (pass < 4) {
-              SKIP_THIS_MEAS(Nbad);
-              continue;
+            // something of a hack: force object to use synth values if synth mags >>
+            // saturation (3pi instrumental mags < -15)
+            float MaxMagForceSynth = NAN;
+            switch (catalog[Nc].measure[m].photcode) {
+              case 3001:
+                MaxMagForceSynth = 13.64;
+                break;
+              case 3002:
+                MaxMagForceSynth = 13.76;
+                break;
+              case 3003:
+                MaxMagForceSynth = 13.74;
+                break;
+              case 3004:
+                MaxMagForceSynth = 12.94;
+                break;
+              case 3005:
+                MaxMagForceSynth = 12.01;
+                break;
             }
-            haveSynth = TRUE;
+            if (catalog[Nc].measureT[m].M < MaxMagForceSynth) {
+              forceSynth = TRUE;
+              forceSynthEntry = N;
+            } else {
+              if (pass < 4) {
+                SKIP_THIS_MEAS(Nbad);
+                continue;
+              }
+              haveSynth = TRUE;
+            }
           }
         }
@@ -476 +507 @@
       } 
 
+      if (forceSynth) {
+        // use the single SYNTH value instead of the other mags here
+        myAssert ((forceSynthEntry < N) && (forceSynthEntry >= 0), "programming error");
+        list[0]  = list[forceSynthEntry];
+        dlist[0] = dlist[forceSynthEntry];
+        wlist[0] = wlist[forceSynthEntry];
+        N = 1;
+      }
       liststats (list, dlist, wlist, N, &stats);
 

branches/eam_branches/ipp-20120405/Ohana/src/relphot/src/relphot_client.c

@@ -19 +19 @@
   // get configuration info, args, lockfile (set CATDIR, HOST_ID, HOSTDIR, etc) 
   initialize_client (argc, argv);
+  client_logger_init ();
 
   // load the current sky table (layout of all SkyRegions) 
@@ -33 +34 @@
       exit (2);
   }
+  client_logger_message ("loaded sky table and defined patch\n");
   
   switch (MODE) {
@@ -42 +44 @@
           exit (2);
       }
+      client_logger_message ("loaded catalogs\n");
+
       BrightCatalog *bcatalog = BrightCatalogMerge (catalog, Ncatalog);
+      client_logger_message ("generated subset data\n");
+
       if (!BrightCatalogSave (BCATALOG, bcatalog)) {
           fprintf (stderr, "ERROR saving bright catalog from %s\n", CATDIR);
           exit (2);
       }
+      client_logger_message ("generated subset table\n");
       break;
     }
@@ -58 +65 @@
           exit (2);
       }
+      client_logger_message ("loaded image subset data\n");
       
       // save the available image information in the static array in ImageOps.c
@@ -66 +74 @@
       snprintf (flatcorrFile, 1024, "%s/flatcorr.fits", CATDIR);
       FlatCorrectionTable *flatcorr = FlatCorrectionLoad (flatcorrFile, VERBOSE);
+      client_logger_message ("loaded flat-field correction data\n");
 
       reload_catalogs (skylist, flatcorr, HOST_ID, HOSTDIR);
+      client_logger_message ("updated catalogs\n");
       break;
     }
@@ -73 +83 @@
     case MODE_UPDATE_OBJECTS: {
       relphot_objects (HOST_ID, HOSTDIR);
+      client_logger_message ("updated objects\n");
       break;
     }
@@ -80 +91 @@
       abort();
   }
+  client_logger_message ("done with relphot_client\n");
 
   exit (0);
 }
+
+// I'm getting unlogged errors and failures.  I need a log ouput that the clients can
+// write independent of the master
+
+static FILE *logfile = NULL;
+int client_logger_init () {
+
+  char filename[DVO_MAX_PATH];
+
+  snprintf (filename, DVO_MAX_PATH, "%s/relphot.client.XXXXXX.log", HOSTDIR);
+    
+  int fd = mkstemp (filename);
+  if (fd == -1) {
+    fprintf (stderr, "failed to open client logger, exiting\n");
+    exit (50);
+  }
+
+  logfile = fdopen (fd, "w");
+  if (!logfile)  {
+    fprintf (stderr, "failed to fdopen client logger, exiting\n");
+    exit (51);
+  }
+  return TRUE;
+}
+
+int client_logger_message (char *format,...) {
+
+  va_list argp;
+
+  va_start (argp, format);
+  vfprintf (logfile, format, argp);
+  va_end (argp);
+  return TRUE;
+}