Changeset 41664

Timestamp:

Jun 16, 2021, 1:43:22 PM (5 years ago)

Author:

eugene

Message:

add function to rationalize zero points

Location:

trunk/Ohana/src/relphot/src

Files:

• GridOps.c (modified) (2 diffs)
• ImageOps.c (modified) (2 diffs)
• MosaicOps.c (modified) (3 diffs)
• TGroupOps.c (modified) (3 diffs)
• relphot_images.c (modified) (2 diffs)

trunk/Ohana/src/relphot/src/GridOps.c

@@ -274 +274 @@
     if (!GridCorr[code]) continue;
 
+    // float GridSum = 0.0;
+    // int   GridCnt =   0;
     for (int ix = 0; ix < GridCorr[code]->Nx; ix++) {
       for (int iy = 0; iy < GridCorr[code]->Ny; iy++) {
@@ -292 +294 @@
         GridCorr[code]->dMgrid[ix][iy] = sqrt(r*(Mgrid2 - Mgrid*Mgrid)); // sample stdev
         // fprintf (stderr, "grid code %d, %d x %d : %f +/- %f : %d\n", code, ix, iy, GridCorr[code]-> Mgrid[ix][iy], GridCorr[code]->dMgrid[ix][iy], GridCorr[code]->nMgrid[ix][iy]);
+        // GridSum += Mgrid;
+        // GridCnt ++;
       }
     }
+    // float GridAve = GridSum / GridCnt;
+    // fprintf (stderr, "grid average: %f\n", GridAve);
   }
   return;

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -1021 +1021 @@
   free (mlist);
 
+  fprintf (stderr, "rationalize by image using %d pts\n", N);
   return stats.median; 
 }
@@ -1031 +1032 @@
     int mycode = GetPhotcodeEquivCodebyCode (image[i].photcode);
     if (mycode != photcode) continue;
-    image[i].McalPSF -= zpt;
-    image[i].McalAPER -= zpt;
+    // fprintf (stderr, "IMAGE %d zpt %f -> ", i, image[i].McalPSF);
+
+    int applyOffset = TRUE;
+    TGroup *mygrp = getTGroupForImage (i);
+    if (mygrp && (mygrp->flags & ID_IMAGE_TGROUP_PHOTCAL)) applyOffset = FALSE;
+
+    Mosaic *mymos = getMosaicForImage (i);
+    if (mymos && (mymos->flags & ID_IMAGE_MOSAIC_PHOTCAL)) applyOffset = FALSE;
+
+    if (applyOffset) {
+      image[i].McalPSF -= zpt;
+      image[i].McalAPER -= zpt;
+    }
+    // fprintf (stderr, "%f (%d)\n", image[i].McalPSF, applyOffset);
   }
 

trunk/Ohana/src/relphot/src/MosaicOps.c

@@ -1574 +1574 @@
 }
 
+TGroup *getTGroupForMosaic (int mos) {
+  if (mos >= Nmosaic) return NULL;
+  if (mos < 0) return NULL;
+
+  if (!mosaic[mos].inTGroup) return NULL;
+
+  int imageIdx = MosaicToImage[mos][0];
+
+  TGroup *mygrp = getTGroupForImage (imageIdx);
+  return mygrp;
+}
+
 double get_median_zpt_mosaics (short photcode) {
 
@@ -1601 +1613 @@
   free (mlist);
 
+  fprintf (stderr, "rationalize by mosaic using %d pts\n", N);
   return stats.median; 
 }
@@ -1611 +1624 @@
   for (int i = 0; i < Nmosaic; i++) {
     if (mosaic[i].photcode != photcode) continue;
-    mosaic[i].McalPSF -= zpt;
-    mosaic[i].McalAPER -= zpt;
+    // fprintf (stderr, "MOSAIC %d zpt %f -> ", i, mosaic[i].McalPSF);
+
+    int applyOffset = TRUE;
+    TGroup *mygrp = getTGroupForMosaic (i);
+    if (mygrp && (mygrp->flags & ID_IMAGE_TGROUP_PHOTCAL)) applyOffset = FALSE;
+    if (!(mosaic[i].flags & ID_IMAGE_MOSAIC_PHOTCAL)) applyOffset = FALSE;
+
+    if (applyOffset) {
+      mosaic[i].McalPSF -= zpt;
+      mosaic[i].McalAPER -= zpt;
+    }
+    // fprintf (stderr, "%f (%d)\n", mosaic[i].McalPSF, applyOffset);
   }
 

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

@@ -1335 +1335 @@
       }
       // too few exposures (configure)
-      if (tgroup[j].Nmosaic < 4) {
+      if ((tgroup[j].Nmosaic < 4) && (tgroup[j].Nimage < 4)) {
         mark = TRUE;
         NfewExp ++;
@@ -1395 +1395 @@
   free (mlist);
 
+  fprintf (stderr, "rationalize by tgroup using %d pts\n", N);
   return stats.median; 
 }
@@ -1407 +1408 @@
     for (int j = 0; j < tgroupTimes[i][0].nCode; j++) {
       if (tgroup[j].photcode != photcode) continue;
+      if (!(tgroup[j].flags & ID_IMAGE_TGROUP_PHOTCAL)) continue;
       tgroup[j].McalPSF -= zpt;
       tgroup[j].McalAPER -= zpt;

trunk/Ohana/src/relphot/src/relphot_images.c

@@ -97 +97 @@
       SetZptIteration (i);
 
+      rationalize_zeropoints (i);
+
       setMrel  (catalog, Ncatalog); // threaded (calls setMrelCatalog)
 
@@ -102 +104 @@
       setMmos  (catalog);
       setMgrp  (catalog);
-
-      rationalize_zeropoints (i);
 
       setMgrid (catalog, Ncatalog);