Changeset 33503

Timestamp:

Mar 13, 2012, 1:49:44 PM (14 years ago)

Author:

eugene

Message:

attempts to reduce memory footprint : allocate only 30 idx entries per pass on Image index; pass -update flag to relphot_client -update-objects; change relphot_client -update mode ot relphot_client -update-catalogs; modification of the mosaic time range to match image time range

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src

Files:

• BrightCatalog.c (modified) (3 diffs)
• ImageOps.c (modified) (2 diffs)
• MosaicOps.c (modified) (1 diff)
• args.c (modified) (3 diffs)
• reload_catalogs.c (modified) (2 diffs)
• relphot_objects.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/BrightCatalog.c

@@ -635 +635 @@
     if (catalogs->Ncatalog >= catalogs->NCATALOG) {
       catalogs->NCATALOG += D_NCATALOG;
-      D_NCATALOG = MAX(2000, 2*D_NCATALOG);
 
       // fprintf (stderr, "realloc catalogs->catalog: old: %llx  ", (long long) catalogs->catalog);
@@ -652 +651 @@
 
       int j;
-      for (j = catalogs->NCATALOG - 16; j < catalogs->NCATALOG; j++) {
+      for (j = catalogs->NCATALOG - D_NCATALOG; j < catalogs->NCATALOG; j++) {
         dvo_catalog_init (&catalogs->catalog[j], TRUE);
         catalogs->catIDs[j] = 0;
@@ -663 +662 @@
         ALLOCATE (catalogs->catalog[j].secfilt,  SecFilt,     catalogs->NAVERAGE[j]*Nsecfilt);
       }
+      D_NCATALOG = MAX(2000, 2*D_NCATALOG);
     }
   }

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/ImageOps.c

@@ -154 +154 @@
     for (i = 0; i < Nimage; i++) {
       N_onImage[i] = 0;
-      N_ONIMAGE[i] = 100;
+      N_ONIMAGE[i] = 30;
       ALLOCATE (ImageToCatalog[i], off_t, N_ONIMAGE[i]);
       ALLOCATE (ImageToMeasure[i], off_t, N_ONIMAGE[i]);
@@ -288 +288 @@
 
     if (N_onImage[idx] == N_ONIMAGE[idx]) {
-      N_ONIMAGE[idx] += 100;
+      N_ONIMAGE[idx] += 30;
       REALLOCATE (ImageToCatalog[idx], off_t, N_ONIMAGE[idx]);
       REALLOCATE (ImageToMeasure[idx], off_t, N_ONIMAGE[idx]);

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/MosaicOps.c

@@ -527 +527 @@
   {
     Image *image = getimage(idx);
-    unsigned int imageStart = image[0].tzero - MAX(0.01*image[0].trate*image[0].NY, 1);
+    // XXX we are now matching with just tzero.  be careful for cameras with drift
+    // unsigned int imageStart = image[0].tzero - MAX(0.01*image[0].trate*image[0].NY, 1);
+    unsigned int imageStart = image[0].tzero;
     if (imageStart != mosaic[mosID].start) {
       fprintf (stderr, "error in image to mosaic match\n");

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/args.c

@@ -349 +349 @@
     remove_argument (N, &argc, argv);
   }
-  if ((N = get_argument (argc, argv, "-update"))) {
+  if ((N = get_argument (argc, argv, "-update-catalogs"))) {
     if (MODE) {
-      fprintf (stderr, "ERROR: cannot use both -load and -update options!\n");
+      fprintf (stderr, "ERROR: cannot mix modes (-load, -update-catalogs, -update-objects)\n");
       relphot_client_usage();
     }
@@ -361 +361 @@
   if ((N = get_argument (argc, argv, "-update-objects"))) {
     if (MODE) {
-      fprintf (stderr, "ERROR: cannot mix modes (-load, -update, -update-objects)\n");
+      fprintf (stderr, "ERROR: cannot mix modes (-load, -update-catalogs, -update-objects)\n");
       relphot_client_usage();
     }
@@ -451 +451 @@
   }  
 
+  UPDATE = FALSE;
+  if ((N = get_argument (argc, argv, "-update"))) {
+    remove_argument (N, &argc, argv);
+    UPDATE = TRUE;
+  }
+
   UPDATE_CATFORMAT = NULL;
   if ((N = get_argument (argc, argv, "-update-catformat"))) {

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/reload_catalogs.c

@@ -143 +143 @@
 
     char command[1024];
-    snprintf (command, 1024, "relphot_client %s -update %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f", 
+    snprintf (command, 1024, "relphot_client %s -update-catalogs %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f", 
               PhotcodeList, imageFile, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR);
 
-    // options & configs which affect relphot_client -update 
+    // options & configs which affect relphot_client -update-catalogs
     // VERBOSE, VERBOSE2
     // RESET
@@ -159 +159 @@
     if (VERBOSE2)         { snprintf (tmpline, 1024, "%s -vv",                  command);                                         strcpy (command, tmpline); }
     if (RESET)            { snprintf (tmpline, 1024, "%s -reset",               command);                                         strcpy (command, tmpline); }
+    if (UPDATE)           { snprintf (tmpline, 1024, "%s -update",              command);                                         strcpy (command, tmpline); }
     if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }
     if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/relphot_objects.c

@@ -150 +150 @@
     if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
     if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                    strcpy (command, tmpline); }
+    if (UPDATE)        { snprintf (tmpline, 1024, "%s -update",         command);                    strcpy (command, tmpline); }
     if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }