Changeset 34088 for trunk/Ohana/src/relphot

Timestamp:

Jun 26, 2012, 11:46:01 AM (14 years ago)

Author:

eugene

Message:

updates for pedantic gcc, mods to relphot average mags to handle GPC1 stacks

Location:

trunk/Ohana/src/relphot/src

Files:

• GridOps.c (modified) (3 diffs)
• MosaicOps.c (modified) (4 diffs)
• StarOps.c (modified) (6 diffs)
• reload_catalogs.c (modified) (1 diff)
• select_images.c (modified) (3 diffs)
• setMrelFinal.c (modified) (3 diffs)

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

@@ -423 +423 @@
         Merr =  MAX (catalog[c].measureT[m].dM, MIN_ERROR);
 
-        // Wsys = 1.0 / SQ(Merr);
-        Wsys = 1.0;
+        // disable Wsys for now
+        Wsys = TRUE ? 1.0 : 1.0 / SQ(Merr);
 
         Ng = gridmeas[c][m];
@@ -684 +684 @@
   off_t i, Nimage;
   int j, Nbytes, Nformat;
-  off_t *imlist;
   FILE *f;
   Header header, theader;
@@ -697 +696 @@
 
   /* select reference mosaic image */
-  imlist = SelectRefMosaic (&refmosaic, &Nimage);
+  // off_t *imlist = SelectRefMosaic (&refmosaic, &Nimage); return value ignored
+  SelectRefMosaic (&refmosaic, &Nimage);
 
   /* we are writing to this file */

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

