Changeset 40369

Timestamp:

Mar 15, 2018, 5:08:26 PM (8 years ago)

Author:

watersc1

Message:

Update to allow HSC data to be processed by setphot. The setphot.c change should NOT be merged to the trunk. The others are safe

Location:

branches/czw_branch/20170908/Ohana/src/uniphot/src

Files:

• cam_zpt_correction.c (modified) (2 diffs)
• match_camcorr_to_images.c (modified) (1 diff)
• setphot.c (modified) (1 diff)

branches/czw_branch/20170908/Ohana/src/uniphot/src/cam_zpt_correction.c

@@ -286 +286 @@
   // table->offset[seq][ix][iy] with dM values for image[seq] 
 
+  // Set up HSC/GPC1 distinguishing limits
+
+  int minCodeGPC1 = 10000;
+  int maxCodeGPC1 = 10576;
+
+  int minCodeHSC  = 20000;
+  int maxCodeHSC  = 26111;
+
+  int isGPC1 = FALSE;
+  int isHSC  = FALSE;
+    
   // loop over the flatcorr images and match from image[seq] to newcorr:
   for (i = 0; i < flatcorr->Nimage; i++) {
@@ -302 +313 @@
     int photcode = flatcorr->image[i].photcode;
 
+    if ((photcode >= minCodeGPC1)&&(photcode <= maxCodeGPC1)) {
+      isGPC1 = TRUE;
+      isHSC  = FALSE;
+    }
+    else if ((photcode >= minCodeHSC)&&(photcode <= maxCodeHSC)) {
+      isGPC1 = FALSE;
+      isHSC  = TRUE;
+    }
+    if (!(isGPC1) && !(isHSC)) { continue; }
+
+    int iy, ix, filter;
+
+    
     // find the chip and filter from photcode:
-    int iy = photcode % 10;
-    int ix = (int)(photcode / 10) % 10;
-    int filter = (int)(photcode / 100) % 10;
+    if (isGPC1) {
+      iy = photcode % 10;
+      ix = (int)(photcode / 10) % 10;
+      filter = (int)(photcode / 100) % 10;
+    }
+    else if (isHSC) {
+      iy = 0;
+      ix = (int) photcode % 112;
+      filter = (int)(photcode / 1000) % 10;
+    }
               
     myAssert (ix     < newcorr->Nx, "oops");

branches/czw_branch/20170908/Ohana/src/uniphot/src/match_camcorr_to_images.c

@@ -55 +55 @@
       }
       else if (isHSC) {
-        int ix = photcode % 112;
         int filter = (int)(photcode / 1000) % 10;
-
+        int ix = photcode - 20000 - filter * 1000;
+        
         seq = ix + filter * camcorr->Nchips + j * camcorr->Nflats;
       }

branches/czw_branch/20170908/Ohana/src/uniphot/src/setphot.c

@@ -73 +73 @@
     // we are going to deprecate the flatcorr imaage lookup
     // match_flatcorr_to_images (image, Nimage, &flatcorrTable);
-    match_camcorr_to_images (image, Nimage, camcorr);
+  match_camcorr_to_images (image, Nimage, camcorr);
     //  }