Changeset 38062 for trunk/Ohana/src/relphot

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relphot/Makefile (modified) (2 diffs)
• Ohana/src/relphot/include/relphot.h (modified) (4 diffs)
• Ohana/src/relphot/src/args.c (modified) (4 diffs)
• Ohana/src/relphot/src/extra.c (modified) (2 diffs)
• Ohana/src/relphot/src/help.c (modified) (1 diff)
• Ohana/src/relphot/src/initialize.c (modified) (1 diff)
• Ohana/src/relphot/src/relphot.c (modified) (1 diff)
• Ohana/src/relphot/src/relphot_client.c (modified) (1 diff)
• Ohana/src/relphot/src/relphot_synthphot.c (copied) (copied from branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/relphot_synthphot.c )
• Ohana/src/relphot/src/relphot_synthphot_catalog.c (copied) (copied from branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/relphot_synthphot_catalog.c )
• Ohana/src/relphot/src/synthetic_zpts.c (copied) (copied from branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/synthetic_zpts.c )

trunk/Ohana/src/relphot/Makefile

@@ -50 +50 @@
 $(SRC)/relphot_parallel_regions.$(ARCH).o \
 $(SRC)/relphot_parallel_images.$(ARCH).o \
+$(SRC)/relphot_synthphot.$(ARCH).o       \
+$(SRC)/relphot_synthphot_catalog.$(ARCH).o       \
+$(SRC)/synthetic_zpts.$(ARCH).o  \
 $(SRC)/select_images.$(ARCH).o   \
 $(SRC)/assign_images.$(ARCH).o   \
@@ -93 +96 @@
 $(SRC)/relphot_objects.$(ARCH).o         \
 $(SRC)/relphot_client.$(ARCH).o  \
+$(SRC)/relphot_synthphot.$(ARCH).o       \
+$(SRC)/relphot_synthphot_catalog.$(ARCH).o       \
+$(SRC)/synthetic_zpts.$(ARCH).o  \
 $(SRC)/client_logger.$(ARCH).o   \
 $(SRC)/setExclusions.$(ARCH).o   \

trunk/Ohana/src/relphot/include/relphot.h

@@ -22 +22 @@
   PARALLEL_IMAGES,
   APPLY_OFFSETS,
+  SYNTH_PHOT,
 } RelphotMode;
 
@@ -29 +30 @@
     MODE_UPDATE = 2,
     MODE_UPDATE_OBJECTS = 3,
+    MODE_SYNTH_PHOT = 4,
 } ModeType;
+
+// NOTE: this is only used in special cases where we limit photcode ranges
+typedef enum {
+  PS1_none, 
+  PS1_g = 1, 
+  PS1_r = 2, 
+  PS1_i = 3, 
+  PS1_z = 4, 
+  PS1_y = 5,
+  PS1_w = 6,
+} PS1filters;
+
+typedef struct {
+  Header PHU;
+  Header header[5]; // grizy (matches Nsec in photcodes)
+  Matrix matrix[5];
+  Coords coords;
+  int Nx;
+  int Ny;
+} SynthZeroPoints;
 
 typedef struct {
@@ -175 +197 @@
 char   SKY_TABLE[DVO_MAX_PATH];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
+char  *SYNTH_ZERO_POINTS;
 
 // globals for parallel region operations
@@ -509 +532 @@
 int isGPC1stack (int photcode);
 int isGPC1warp  (int photcode);
-
-
+int isGPC1synth (int photcode);
+int whichGPC1filter (int photcode);
+
+
+SynthZeroPoints *SynthZeroPointsLoad (char *filename);
+
+int relphot_synthphot (int hostID, char *hostpath);
+int relphot_synthphot_parallel (SkyList *sky);
+
+int relphot_synthphot_catalog (Catalog *catalog, SynthZeroPoints *zpts);
+int relphot_synthphot_average (Average *average, SecFilt *secfilt, Measure *measure, SynthZeroPoints *zpts);

trunk/Ohana/src/relphot/src/args.c

@@ -372 +372 @@
     mode = UPDATE_AVERAGES;
   }
