Changeset 38631

Timestamp:

Jul 23, 2015, 8:48:53 AM (11 years ago)

Author:

eugene

Message:

add option to repair by objID

Location:

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

Files:

• Makefile (modified) (2 diffs)
• include/setphot.h (modified) (2 diffs)
• include/setphot_client.h (deleted)
• src/initialize_setphot.c (modified) (1 diff)
• src/repair_catalog_by_objID.c (added)
• src/update_dvo_setphot.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/uniphot/Makefile

@@ -67 +67 @@
 $(SRC)/update_dvo_setphot.$(ARCH).o \
 $(SRC)/update_catalog_setphot.$(ARCH).o \
+$(SRC)/repair_catalog_by_objID.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o         \
 $(SRC)/Shutdown.$(ARCH).o           
@@ -77 +78 @@
 $(SRC)/update_dvo_setphot.$(ARCH).o \
 $(SRC)/update_catalog_setphot.$(ARCH).o \
+$(SRC)/repair_catalog_by_objID.$(ARCH).o \
 $(SRC)/initialize_setphot_client.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o         \

branches/eam_branches/ipp-20150625/Ohana/src/uniphot/include/setphot.h

@@ -35 +35 @@
 int          PARALLEL_SERIAL;
 int          IMAGES_ONLY;
+int          REPAIR_BY_OBJID;
 
 SkyRegion    UserPatch;
@@ -76 +77 @@
 int           parse_zpt_offsets           PROTO((char *ZPT_OFFSET_FILTERS, char *ZPT_OFFSET_VALUES));
 float         apply_zpt_offset            PROTO((short code));
+
+int repair_catalog_by_objID (Catalog *catalog);

branches/eam_branches/ipp-20150625/Ohana/src/uniphot/src/initialize_setphot.c

@@ -49 +49 @@
   if ((N = get_argument (argc, argv, "-reset"))) {
     RESET = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  REPAIR_BY_OBJID = FALSE;
+  if ((N = get_argument (argc, argv, "-repair-by-objid"))) {
+    REPAIR_BY_OBJID = TRUE;
     remove_argument (N, &argc, argv);
   }

branches/eam_branches/ipp-20150625/Ohana/src/uniphot/src/update_dvo_setphot.c

@@ -65 +65 @@
       dvo_catalog_free (&catalog);
       continue;
+    }
+
+    if (REPAIR_BY_OBJID) {
+      // For gpc1 / PV3, I broke some catalogs with dvomerge -replace: the last object can
+      // contaminate the first set of new measurements
+      repair_catalog_by_objID (&catalog);
     }