Changeset 38600 for trunk/Ohana/src/addstar

Timestamp:

Jul 18, 2015, 8:21:16 AM (11 years ago)

Author:

eugene

Message:

fixing loadgalphot

Location:

trunk/Ohana/src/addstar

Files:

• include/loadgalphot.h (modified) (1 diff)
• src/args_loadgalphot.c (modified) (4 diffs)
• src/loadgalphot.c (modified) (1 diff)
• src/loadgalphot_readstars.c (modified) (4 diffs)
• src/loadgalphot_table.c (modified) (1 diff)

trunk/Ohana/src/addstar/include/loadgalphot.h

@@ -36 +36 @@
 } GalPhotIDset;
 
-AddstarClientOptions args_loadgalphot (int argc, char **argv, AddstarClientOptions options);
+AddstarClientOptions args_loadgalphot (int *argc, char **argv, AddstarClientOptions options);
 
 int loadgalphot_table (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions *options);
 
-GalPhot_Stars *loadgalphot_readstars (char *filename, int *nstars);
+GalPhot_Stars *loadgalphot_readstars (char *filename, int *nstars, AddstarClientOptions *options);
 
 int loadgalphot_sortStars (GalPhot_Stars *stars, int Nstars);

trunk/Ohana/src/addstar/src/args_loadgalphot.c

@@ -4 +4 @@
 static void help (void);
 
-AddstarClientOptions args_loadgalphot (int argc, char **argv, AddstarClientOptions options) {
+AddstarClientOptions args_loadgalphot (int *argc, char **argv, AddstarClientOptions options) {
   
   int N;
 
   /* check for help request */
-  if (get_argument (argc, argv, "-help") ||
-      get_argument (argc, argv, "-h")) {
+  if (get_argument (*argc, argv, "-help") ||
+      get_argument (*argc, argv, "-h")) {
     help ();
   }
@@ -27 +27 @@
   HOST_ID = 0;
   PARALLEL = FALSE;
-  if ((N = get_argument (argc, argv, "-parallel"))) {
+  if ((N = get_argument (*argc, argv, "-parallel"))) {
     PARALLEL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   // this is a test mode : rather than launching the remote jobs and waiting for completion,
   // relphot will simply list the remote command and wait for the user to signal completion
   PARALLEL_MANUAL = FALSE;
-  if ((N = get_argument (argc, argv, "-parallel-manual"))) {
+  if ((N = get_argument (*argc, argv, "-parallel-manual"))) {
     PARALLEL = TRUE; // -parallel-manual implies -parallel
     PARALLEL_MANUAL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   // this is a test mode : rather than launching the relphot_client jobs remotely, they are 
   // run in serial via 'system'
   PARALLEL_SERIAL = FALSE;
-  if ((N = get_argument (argc, argv, "-parallel-serial"))) {
+  if ((N = get_argument (*argc, argv, "-parallel-serial"))) {
     if (PARALLEL_MANUAL) {
       fprintf (stderr, "ERROR: cannot mix -parallel-manual and -parallel-serial\n");
@@ -49 +49 @@
     PARALLEL = TRUE; // -parallel-serial implies -parallel
     PARALLEL_SERIAL = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
   /* only add to existing regions */
   options.existing_regions = FALSE;
-  if ((N = get_argument (argc, argv, "-existing-regions"))) {
+  if ((N = get_argument (*argc, argv, "-existing-regions"))) {
     options.existing_regions = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   /* only add to existing objects */
   options.only_match = FALSE;
-  if ((N = get_argument (argc, argv, "-only-match"))) {
+  if ((N = get_argument (*argc, argv, "-only-match"))) {
     options.only_match = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
   /* replace measurement, don't duplicate (ref/cat only) */
   options.replace = FALSE;
-  if ((N = get_argument (argc, argv, "-replace"))) {
+  if ((N = get_argument (*argc, argv, "-replace"))) {
     options.replace = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
+  }
+  /* override any header PHOTCODE values */
+  options.photcode = 0;
+  if ((N = get_argument (*argc, argv, "-p"))) {
+    remove_argument (N, argc, argv);
+    options.photcode = GetPhotcodeCodebyName (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+  if ((N = get_argument (*argc, argv, "-photcode"))) {
+    remove_argument (N, argc, argv);
+    options.photcode = GetPhotcodeCodebyName (argv[N]);
+    remove_argument (N, argc, argv);
   }
 
   /* extra error messages */
   VERBOSE = FALSE;
-  if ((N = get_argument (argc, argv, "-v"))) {
+  if ((N = get_argument (*argc, argv, "-v"))) {
     VERBOSE = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
   /* other addstar options which cannot be used in loadgalphot */
-  options.photcode = 0;
   options.timeref = 0; 
   options.mosaic = FALSE;
@@ -95 +106 @@
   DUMP = NULL;
 
-  if (argc < 2) {
+  if (*argc < 2) {
     fprintf (stderr, "USAGE: loadgalphot [options] (fitsfile) [..more files]\n");
     exit (2);

trunk/Ohana/src/addstar/src/loadgalphot.c

@@ -14 +14 @@
   // need to construct these options with args_loadgalphot...
   options = ConfigInit (&argc, argv);
-  options = args_loadgalphot (argc, argv, options);
+  options = args_loadgalphot (&argc, argv, options);
 
   // load the full sky description table (dvodb must exist)

trunk/Ohana/src/addstar/src/loadgalphot_readstars.c

@@ -15 +15 @@
 
 static float *chisqFit = NULL;
-
-GalPhot_Stars *loadgalphot_readstars (char *filename, int *nstars) {
+static float ZeroPt = 0;
+
+GalPhot_Stars *loadgalphot_readstars (char *filename, int *nstars, AddstarClientOptions *options) {
 
   // read in the full FITS files ('cause I don't have a partial read option)
@@ -67 +68 @@
     namehash[i][2] = -1;
   }
+
+  ZeroPt = GetZeroPoint();
 
   char name[256], tmpname[256];
@@ -228 +231 @@
     stars[i].galphot.modelType = MODEL_TYPE_gal[i];
     stars[i].galphot.detID     = ID_gal[i];
+    stars[i].galphot.photcode  = options->photcode;
 
     // I have a grid of measurements with (Flux, dFlux, Chisq) at each point
@@ -377 +381 @@
 
   // use bilinear interpolation to choose Flux @ (Xmin,Ymin)?
-  galphot->mag    = -2.5*log10(flux[iMin]); // correct for exptime?
+  galphot->mag    = -2.5*log10(flux[iMin]) + ZeroPt; // correct for exptime?
   galphot->magErr = sqrt(fluxErr[iMin]) / flux[iMin];
   galphot->chisq  = chisqMin;

trunk/Ohana/src/addstar/src/loadgalphot_table.c

@@ -6 +6 @@
   int i, Nstars;
 
-  GalPhot_Stars *stars = loadgalphot_readstars (filename, &Nstars);
+  GalPhot_Stars *stars = loadgalphot_readstars (filename, &Nstars, options);
 
   // sort the stars by RA