+  SYNTH_ZERO_POINTS = NULL;
+  if ((N = get_argument (argc, argv, "-synthphot_means"))) {
+    mode = SYNTH_PHOT;
+    remove_argument (N, &argc, argv);
+    myAssert (N < argc, "missing argument to -synthphot_means");
+    SYNTH_ZERO_POINTS = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
   if ((N = get_argument (argc, argv, "-apply-offsets"))) {
     remove_argument (N, &argc, argv);
@@ -398 +406 @@
 
   switch (mode) {
+    case SYNTH_PHOT:
     case UPDATE_AVERAGES:
       if (argc != 1) relphot_usage();
@@ -471 +480 @@
     }
     MODE = MODE_UPDATE_OBJECTS;
+    remove_argument (N, &argc, argv);
+  }
+  SYNTH_ZERO_POINTS = NULL;
+  if ((N = get_argument (argc, argv, "-synthphot_means"))) {
+    MODE = MODE_SYNTH_PHOT;
+    remove_argument (N, &argc, argv);
+    SYNTH_ZERO_POINTS = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -644 +660 @@
   }
 
+  if ((MODE == MODE_SYNTH_PHOT)  && (argc == 1)) return TRUE;
   if ((MODE == MODE_UPDATE_OBJECTS)  && (argc == 1)) return TRUE;
   if (argc != 2) relphot_client_usage ();

trunk/Ohana/src/relphot/src/extra.c

@@ -1 +1 @@
 # include "relphot.h"
+
+// for now (20140710) I need to identify gpc1 chips explicitly.  generalize in the future
+int whichGPC1filter (int photcode) {
+
+  if ((photcode > 10000) && (photcode < 10077)) return PS1_g; // g-band
+  if ((photcode > 10100) && (photcode < 10177)) return PS1_r; // r-band
+  if ((photcode > 10200) && (photcode < 10277)) return PS1_i; // i-band
+  if ((photcode > 10300) && (photcode < 10377)) return PS1_z; // z-band
+  if ((photcode > 10400) && (photcode < 10477)) return PS1_y; // y-band
+  if ((photcode > 10500) && (photcode < 10577)) return PS1_w; // w-band
+
+  return PS1_none;
+}
 
 // for now (20140710) I need to identify gpc1 chips explicitly.  generalize in the future
@@ -50 +63 @@
   return FALSE;
 }
+
+int isGPC1synth (int photcode) {
+
+  if ((photcode >= 3001) && (photcode <= 3006)) return TRUE; // g-band
+
+  return FALSE;
+}

trunk/Ohana/src/relphot/src/help.c

@@ -5 +5 @@
   fprintf (stderr, "       or:    relphot -averages\n");
   fprintf (stderr, "       or:    relphot -apply-offsets\n");
+  fprintf (stderr, "       or:    relphot -synthphot_means\n");
   fprintf (stderr, "       or:    relphot (photcodes) -parallel-regions -region-hosts (RegionFile)\n");
   fprintf (stderr, "       or:    relphot (photcodes) -parallel-images (ImageTable) -region-hosts (RegionFile)\n\n");

trunk/Ohana/src/relphot/src/initialize.c

@@ -97 +97 @@
   args_client (argc, argv);
 
+  if (MODE == MODE_SYNTH_PHOT) return;
+
   if (MODE == MODE_UPDATE_OBJECTS) {
     char tmpline1[256];

trunk/Ohana/src/relphot/src/relphot.c

@@ -17 +17 @@
       // DOES NOT LOAD THE IMAGE TABLE
       relphot_objects (0, NULL);
+      exit (0);
+
+    case SYNTH_PHOT:
+      // set the mean magnitudes ONLY for SYNPHOT objects
+      relphot_synthphot (0, NULL);
       exit (0);
 

trunk/Ohana/src/relphot/src/relphot_client.c

@@ -87 +87 @@
     }
 
+    case MODE_SYNTH_PHOT:
+      // set the mean magnitudes ONLY for SYNPHOT objects
+      relphot_synthphot (HOST_ID, HOSTDIR);
+      client_logger_message ("set synth photometry\n");
+      break;
+
     default:
       fprintf (stderr, "impossible!");