Changeset 39811

Timestamp:

Nov 13, 2016, 10:23:59 AM (10 years ago)

Author:

eugene

Message:

add ability to update stack measurements

Location:

branches/czw_branch/20160809/Ohana/src/relastro

Files:

• include/relastro.h (modified) (1 diff)
• src/UpdateMeasures.c (modified) (1 diff)
• src/UpdateObjectOffsets.c (modified) (2 diffs)
• src/args.c (modified) (4 diffs)

branches/czw_branch/20160809/Ohana/src/relastro/include/relastro.h

@@ -376 +376 @@
 int    SKIP_CFH;
 
+int    UPDATE_PS1_STACK_MEASURE;
 int    UPDATE_PS1_CHIP_MEASURE;
 int    UPDATE_HSC_MEASURE;

branches/czw_branch/20160809/Ohana/src/relastro/src/UpdateMeasures.c

@@ -115 +115 @@
 
       // only modify the chip coordinates
+      if (UPDATE_PS1_STACK_MEASURE && isGPC1stack (measureT->photcode)) {
+        measureT->R = R;
+        measureT->D = D;
+        if (measureB) {
+          measureB->R = R;
+          measureB->D = D;
+        }
+      }
+      // only modify the chip coordinates
       if (UPDATE_PS1_CHIP_MEASURE && isGPC1chip (measureT->photcode)) {
         measureT->R = R;

branches/czw_branch/20160809/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -208 +208 @@
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 
+    if (UPDATE_PS1_STACK_MEASURE) strextend (&command, "-update-ps1-stack");
     if (UPDATE_PS1_CHIP_MEASURE) strextend (&command, "-update-ps1-chip");
     if (UPDATE_HSC_MEASURE)      strextend (&command, "-update-hsc");
@@ -346 +347 @@
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 
+    if (UPDATE_PS1_STACK_MEASURE) strextend (&command, "-update-ps1-stack");
     if (UPDATE_PS1_CHIP_MEASURE) strextend (&command, "-update-ps1-chip");
     if (UPDATE_HSC_MEASURE)      strextend (&command, "-update-hsc");

branches/czw_branch/20160809/Ohana/src/relastro/src/args.c

@@ -158 +158 @@
   }
 
+  UPDATE_PS1_STACK_MEASURE = FALSE;
+  if ((N = get_argument (argc, argv, "-update-ps1-stack"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_PS1_STACK_MEASURE = TRUE;
+  }
   UPDATE_PS1_CHIP_MEASURE = FALSE;
   if ((N = get_argument (argc, argv, "-update-ps1-chip"))) {
@@ -174 +179 @@
   }
   if (RELASTRO_OP == OP_UPDATE_OFFSETS) {
-    if (!UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
-      fprintf (stderr, "for -update-offsets, need to select at least one of -update-ps1-chip, -update-hsc, -update-cfh\n");
+    if (!UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
+      fprintf (stderr, "for -update-offsets, need to select at least one of -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
       exit (2);
     }
   }
   if ((RELASTRO_OP == OP_PARALLEL_IMAGES) || (RELASTRO_OP == OP_IMAGES)) {
-    if (APPLY_OFFSETS && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
-      fprintf (stderr, "for [-images or -parallel-images] with -apply-offsets, need to select at least one of -update-ps1-chip, -update-hsc, -update-cfh\n");
+    if (APPLY_OFFSETS && !UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
+      fprintf (stderr, "for [-images or -parallel-images] with -apply-offsets, need to select at least one of -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
       exit (2);
     }
@@ -879 +884 @@
   }
 
+  UPDATE_PS1_STACK_MEASURE = FALSE;
+  if ((N = get_argument (argc, argv, "-update-ps1-stack"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_PS1_STACK_MEASURE = TRUE;
+  }
   UPDATE_PS1_CHIP_MEASURE = FALSE;
   if ((N = get_argument (argc, argv, "-update-ps1-chip"))) {
@@ -895 +905 @@
   }
   if (RELASTRO_OP == OP_UPDATE_OFFSETS) {
-    if (!UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
-      fprintf (stderr, "for -update-offsets, need to select at least one of -update-ps1-chip, -update-hsc, -update-cfh\n");
+    if (!UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
+      fprintf (stderr, "for -update-offsets, need to select at least one of -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
       exit (2);
     }