Changeset 40262

Timestamp:

Dec 8, 2017, 11:02:39 AM (9 years ago)

Author:

eugene

Message:

fix error in stackBestOff; add option to use PSF not APER Mcal for stack APER mags (for testing)

Location:

branches/eam_branches/ohana.20170822/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/StarOps.c (modified) (2 diffs)
• src/args.c (modified) (2 diffs)
• src/launch_region_hosts.c (modified) (1 diff)
• src/reload_catalogs.c (modified) (1 diff)
• src/relphot_objects.c (modified) (1 diff)
• src/setMrelCatalog.c (modified) (2 diffs)

branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h

@@ -338 +338 @@
 int    ApplyOffsets;
 int    SyntheticPhotometry;
+
+int    USE_MCAL_PSF_FOR_STACK_APER;
 
 char  *PhotcodeList;

branches/eam_branches/ohana.20170822/src/relphot/src/StarOps.c

@@ -496 +496 @@
 
         // we need to use McalAPER for stacks (and only stacks)
-        int isStack = isGPC1stack(catalog[i].measureT[m].photcode);
+        int useStackAper = !USE_MCAL_PSF_FOR_STACK_APER && isGPC1stack(catalog[i].measureT[m].photcode);
 
         // note that measurements for which the image is not selected will not be modified
@@ -503 +503 @@
         // set the output calibration
         catalog[i].measure[m].McalPSF  = McalPSF  + Mmos + Mgrid;
-        catalog[i].measure[m].McalAPER = isStack ? McalAPER + Mmos + Mgrid : McalPSF  + Mmos + Mgrid;
+        catalog[i].measure[m].McalAPER = useStackAper ? McalAPER + Mmos + Mgrid : McalPSF  + Mmos + Mgrid;
 
         if (catalog[i].measureT[m].dbFlags & ID_MEAS_PHOTOM_UBERCAL) {

branches/eam_branches/ohana.20170822/src/relphot/src/args.c

@@ -325 +325 @@
     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;
   }
 
@@ -696 +701 @@
   }
 
+  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;
+  }
+
   /* define time */
   TimeSelect = FALSE;

branches/eam_branches/ohana.20170822/src/relphot/src/launch_region_hosts.c

@@ -74 +74 @@
     if (FREEZE_MOSAICS)             strextend (&command, "-mosfreeze");
     if (CALIBRATE_STACKS_AND_WARPS) strextend (&command, "-only-stacks-and-warps");
+    if (USE_MCAL_PSF_FOR_STACK_APER) { strextend (&command, "-use-mcal-psf-for-stack-aper"); }
 
     if (PARALLEL)                   strextend (&command, "-parallel");

branches/eam_branches/ohana.20170822/src/relphot/src/reload_catalogs.c

@@ -247 +247 @@
     if (SYNTH_ZERO_POINTS) { strextend (&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
     if (USE_BASIC_CHECK)   {  strextend (&command, "-basic-image-search"); }
+    if (USE_MCAL_PSF_FOR_STACK_APER) { strextend (&command, "-use-mcal-psf-for-stack-aper"); }
 
     if (!(STAGES & STAGE_CHIP))  { strextend (&command, "-skip-chip"); }

branches/eam_branches/ohana.20170822/src/relphot/src/relphot_objects.c

@@ -251 +251 @@
     if (USE_BASIC_CHECK)   { strextend (&command, "-basic-image-search"); }
     if (USE_ALL_IMAGES)    { strextend (&command, "-use-all-images"); }
+    if (USE_MCAL_PSF_FOR_STACK_APER) { strextend (&command, "-use-mcal-psf-for-stack-aper"); }
 
     if (!(STAGES & STAGE_CHIP))  { strextend (&command, "-skip-chip"); }

branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c

@@ -705 +705 @@
     } else {
       McalPSF   = getMcal  (meas, cat, MAG_CLASS_PSF);
-      McalAPER  = getMcal  (meas, cat, MAG_CLASS_KRON);
+      McalAPER  = USE_MCAL_PSF_FOR_STACK_APER ? getMcal  (meas, cat, MAG_CLASS_PSF) : getMcal  (meas, cat, MAG_CLASS_KRON);
       Mmos      = getMmos  (meas, cat);
       Mgrid     = getMgrid (meas, cat);
@@ -768 +768 @@
 
     // record the measurement which gave the best value
-    secfilt[Nsec].stackBestOff = (bestEntryMax > -1) ? -1 : bestEntryMax + measureOffset;
+    secfilt[Nsec].stackBestOff = (bestEntryMax == -1) ? -1 : bestEntryMax + measureOffset;
     myAssert (secfilt[Nsec].stackBestOff <= catalog[0].Nmeasure, "stackBestOff out of range");