Changeset 41623 for branches/eam_branches/relphot.20210521/src/reload_catalogs.c

Timestamp:

May 27, 2021, 3:55:13 PM (5 years ago)

Author:

eugene

Message:

consolidate reload_catalogs and relphot_objects; option to supply grid correction in relphot -averages and relphot -apply-offsets

File:

• branches/eam_branches/relphot.20210521/src/reload_catalogs.c (modified) (5 diffs)

branches/eam_branches/relphot.20210521/src/reload_catalogs.c

@@ -17 +17 @@
 
   struct timeval start, stop;
-  double dtime = 0.0;
-  double time1 = 0.0;
-  double time2 = 0.0;
-  double time3a = 0.0;
-  double time3b = 0.0;
-  double time4 = 0.0;
-  double time5 = 0.0;
-  double time6 = 0.0;
-  double time7 = 0.0;
+  double dtime = 0.0, time1 = 0.0, time2 = 0.0, time3 = 0.0;
+  double time4 = 0.0, time5 = 0.0, time6 = 0.0, time7 = 0.0, time8 = 0.0;
 
   // XXX need to decide how to determine PARALLEL mode...
@@ -80 +73 @@
     TIMESTAMP(time2);
 
-    // XXX relphot_objects.c resets average and secfilt here
-
     populate_tiny_values(&catalog, DVO_TV_MEASURE | DVO_TV_AVERAGE);
-    TIMESTAMP(time3a);
+    TIMESTAMP(time3);
 
     // XXX need to worry about the image subset data
     initImageBins  (&catalog, 1, FALSE);
-    initMosaicBins (&catalog, 1, FALSE);
-    initTGroupBins (&catalog, 1);
-
-    initGridBins   (); 
-    TIMESTAMP(time3b);
+    TIMESTAMP(time4);
 
     findImages (&catalog, 1, FALSE);
-    findMosaics (&catalog, 1, FALSE);
-    findTGroups (&catalog, 1);
-
-    TIMESTAMP(time4);
+    TIMESTAMP(time5);
 
     initMrel (&catalog, 1);
@@ -103 +87 @@
     setMflatFromGrid (&catalog); // Mgrid is used to set Mflat; Mgrid is the ignored in setMrelFinal/setMrelCatalog.c
     setMrelFinal (&catalog, FALSE);
-    TIMESTAMP(time5);
-
-    // XXX relphot_objects allows !UPDATE and skips
+    TIMESTAMP(time6);
 
     // modify the output format as desired (ignore current format on disk)
@@ -125 +107 @@
     free_tiny_values(&catalog);
     dvo_catalog_free (&catalog);
-    TIMESTAMP(time6);
-
-    // XXX freeTgroupBins here: 
+    TIMESTAMP(time7);
 
     freeImageBins (1, FALSE);
-    freeMosaicBins (1, FALSE);
-    freeTGroupBins (1);
-    freeGridBins ();
-    TIMESTAMP(time7);
+    TIMESTAMP(time8);
 
     if (hostID) {
@@ -140 +117 @@
   }
 
-  fprintf (stderr, "time step 1  %10.3f sec : find catalog\n", time1);
-  fprintf (stderr, "time step 2  %10.3f sec : load catalog\n", time2);
-  fprintf (stderr, "time step 3  %10.3f sec : make tiny values\n", time3a);
-  fprintf (stderr, "time step 4  %10.3f sec : init imbins\n",  time3b);
-  fprintf (stderr, "time step 5  %10.3f sec : find images\n",  time4);
-  fprintf (stderr, "time step 6  %10.3f sec : set Mrel\n",     time5);
-  fprintf (stderr, "time step 7  %10.3f sec : save catalog\n", time6);
-  fprintf (stderr, "time step 8  %10.3f sec : free catalog\n", time7);
+  fprintf (stderr, "time step 1  %10.3f sec : find catalog\n",     time1);
+  fprintf (stderr, "time step 2  %10.3f sec : load catalog\n",     time2);
+  fprintf (stderr, "time step 3  %10.3f sec : make tiny values\n", time3);
+  fprintf (stderr, "time step 4  %10.3f sec : init imbins\n",      time4);
+  fprintf (stderr, "time step 5  %10.3f sec : find images\n",      time5);
+  fprintf (stderr, "time step 6  %10.3f sec : set Mrel\n",         time6);
+  fprintf (stderr, "time step 7  %10.3f sec : save catalog\n",     time7);
+  fprintf (stderr, "time step 8  %10.3f sec : free catalog\n",     time8);
 }