Changeset 38384

Timestamp:

Jun 5, 2015, 12:36:49 PM (11 years ago)

Author:

bills

Message:

Code to implement update mode in psphotStack

Location:

trunk/psphot/src

Files:

• psphotStackArguments.c (modified) (1 diff)
• psphotStackImageLoop.c (modified) (2 diffs)
• psphotStackParseCamera.c (modified) (6 diffs)

trunk/psphot/src/psphotStackArguments.c

@@ -31 +31 @@
     // these options override the PSPHOT recipe values loaded from recipe files
     psMetadata *options = pmConfigRecipeOptions (config, PSPHOT_RECIPE);
+
+    bool updateMode = false;
+    if ((N = psArgumentGet (argc, argv, "-updatemode"))) {
+        psArgumentRemove (N, &argc, argv);
+        updateMode = true;
+    }
+    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PSPHOT.STACK.UPDATEMODE", 0, "update mode flag", updateMode);
 
     // visual : interactive display mode

trunk/psphot/src/psphotStackImageLoop.c

@@ -30 +30 @@
 
     psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+    bool updateMode = psMetadataLookupBool(&status, config->arguments, "PSPHOT.STACK.UPDATEMODE");
 
     // just load the full set of images up front except for EXPNUM which we defer
@@ -61 +62 @@
 
                 // XXX for now, we assume there is only a single chip in the PHU:
-                if (!psphotStackReadout (config, view)) {
-                    psError(psErrorCodeLast(), false, "failure in psphotStackReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
+                if (!updateMode) {
+                    if (!psphotStackReadout (config, view)) {
+                        psError(psErrorCodeLast(), false, "failure in psphotStackReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
+                        psFree (view);
+                        return false;
+                    }
+                } else {
+                    if (!psphotStackUpdateReadout (config, view)) {
+                        psError(psErrorCodeLast(), false, "failure in psphotStackReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
+                        psFree (view);
+                        return false;
+                    }
+                }
 
                 UpdateHeadersForReadout(config, view);

trunk/psphot/src/psphotStackParseCamera.c

@@ -18 +18 @@
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
     bool savePSF = psMetadataLookupBool(&status, recipe, "SAVE.PSF");
+    // XXX: bills: I don't think psphotStack will work if SAVE.BACKMDL is false
     bool saveBackgroundModel = psMetadataLookupBool(&status, recipe, "SAVE.BACKMDL");
     bool saveBackground = psMetadataLookupBool(&status, recipe, "SAVE.BACKGND");
@@ -26 +27 @@
     bool saveChisq = psMetadataLookupBool(&status, recipe, "SAVE.CHISQ");
     bool useRaw = psMetadataLookupBool(&status, recipe, "PSPHOT.STACK.USE.RAW");
+
+    bool updateMode = psMetadataLookupBool(&status, config->arguments, "PSPHOT.STACK.UPDATEMODE");
+    if (updateMode) {
+        // Tell the sources reader to save a copy of the header from the input sources file on
+        // readout->analysis so that we can copy some metadata from measurements that are skipped
+        // in update mode from there to the analysis structure.
+        psMetadataAddBool(recipe, PS_LIST_TAIL, "SAVE.INPUT.SOURCES.HEADER", PS_META_REPLACE, "", true);
+    }
 
 
@@ -65 +74 @@
                 }
             }
-            psString psf = psMetadataLookupStr(&status, input, "RAW:PSF"); // Name of mask
+            psString psf = psMetadataLookupStr(&status, input, "RAW:PSF"); // Name of psf
             if (psf && strlen(psf) > 0) {
-                if (!defineFile(config, rawInputFile, "PSPHOT.STACK.PSF.RAW", psf, PM_FPA_FILE_PSF)) {
+                // if (!defineFile(config, rawInputFile, "PSPHOT.STACK.PSF.RAW", psf, PM_FPA_FILE_PSF)) {
+                if (!defineFile(config, rawInputFile, "PSPHOT.PSF.LOAD", psf, PM_FPA_FILE_PSF)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to define file from psf %d (%s)", i, psf);
+                    return false;
+                }
+            }
+            psString backmdl = psMetadataLookupStr(&status, input, "RAW:BACKMDL"); // Name of background model
+            if (backmdl && strlen(backmdl) > 0) {
+                if (!defineFile(config, NULL, "PSPHOT.STACK.BACKMDL.RAW", backmdl, PM_FPA_FILE_IMAGE)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to define file from backmdl %d (%s)", i, backmdl);
                     return false;
                 }
@@ -144 +161 @@
         }
 
-        psString sources = psMetadataLookupStr(&status, input, "SOURCES"); // Name of mask
-        if (sources && strlen(sources) > 0) {
-            if (!defineFile(config, NULL, "PSPHOT.STACK.SOURCES", sources, PM_FPA_FILE_CMF)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to define file from sources %d (%s)", i, sources);
-                return false;
-            }
-        }
+        psString sources = psMetadataLookupStr(&status, input, "SOURCES"); // Name of sources
+        if (sources && strlen(sources) > 0) {
+            // input sources are not bound to fpa. 
+            // XXX: bills: I believe that they are only required in -updatemode now.
+            if (!defineFile(config, NULL, "PSPHOT.STACK.SOURCES", sources, PM_FPA_FILE_CMF)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from sources %d (%s)", i, sources);
+                return false;
+            }
+        }
 
         psS64 stack_id = psMetadataLookupS64(&status, input, "STACK_ID");
@@ -207 +226 @@
                     return false;
                 }
-                output->save = true;
+                // don't save psf in update mode?
+                output->save = !updateMode;
                 output->fileID = stack_id;
             }
@@ -219 +239 @@
                 }
 
-                output->save = true;
+                // do not save the background model file when in update mode. We need to create the file above
+                // but we don't need save it.
+                output->save = !updateMode;
                 output->fileID = stack_id;
             }