Changeset 40129

Timestamp:

Sep 8, 2017, 3:28:50 PM (9 years ago)

Author:

watersc1

Message:

Changes to setphot to deal with HSC data, and to force it to apply the correction requested.

Location:

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

Files:

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

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

@@ -100 +100 @@
     char field[256];
     double value;
-
+    
     snprintf (field, 256, "TS_%03d", i);
     if (!gfits_scan (phu, field, "%lf", 1, &value)) return FALSE;
     cam->tstart[i] = ohana_mjd_to_sec(value);
-
+    
     snprintf (field, 256, "TE_%03d", i);
     if (!gfits_scan (phu, field, "%lf", 1, &value)) return FALSE;
@@ -174 +174 @@
   if (!flat_id) return 0.0;
 
-  myAssert (flat_id > 0, "flat_id out of range");
-  myAssert (flat_id <= cam->Nvalues, "flat_id out of range");
-
+  //  myAssert (flat_id > 0, "flat_id out of range");
+  // myAssert (flat_id <= cam->Nvalues, "flat_id out of range");
+  if ((flat_id < 0)||(flat_id > cam->Nvalues)) { return 0.0; }
+  
   // validate the flat_id (not out of range?)
   // NOTE: we are setting the ID to be the sequence + 1 (match_camcorr_to_images.c:39)

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

@@ -217 +217 @@
   
 
-  if (argc != 2) {
+  if (argc > 2) {
     fprintf (stderr, "USAGE: setphot (zptfile) [options]\n");
     fprintf (stderr, "  options:\n");

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

@@ -14 +14 @@
   // season comes from the date/time
 
-  int minCode = 10000;
-  int maxCode = 10576;
+  int minCodeGPC1 = 10000;
+  int maxCodeGPC1 = 10576;
+
+  int minCodeHSC  = 20000;
+  int maxCodeHSC  = 26111;
 
   int Nmissed = 0;
+
+  int isGPC1 = FALSE;
+  int isHSC  = FALSE;
   
   for (i = 0; i < Nimage; i++) {
     if (!image[i].photcode) continue; // skip PHU images
 
-    if (image[i].photcode < minCode) continue; // skip non-gpc1-chip images
-    if (image[i].photcode > maxCode) continue; // skip non-gpc1-chip images
+    if ((image[i].photcode >= minCodeGPC1)&&(image[i].photcode <= maxCodeGPC1)) {
+      isGPC1 = TRUE;
+      isHSC  = FALSE;
+    }
+    else if ((image[i].photcode >= minCodeHSC)&&(image[i].photcode <= maxCodeHSC)) {
+      isGPC1 = FALSE;
+      isHSC  = TRUE;
+    }
 
+    if (!(isGPC1) && !(isHSC)) { continue; }
+    
     int found = FALSE;
     for (j = 0; !found && (j < camcorr->Nseason); j++) {
@@ -30 +44 @@
       if (image[i].tzero > camcorr->tstop[j]) continue;
 
+      int seq;
       int photcode = image[i].photcode;
-      int iy =  photcode % 10;
-      int ix = (int)(photcode / 10) % 10;
-      int filter = (int)(photcode / 100) % 10;
+
+      if (isGPC1) { 
+        int iy =  photcode % 10;
+        int ix = (int)(photcode / 10) % 10;
+        int filter = (int)(photcode / 100) % 10;
+
+        seq = ix + iy * camcorr->Nx + filter * camcorr->Nchips + j * camcorr->Nflats;
+      }
+      else if (isHSC) {
+        int ix = photcode % 112;
+        int filter = (int)(photcode / 1000) % 10;
+
+        seq = ix + filter * camcorr->Nchips + j * camcorr->Nflats;
+      }
 
       // we add one so photom_map_id = 0 can mean no map
-      int seq = ix + iy * camcorr->Nx + filter * camcorr->Nchips + j * camcorr->Nflats;
       image[i].photom_map_id = seq + 1;
       found = TRUE;

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

@@ -37 +37 @@
     }
     camcorr = merge_flatcorr_and_camcorr (&flatcorrTable, rawcorr);
-
+    
     char newflatfile[DVO_MAX_PATH];
     size = snprintf (newflatfile, DVO_MAX_PATH, "%s/flatfield.fits", CATDIR);
@@ -43 +43 @@
     CamPhotomCorrectionSave (camcorr, newflatfile);
   } else {
-    zpts = load_zpt_table (argv[1], &Nzpts);
+    //    zpts = load_zpt_table (argv[1], &Nzpts);
   }
 
-  if (!zpts) Shutdown ("failed to load zero points, or empty table");
+  if ((CAM_PHOTOM_FILE)&&(!camcorr)) {
+    CamPhotomCorrection *rawcorr = CamPhotomCorrectionLoad(CAM_PHOTOM_FILE);
+    if (!rawcorr) {
+      fprintf (stderr, "failed to load camera-static flat-field correction\n");
+      exit (2);
+    }
+    camcorr = rawcorr;
+    char newflatfile[DVO_MAX_PATH];
+    int size = snprintf (newflatfile, DVO_MAX_PATH, "%s/flatfield.fits", CATDIR);
+    assert (size < DVO_MAX_PATH);
+    CamPhotomCorrectionSave (camcorr, newflatfile);
+
+    //    zpts = load_zpt_table (argv[1], &Nzpts);
+  }    
+
+  
+  //  if (!zpts) Shutdown ("failed to load zero points, or empty table");
 
   // load images 
@@ -52 +68 @@
   if (!UPDATE) dvo_image_unlock (&db); 
   
-  match_zpts_to_images (image, Nimage, zpts, Nzpts);
+  //  match_zpts_to_images (image, Nimage, zpts, Nzpts);
 
-  if (UBERCAL) {
+  //  if (UBERCAL) {
     // we are going to deprecate the flatcorr imaage lookup
     // match_flatcorr_to_images (image, Nimage, &flatcorrTable);
     match_camcorr_to_images (image, Nimage, camcorr);
-  } 
+    //  } 
 
   if (!IMAGES_ONLY) {