Changeset 39642 for trunk/Ohana/src/relphot/src/load_images.c

Timestamp:

Jul 29, 2016, 11:46:14 AM (10 years ago)

Author:

eugene

Message:

add option to use all images rather than generating a subset

File:

• trunk/Ohana/src/relphot/src/load_images.c (modified) (2 diffs)

trunk/Ohana/src/relphot/src/load_images.c

@@ -5 +5 @@
 // This function generates a subset of the images based on selections.  Input db has already
 // been loaded with the raw fits table data
-int load_images (FITS_DB *db, SkyList *skylist, SkyRegion *region, int unlockImages) {
+int load_images (FITS_DB *db, SkyList *skylist, SkyRegion *region, int unlockImages, int UseAllImages) {
 
   Image     *image, *subset;
@@ -31 +31 @@
 
   // select the images which overlap the selected sky regions
-  // 'subset' points to a new copy of the data (different from 'image')
-  subset = select_images (skylist, image, Nimage, inSubset, &LineNumber, &Nsubset, region);
-  MARKTIME("selected %d overlapping images: %f sec\n", (int) Nsubset, dtime);
+  // 'subset' points to a new copy of the data (different from 'image') if a subset is selected
+  if (UseAllImages) {
+    ALLOCATE (LineNumber, off_t, Nimage);
+    for (off_t i = 0; i < Nimage; i++) {
+      LineNumber[i] = i;
+      inSubset[i] = TRUE;
+    }
+    subset  = image;
+    Nsubset = Nimage;
+  } else {
+    subset = select_images (skylist, image, Nimage, inSubset, &LineNumber, &Nsubset, region);
+    MARKTIME("selected %d overlapping images: %f sec\n", (int) Nsubset, dtime);
 
-  if (Nimage == 0) {
-    fprintf (stderr, "no images selected for analysis : problem with region or photcode?\n");
-    exit (4);
+    if (Nimage == 0) {
+      fprintf (stderr, "no images selected for analysis : problem with region or photcode?\n");
+      exit (4);
+    }
+
+    if (Nsubset == Nimage) {
+      free (subset);
+      subset = image;
+    }
   }