Changeset 39611 for trunk

Timestamp:

Jun 25, 2016, 10:22:40 AM (10 years ago)

Author:

eugene

Message:

update dvolens to use repair-from-warpIDs globally

Location:

trunk/Ohana/src/dvolens/src

Files:

• args.c (modified) (2 diffs)
• update_objects.c (modified) (1 diff)
• update_objects_catalog.c (modified) (3 diffs)

trunk/Ohana/src/dvolens/src/args.c

@@ -50 +50 @@
     REPAIR_LENSING_IDS_FROM_WARPS = TRUE;
     remove_argument (N, &argc, argv);
+  }
+  if (REPAIR_LENSING_IDS && REPAIR_LENSING_IDS_FROM_WARPS) {
+    fprintf (stderr, "cannot use both -repair-lensing-ids and -repair-lensing-ids-from-warps, exiting\n");
+    exit (2);
   }
 
@@ -193 +197 @@
     remove_argument (N, &argc, argv);
   }
+  if (REPAIR_LENSING_IDS && REPAIR_LENSING_IDS_FROM_WARPS) {
+    fprintf (stderr, "cannot use both -repair-lensing-ids and -repair-lensing-ids-from-warps, exiting\n");
+    exit (2);
+  }
 
   UPDATE = FALSE;

trunk/Ohana/src/dvolens/src/update_objects.c

@@ -169 +169 @@
     // VERBOSE, VERBOSE2, UPDATE
 
-    if (VERBOSE)            strextend (&command, "-v");
-    if (VERBOSE2)           strextend (&command, "-vv");
-    if (UPDATE)             strextend (&command, "-update");
-    if (REPAIR_LENSING_IDS) strextend (&command, "-repair-lensing-ids");
-    if (UserCatalog)        strextend (&command, "-catalog %s", UserCatalog);
+    if (VERBOSE)                       strextend (&command, "-v");
+    if (VERBOSE2)                      strextend (&command, "-vv");
+    if (UPDATE)                        strextend (&command, "-update");
+    if (REPAIR_LENSING_IDS)            strextend (&command, "-repair-lensing-ids");
+    if (REPAIR_LENSING_IDS_FROM_WARPS) strextend (&command, "-repair-lensing-ids-from-warps");
+    if (UserCatalog)                   strextend (&command, "-catalog %s", UserCatalog);
 
     fprintf (stderr, "command: %s\n", command);

trunk/Ohana/src/dvolens/src/update_objects_catalog.c

@@ -46 +46 @@
   double time4 = 0.0;
 
+  int NfixLensing = 0;
+  int NgoodLensing = 0;
   int NmissLensing = 0;
   int NmissWarps   = 0;
@@ -80 +82 @@
         Lensing *lensing = &catalog->lensing[Loff + Lj];
         if (lensing->detID == measure->detID) {
-          lensing->oldImID = lensing->imageID;
-          lensing->imageID = measure->imageID;
+          if (lensing->imageID == measure->imageID) {
+            NgoodLensing ++;
+          } else {
+            lensing->oldImID = lensing->imageID;
+            lensing->imageID = measure->imageID;
+            NfixLensing ++;
+          }
           Nmatch ++;
         }
@@ -357 +364 @@
   if (REPAIR_LENSING_IDS) fprintf (stderr, "corrected %d lensing IDs, failed on %d lensing IDs\n", Nfixed, Nfailed);
 
-  if (REPAIR_LENSING_IDS_FROM_WARPS) fprintf (stderr, "missed %d lensing IDs, %d warps\n", NmissLensing, NmissWarps);
+  if (REPAIR_LENSING_IDS_FROM_WARPS) fprintf (stderr, "Ngood %d Nfixed %d missed %d lensing IDs, %d warps\n", NgoodLensing, NfixLensing, NmissLensing, NmissWarps);
 
   catalog->Nlensobj = Nlensobj;