Changeset 42134

Timestamp:

Mar 21, 2022, 2:25:16 PM (4 years ago)

Author:

eugene

Message:

merge from ipp-20211108: relphot -average allows specific photcodes

Location:

trunk/Ohana/src/relphot/src

Files:

• ResetOps.c (modified) (1 diff)
• args.c (modified) (1 diff)
• initialize.c (modified) (1 diff)
• setMrelFinal.c (modified) (1 diff)

trunk/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?

trunk/Ohana/src/relphot/src/args.c

@@ -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();
+      // break;
       
+      if (argc == 1) break; // if no photcodes are given, use them all?
+
     case UPDATE_IMAGES:
     case PARALLEL_IMAGES:

trunk/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;

trunk/Ohana/src/relphot/src/setMrelFinal.c

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