Changeset 40190

Timestamp:

Oct 27, 2017, 7:39:25 PM (9 years ago)

Author:

mhuber

Message:

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

Location:

tags/ipp-20170121/psphot/src

Files:

• psphotChipParams.c (modified) (2 diffs, 1 prop)
• psphotReadoutMinimal.c (modified) (1 diff, 1 prop)

tags/ipp-20170121/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;
         }
     }

tags/ipp-20170121/psphot/src/psphotReadoutMinimal.c

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