Changeset 39024 for trunk

Timestamp:

Nov 2, 2015, 2:38:43 PM (11 years ago)

Author:

eugene

Message:

forced galaxy cmf needs to be supplied an imageID value in loadgalphot

Location:

trunk/Ohana/src/addstar

Files:

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

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

@@ +1 @@
+
+int IMAGE_ID;
 
 typedef struct {

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

@@ -83 +83 @@
   }
 
+  IMAGE_ID = 0;
+  if ((N = get_argument (*argc, argv, "-image-id"))) {
+    remove_argument (N, argc, argv);
+    IMAGE_ID = atoi (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+
   /* extra error messages */
   VERBOSE = FALSE;

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

@@ -232 +232 @@
     stars[i].galphot.detID     = ID_gal[i];
     stars[i].galphot.photcode  = options->photcode;
+    stars[i].galphot.imageID   = IMAGE_ID;
 
     // I have a grid of measurements with (Flux, dFlux, Chisq) at each point

trunk/Ohana/src/addstar/src/mkcmf.c

@@ -267 +267 @@
   coords.crpix2 = CRPIX2;
   
-  if (isStack || isForcedWarp || isDiff) {
+  if (isStack || isForcedWarp || isForcedGalaxy || isDiff) {
     coords.cdelt1 = 0.25/3600.0;
     coords.cdelt2 = 0.25/3600.0;
@@ -350 +350 @@
 
   gfits_modify (&header, "NSTARS",   "%d", 1, Nstars);
-  gfits_modify (&header, "PHOTCODE", "%s", 1, photcode);
+  if (!isForcedGalaxy) {
+    gfits_modify (&header, "PHOTCODE", "%s", 1, photcode);
+  }
   if (isfinite(mjd)) {
     gfits_modify (&header, "MJD-OBS", "%lf", 1, mjd);