Changeset 41404 for trunk

Timestamp:

Aug 25, 2020, 9:09:13 AM (6 years ago)

Author:

eugene

Message:

tgroups should be linked to subset entries, not full-table entries

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/TGroupOps.c (modified) (3 diffs)
• src/load_images.c (modified) (1 diff)

trunk/Ohana/src/relphot/include/relphot.h

@@ -486 +486 @@
 void          initMosaicGrid      PROTO((Image *image, off_t Nimage));
 void          initMosaics         PROTO((Image *subset, off_t Nsubset, Image *image, char *inSubset, off_t Nimage));
-void          initTGroups         PROTO((Image *subset, off_t *LineNumber, off_t Nsubset));
+void          initTGroups         PROTO((Image *subset, off_t Nsubset));
 void          freeTGroups         PROTO((void));
 void          initTGroupBins      PROTO((Catalog *catalog, int Ncatalog));

trunk/Ohana/src/relphot/src/TGroupOps.c

@@ -96 +96 @@
 
 // assign the images to the tgroups
-void initTGroups (Image *subset, off_t *LineNumber, off_t Nsubset) {
+void initTGroups (Image *subset, off_t Nsubset) {
 
   if (!TGROUP_ZEROPT) return;
@@ -133 +133 @@
     ImageToTGroup[i] = j;
 
+    // note the array 'subset' is registered in ImageOps.c:images by initImages
+    // and can be retrieve with getimages
+
     // add image to tgroup image list
-    tgroup[j].image[tgroup[j].Nimage] = i; // should this be 'i' or LineNumber[i] ??
+    tgroup[j].image[tgroup[j].Nimage] = i; // reference to entry in 'subset'
     tgroup[j].Nimage ++;
     if (tgroup[j].Nimage == tgroup[j].NIMAGE) {
@@ -190 +193 @@
     ALLOCATE_PTR (McalAPER, double, tgroup[i].Nimage);
     for (int j = 0; j < tgroup[i].Nimage; j++) {
-      int Nsub = LineNumber[tgroup[i].image[j]];
+      int Nsub = tgroup[i].image[j];
       McalPSF[j] = images[Nsub].McalPSF;
       McalAPER[j] = images[Nsub].McalAPER;

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

@@ -110 +110 @@
   MARKTIME("init images: %f sec\n", dtime);
 
-  initTGroups (subset, LineNumber, Nsubset);
+  // assign chip images to tgroups
+  initTGroups (subset, Nsubset);
 
   return TRUE;