Changeset 41428 for trunk

Timestamp:

Oct 16, 2020, 7:07:10 AM (6 years ago)

Author:

eugene

Message:

extend mosaic analysis to GPC2, HSC, Megacam

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (7 diffs)
• src/MosaicOps.c (modified) (5 diffs)
• src/extra.c (modified) (2 diffs)

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

@@ -667 +667 @@
 
 // in extra.c
+int isMosaicChip  (int photcode);
+
 int isGPC1chip  (int photcode);
+int isGPC2chip  (int photcode);
 int isGPC1stack (int photcode);
 int isGPC1warp  (int photcode);

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

@@ -848 +848 @@
     if (image[i].flags & IMAGE_BAD) continue;
 
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     mlist[N] = image[i].McalPSF;
@@ -961 +961 @@
   for (i = 0; i < Nimage; i++) {
 
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     Mlist[Nplot] = image[i].McalPSF;
@@ -1008 +1008 @@
 
   for (i = 0; i < Nimage; i++) {
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     bin = image[i].dMcal / 0.00025;
@@ -1045 +1045 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     N = 0;
@@ -1094 +1094 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     list[n] = image[i].McalChiSq;
@@ -1127 +1127 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     list[n] = image[i].McalPSF;
@@ -1160 +1160 @@
     if (image[i].flags & IMAGE_BAD)  continue;
 
-    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (FREEZE_IMAGES && isMosaicChip(image[i].photcode)) continue;
 
     list[n] = image[i].dMcal;

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

@@ -173 +173 @@
   int Nmoschip = 0;
   for (i = 0; i < Nsubset; i++) {
-    if (!isGPC1chip(subset[i].photcode)) continue;
+    if (!isMosaicChip(subset[i].photcode)) continue;
     startTimes[Nmoschip] = subset[i].tzero;
     Nmoschip ++;
@@ -238 +238 @@
     }
     
-    if (!isGPC1chip(image[i].photcode)) continue;
+    if (!isMosaicChip(image[i].photcode)) continue;
 
     /* set image time range */
@@ -262 +262 @@
     ImageToMosaic[i] = -1;
 
-    if (!isGPC1chip(subset[i].photcode)) {
+    if (!isMosaicChip(subset[i].photcode)) {
       Nsimple ++;
       continue;
@@ -346 +346 @@
   int Nmoschip = 0;
   for (i = 0; i < Nimage; i++) {
-    if (!isGPC1chip(image[i].photcode)) continue;
+    if (!isMosaicChip(image[i].photcode)) continue;
     startTimes[Nmoschip] = image[i].tzero;
     Nmoschip ++;
@@ -409 +409 @@
     ImageToMosaic[i] = -1;
 
-    if (!isGPC1chip(image[i].photcode)) {
+    if (!isMosaicChip(image[i].photcode)) {
       Nsimple ++;
       continue;

trunk/Ohana/src/relphot/src/extra.c

@@ -1 +1 @@
 # include "relphot.h"
+
+int isMosaicChip (int photcode) {
+
+  if (isGPC1chip(photcode)) return TRUE;
+  if (isGPC2chip(photcode)) return TRUE;
+  if (isHSCchip(photcode))  return TRUE;
+  if (isCFHchip(photcode))  return TRUE; // this is megacam
+  return FALSE;
+}
 
 // for now (20140710) I need to identify gpc1 chips explicitly.  generalize in the future
@@ -24 +33 @@
   if (((photcode > 10400) && (photcode < 10477)) || (photcode == 4500)) return TRUE; // y-band
   if (((photcode > 10500) && (photcode < 10577)) || (photcode == 4600)) return TRUE; // w-band
+
+  return FALSE;
+}
+
+// for now, I need to identify gpc2 chips explicitly.  generalize in the future
+int isGPC2chip (int photcode) {
+
+  if ((photcode >= 30000) && (photcode <= 30077)) return TRUE; // g-band
+  if ((photcode >= 30100) && (photcode <= 30177)) return TRUE; // r-band
+  if ((photcode >= 30200) && (photcode <= 30277)) return TRUE; // i-band
+  if ((photcode >= 30300) && (photcode <= 30377)) return TRUE; // z-band
+  if ((photcode >= 30400) && (photcode <= 30477)) return TRUE; // y-band
+  if ((photcode >= 30500) && (photcode <= 30577)) return TRUE; // w-band
 
   return FALSE;