Changeset 15401

Timestamp:

Oct 28, 2007, 3:42:03 PM (19 years ago)

Author:

eugene

Message:

fix chip mode

Location:

branches/eam_branch_20071023/psastro/src

Files:

• Makefile.am (modified) (1 diff)
• psastro.h (modified) (2 diffs)
• psastroArguments.c (modified) (1 diff)
• psastroDefineFiles.c (modified) (3 diffs)
• psastroEnforceChip.c (deleted)
• psastroEnforceChips.c (added)
• psastroMosaicAstrom.c (modified) (1 diff)

branches/eam_branch_20071023/psastro/src/Makefile.am

@@ -33 +33 @@
         psastroLuminosityFunction.c \
         psastroRefstarSubset.c      \
+        psastroEnforceChips.c       \
         psastroMosaicAstrom.c       \
         psastroMosaicGradients.c    \

branches/eam_branch_20071023/psastro/src/psastro.h

@@ -27 +27 @@
 bool              psastroDataSave (pmConfig *config);
 bool              psastroDefineFiles (pmConfig *config, pmFPAfile *input);
+bool              psastroDefineFile (pmConfig *config, pmFPA *input, char *filerule, char *argname, pmFPAfileType fileType, pmDetrendType detrendType);
 bool              psastroAnalysis (pmConfig *config);
 
@@ -78 +79 @@
 int               psastroSortByMag (const void *a, const void *b);
 
+bool              psastroEnforceChips (pmConfig *config, pmFPA *fpa, psMetadata *recipe);
+
 # endif /* PSASTRO_H */

branches/eam_branch_20071023/psastro/src/psastroArguments.c

@@ -36 +36 @@
         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_META_REPLACE, "", argv[N]);
         psArgumentRemove (N, &argc, argv);
+    }
+    
+    // apply the chip correction based on the reference astrometry?
+    if ((N = psArgumentGet (argc, argv, "-fixchips"))) {
+        psArgumentRemove (N, &argc, argv);
+        psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.FIX.CHIPS", PS_META_REPLACE, "", true);
+    }
+    // define the reference astrometry file
+    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "REF.ASTROM", "-refastrom", "-refastromlist");
+    if (status) {
+        // if supplied, assume -fixchips is desired
+        psMetadataAddBool (config->arguments, PS_LIST_TAIL, "PSASTRO.FIX.CHIPS", PS_META_REPLACE, "", true);
     }
 

branches/eam_branch_20071023/psastro/src/psastroDefineFiles.c

@@ -4 +4 @@
 
     // these calls bind the I/O handle to the specified fpa
+    bool status;
+
+    // select the current recipe
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSASTRO_RECIPE);
+    if (!recipe) {
+        psError(PSASTRO_ERR_CONFIG, false, "Can't find PSASTRO recipe!\n");
+        return false;
+    }
 
     pmFPAfile *output = pmFPAfileDefineOutput (config, input->fpa, "PSASTRO.OUTPUT");
@@ -12 +20 @@
     output->save = true;
 
-    // XXX not sure of this: should this be bind from args?
-    pmFPAfile *refAstrom = pmFPAfileDefineFromConf (&status, config, "PSASTRO.REF.ASTROM");
-    if (!refAstrom) {
-        psError(PSASTRO_ERR_CONFIG, false, "Failed to load ref astrometry");
-        return false;
+    bool fixChips = psMetadataLookupBool (&status, recipe, "PSASTRO.FIX.CHIPS");
+
+    if (fixChips) {
+        if (!psastroDefineFile (config, input->fpa, "PSASTRO.REF.ASTROM", "REF.ASTROM", PM_FPA_FILE_ASTROM, PM_DETREND_TYPE_ASTROM)) {
+            psError (PS_ERR_IO, false, "Can't find a reference astrometry file");
+            return NULL;
+        }
     }
 
@@ -31 +41 @@
     return true;
 }
+
+bool psastroDefineFile (pmConfig *config, pmFPA *input, char *filerule, char *argname, pmFPAfileType fileType, pmDetrendType detrendType) {
+
+    bool status;
+    pmFPAfile *file;
+
+    // look for the file on the argument list
+    file = pmFPAfileDefineFromArgs  (&status, config, filerule, argname);
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return false;
+    }
+    if (file) {
+        if (file->type != fileType) {
+            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (fileType));
+            return false;
+        }
+        return true;
+    }
+
+    // look for the file in the camera config table
+    file = pmFPAfileDefineFromConf  (&status, config, filerule);
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return false;
+    }
+    if (file) {
+        if (file->type != fileType) {
+            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (fileType));
+            return false;
+        }
+        return true;
+    }
+
+    // look for the file to be loaded from the detrend database
+    file = pmFPAfileDefineFromDetDB (&status, config, filerule, input, detrendType);
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load file definition");
+        return false;
+    }
+    if (file) {
+        if (file->type != fileType) {
+            psError(PS_ERR_IO, true, "%s is not of type %s", filerule, pmFPAfileStringFromType (fileType));
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+

branches/eam_branch_20071023/psastro/src/psastroMosaicAstrom.c

@@ -21 +21 @@
     pmFPA *fpa = input->fpa;
 
-    // XXX before we do object matches, we need to fix failed chips
-    // compare chips with supplied mosaic model
-    // adjust significant outliers to match model
-
-    if (!psastroEnforceChips (fpa, recipe) {
+    // before we do object matches, we need to (optionally) fix failed chips.  We compare chips with
+    // the supplied mosaic model.  Adjust significant outliers to match model.  
+    if (!psastroEnforceChips (config, fpa, recipe)) {
         psError(PSASTRO_ERR_UNKNOWN, false, "failed to align problematic chips");
         return false;