Changeset 34088 for trunk/Ohana/src/addstar

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/addstar

Files:

• Makefile (modified) (1 diff)
• src/GetFileMode.c (modified) (2 diffs)
• src/LoadData.c (modified) (1 diff)
• src/LoadDataPMM.c (modified) (1 diff)
• src/ReadStarsSDSS.c (modified) (1 diff)
• src/edge_check.c (modified) (2 diffs)
• src/get2mass_full.c (modified) (1 diff)
• src/get2mass_ops.c (modified) (3 diffs)
• src/load2mass_as_rawdata.c (modified) (2 diffs)
• src/load_subpix.c (modified) (1 diff)
• src/loadwise_rawdata.c (modified) (2 diffs)
• src/resort_catalog.c (modified) (1 diff)
• src/sky_tessalation.c (modified) (1 diff)

trunk/Ohana/src/addstar/Makefile

@@ -13 +13 @@
 
 # programs may add their own internal requirements here
-FULL_CFLAGS   = $(BASE_CFLAGS) -Wall -Werror
+FULL_CFLAGS   = $(BASE_CFLAGS)
 FULL_CPPFLAGS = $(BASE_CPPFLAGS)
 FULL_LDFLAGS  = -lkapa -ldvo -lFITS -lohana $(BASE_LDFLAGS)

trunk/Ohana/src/addstar/src/GetFileMode.c

@@ -7 +7 @@
 
   int Naxis;
-  int simple, extend, haveNaxis, haveCTYPE;
+  int simple, extend;
   int havePHOT_VER, haveTARG_VER;
 
   gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
-  haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);
-  haveCTYPE = gfits_scan (header, "CTYPE1", "%s", 1, ctype);
+  int haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);
+  int haveCTYPE = gfits_scan (header, "CTYPE1", "%s", 1, ctype);
 
   gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);
@@ -22 +22 @@
   if (havePHOT_VER && haveTARG_VER) return SDSS_OBJ;
 
-  if ((Naxis == 2) || TEXTMODE || !simple) {
-    if (!strcmp (&ctype[4], "-WRP")) {
+  if (haveNaxis && ((Naxis == 2) || TEXTMODE || !simple)) {
+    if (haveCTYPE && !strcmp (&ctype[4], "-WRP")) {
       return MOSAIC_CMP;
     }

trunk/Ohana/src/addstar/src/LoadData.c

@@ -1 +1 @@
 # include "addstar.h"
-# define DVO_IMAGE_NAME_LEN 128
 
 // XXX this function is somewhat specific to the elixir format output files 

trunk/Ohana/src/addstar/src/LoadDataPMM.c

@@ -1 +1 @@
 # include "addstar.h"
-# define DVO_IMAGE_NAME_LEN 128
 
 /* .asc files look like:

trunk/Ohana/src/addstar/src/ReadStarsSDSS.c

@@ -1 +1 @@
 # include "addstar.h"
-# define DVO_IMAGE_NAME_LEN 128
+
 int SetSDSSFlags (Stars *star, unsigned int flags1, unsigned int flags2);
 

trunk/Ohana/src/addstar/src/edge_check.c

@@ -4 +4 @@
 
   double theta1, theta2;
-  double Theta1, Theta2;
 
   theta1 = opening_angle (x1[0], y1[0], x2[0], y2[0], x1[1], y1[1]); 
@@ -17 +16 @@
   }
 
-  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/addstar/src/get2mass_full.c

@@ -23 +23 @@
   star[0][0].measure.theta = ToShortPixels(strtod (ptr, NULL));
 
-  star[2][0].measure.FWx   = star[2][0].measure.FWx   = star[0][0].measure.FWx;
-  star[2][0].measure.FWy   = star[2][0].measure.FWy   = star[0][0].measure.FWy;
-  star[2][0].measure.theta = star[2][0].measure.theta = star[0][0].measure.theta;
+  star[2][0].measure.FWx   = star[1][0].measure.FWx   = star[0][0].measure.FWx;
+  star[2][0].measure.FWy   = star[1][0].measure.FWy   = star[0][0].measure.FWy;
+  star[2][0].measure.theta = star[1][0].measure.theta = star[0][0].measure.theta;
 
   ptr = next2MASSfield (ptr); // designation (skip)

trunk/Ohana/src/addstar/src/get2mass_ops.c

@@ -73 +73 @@
 
   char *ptr;
-  char Jquality, Hquality, Kquality;
   double J, dJ, H, dH, K, dK;
   e_time time;
@@ -95 +94 @@
   dK = strtod (ptr, NULL);
 
-  /* filter on the ph_qual flag for this filter (field 19) */
+  // get the time
+  time = get2mass_time (ptr, 20, Nmax - (ptr - line));
+
+# if (0)
+  char Jquality, Hquality, Kquality;
+  /* old code to filter on the ph_qual flag for this filter (field 19) */
   if (SELECT_2MASS_QUALITY != NULL) {
     ptr = skipNbounds (ptr, '|', 3, Nmax - (ptr - line));
@@ -105 +109 @@
     time = get2mass_time (ptr, 20, Nmax - (ptr - line));
   }
+# endif
 
   // how many bits are being used for the 2mass flags; can we just set photFlags based on them?

trunk/Ohana/src/addstar/src/load2mass_as_rawdata.c

@@ -14 +14 @@
   int i, j, verbose;
   int Nstars, NSTARS, Ntstars, NTSTARS;
-  int Nbyte, Nextra, Ntotal, offset;
+  int Nbyte, Nextra, offset;
 
   double Rmin, Rmax, Dmin, Dmax;
@@ -37 +37 @@
 
   Nextra = 0;  // number excess bytes from lsat partial row
-  Ntotal = 0;  // track the total number of bytes read 
   while ((Nbyte = fread (&buffer[Nextra], 1, NBYTE-Nextra, f)) != 0) {
     if (Nbyte == -1) Shutdown ("error reading from raw file %s", filename);

trunk/Ohana/src/addstar/src/load_subpix.c

@@ -45 +45 @@
 
   int bin;
-  double dy, dM;
+  double dM;
 
-  dy = y - (int)(y);
+  // dy = y - (int)(y);
   bin = 5 * (int)(x/100) + (int)(y/100);
   dM = Subpix[bin].dM;

trunk/Ohana/src/addstar/src/loadwise_rawdata.c

@@ -14 +14 @@
   int i, j, verbose;
   int Nstars, NSTARS, Ntstars, NTSTARS;
-  int Nbyte, Nextra, Ntotal, offset;
+  int Nbyte, Nextra, offset;
 
   double Rmin, Rmax, Dmin, Dmax;
@@ -37 +37 @@
 
   Nextra = 0;  // number excess bytes from lsat partial row
-  Ntotal = 0;  // track the total number of bytes read 
   while ((Nbyte = fread (&buffer[Nextra], 1, NBYTE-Nextra, f)) != 0) {
     if (Nbyte == -1) Shutdown ("error reading from raw file %s", filename);

trunk/Ohana/src/addstar/src/resort_catalog.c

@@ -146 +146 @@
   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/addstar/src/sky_tessalation.c

@@ -2 +2 @@
 # include "assert.h"
 # define iSWAP(X,Y) {int tmp=(X); (X) = (Y); (Y) = tmp;}
-# define DVO_IMAGE_NAME_LEN 128
 
 // we use a static refcoords structure to avoid multiple alloc / init steps