Changeset 33230

Timestamp:

Feb 10, 2012, 7:34:05 AM (14 years ago)

Author:

eugene

Message:

fixing "update" function names

Location:

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src

Files:

• setphot_client.c (modified) (1 diff)
• update_catalog_setphot_client.c (added)
• update_dvo_setphot_client.c (moved) (moved from branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/update_setphot_client.c ) (2 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/setphot_client.c

@@ -24 +24 @@
   FlatCorrectionTable *flatcorrTable = FlatCorrectionLoad (flatcorrFile);
 
-  update_setphot(image, Nimage, flatcorrTable);
+  update_dvo_setphot_client (image, Nimage, flatcorrTable);
 
   exit (0);

branches/eam_branches/ipp-20111122/Ohana/src/uniphot/src/update_dvo_setphot_client.c

@@ -4 +4 @@
 // we want to load a subset of image data for this operation.  we only need:
 // imageID, photom_map_id, Mcal, dMcal, flags.  
-int update_setphot (Image *image, off_t Nimage, FlatCorrectionTable *flatcorr) {
+int update_dvo_setphot_client (Image *image, off_t Nimage, FlatCorrectionTable *flatcorr) {
 
   SkyRegion UserPatch;
@@ -81 +81 @@
   return (TRUE);
 }      
-
-void update_catalog_setphot_client (Catalog *catalog, Image *image, off_t *index, off_t Nimage, FlatCorrectionTable *flatcorr) {
-
-  off_t i, j, found;
-
-  found = 0;    
-  for (i = 0; i < catalog[0].Naverage; i++) {
-
-    off_t m = catalog[0].average[i].measureOffset;
-    for (j = 0; j < catalog[0].average[i].Nmeasure; j++, m++) {
-      off_t idx = catalog[0].measure[m].imageID;
-      if (idx <= 0) continue; // detections with imageID == 0 do not have a valid image (eg, ref photcode)
-
-      off_t id = index[idx];
-      float Mcal = image[id].Mcal;
-      float dMcal = image[id].dMcal;
-      float Mcal_offset = 0.0;
-
-      // if we know about a flat-field correction, then we need to apply the sub-chip correction
-      int flat_id = image[id].photom_map_id;
-      if (flat_id > 0) {
-          Mcal_offset = FlatCorrectionOffset (flatcorr, flat_id, catalog[0].measure[m].Xccd, catalog[0].measure[m].Yccd);
-      }
-
-      catalog[0].measure[m].Mcal = Mcal - Mcal_offset;
-      catalog[0].measure[m].dMcal = dMcal;
-
-      // if we are setting the zero points from an UBERCAL database, and this detection is from one of those images,
-      // then tag the measurement as well
-      if (UBERCAL && (image[id].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
-        catalog[0].measure[m].dbFlags |=  ID_MEAS_PHOTOM_UBERCAL;
-      }
-
-      found ++;
-    }
-  }
-
-  if (found) {
-    fprintf (stderr, "found "OFF_T_FMT" matches\n", found);
-  }
-}