IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7677 for trunk/psphot/src


Ignore:
Timestamp:
Jun 23, 2006, 5:33:37 PM (20 years ago)
Author:
Paul Price
Message:

Fixing code after pushing argc,argv into pmConfig.

Location:
trunk/psphot/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/psphot/src/psphot.c

    r7518 r7677  
    55    psTimerStart ("complete");
    66
    7     psphotErrorRegister();              // register our error codes/messages
     7    psphotErrorRegister();              // register our error codes/messages
    88
    99    // basic pslib options
    … …  
    1414
    1515    // load command-line arguments, options, and system config data
    16     pmConfig *config = psphotArguments (&argc, argv);
     16    pmConfig *config = psphotArguments (argc, argv);
    1717    if (config == NULL) {
    18         psErrorStackPrint(stderr, "");
    19         exit(1);
     18        psErrorStackPrint(stderr, "");
     19        exit(1);
    2020    }
    2121
    2222    // load input data (config and images (signal, noise, mask)
    2323    if (!psphotParseCamera (config)) {
    24         psErrorStackPrint(stderr, "");
    25         exit(1);
     24        psErrorStackPrint(stderr, "");
     25        exit(1);
    2626    }
    2727

  • trunk/psphot/src/psphot.h

    r7638 r7677  
    1212
    1313// top-level psphot functions
    14 pmConfig       *psphotArguments (int *argc, char **argv);
     14pmConfig       *psphotArguments (int argc, char **argv);
    1515bool            psphotParseCamera (pmConfig *config);
    1616bool            psphotImageLoop (pmConfig *config);
    … …  
    3131pmPSF          *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe);
    3232bool            psphotPSFstats (pmReadout *readout, psMetadata *recipe, pmPSF *psf);
    33 bool            psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final);
     33bool            psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final);
    3434bool            psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
    3535bool            psphotReplaceUnfit (psArray *sources);
    … …  
    4040// basic support functions
    4141void            psphotModelGroupInit (void);
    42 int             psphotSortBySN (const void **a, const void **b);
    43 int             psphotSortByY (const void **a, const void **b);
     42int             psphotSortBySN (const void **a, const void **b);
     43int             psphotSortByY (const void **a, const void **b);
    4444bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf);
    4545void            psphotTestArguments (int *argc, char **argv);
    … …  
    4848
    4949// functions to set the correct source pixels
    50 bool            psphotInitRadiusPSF (psMetadata *recipe, pmModelType type);
    51 bool            psphotCheckRadiusPSF (pmReadout *readout, pmSource *source, pmModel *model);
    52 bool            psphotCheckRadiusPSFBlend (pmReadout *readout, pmSource *source, pmModel *model, float dR);
    53 bool            psphotInitRadiusEXT (psMetadata *recipe, pmModelType type);
    54 bool            psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model);
     50bool            psphotInitRadiusPSF (psMetadata *recipe, pmModelType type);
     51bool            psphotCheckRadiusPSF (pmReadout *readout, pmSource *source, pmModel *model);
     52bool            psphotCheckRadiusPSFBlend (pmReadout *readout, pmSource *source, pmModel *model, float dR);
     53bool            psphotInitRadiusEXT (psMetadata *recipe, pmModelType type);
     54bool            psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model);
    5555
    5656// output functions
    57 bool            psphotDumpMoments (psMetadata *recipe, psArray *sources);
     57bool            psphotDumpMoments (psMetadata *recipe, psArray *sources);
    5858psMetadata     *psphotDefineHeader (psMetadata *recipe);
    5959bool            psphotWeightBias (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
    6060
    6161// PSF / DBL / EXT evaluation functions
    62 bool            psphotEvalPSF (pmSource *source, pmModel *model);
    63 bool            psphotEvalDBL (pmSource *source, pmModel *model);
    64 bool            psphotEvalEXT (pmSource *source, pmModel *model);
     62bool            psphotEvalPSF (pmSource *source, pmModel *model);
     63bool            psphotEvalDBL (pmSource *source, pmModel *model);
     64bool            psphotEvalEXT (pmSource *source, pmModel *model);
    6565
    6666//  functions to support the source fitting process
    67 bool            psphotInitLimitsPSF (psMetadata *recipe);
    68 bool            psphotInitLimitsEXT (psMetadata *recipe);
    69 bool            psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf);
    70 bool            psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf);
    71 bool            psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf);
    72 pmModel        *psphotFitEXT (pmReadout *readout, pmSource *source);
    73 psArray        *psphotFitDBL (pmReadout *readout, pmSource *source);
     67bool            psphotInitLimitsPSF (psMetadata *recipe);
     68bool            psphotInitLimitsEXT (psMetadata *recipe);
     69bool            psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf);
     70bool            psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf);
     71bool            psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf);
     72pmModel        *psphotFitEXT (pmReadout *readout, pmSource *source);
     73psArray        *psphotFitDBL (pmReadout *readout, pmSource *source);
    7474
    7575// functions to support simultaneous multi-source fitting
    76 bool            psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode);
     76bool            psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode);
    7777

  • trunk/psphot/src/psphotArguments.c

    r7519 r7677  
    22# include <glob.h>
    33
    4 pmConfig *psphotArguments (int *argc, char **argv) {
     4pmConfig *psphotArguments(int argc, char **argv) {
    55
    66    int N;
    77    bool status;
    88
    9     if (*argc == 1) {
    10         psError(PSPHOT_ERR_ARGUMENTS, true, "Too few arguments: %d", *argc);
    11         return NULL;
     9    if (argc == 1) {
     10        psError(PSPHOT_ERR_ARGUMENTS, true, "Too few arguments: %d", argc);
     11        return NULL;
    1212    }
    1313
    14     // load config data from default locations 
     14    // load config data from default locations
    1515    pmConfig *config = pmConfigRead(argc, argv);
    1616    if (config == NULL) {
    17         psError(PSPHOT_ERR_CONFIG, false, "Can't find site configuration");
    18         return NULL;
     17        psError(PSPHOT_ERR_CONFIG, false, "Can't find site configuration");
     18        return NULL;
    1919    }
    2020
    … …  
    2929
    3030    // run the test model (requires X,Y coordinate)
    31     if ((N = psArgumentGet (*argc, argv, "-modeltest"))) {
    32         psMetadataAddBool (options, PS_LIST_TAIL, "TEST_FIT",   0, "", true);
    33         psMetadataAddF32  (options, PS_LIST_TAIL, "TEST_FIT_X", 0, "", atof(argv[N+1]));
    34         psMetadataAddF32  (options, PS_LIST_TAIL, "TEST_FIT_Y", 0, "", atof(argv[N+2]));
     31    if ((N = psArgumentGet (config->argc, config->argv, "-modeltest"))) {
     32        psMetadataAddBool (options, PS_LIST_TAIL, "TEST_FIT",   0, "", true);
     33        psMetadataAddF32  (options, PS_LIST_TAIL, "TEST_FIT_X", 0, "", atof(argv[N+1]));
     34        psMetadataAddF32  (options, PS_LIST_TAIL, "TEST_FIT_Y", 0, "", atof(argv[N+2]));
    3535
    36         psArgumentRemove (N, argc, argv);
    37         psArgumentRemove (N, argc, argv);
    38         psArgumentRemove (N, argc, argv);
     36        psArgumentRemove (N, &config->argc, config->argv);
     37        psArgumentRemove (N, &config->argc, config->argv);
     38        psArgumentRemove (N, &config->argc, config->argv);
    3939
    40         // specify the modeltest model
    41         if ((N = psArgumentGet (*argc, argv, "-model"))) {
    42             psArgumentRemove (N, argc, argv);
    43             psMetadataAddStr (options, PS_LIST_TAIL, "TEST_FIT_MODEL", 0, "", argv[N]);
    44             psArgumentRemove (N, argc, argv);
    45         }
     40        // specify the modeltest model
     41        if ((N = psArgumentGet (config->argc, config->argv, "-model"))) {
     42            psArgumentRemove (N, &config->argc, config->argv);
     43            psMetadataAddStr (options, PS_LIST_TAIL, "TEST_FIT_MODEL", 0, "", config->argv[N]);
     44            psArgumentRemove (N, &config->argc, config->argv);
     45        }
    4646
    47         // specify the test fit mode
    48         if ((N = psArgumentGet (*argc, argv, "-fitmode"))) {
    49             psArgumentRemove (N, argc, argv);
    50             psMetadataAddStr (options, PS_LIST_TAIL, "TEST_FIT_MODE", 0, "", argv[N]);
    51             psArgumentRemove (N, argc, argv);
    52         }
    53         if ((N = psArgumentGet (*argc, argv, "-fitset"))) {
    54             psArgumentRemove (N, argc, argv);
    55             psMetadataAddStr (options, PS_LIST_TAIL, "TEST_FIT_SET", 0, "", argv[N]);
    56             psArgumentRemove (N, argc, argv);
    57         }
     47        // specify the test fit mode
     48        if ((N = psArgumentGet (config->argc, config->argv, "-fitmode"))) {
     49            psArgumentRemove (N, &config->argc, config->argv);
     50            psMetadataAddStr (options, PS_LIST_TAIL, "TEST_FIT_MODE", 0, "", config->argv[N]);
     51            psArgumentRemove (N, &config->argc, config->argv);
     52        }
     53        if ((N = psArgumentGet (config->argc, config->argv, "-fitset"))) {
     54            psArgumentRemove (N, &config->argc, config->argv);
     55            psMetadataAddStr (options, PS_LIST_TAIL, "TEST_FIT_SET", 0, "", config->argv[N]);
     56            psArgumentRemove (N, &config->argc, config->argv);
     57        }
    5858    }
    5959
    6060    // photcode : used in output to supplement header data (argument or recipe?)
    61     if ((N = psArgumentGet (*argc, argv, "-photcode"))) {
    62         psArgumentRemove (N, argc, argv);
    63         psMetadataAddStr (options, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "", argv[N]);
    64         psArgumentRemove (N, argc, argv);
     61    if ((N = psArgumentGet (config->argc, config->argv, "-photcode"))) {
     62        psArgumentRemove (N, &config->argc, config->argv);
     63        psMetadataAddStr (options, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "", config->argv[N]);
     64        psArgumentRemove (N, &config->argc, config->argv);
    6565    }
    6666
    67     // break : used from recipe throughout psphotReadout 
    68     if ((N = psArgumentGet (*argc, argv, "-break"))) {
    69         psArgumentRemove (N, argc, argv);
    70         psMetadataAddStr (options, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", argv[N]);
    71         psArgumentRemove (N, argc, argv);
     67    // break : used from recipe throughout psphotReadout
     68    if ((N = psArgumentGet (config->argc, config->argv, "-break"))) {
     69        psArgumentRemove (N, &config->argc, config->argv);
     70        psMetadataAddStr (options, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", config->argv[N]);
     71        psArgumentRemove (N, &config->argc, config->argv);
    7272    }
    7373
    74     // fitmode : used from recipe throughout psphotReadout 
    75     if ((N = psArgumentGet (*argc, argv, "-fitmode"))) {
    76         psArgumentRemove (N, argc, argv);
    77         psMetadataAddStr (options, PS_LIST_TAIL, "FITMODE", PS_META_REPLACE, "", argv[N]);
    78         psArgumentRemove (N, argc, argv);
     74    // fitmode : used from recipe throughout psphotReadout
     75    if ((N = psArgumentGet (config->argc, config->argv, "-fitmode"))) {
     76        psArgumentRemove (N, &config->argc, config->argv);
     77        psMetadataAddStr (options, PS_LIST_TAIL, "FITMODE", PS_META_REPLACE, "", config->argv[N]);
     78        psArgumentRemove (N, &config->argc, config->argv);
    7979    }
    8080
    8181    // analysis region : overrides recipe value, used in psphotReadout/psphotEnsemblePSF
    82     if ((N = psArgumentGet (*argc, argv, "-region"))) {
    83         psArgumentRemove (N, argc, argv);
    84         psMetadataAddStr (options, PS_LIST_TAIL, "ANALYSIS_REGION", 0, "", argv[N]);
    85         psArgumentRemove (N, argc, argv);
     82    if ((N = psArgumentGet (config->argc, config->argv, "-region"))) {
     83        psArgumentRemove (N, &config->argc, config->argv);
     84        psMetadataAddStr (options, PS_LIST_TAIL, "ANALYSIS_REGION", 0, "", config->argv[N]);
     85        psArgumentRemove (N, &config->argc, config->argv);
    8686    }
    8787
    8888    // other arbitrary recipe values: -D key value (all added as string)
    89     while ((N = psArgumentGet (*argc, argv, "-D"))) {
    90         psArgumentRemove (N, argc, argv);
    91         psMetadataAddStr (options, PS_LIST_TAIL, argv[N], 0, "", argv[N+1]);
    92         psArgumentRemove (N, argc, argv);
    93         psArgumentRemove (N, argc, argv);
     89    while ((N = psArgumentGet (config->argc, config->argv, "-D"))) {
     90        psArgumentRemove (N, &config->argc, config->argv);
     91        psMetadataAddStr (options, PS_LIST_TAIL, config->argv[N], 0, "", config->argv[N+1]);
     92        psArgumentRemove (N, &config->argc, config->argv);
     93        psArgumentRemove (N, &config->argc, config->argv);
    9494    }
    9595
    9696    // other arbitrary recipe values: -Df key value (all added as float)
    97     while ((N = psArgumentGet (*argc, argv, "-Df"))) {
    98         psArgumentRemove (N, argc, argv);
    99         psMetadataAddF32 (options, PS_LIST_TAIL, argv[N], 0, "", atof(argv[N+1]));
    100         psArgumentRemove (N, argc, argv);
    101         psArgumentRemove (N, argc, argv);
     97    while ((N = psArgumentGet (config->argc, config->argv, "-Df"))) {
     98        psArgumentRemove (N, &config->argc, config->argv);
     99        psMetadataAddF32 (options, PS_LIST_TAIL, config->argv[N], 0, "", atof(config->argv[N+1]));
     100        psArgumentRemove (N, &config->argc, config->argv);
     101        psArgumentRemove (N, &config->argc, config->argv);
    102102    }
    103103
    104104    // other arbitrary recipe values: -Di key value (all added as int)
    105     while ((N = psArgumentGet (*argc, argv, "-Di"))) {
    106         psArgumentRemove (N, argc, argv);
    107         psMetadataAddS32 (options, PS_LIST_TAIL, argv[N], 0, "", atoi(argv[N+1]));
    108         psArgumentRemove (N, argc, argv);
    109         psArgumentRemove (N, argc, argv);
     105    while ((N = psArgumentGet (config->argc, config->argv, "-Di"))) {
     106        psArgumentRemove (N, &config->argc, config->argv);
     107        psMetadataAddS32 (options, PS_LIST_TAIL, config->argv[N], 0, "", atoi(config->argv[N+1]));
     108        psArgumentRemove (N, &config->argc, config->argv);
     109        psArgumentRemove (N, &config->argc, config->argv);
    110110    }
    111    
     111
    112112    // drop the local view on the options (saved on config->arguments)
    113113    psFree (options);
    114114
    115115    // the input file is a required argument; if not found, we will exit
    116     status = pmConfigFileSetsMD (config->arguments, argc, argv, "INPUT", "-file", "-list");
     116    status = pmConfigFileSetsMD (config->arguments, config, "INPUT", "-file", "-list");
    117117    if (!status) {
    118         psError(PSPHOT_ERR_ARGUMENTS, false, "pmConfigFileSetsMD failed to parse arguments");
    119         return NULL;
     118        psError(PSPHOT_ERR_ARGUMENTS, false, "pmConfigFileSetsMD failed to parse arguments");
     119        return NULL;
    120120    }
    121121
    122122    // chip selection is used to limit chips to be processed
    123     if ((N = psArgumentGet (*argc, argv, "-chip"))) {
    124         psArgumentRemove (N, argc, argv);
    125         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(argv[N]));
    126         psArgumentRemove (N, argc, argv);
     123    if ((N = psArgumentGet (config->argc, config->argv, "-chip"))) {
     124        psArgumentRemove (N, &config->argc, config->argv);
     125        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(config->argv[N]));
     126        psArgumentRemove (N, &config->argc, config->argv);
    127127    }
    128128
    129     if (*argc != 2) {
    130         psError(PSPHOT_ERR_ARGUMENTS, true, "Expected to see one more argument; saw %d", *argc - 1);
    131         return NULL;
     129    if (config->argc != 2) {
     130        psError(PSPHOT_ERR_ARGUMENTS, true, "Expected to see one more argument; saw %d", config->argc - 1);
     131        return NULL;
    132132    }
    133    
     133
    134134    // output position is fixed
    135     psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[1]);
     135    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", config->argv[1]);
    136136
    137137    psTrace(__func__, 1, "Done with psphotArguments...\n");
Note: See TracChangeset for help on using the changeset viewer.