Changeset 8058
- Timestamp:
- Aug 1, 2006, 5:27:46 PM (20 years ago)
- Location:
- trunk/ppImage/src
- Files:
-
- 3 edited
-
ppFocusParseCamera.c (modified) (5 diffs)
-
ppImage.h (modified) (1 diff)
-
ppImageParseCamera.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ppImage/src/ppFocusParseCamera.c
r7749 r8058 10 10 pmFPAfile *input = pmFPAfileDefineSingleFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT", entry); 11 11 if (!status) { 12 13 12 psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT"); 13 return NULL; 14 14 } 15 15 16 16 // add recipe options supplied on command line 17 psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, "PHASE2");17 psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME); 18 18 psMetadata *arglist = psMetadataLookupPtr (&status, config->arguments, "PPIMAGE.OPTIONS"); 19 19 psMetadataCopy (recipe, arglist); … … 22 22 ppImageOptions *options = ppImageOptionsParse (config); 23 23 24 // the following are defined from the argument list, if given, 24 // the following are defined from the argument list, if given, 25 25 // otherwise they revert to the config information or detrend database if specified 26 26 // not all input or output images are used in a given recipe 27 27 if (options->doBias) { 28 29 30 31 32 28 bool status = false; 29 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.BIAS", "BIAS"); 30 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.BIAS"); 31 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS); 32 if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source"); 33 33 } 34 34 if (options->doDark) { 35 36 37 38 39 35 bool status = false; 36 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.DARK", "DARK"); 37 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.DARK"); 38 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK); 39 if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source"); 40 40 } 41 41 if (options->doMask) { 42 43 44 45 46 42 bool status = false; 43 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.MASK", "MASK"); 44 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.MASK"); 45 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK); 46 if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source"); 47 47 } 48 48 if (options->doFlat) { 49 50 51 52 53 49 bool status = false; 50 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.FLAT", "FLAT"); 51 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.FLAT"); 52 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT); 53 if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source"); 54 54 } 55 55 … … 67 67 68 68 // output is used as a carrier: input to byChip 69 output->freeLevel = PM_FPA_LEVEL_CHIP; 69 output->freeLevel = PM_FPA_LEVEL_CHIP; 70 70 71 71 // define the binned target files (which may just be carriers for some camera configurations) … … 90 90 psArray *chips = psStringSplitArray (chipLine, ",", false); 91 91 if (chips->n > 0) { 92 93 94 95 96 97 98 92 pmFPASelectChip (input->fpa, -1, true); // deselect all chips 93 for (int i = 0; i < chips->n; i++) { 94 int chipNum = atoi(chips->data[i]); 95 if (! pmFPASelectChip(input->fpa, chipNum, false)) { 96 psError(PS_ERR_IO, false, "Chip number %d doesn't exist in camera.\n", chipNum); 97 return false; 98 } 99 99 } 100 100 } … … 121 121 psMetadataRemoveKey (config->files, "PPIMAGE.BIN1"); 122 122 psMetadataRemoveKey (config->files, "PPIMAGE.BIN2"); 123 123 124 124 psMetadataRemoveKey (config->files, "PPIMAGE.JPEG1"); 125 125 psMetadataRemoveKey (config->files, "PPIMAGE.JPEG2"); -
trunk/ppImage/src/ppImage.h
r7771 r8058 9 9 #include "ppImageOptions.h" 10 10 11 #define RECIPE_NAME "P HASE2"// Name of the recipe to use11 #define RECIPE_NAME "PPIMAGE" // Name of the recipe to use 12 12 #define TIMERNAME "ppImage" // Name of timer 13 13 -
trunk/ppImage/src/ppImageParseCamera.c
r7629 r8058 9 9 pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT"); 10 10 if (!status) { 11 12 11 psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT"); 12 return NULL; 13 13 } 14 14 15 15 // add recipe options supplied on command line 16 psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, "PHASE2");16 psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, RECIPE_NAME); 17 17 psMetadata *arglist = psMetadataLookupPtr (&status, config->arguments, "PPIMAGE.OPTIONS"); 18 18 psMetadataCopy (recipe, arglist); … … 21 21 ppImageOptions *options = ppImageOptionsParse (config); 22 22 23 // the following are defined from the argument list, if given, 23 // the following are defined from the argument list, if given, 24 24 // otherwise they revert to the config information 25 25 // not all input or output images are used in a given recipe 26 26 if (options->doBias) { 27 28 29 30 31 27 bool status = false; 28 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.BIAS", "BIAS"); 29 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.BIAS"); 30 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.BIAS", input->fpa, PM_DETREND_TYPE_BIAS); 31 if (!status) psAbort ("ppImageParseDetrend", "can't find a bias image source"); 32 32 } 33 33 if (options->doDark) { 34 35 36 37 38 34 bool status = false; 35 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.DARK", "DARK"); 36 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.DARK"); 37 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.DARK", input->fpa, PM_DETREND_TYPE_DARK); 38 if (!status) psAbort ("ppImageParseDetrend", "can't find a dark image source"); 39 39 } 40 40 if (options->doMask) { 41 42 43 44 45 41 bool status = false; 42 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.MASK", "MASK"); 43 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.MASK"); 44 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.MASK", input->fpa, PM_DETREND_TYPE_MASK); 45 if (!status) psAbort ("ppImageParseDetrend", "can't find a mask image source"); 46 46 } 47 47 if (options->doFlat) { 48 49 50 51 52 48 bool status = false; 49 pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.FLAT", "FLAT"); 50 pmFPAfileDefineFromConf (&status, config, "PPIMAGE.FLAT"); 51 pmFPAfileDefineFromDetDB (&status, config, "PPIMAGE.FLAT", input->fpa, PM_DETREND_TYPE_FLAT); 52 if (!status) psAbort ("ppImageParseDetrend", "can't find a flat image source"); 53 53 } 54 54 … … 66 66 67 67 // output is used as a carrier: input to byChip 68 output->freeLevel = PM_FPA_LEVEL_CHIP; 68 output->freeLevel = PM_FPA_LEVEL_CHIP; 69 69 70 70 // define the binned target files (which may just be carriers for some camera configurations) … … 89 89 psArray *chips = psStringSplitArray (chipLine, ",", false); 90 90 if (chips->n > 0) { 91 92 93 94 95 96 97 91 pmFPASelectChip (input->fpa, -1, true); // deselect all chips 92 for (int i = 0; i < chips->n; i++) { 93 int chipNum = atoi(chips->data[i]); 94 if (! pmFPASelectChip(input->fpa, chipNum, false)) { 95 psError(PS_ERR_IO, false, "Chip number %d doesn't exist in camera.\n", chipNum); 96 return false; 97 } 98 98 } 99 99 }
Note:
See TracChangeset
for help on using the changeset viewer.
