Changeset 42166 for branches/eam_branches/ipp-20220316/Ohana/src/relphot

Timestamp:

Apr 8, 2022, 5:04:42 PM (5 years ago)

Author:

eugene

Message:

merge changes from trunk (UKIRT addstar, relphot mods, dvomerge mods, ippCheck work, mlayer

Location:

branches/eam_branches/ipp-20220316

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relphot (modified) (1 prop)
• Ohana/src/relphot/include/relphot.h (modified) (1 diff)
• Ohana/src/relphot/src/ResetOps.c (modified) (1 diff)
• Ohana/src/relphot/src/args.c (modified) (6 diffs)
• Ohana/src/relphot/src/help.c (modified) (3 diffs)
• Ohana/src/relphot/src/initialize.c (modified) (1 diff)
• Ohana/src/relphot/src/relphot_images.c (modified) (1 diff)
• Ohana/src/relphot/src/setMrelCatalog.c (modified) (2 diffs)
• Ohana/src/relphot/src/setMrelFinal.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/Ohana/src/relphot/include/relphot.h

@@ -721 +721 @@
 int relphot_images (SkyList *skylist);
 
-void relphot_usage (void);
+void relphot_usage (int argc, char **argv);
 void relphot_help (int argc, char **argv);
 

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/ResetOps.c

@@ -123 +123 @@
 
   for (off_t i = 0; i < catalog->Naverage; i++) {
-    catalog->average[i].psfQF     = NAN;        // force recalculation in setMrelCatalog
-    catalog->average[i].psfQFperf = NAN;        // force recalculation in setMrelCatalog
-    catalog->average[i].stargal   = NAN;        // force recalculation in setMrelCatalog
-    catalog->average[i].photFlagsUpper = 0;     // reset (will be re-calculated)
-    catalog->average[i].photFlagsLower = 0;     // reset (will be re-calculated)
-    catalog->average[i].NwarpOK        = 0;     // reset (will be re-calculated)
+    if (STAGES & STAGE_CHIP) {
+      catalog->average[i].psfQF     = NAN;      // force recalculation in setMrelCatalog
+      catalog->average[i].psfQFperf = NAN;      // force recalculation in setMrelCatalog
+      catalog->average[i].stargal   = NAN;      // force recalculation in setMrelCatalog
+      catalog->average[i].photFlagsUpper = 0;   // reset (will be re-calculated)
+      catalog->average[i].photFlagsLower = 0;   // reset (will be re-calculated)
+    }
+    
+    if (STAGES & STAGE_WARP) {
+      catalog->average[i].NwarpOK        = 0;   // reset (will be re-calculated)
+    }
 
     // RESET_FLATCORR independent of RESET?

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/args.c

@@ -203 +203 @@
     remove_argument (N, &argc, argv);
     TEST_IMAGE1 = strtol(argv[N], &endptr, 0);
-    if (*endptr) relphot_usage (); 
+    if (*endptr) relphot_usage (argc, argv); 
     remove_argument (N, &argc, argv);
   }
@@ -211 +211 @@
     remove_argument (N, &argc, argv);
     TEST_IMAGE2 = strtol(argv[N], &endptr, 0);
-    if (*endptr) relphot_usage (); 
+    if (*endptr) relphot_usage (argc, argv); 
     remove_argument (N, &argc, argv);
   }
@@ -584 +584 @@
     remove_argument (N, &argc, argv);
     mode = PARALLEL_IMAGES;
-    if (N >= argc) relphot_usage();
+    if (N >= argc) relphot_usage(argc, argv);
     IMAGE_TABLE = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
-    if (!REGION_FILE) relphot_usage();
+    if (!REGION_FILE) relphot_usage(argc, argv);
   }
 
@@ -594 +594 @@
     remove_argument (N, &argc, argv);
     mode = PARALLEL_REGIONS;
-    if (!REGION_FILE) relphot_usage();
+    if (!REGION_FILE) relphot_usage(argc, argv);
     if ((N = get_argument (argc, argv, "-parallel-regions-manual"))) {
       remove_argument (N, &argc, argv);
@@ -609 +609 @@
       // note: initialize sets PhotcodeList to the full set of average photcodes
       // if the mode is UPDATE_AVERAGES
-      if (argc != 1) relphot_usage();
-      break;
+      // if (argc != 1) relphot_usage(argc, argv);
+      // break;
       
+      if (argc == 1) break; // if no photcodes are given, use them all?
+
     case UPDATE_IMAGES:
     case PARALLEL_IMAGES:
@@ -623 +625 @@
     default:
       fprintf (stderr, "no valid mode selected\n");
-      relphot_usage();
+      relphot_usage(argc, argv);
       break;
   }
-  if (argc != 1) relphot_usage ();
+  if (argc != 1) relphot_usage (argc, argv);
 
   // if we supplied a file, we need to load it now

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/help.c

@@ -1 +1 @@
 # include "relphot.h"
 
-void relphot_usage (void) {
+void relphot_usage (int argc, char **argv) {
   fprintf (stderr, "ERROR: USAGE: relphot (photcodes) -images\n");
   fprintf (stderr, "       or:    relphot -averages\n");
@@ -11 +11 @@
   fprintf (stderr, "       or:    -catalog (name)\n");
   fprintf (stderr, "  use -h for more usage information\n");
+
+  fprintf (stderr, "unparsed arguments: ");
+  for (int i = 0; i < argc; i++) {
+    fprintf (stderr, "%s ", argv[i]);
+  }
+  fprintf (stderr, "\n");
+
   exit (2);
 } 
@@ -19 +26 @@
   if (get_argument (argc, argv, "-help")) goto show_help;
   if (get_argument (argc, argv, "-h"))    goto show_help;
-  if (argc == 1) relphot_usage();
+  if (argc == 1) relphot_usage(0, NULL);
   return;
 

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/initialize.c

@@ -9 +9 @@
   if (!mode) exit (2);
 
-  // UPDATE_AVERAGES always operates on all photcodes? 
-  if (mode == UPDATE_AVERAGES) {
+  // UPDATE_AVERAGES used to always operate on all photcodes
+  // now, if a list of photcodes are given that is used, otherwise
+  // all will be used
+  if (!photcodes) {
     char tmpline1[256];
     int Ns;

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/relphot_images.c

@@ -132 +132 @@
   
     // if (GRID_ZEROPT) dump_grid ();
+    setMcal  (catalog);
+    setMmos  (catalog);
+    setMgrp  (catalog);
 
     setMcal  (catalog);

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/setMrelCatalog.c

@@ -266 +266 @@
       // overlaps).  Msys + measure.Mcal is our best guess of the true magnitude
       Mcal = measureT[k].McalPSF; // check that this is zero for loaded REF value
+      // but external reference photometry might not have Mcal set, so set to 0.0 in that case.
+      if (isnan(Mcal)) Mcal = 0.0;
     } else {
       // getMcal returns image[].Mcal
@@ -412 +414 @@
 
     // XXX hardwired grizy = (01234) JHK = (567) w = (8)
-    if ((Nsec < 5) || (Nsec == 8)) {
+    if (Nsec < 5) {
       secfilt[Nsec].Ncode = results->NexpPS1[Nsec]; 
     } else {

branches/eam_branches/ipp-20220316/Ohana/src/relphot/src/setMrelFinal.c

@@ -11 +11 @@
   int Nsecfilt = GetPhotcodeNsecfilt ();
 
+  // this resets values only if -reset is used
   ResetAverageAndMeasure (catalog);