Changeset 40034

Timestamp:

May 12, 2017, 10:18:07 PM (9 years ago)

Author:

mhuber

Message:

update nightly diffs to PS1_DV5 for chip position in cmf, add option to disable chip back mapping and necessary config for SSdiff

Location:

trunk

Files:

• ippconfig/recipes/psphot.config (modified) (4 diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 diff)
• psphot/src/psphotChipParams.c (modified) (2 diffs)
• psphot/src/psphotReadoutMinimal.c (modified) (1 diff)

trunk/ippconfig/recipes/psphot.config

@@ -90 +90 @@
 # calculate difference stats?
 DIFF_STATS                          BOOL  FALSE
+
+# add backward chip mapping
+CHIP_PARAMS                         BOOL  TRUE
 
 # basic object statistics
@@ -687 +690 @@
 DIFF    METADATA
   DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
-  OUTPUT.FORMAT                     STR  PS1_DV3       # Format of output file
+  OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
 
   # Extended source fit parameters
@@ -701 +704 @@
 END
 
+# Recipe overrides for STACK-STACK DIFF
+STACK_DIFF         METADATA
+  DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
+  OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
+
+  CHIP_PARAMS                       BOOL FALSE
+
+  # Extended source fit parameters
+  # these models are used for high-quality shape analysis after all sources have been removed
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform the detailed extended sourc fits?
+  EXT_MODEL                           STR   PS_MODEL_TRAIL
+
+  # extended source models applied to sources
+  EXTENDED_SOURCE_MODELS METADATA
+    TYPE      EXTENDED_SOURCE_MODEL  MODEL            SNLIM   PSF_CONVOLVED
+    TRAIL_RAW EXTENDED_SOURCE_MODEL  PS_MODEL_TRAIL    10.0   FALSE
+  END
+END
+
+
+
 # Recipe overrides for DIFF_PV3
 DIFF_PV3        METADATA
@@ -721 +745 @@
   PEAKS_NSIGMA_LIMIT_2              F32  3.5           # peak significance threshold -- MOPS would like to see 4.0->3.5 since ppMops fixed
   DIFF_STATS                        BOOL TRUE          # Calculate diff-specific stats
-  OUTPUT.FORMAT                     STR  PS1_DV3       # Format of output file
+  OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
 
   PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -665 +665 @@
 END
 
-# reduction class specifically for warpwarp diffs:
+# reduction class specifically for stackstack diffs:
 STACKSTACK      METADATA
         DIFF_PPSUB      STR     STACKSTACK
-        DIFF_PSPHOT     STR     DIFF
+        DIFF_PSPHOT     STR     STACK_DIFF
         JPEG_BIN1       STR     PPIMAGE_J1
         JPEG_BIN2       STR     PPIMAGE_J2

trunk/psphot/src/psphotChipParams.c

@@ -34 +34 @@
     psAssert (recipe, "missing recipe?");
 
+    //MEH -- shouldn't do if input is stack... will need to be a config option for now
+    // -- return true method like for psphotExtendedSourceFits to be consistent...
+    if (!psMetadataLookupBool (&status, recipe, "CHIP_PARAMS")) {
+        psLogMsg ("psphot", PS_LOG_INFO, "stack -- skipping backward chip mapping \n");
+        return true;
+    }
+
     int num = psphotFileruleCount(config, filerule);
 
@@ -59 +66 @@
         if (!psphotChipParamsReadout (config, recipe, view, filerule, readout, sources)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to measure magnitudes for %s entry %d", filerule, i);
-            return false;
+             return false;
         }
     }

trunk/psphot/src/psphotReadoutMinimal.c

@@ -90 +90 @@
     psphotKronIterate(config, view, filerule, 1);
 
+    // MEH -- sensless for SSdfiffs...
     psphotChipParams (config, view, filerule);