Changeset 35715 for trunk/psastro

Timestamp:

Jun 26, 2013, 4:44:14 PM (13 years ago)

Author:

bills

Message:

Implement "Update" for camera stage.
This mode uses the existing smf file and updates the dynamic masks.
Will be used to create new masks from LAP which have correct
dynamic masking. Also builds (rebuilds) the background model files

Location:

trunk/psastro/src

Files:

• psastro.h (modified) (1 diff)
• psastroAnalysis.c (modified) (3 diffs)
• psastroArguments.c (modified) (3 diffs)
• psastroChooseRefstars.c (modified) (2 diffs)
• psastroExtractAnalysis.c (modified) (1 diff)

trunk/psastro/src/psastro.h

@@ -83 +83 @@
 bool              psastroOneChipGrid (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
 bool              psastroOneChipFit (pmFPA *fpa, pmChip *chip, pmReadout *readout, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
-bool              psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source);
+bool              psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source, bool saveExistingMatchedRefs);
 bool              psastroRefstarSubset (pmReadout *readout);
 pmLumFunc        *psastroLuminosityFunction (psArray *stars, pmLumFunc *rawFunc);

trunk/psastro/src/psastroAnalysis.c

@@ -86 +86 @@
     }
 
-    if (!psastroChooseRefstars (config, refs, "PSASTRO.INPUT")) {
+    bool skipastro = psMetadataLookupBool (&status, config->arguments, "PSASTRO.SKIP.ASTRO");
+
+    if (!psastroChooseRefstars (config, refs, "PSASTRO.INPUT", skipastro)) {
         psError (PSASTRO_ERR_UNKNOWN, false, "failed to select reference data for chips\n");
         psFree(refs);
@@ -108 +110 @@
         mosastro  = psMetadataLookupBool (&status, recipe, "PSASTRO.MOSAIC.MODE");
     }
-    if (!chipastro && !mosastro) {
+
+    if (skipastro) {
+        chipastro = false;
+        mosastro = false;
+        psLogMsg ("psastro", 3, "skip astrometry mode, accepting input astrometry\n");
+    } else if (!chipastro && !mosastro) {
         psLogMsg ("psastro", 3, "no astrometry mode selected, assuming chip astrometry\n");
         chipastro = true;
@@ -144 +151 @@
     }
 
-    if (!psastroZeroPoint (config)) {
-        psError(psErrorCodeLast(), false, "Failed to calculate zero point.");
-        return false;
-    }
+    if (!skipastro) {
+        if (!psastroZeroPoint (config)) {
+            psError(psErrorCodeLast(), false, "Failed to calculate zero point.");
+            return false;
+        }
 
-    if (!psastroAstromGuessCheck (config)) {
-        psError(psErrorCodeLast(), false, "Failed to check astrometry guess.");
-        return false;
+        if (!psastroAstromGuessCheck (config)) {
+            psError(psErrorCodeLast(), false, "Failed to check astrometry guess.");
+            return false;
+        }
     }
 

trunk/psastro/src/psastroArguments.c

@@ -74 +74 @@
 
     // apply mosastro mode?
+    bool mosastro = false;
     if ((N = psArgumentGet (argc, argv, "-mosastro"))) {
         psArgumentRemove (N, &argc, argv);
@@ -81 +82 @@
         psArgumentRemove (N, &argc, argv);
         psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.MOSAIC.MODE", PS_META_REPLACE, "", true);
+        mosastro = true;
     }
 
     // apply chipastro mode?
+    bool chipastro = false;
     if ((N = psArgumentGet (argc, argv, "-chipastro"))) {
         psArgumentRemove (N, &argc, argv);
@@ -91 +94 @@
         psArgumentRemove (N, &argc, argv);
         psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.CHIP.MODE", PS_META_REPLACE, "", true);
+        chipastro = true;
+    }
+    if ((N = psArgumentGet (argc, argv, "-skipastro"))) {
+        psArgumentRemove (N, &argc, argv);
+        if (mosastro) {
+            psError(PSASTRO_ERR_ARGUMENTS, true, "cannot specify +mosastro with -skipastro");
+            psErrorStackPrint(stderr, "exit");
+            return false;
+        }
+        if (chipastro) {
+            psError(PSASTRO_ERR_ARGUMENTS, true, "cannot specify +chipastro with -skipastro");
+            return false;
+        }
+        psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.SKIP.ASTRO", PS_META_REPLACE, "", true);
     }
 

trunk/psastro/src/psastroChooseRefstars.c

@@ -20 +20 @@
 }
 
-bool psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source) {
+bool psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source, bool saveExistingMatchedRefs) {
 
     bool status;
@@ -55 +55 @@
         // analysis.  however, we are re-doing the astrometry here, so remove
         // that prior set of matched references
-        psMetadataRemoveKey (fpa->analysis, "MATCHED_REFS");
+        if (!saveExistingMatchedRefs) {
+            psMetadataRemoveKey (fpa->analysis, "MATCHED_REFS");
+        }
     }
 

trunk/psastro/src/psastroExtractAnalysis.c

@@ -44 +44 @@
     }
 
-    if (!psastroChooseRefstars (config, refs, "PSASTRO.EXTRACT.ASTROM")) {
+    if (!psastroChooseRefstars (config, refs, "PSASTRO.EXTRACT.ASTROM", false)) {
         psError (PSASTRO_ERR_UNKNOWN, false, "failed to select reference data for chips\n");
         psFree(refs);