@@ -762 +762 @@
 int setMmos_mosaic (Mosaic *myMosaic, off_t Nmos, Image *image, Catalog *catalog, SetMmosInfo *info, FlatCorrectionTable *flatcorr) {
 
-  Image *imageReal;
   off_t j, NimageReal;
 
@@ -776 +775 @@
   assert (Nmos < Nmosaic);
 
-  imageReal = getimages (&NimageReal, NULL);
+  // Image *imageReal = getimages (&NimageReal, NULL); returned pointer is not used
+  getimages (&NimageReal, NULL);
 
   /* on PoorImages run, skip good images */
@@ -1500 +1500 @@
   off_t i, j, m, c, N, ave, Nimage;
   double *xlist, *ylist;
-  double Xmin, Xmax, Ymin, Ymax;
+  // double Xmin, Xmax, Ymin, Ymax;
   char string[64];
-  Image *image;
   Graphdata graphdata;
 
   if (!MOSAIC_ZEROPT) return;
 
-  image = getimages (&Nimage, NULL);
+  // Image *image = getimages (&Nimage, NULL); returned value ignored
+  getimages (&Nimage, NULL);
 
   N = 0;
-  for (i = 0; i < Nmosaic; i++) 
+  for (i = 0; i < Nmosaic; i++) {
     N = MAX (N, N_onMosaic[i]);
+  }
 
   ALLOCATE (xlist, double, N);
@@ -1518 +1519 @@
   for (i = 0; i < Nmosaic; i++) {
     N = 0;
-    Xmin = Ymin = +360.0;
-    Xmax = Ymax = -360.0;
+    // Xmin = Ymin = +360.0;
+    // Xmax = Ymax = -360.0;
     for (j = 0; j < N_onMosaic[i]; j++) {
       

trunk/Ohana/src/relphot/src/StarOps.c

@@ -354 +354 @@
       int Next = 0;
       int haveSynth = FALSE;
+      int haveStack = FALSE;
 
       int forceSynth = FALSE;
@@ -413 +414 @@
             }
           }
+          // gpc1 stack data
+          if ((catalog[Nc].measure[m].photcode >= 11000) && (catalog[Nc].measure[m].photcode <= 11400)) {
+            if (pass < 2) continue;
+            haveStack = TRUE;
+          }
+
           // count extended detections for 2MASS (XXX NOTE hardwired photcodes 2011, 2012, 2013)
           if ((catalog[Nc].measure[m].photcode >= 2011) && (catalog[Nc].measure[m].photcode <= 2013)) {
@@ -477 +484 @@
         // up-weight the ubercal values (or convergence can take a long time...)
         if (catalog[Nc].measureT[m].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {
+          haveUbercal = TRUE;
           wlist[N] = 10.0;
         }
@@ -492 +500 @@
 
       int Nminmeas = isSetMrelFinal ? 1 : STAR_TOOFEW + 1;
+
+      if (haveStack && (N > 1)) {
+        // fprintf (stderr, "multiple stack values for %10.6f %10.6f\n", catalog[Nc].averageT[j].R, catalog[Nc].averageT[j].D);
+      }
 
       // when performing the grid analysis, STAR_TOOFEW should be set to 1;
@@ -1106 +1118 @@
   off_t j, N;
   double *xlist, *ylist;
-  double Xmin, Ymin, Xmax, Ymax;
+  // double Xmin, Ymin, Xmax, Ymax;
   Graphdata graphdata;
 
@@ -1117 +1129 @@
 
   N = 0;
-  Xmin = Ymin = +360.0;
-  Xmax = Ymax = -360.0;
+  // Xmin = Ymin = +360.0;
+  // Xmax = Ymax = -360.0;
   for (i = 0; i < Ncatalog; i++) {
     for (j = 0; j < catalog[i].Naverage; j++) {

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -94 +94 @@
       catalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
     }
+
+    struct timeval now;
+    gettimeofday (&now, (void *) NULL);
+    char *moddate = ohana_sec_to_date (now.tv_sec);
+    gfits_modify (&catalog.header, "RELPHOT", "%s", 1, moddate);      
+    free (moddate);
+
     dvo_catalog_save (&catalog, VERBOSE); 
     dvo_catalog_unlock (&catalog);

trunk/Ohana/src/relphot/src/select_images.c

@@ -256 +256 @@
     }
     if (RESET) {
-      if (!KEEP_UBERCAL) {
+      if (!KEEP_UBERCAL || !(image[nimage].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
         image[nimage].Mcal = 0.0;
         image[nimage].dMcal = NAN;
@@ -296 +296 @@
 
   double theta1, theta2;
-  double Theta1, Theta2;
 
   theta1 = opening_angle (x1[0], y1[0], x2[0], y2[0], x1[1], y1[1]); 
@@ -309 +308 @@
   }
 
-  Theta1 = theta1;
-  Theta2 = theta2;
   theta1 = opening_angle (x2[0], y2[0], x1[1], y1[1], x2[1], y2[1]); 
   theta2 = opening_angle (x2[0], y2[0], x1[1], y1[1], x1[0], y1[0]); 

trunk/Ohana/src/relphot/src/setMrelFinal.c

@@ -166 +166 @@
 
   /* allow measures from images marked POOR and FEW */
-  if (pass >= 2) IMAGE_BAD = ID_IMAGE_PHOTOM_NOCAL;
+  if (pass >= 3) IMAGE_BAD = ID_IMAGE_PHOTOM_NOCAL;
   
   /* allow measures marked as outliers (POOR) and off image region (AREA) */
-  if (pass >= 2) {
+  if (pass >= 3) {
     MEAS_BAD = ID_MEAS_NOCAL | ID_MEAS_SKIP_PHOTOM;
   } else {
@@ -233 +233 @@
         }
 
-        // PASS 3 : accept bad measurements (eg, SAT, CR)
+        // PASS 3 : accept bad measurements (eg, SAT, CR), internal outliers
         if (pass < 3) {
           if (catalog[0].measure[m].photFlags & code->photomBadMask) goto skip;
@@ -241 +241 @@
         }
         
-        // PASS 2 : internal outliers accepted
+        // PASS 2 : accept stack measurements
 
         // PASS 1 : accept poor measurements as well (eg, POOR FIT, etc)