Changeset 34819

Timestamp:

Dec 14, 2012, 3:03:53 PM (14 years ago)

Author:

eugene

Message:

add -skip-images, fix memleak, add -vv (VERBOSE2)

Location:

branches/eam_branches/ipp-20121130/Ohana/src/delstar

Files:

• include/delstar.h (modified) (2 diffs)
• src/args.c (modified) (3 diffs)
• src/delete_photcodes.c (modified) (7 diffs)
• src/delstar.c (modified) (2 diffs)
• src/delstar_client.c (modified) (1 diff)

branches/eam_branches/ipp-20121130/Ohana/src/delstar/include/delstar.h

@@ -27 +27 @@
 double ALPHA;
 int    VERBOSE;
+int    VERBOSE2;
 int    ORPHAN;
 int    MISSED;
@@ -38 +39 @@
 int          HOST_ID;
 char        *HOSTDIR;
+
+int SKIP_IMAGES;
 
 time_t    START;

branches/eam_branches/ipp-20121130/Ohana/src/delstar/src/args.c

@@ -44 +44 @@
   }
 
+  VERBOSE2 = FALSE;
+  if ((N = get_argument (argc, argv, "-vv"))) {
+    VERBOSE = TRUE;
+    VERBOSE2 = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
   // region of interest
   UserPatch.Rmin = 0;
@@ -58 +65 @@
     remove_argument (N, &argc, argv);
     UserPatch.Dmax = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  SKIP_IMAGES = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-images"))) {
+    SKIP_IMAGES = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -205 +218 @@
   }
 
+  VERBOSE2 = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    VERBOSE = TRUE;
+    VERBOSE2 = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
   /* specify portion of the sky */
   UserPatch.Rmin = 0;

branches/eam_branches/ipp-20121130/Ohana/src/delstar/src/delete_photcodes.c

@@ -46 +46 @@
 
     // an error exit status here is a significant error
-    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "a")) {
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE2, "a")) {
       fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
       exit (2);
     }
     if (!catalog.Naves_disk) {
-      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
+      if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -58 +58 @@
 
     delete_photcodes_catalog (&catalog, photcodes, Nphotcodes);
-    dvo_catalog_save_complete (&catalog, VERBOSE);
+    dvo_catalog_save_complete (&catalog, VERBOSE2);
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
@@ -97 +97 @@
     char tmpline[1024];
     if (VERBOSE)       { snprintf (tmpline, 1024, "%s -v",              command);                    strcpy (command, tmpline); }
+    if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);
@@ -287 +288 @@
   FREE(measure);
   FREE(average);
+  FREE(secfilt);
   catalog[0].measure = measureOut;
   catalog[0].average = averageOut;
@@ -299 +301 @@
   for (i = 0; i < NaveOut; i++) {
     NmeasureTotal += catalog[0].average[i].Nmeasure;
-    if (VERBOSE && !(NmeasureTotal <= catalog[0].Nmeasure)) {
+    if (VERBOSE2 && !(NmeasureTotal <= catalog[0].Nmeasure)) {
       fprintf (stderr, "too few measurements: %d %d %d\n", (int) i, NmeasureTotal, (int) catalog[0].Nmeasure);
     }
     measureOffsetOK &= (catalog[0].average[i].measureOffset < catalog[0].Nmeasure);
-    if (VERBOSE && !(catalog[0].average[i].measureOffset < catalog[0].Nmeasure)) {
+    if (VERBOSE2 && !(catalog[0].average[i].measureOffset < catalog[0].Nmeasure)) {
       fprintf (stderr, "offset too large: %d %d %d\n", (int) i, catalog[0].average[i].Nmeasure, (int) catalog[0].Nmeasure);
     }
     measureOffsetOK &= (catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure);
-    if (VERBOSE && !(catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure)) {
+    if (VERBOSE2 && !(catalog[0].average[i].measureOffset + catalog[0].average[i].Nmeasure <= catalog[0].Nmeasure)) {
       fprintf (stderr, "orrset + Nmeasure too large: %d + %d > %d %d\n", (int) i, catalog[0].average[i].measureOffset, catalog[0].average[i].Nmeasure, (int) catalog[0].Nmeasure);
     }
@@ -313 +315 @@
     for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
       averefOK &= (catalog[0].measure[m+j].averef == i);
-      if (VERBOSE && !(catalog[0].measure[m+j].averef == i)) {
+      if (VERBOSE2 && !(catalog[0].measure[m+j].averef == i)) {
         fprintf (stderr, "averef broken: %d vs %d (measure %d)\n", (int) i, catalog[0].measure[m+j].averef, (int) (m+j));
       }
@@ -340 +342 @@
   FREE (measureSeqRaw);
   FREE (measureSeqOut);
+  FREE (measureRefOut);
   FREE (measureAveRaw);
   FREE (averageNmeas);

branches/eam_branches/ipp-20121130/Ohana/src/delstar/src/delstar.c

@@ -10 +10 @@
   args (argc, argv);
 
-  set_db (&db);
-  status = dvo_image_lock (&db, ImageCat, 60.0, LCK_XCLD); /* XCLD */
-  if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
-  if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
-
-  status = dvo_image_load (&db, VERBOSE, FALSE);
-  if (!status) Shutdown ("can't read image catalog %s", db.filename);
+  if (!SKIP_IMAGES) {
+    set_db (&db);
+    status = dvo_image_lock (&db, ImageCat, 60.0, LCK_XCLD); /* XCLD */
+    if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
+    if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+    status = dvo_image_load (&db, VERBOSE, FALSE);
+    if (!status) Shutdown ("can't read image catalog %s", db.filename);
+  }
 
   switch (MODE) {
@@ -29 +30 @@
       break;
     case MODE_PHOTCODES: {
-      if (!delete_image_photcodes (&db)) exit (1);
+      if (!SKIP_IMAGES) {
+        if (!delete_image_photcodes (&db)) exit (1);
+      }
 
       if (!delete_photcodes (0, NULL)) {

branches/eam_branches/ipp-20121130/Ohana/src/delstar/src/delstar_client.c

@@ -32 +32 @@
       break;
     case MODE_PHOTCODES:
-      delete_photcodes (HOST_ID, HOSTDIR);
-      break;
+      if (!delete_photcodes (HOST_ID, HOSTDIR)) {
+        fprintf (stderr, "failure deleting measurements from %s\n", HOSTDIR);
+        exit (1);
+      }
+      exit (0);
     case MODE_ORPHAN:
       break;