Changeset 39713

Timestamp:

Sep 22, 2016, 2:38:18 PM (10 years ago)

Author:

eugene

Message:

allow setphot to have a user-specified photcode range

Location:

branches/czw_branch/20160809/Ohana/src/uniphot

Files:

• include/setphot.h (modified) (1 diff)
• src/initialize_setphot.c (modified) (1 diff)
• src/initialize_setphot_client.c (modified) (1 diff)
• src/update_catalog_setphot.c (modified) (1 diff)
• src/update_dvo_setphot.c (modified) (1 diff)

branches/czw_branch/20160809/Ohana/src/uniphot/include/setphot.h

@@ -67 +67 @@
 int          VERBOSE;
 int          RESET;
+int          PHOTCODE_MIN;
+int          PHOTCODE_MAX;
 int          UBERCAL; // load the supplied ubercal zero point fits table (with flat-field corrections)
 int          NO_METADATA; // the supplied ubercal data has no descriptive metadata

branches/czw_branch/20160809/Ohana/src/uniphot/src/initialize_setphot.c

@@ -109 +109 @@
   if ((N = get_argument (argc, argv, "-reset"))) {
     RESET = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  PHOTCODE_MIN = 0;
+  PHOTCODE_MAX = 0;
+  if ((N = get_argument (argc, argv, "-photcode-range"))) {
+    remove_argument (N, &argc, argv);
+    PHOTCODE_MIN = atoi (argv[N]);    
+    remove_argument (N, &argc, argv);
+    PHOTCODE_MAX = atoi (argv[N]);    
     remove_argument (N, &argc, argv);
   }

branches/czw_branch/20160809/Ohana/src/uniphot/src/initialize_setphot_client.c

@@ -96 +96 @@
   }
 
+  PHOTCODE_MIN = 0;
+  PHOTCODE_MAX = 0;
+  if ((N = get_argument (argc, argv, "-photcode-range"))) {
+    remove_argument (N, &argc, argv);
+    PHOTCODE_MIN = atoi (argv[N]);    
+    remove_argument (N, &argc, argv);
+    PHOTCODE_MAX = atoi (argv[N]);    
+    remove_argument (N, &argc, argv);
+  }
+
   // region of interest
   UserPatch.Rmin = 0;

branches/czw_branch/20160809/Ohana/src/uniphot/src/update_catalog_setphot.c

@@ -26 +26 @@
     if (!code) continue; // invalid photcode
     if (code->type != PHOT_DEP) continue;
+
+    // allow a restriction on the modified zpts:
+    if (PHOTCODE_MAX) {
+      if (measure[0].photcode < PHOTCODE_MIN) continue;
+      if (measure[0].photcode > PHOTCODE_MAX) continue;
+    }
 
     off_t idx = measure[0].imageID;

branches/czw_branch/20160809/Ohana/src/uniphot/src/update_dvo_setphot.c

@@ -179 +179 @@
     if (DCR_RESET)        { strextend (&command, "-DCR-reset"); }
     if (CAM_RESET)        { strextend (&command, "-CAM-reset"); }
+
+    if (PHOTCODE_MAX)     { strextend (&command, "-photcode-range %d %d", PHOTCODE_MIN, PHOTCODE_MAX); }
 
     fprintf (stderr, "command: %s\n", command);