Changeset 34088 for trunk/Ohana/src/relastro

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/relastro/src

Files:

• CoordOps.c (modified) (1 diff)
• ImageOps.c (modified) (1 diff)
• StarMaps.c (modified) (2 diffs)
• relastro_merge_source.c (modified) (3 diffs)
• resort_catalog.c (modified) (1 diff)
• select_images.c (modified) (2 diffs)
• testparallax.c (modified) (2 diffs)

trunk/Ohana/src/relastro/src/CoordOps.c

@@ -11 +11 @@
 
   off_t N;
-  Image *images;
 
-  images = getimages (&N, NULL);
+  // Images *images = getimages (&N, NULL); return value ignored
+  getimages (&N, NULL);
 
   NoldCoords = N;

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -426 +426 @@
     XY_to_LM (&Rx, &Dx, dLsig, 0.0, coords);
     dP0 = 3600.0 * hypot(Rx - Ro, Dx - Do); // convert to arcsec
-    XY_to_LM (&Rx, &Dx, 0.0, dLsig, coords);
+    XY_to_LM (&Rx, &Dx, 0.0, dMsig, coords);
     dP1 = 3600.0 * hypot(Rx - Ro, Dx - Do); // convert to arcsec
     dPosSys = 0.5 * (dP0 + dP1);

trunk/Ohana/src/relastro/src/StarMaps.c

@@ -57 +57 @@
 int updateStarMaps(Catalog *catalog) {
 
-  Image *images;
   off_t i, N, Nimages;
   int xbin, ybin;
@@ -64 +63 @@
   gettimeofday (&start, (void *) NULL);
 
-  images = getimages(&Nimages, NULL);
+  // Images *images = getimages(&Nimages, NULL); return value ignored
+  getimages(&Nimages, NULL);
 
   for (i = 0; i < catalog[0].Nmeasure; i++) {

trunk/Ohana/src/relastro/src/relastro_merge_source.c

@@ -18 +18 @@
   dvo_catalog_init (&catalog_dst, TRUE);
   SkyRegion *region_src = NULL;
-  SkyRegion *region_dst = NULL;
+  // SkyRegion *region_dst = NULL;
 
   // load data from each region file, only use bright stars
@@ -26 +26 @@
       region_src = &sky[0].regions[i];
     }
+    // currently, we only accept dst == src...
     if (sky[0].regions[i].index == CAT_ID_DST) {
       catalog_dst.filename = sky[0].filename[i];
-      region_dst = &sky[0].regions[i];
+      // region_dst = &sky[0].regions[i];
     }
   }    
@@ -91 +92 @@
 
     // repoint the src measures at this object
-    Measure *measures_src;
-    ALLOCATE (measures_src, Measure, catalog_src.average[index_src].Nmeasure);
     m = catalog_src.average[index_src].measureOffset;
     for (i = 0; i < catalog_src.average[index_src].Nmeasure; i++, m++) {

trunk/Ohana/src/relastro/src/resort_catalog.c

@@ -112 +112 @@
   int NmeasureTotal = 0;
   int measureOffsetOK = TRUE;
-  for (i = 0; i < catalog[0].Naverage; i++) {
+  for (i = 0; i < Naverage; i++) {
     NmeasureTotal += catalog[0].average[i].Nmeasure;
     if (VERBOSE && !(NmeasureTotal <= catalog[0].Nmeasure)) {

trunk/Ohana/src/relastro/src/select_images.c

@@ -292 +292 @@
 
   double theta1, theta2;
-  double Theta1, Theta2;
 
   theta1 = opening_angle (x1[0], y1[0], x2[0], y2[0], x1[1], y1[1]); 
@@ -305 +304 @@
   }
 
-  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/relastro/src/testparallax.c

@@ -10 +10 @@
   double R[NPTS], D[NPTS], Time[NPTS], JD[NPTS];
   double X[NPTS], Y[NPTS], dX[NPTS], dY[NPTS], pX[NPTS], pY[NPTS];
-  double Tref[NPTS], Tjyrs[NPTS], TrefS, TjyrsS, TrefMean, TjyrsMean, Ro, Do;
+  double Tref[NPTS], Tjyrs[NPTS], TrefS, TjyrsS, TrefMean, Ro, Do;
   Coords coords;
   PMFit fitPAR;
@@ -82 +82 @@
   }
   TrefMean = TrefS / Npts;
-  TjyrsMean = TjyrsS / Npts;
+  // double TjyrsMean = TjyrsS / Npts;
 
   for (i = 0; i < Npts; i++) {