Changeset 40223

Timestamp:

Nov 28, 2017, 7:59:28 PM (9 years ago)

Author:

eugene

Message:

updates to be compatible with ipptopsps test

Location:

branches/eam_branches/ohana.20170822/src

Files:

• libdvo/src/dvo_catalog_split.c (modified) (1 diff)
• libdvo/src/dvo_convert.c (modified) (1 diff)
• relastro/include/relastro.h (modified) (1 diff)
• relastro/src/UpdateMeasures.c (modified) (1 diff)
• relastro/src/UpdateObjectOffsets.c (modified) (2 diffs)
• relastro/src/args.c (modified) (3 diffs)

branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog_split.c

@@ -464 +464 @@
   catalog[0].Nmissing_disk = Nmissing;
   catalog[0].Nsecfilt_disk = Naverage * Nsecfilt;
-  catalog[0].Nlensing_disk  = Nlensing;
-  catalog[0].Nlensobj_disk  = Nlensobj;
-  catalog[0].Nstarpar_disk  = Nstarpar;
+  catalog[0].Nlensing_disk = Nlensing;
+  catalog[0].Nlensobj_disk = Nlensobj;
+  catalog[0].Nstarpar_disk = Nstarpar;
   catalog[0].Ngalphot_disk = Ngalphot;
 

branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert.c

@@ -1015 +1015 @@
 //    FORMAT_CASE (PS1_V3,          PS1_V3);
 //    FORMAT_CASE (PS1_V4,          PS1_V4);
+      FORMAT_CASE (PS1_V5,          PS1_V5_R1);
       FORMAT_CASE (PS1_V6,          PS1_V6);
       FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);

branches/eam_branches/ohana.20170822/src/relastro/include/relastro.h

@@ -378 +378 @@
 int    SKIP_CFH;
 
+int    UPDATE_ALL_MEASURE;
 int    UPDATE_PS1_STACK_MEASURE;
 int    UPDATE_PS1_CHIP_MEASURE;

branches/eam_branches/ohana.20170822/src/relastro/src/UpdateMeasures.c

@@ -167 +167 @@
       }
     set_measure_done:
+      continue; // XXX this line is needed only to support the label above
     }
     if (VERBOSE) fprintf (stderr, "%s : Noff ori RA %d ( %d %d %d ), Noff ori DEC %d ( %d %d %d )\n", catalog[i].filename, NoffRAori, NoffRAchip, NoffRAstack, NoffRAwarp, NoffDECori, NoffDECchip, NoffDECstack, NoffDECwarp);

branches/eam_branches/ohana.20170822/src/relastro/src/UpdateObjectOffsets.c

@@ -208 +208 @@
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 
+    if (UPDATE_ALL_MEASURE)       strextend (&command, "-update-all-cameras");
     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");
-    if (UPDATE_CFH_MEASURE)      strextend (&command, "-update-cfh");
-
-    if (UPDATE)        strextend (&command, "-update");
+    if (UPDATE_PS1_CHIP_MEASURE)  strextend (&command, "-update-ps1-chip");
+    if (UPDATE_HSC_MEASURE)       strextend (&command, "-update-hsc");
+    if (UPDATE_CFH_MEASURE)       strextend (&command, "-update-cfh");
+
+    if (UPDATE)           strextend (&command, "-update");
     if (RESET_BAD_IMAGES) strextend (&command, "-reset-bad-images");
-    if (USE_BASIC_CHECK) strextend (&command, "-basic-image-search");
-    if (USE_ALL_IMAGES)      strextend (&command, "-use-all-images");
+    if (USE_BASIC_CHECK)  strextend (&command, "-basic-image-search");
+    if (USE_ALL_IMAGES)   strextend (&command, "-use-all-images");
 
     if (MinBadQF > 0.0)        strextend (&command, "-min-bad-psfqf %f", MinBadQF); 
@@ -347 +348 @@
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 
+    if (UPDATE_ALL_MEASURE)       strextend (&command, "-update-all-cameras");
     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");
-    if (UPDATE_CFH_MEASURE)      strextend (&command, "-update-cfh");
+    if (UPDATE_PS1_CHIP_MEASURE)  strextend (&command, "-update-ps1-chip");
+    if (UPDATE_HSC_MEASURE)       strextend (&command, "-update-hsc");
+    if (UPDATE_CFH_MEASURE)       strextend (&command, "-update-cfh");
 
     if (UPDATE)        strextend (&command, "-update");

branches/eam_branches/ohana.20170822/src/relastro/src/args.c

@@ -190 +190 @@
   }
   if ((RELASTRO_OP == OP_PARALLEL_IMAGES) || (RELASTRO_OP == OP_IMAGES)) {
-    if (APPLY_OFFSETS && !UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
+    if (APPLY_OFFSETS && !UPDATE_ALL_MEASURE && !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);
@@ -895 +895 @@
   }
 
+  UPDATE_ALL_MEASURE = FALSE;
+  if ((N = get_argument (argc, argv, "-update-all-cameras"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE_ALL_MEASURE = TRUE;
+  }
   UPDATE_PS1_STACK_MEASURE = FALSE;
   if ((N = get_argument (argc, argv, "-update-ps1-stack"))) {
@@ -916 +921 @@
   }
   if (RELASTRO_OP == OP_UPDATE_OFFSETS) {
-    if (!UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
+    if (!UPDATE_ALL_MEASURE && !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);