Changeset 41462 for trunk/Ohana/src/relphot/src/args.c

Timestamp:

Jan 4, 2021, 4:33:51 PM (6 years ago)

Author:

eugene

Message:

substantial updates to the zero point statistics analysis

File:

• trunk/Ohana/src/relphot/src/args.c (modified) (3 diffs)

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

@@ -303 +303 @@
   }
 
+  // global restriction on fitting image zero points for mosaic cameras
+  FREEZE_IMAGES = FALSE;
+  if ((N = get_argument (argc, argv, "-imfreeze"))) {
+    remove_argument (N, &argc, argv);
+    FREEZE_IMAGES = TRUE;
+  }
+  // global restriction on fitting mosaic zero points
+  FREEZE_MOSAICS = FALSE;
+  if ((N = get_argument (argc, argv, "-mosfreeze"))) {
+    remove_argument (N, &argc, argv);
+    FREEZE_MOSAICS = TRUE;
+  }
+  CALIBRATE_STACKS_AND_WARPS = FALSE;
+  if ((N = get_argument (argc, argv, "-only-stacks-and-warps"))) {
+    remove_argument (N, &argc, argv);
+    CALIBRATE_STACKS_AND_WARPS = TRUE;
+  }
+  USE_MCAL_PSF_FOR_STACK_APER = FALSE;
+  if ((N = get_argument (argc, argv, "-use-mcal-psf-for-stack-aper"))) {
+    remove_argument (N, &argc, argv);
+    USE_MCAL_PSF_FOR_STACK_APER = TRUE;
+  }
+
+
+  // default behavior is to fit all chips independently
+  TGROUP_ZPT_MODE = TGROUP_ZPT_MODE_NONE;
+  MOSAIC_ZPT_MODE = MOSAIC_ZPT_MODE_NONE;
+  IMAGE_ZPT_MODE  = IMAGE_ZPT_MODE_ALL;
+
   /* XXX this argument used to do two things: specify the camera name and tell the analysis to
      calculate a common zero point for a single mosaic.  I've moved the MOSAICNAME concept into the
@@ -315 +344 @@
       exit (2);
     }
-  }
-
-  FREEZE_IMAGES = FALSE;
-  if ((N = get_argument (argc, argv, "-imfreeze"))) {
-    remove_argument (N, &argc, argv);
-    FREEZE_IMAGES = TRUE;
-  }
-  FREEZE_MOSAICS = FALSE;
-  if ((N = get_argument (argc, argv, "-mosfreeze"))) {
-    remove_argument (N, &argc, argv);
-    FREEZE_MOSAICS = TRUE;
-  }
-  CALIBRATE_STACKS_AND_WARPS = FALSE;
-  if ((N = get_argument (argc, argv, "-only-stacks-and-warps"))) {
-    remove_argument (N, &argc, argv);
-    CALIBRATE_STACKS_AND_WARPS = TRUE;
-  }
-  USE_MCAL_PSF_FOR_STACK_APER = FALSE;
-  if ((N = get_argument (argc, argv, "-use-mcal-psf-for-stack-aper"))) {
-    remove_argument (N, &argc, argv);
-    USE_MCAL_PSF_FOR_STACK_APER = TRUE;
+    IMAGE_ZPT_MODE  = IMAGE_ZPT_MODE_NONE;
+    MOSAIC_ZPT_MODE = MOSAIC_ZPT_MODE_ALL;
   }
 
@@ -341 +351 @@
   TGROUP_ZEROPT = FALSE;
   char *TGROUP_FILENAME = NULL;
-  if ((N = get_argument (argc, argv, "-tgroup"))) {
+  if ((N = get_argument (argc, argv, "-tgroup")) || (N = get_argument (argc, argv, "-tgroups"))) {
     TGROUP_ZEROPT = TRUE;
     remove_argument (N, &argc, argv);
     TGROUP_FILENAME = strcreate(argv[N]);
     remove_argument (N, &argc, argv);
-    FREEZE_IMAGES = TRUE;
-  }
-  if ((N = get_argument (argc, argv, "-tgroups"))) {
-    if (TGROUP_ZEROPT) {
-      fprintf (stderr, "use only one of -tgroups and -tgroup (same meaning)\n");
-      exit (2);
-    }
-    TGROUP_ZEROPT = TRUE;
-    remove_argument (N, &argc, argv);
-    TGROUP_FILENAME = strcreate(argv[N]);
-    remove_argument (N, &argc, argv);
-    FREEZE_IMAGES = TRUE;
+    // if we fit for TGROUPS, start with the images and mosaics frozen
+    TGROUP_ZPT_MODE = TGROUP_ZPT_MODE_ALL;
+    IMAGE_ZPT_MODE  = IMAGE_ZPT_MODE_NONE;
+    MOSAIC_ZPT_MODE = MOSAIC_ZPT_MODE_NONE;
+  }
+  if ((N = get_argument (argc, argv, "-tgroup")) || (N = get_argument (argc, argv, "-tgroups"))) {
+    fprintf (stderr, "use only one of -tgroups and -tgroup (same meaning)\n");
+    exit (2);
   }
   TGROUP_FIT_AIRMASS = FALSE;