IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23195


Ignore:
Timestamp:
Mar 5, 2009, 11:07:57 AM (17 years ago)
Author:
Paul Price
Message:

Adding function to print version information so it's captured in the log.

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppArith/src/ppArith.c

    r21378 r23195  
    3434    }
    3535
     36    ppArithVersionPrint();
     37
    3638    if (!ppArithArguments(argc, argv, config)) {
    3739        psErrorStackPrint(stderr, "Error reading arguments.\n");

  • trunk/ppArith/src/ppArith.h

    r21244 r23195  
    2222 * Parse the arguments
    2323 */
    24 bool ppArithArguments(int argc, char *argv[], ///< Command-line arguments 
    25                       pmConfig *config    ///< Configuration 
     24bool ppArithArguments(int argc, char *argv[], ///< Command-line arguments
     25                      pmConfig *config    ///< Configuration
    2626    );
    2727
    … …  
    2929 * Parse the camera input
    3030 */
    31 bool ppArithCamera(pmConfig *config       ///< Configuration 
     31bool ppArithCamera(pmConfig *config       ///< Configuration
    3232    );
    3333
    … …  
    3535 * Loop over the FPA hierarchy
    3636 */
    37 bool ppArithLoop(pmConfig *config         ///< Configuration 
     37bool ppArithLoop(pmConfig *config         ///< Configuration
    3838    );
    3939
    … …  
    4141 * Perform arithmetic on the readout
    4242 */
    43 bool ppArithReadout(pmReadout *output,  ///< Output readout 
    44                     const pmReadout *input1, ///< Input readout 
    45                     const pmReadout *input2, ///< Input readout 
    46                     const pmConfig *config, ///< Configuration 
    47                     const pmFPAview *view ///< View of readout on which to operate 
     43bool ppArithReadout(pmReadout *output,  ///< Output readout
     44                    const pmReadout *input1, ///< Input readout
     45                    const pmReadout *input2, ///< Input readout
     46                    const pmConfig *config, ///< Configuration
     47                    const pmFPAview *view ///< View of readout on which to operate
    4848    );
    4949
    5050/**
    51  * Put the program version information into a metadata
     51 * Put the program version information into header
    5252 */
    53 void ppArithVersionMetadata(psMetadata *metadata ///< Metadata to populate
     53bool ppArithVersionHeader(psMetadata *header ///< Header to populate
    5454    );
     55
     56/// Print version information
     57void ppArithVersionPrint(void);
    5558
    5659///@}

  • trunk/ppArith/src/ppArithLoop.c

    r21378 r23195  
    113113                    hdu->header = psMetadataAlloc();
    114114                }
    115                 ppArithVersionMetadata(hdu->header);
     115                ppArithVersionHeader(hdu->header);
    116116                lastHDU = hdu;
    117117            }

  • trunk/ppArith/src/ppArithVersion.c

    r23124 r23195  
    5959};
    6060
    61 void ppArithVersionMetadata(psMetadata *metadata)
     61bool ppArithVersionHeader(psMetadata *header)
    6262{
    63     PS_ASSERT_METADATA_NON_NULL(metadata,);
     63    PS_ASSERT_METADATA_NON_NULL(header, false);
     64
     65    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     66    psString timeString = psTimeToISO(time); // The time in an ISO string
     67    psFree(time);
     68    psString history = NULL;               // History string
     69    psStringAppend(&history, "ppArith at %s", timeString);
     70    psFree(timeString);
     71    psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, history);
     72    psFree(history);
     73
     74    psLibVersionHeader(header);
     75    psModulesVersionHeader(header);
     76    ppStatsVersionHeader(header);
     77
     78    psString version = ppArithVersion(); // Software version
     79    psString source  = ppArithSource();  // Software source
     80
     81    psMetadataAddStr(header, PS_LIST_TAIL, "IPP.PPARITH.VERSION", PS_META_REPLACE,
     82                     "Software version", version);
     83    psMetadataAddStr(header, PS_LIST_TAIL, "IPP.PPARITH.SOURCE", PS_META_REPLACE,
     84                     "S/W source", source);
     85
     86    psFree(version);
     87    psFree(source);
     88
     89    return true;
     90}
     91
     92void ppArithVersionPrint(void)
     93{
     94    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     95    psString timeString = psTimeToISO(time); // The time in an ISO string
     96    psFree(time);
     97    psLogMsg("ppArith", PS_LOG_INFO, "ppArith at %s", timeString);
     98    psFree(timeString);
    6499
    65100    psString pslib = psLibVersionLong();// psLib version
    … …  
    68103    psString ppArith = ppArithVersionLong(); // ppArith version
    69104
    70     psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
    71     psString timeString = psTimeToISO(time); // The time in an ISO string
    72     psFree(time);
    73     psString head = NULL;               // Head string
    74     psStringAppend(&head, "ppArith processing at %s. Component information:", timeString);
    75     psFree(timeString);
     105    psLogMsg("ppArith", PS_LOG_INFO, "%s", pslib);
     106    psLogMsg("ppArith", PS_LOG_INFO, "%s", psmodules);
     107    psLogMsg("ppArith", PS_LOG_INFO, "%s", ppStats);
     108    psLogMsg("ppArith", PS_LOG_INFO, "%s", ppArith);
    76109
    77     psMetadataAddStr(metadata, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, head, "");
    78     psMetadataAddStr(metadata, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, pslib, "");
    79     psMetadataAddStr(metadata, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, psmodules, "");
    80     psMetadataAddStr(metadata, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, ppStats, "");
    81     psMetadataAddStr(metadata, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, ppArith, "");
    82 
    83     psFree(head);
    84110    psFree(pslib);
    85111    psFree(psmodules);

  • trunk/ppImage/src/ppImage.c

    r19928 r23195  
    2121        exit(PS_EXIT_CONFIG_ERROR);
    2222    }
     23
     24    ppImageVersionPrint();
    2325
    2426    // define recipe options

  • trunk/ppImage/src/ppImage.h

    r23164 r23195  
    218218    );
    219219
     220/// Print version information
     221void ppImageVersionPrint(void);
     222
    220223
    221224// calculate stats, including MD5

  • trunk/ppImage/src/ppImageVersion.c

    r23165 r23195  
    7474    return true;
    7575}
     76
     77
     78void ppImageVersionPrint(void)
     79{
     80    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     81    psString timeString = psTimeToISO(time); // The time in an ISO string
     82    psFree(time);
     83    psLogMsg("ppImage", PS_LOG_INFO, "ppImage at %s", timeString);
     84    psFree(timeString);
     85
     86    psString pslib = psLibVersionLong();// psLib version
     87    psString psmodules = psModulesVersionLong(); // psModules version
     88    psString psphot = psphotVersionLong(); // psphot version
     89    psString psastro = psastroVersionLong(); // psastro version
     90    psString ppStats = ppStatsVersionLong(); // ppStats version
     91    psString ppImage = ppImageVersionLong(); // ppImage version
     92
     93    psLogMsg("ppImage", PS_LOG_INFO, "%s", pslib);
     94    psLogMsg("ppImage", PS_LOG_INFO, "%s", psmodules);
     95    psLogMsg("ppImage", PS_LOG_INFO, "%s", psphot);
     96    psLogMsg("ppImage", PS_LOG_INFO, "%s", psastro);
     97    psLogMsg("ppImage", PS_LOG_INFO, "%s", ppStats);
     98    psLogMsg("ppImage", PS_LOG_INFO, "%s", ppImage);
     99
     100    psFree(pslib);
     101    psFree(psmodules);
     102    psFree(psphot);
     103    psFree(psastro);
     104    psFree(ppStats);
     105    psFree(ppImage);
     106
     107    return;
     108}

  • trunk/ppMerge/src/ppMerge.c

    r21244 r23195  
    3838        goto die;
    3939    }
     40
     41    ppMergeVersionPrint();
    4042
    4143    ppMergeType type = psMetadataLookupS32(NULL, config->arguments, "TYPE"); ///< Type of frame

  • trunk/ppMerge/src/ppMerge.h

    r23166 r23195  
    181181    );
    182182
     183/// Print version information
     184void ppMergeVersionPrint(void);
     185
     186
    183187///@}
    184188#endif

  • trunk/ppMerge/src/ppMergeVersion.c

    r23166 r23195  
    9090}
    9191
     92void ppMergeVersionPrint(void)
     93{
     94    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     95    psString timeString = psTimeToISO(time); // The time in an ISO string
     96    psFree(time);
     97    psLogMsg("ppMerge", PS_LOG_INFO, "ppMerge at %s", timeString);
     98    psFree(timeString);
     99
     100    psString pslib = psLibVersionLong();// psLib version
     101    psString psmodules = psModulesVersionLong(); // psModules version
     102    psString ppStats = ppStatsVersionLong(); // ppStats version
     103    psString ppMerge = ppMergeVersionLong(); // ppMerge version
     104
     105    psLogMsg("ppImage", PS_LOG_INFO, "%s", pslib);
     106    psLogMsg("ppImage", PS_LOG_INFO, "%s", psmodules);
     107    psLogMsg("ppImage", PS_LOG_INFO, "%s", ppStats);
     108    psLogMsg("ppImage", PS_LOG_INFO, "%s", ppMerge);
     109
     110    psFree(pslib);
     111    psFree(psmodules);
     112    psFree(ppStats);
     113    psFree(ppMerge);
     114
     115    return;
     116}

  • trunk/ppStack/src/ppStack.c

    r21258 r23195  
    3333        goto die;
    3434    }
     35
     36    ppStackVersionPrint();
    3537
    3638    if (!pmModelClassInit()) {

  • trunk/ppStack/src/ppStack.h

    r23192 r23195  
    146146    );
    147147
     148/// Print version information
     149void ppStackVersionPrint(void);
     150
    148151/// Convolve image to match specified seeing
    149152bool ppStackMatch(pmReadout *readout,   // Readout to be convolved; replaced with output

  • trunk/ppStack/src/ppStackVersion.c

    r23172 r23195  
    8080    return true;
    8181}
     82
     83void ppStackVersionPrint(void)
     84{
     85    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     86    psString timeString = psTimeToISO(time); // The time in an ISO string
     87    psFree(time);
     88    psLogMsg("ppStack", PS_LOG_INFO, "ppStack at %s", timeString);
     89    psFree(timeString);
     90
     91    psString pslib = psLibVersionLong();// psLib version
     92    psString psmodules = psModulesVersionLong(); // psModules version
     93    psString psphot = psphotVersionLong(); // psphot version
     94    psString ppStats = ppStatsVersionLong(); // psastro version
     95    psString ppStack = ppStackVersionLong(); // ppStack version
     96
     97    psLogMsg("ppStack", PS_LOG_INFO, "%s", pslib);
     98    psLogMsg("ppStack", PS_LOG_INFO, "%s", psmodules);
     99    psLogMsg("ppStack", PS_LOG_INFO, "%s", psphot);
     100    psLogMsg("ppStack", PS_LOG_INFO, "%s", ppStats);
     101    psLogMsg("ppStack", PS_LOG_INFO, "%s", ppStack);
     102
     103    psFree(pslib);
     104    psFree(psmodules);
     105    psFree(psphot);
     106    psFree(ppStats);
     107    psFree(ppStack);
     108
     109    return;
     110}

  • trunk/ppSub/src/ppSub.c

    r21524 r23195  
    3434        goto die;
    3535    }
     36
     37    ppSubVersionPrint();
    3638
    3739    if (!pmModelClassInit()) {

  • trunk/ppSub/src/ppSub.h

    r23173 r23195  
    9393    );
    9494
     95/// Print version information
     96void ppSubVersionPrint(void);
     97
    9598
    9699// Copy every instance of a single keyword from one metadata to another

  • trunk/ppSub/src/ppSubVersion.c

    r23173 r23195  
    9292    return true;
    9393}
     94
     95void ppSubVersionPrint(void)
     96{
     97    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     98    psString timeString = psTimeToISO(time); // The time in an ISO string
     99    psFree(time);
     100    psLogMsg("ppSub", PS_LOG_INFO, "ppSub at %s", timeString);
     101    psFree(timeString);
     102
     103    psString pslib = psLibVersionLong();// psLib version
     104    psString psmodules = psModulesVersionLong(); // psModules version
     105    psString psphot = psphotVersionLong(); // psphot version
     106    psString ppStats = ppStatsVersionLong(); // ppStats version
     107    psString ppSub = ppSubVersionLong(); // ppSub version
     108
     109    psLogMsg("ppSub", PS_LOG_INFO, "%s", pslib);
     110    psLogMsg("ppSub", PS_LOG_INFO, "%s", psmodules);
     111    psLogMsg("ppSub", PS_LOG_INFO, "%s", psphot);
     112    psLogMsg("ppSub", PS_LOG_INFO, "%s", ppStats);
     113    psLogMsg("ppSub", PS_LOG_INFO, "%s", ppSub);
     114
     115    psFree(pslib);
     116    psFree(psmodules);
     117    psFree(psphot);
     118    psFree(ppStats);
     119    psFree(ppSub);
     120
     121    return;
     122}

  • trunk/psastro/src/Makefile.am

    r23120 r23195  
    1010FORCE: ;
    1111
    12 libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=\"$(PSASTRO_VERSION)\" -DPSASTRO_BRANCH=\"$(PSASTRO_BRANCH)\" -DPSASTRO_SOURCE=\"$(PSASTRO_SOURCE)\"
    13 libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
     12libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=\"$(PSASTRO_VERSION)\" -DPSASTRO_BRANCH=\"$(PSASTRO_BRANCH)\" -DPSASTRO_SOURCE=\"$(PSASTRO_SOURCE)\"
     13libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
    1414
    1515bin_PROGRAMS = psastro psastroModel psastroModelFit gpcModel

  • trunk/psastro/src/psastro.c

    r21409 r23195  
    3434    if (!config) usage ();
    3535
     36    psastroVersionPrint();
     37
    3638    // load identify the data sources
    3739    if (!psastroParseCamera (config)) {
    38         psErrorStackPrint(stderr, "error setting up the camera\n");
    39         exit (1);
     40        psErrorStackPrint(stderr, "error setting up the camera\n");
     41        exit (1);
    4042    }
    4143
    … …  
    4345    // select subset of stars for astrometry
    4446    if (!psastroDataLoad (config)) {
    45         psErrorStackPrint(stderr, "error loading input data\n");
    46         exit (1);
     47        psErrorStackPrint(stderr, "error loading input data\n");
     48        exit (1);
    4749    }
    4850
    4951    // run the full astrometry analysis (chip and/or mosaic)
    5052    if (!psastroAnalysis (config)) {
    51         psErrorStackPrint(stderr, "failure in psastro analysis\n");
    52         exit (1);
     53        psErrorStackPrint(stderr, "failure in psastro analysis\n");
     54        exit (1);
    5355    }
    54    
     56
    5557    // write out the results
    5658    if (!psastroDataSave (config)) {
    57         psErrorStackPrint(stderr, "failed to write out data\n");
    58         exit (1);
     59        psErrorStackPrint(stderr, "failed to write out data\n");
     60        exit (1);
    5961    }
    6062

  • trunk/psastro/src/psastro.h

    r23169 r23195  
    9999bool              psastroVersionHeader(psMetadata *header);
    100100bool              psastroVersionHeaderFull(psMetadata *header);
     101void              psastroVersionPrint(void);
    101102
    102103// demo plots

  • trunk/psastro/src/psastroVersion.c

    r23169 r23195  
    8080    psLibVersionHeader(header);
    8181    psModulesVersionHeader(header);
     82    ppStatsVersionHeader(header);
    8283    psastroVersionHeader(header);
    8384
    8485    return true;
    8586}
     87
     88void psastroVersionPrint(void)
     89{
     90    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     91    psString timeString = psTimeToISO(time); // The time in an ISO string
     92    psFree(time);
     93    psLogMsg("psastro", PS_LOG_INFO, "psastro at %s", timeString);
     94    psFree(timeString);
     95
     96    psString pslib = psLibVersionLong();// psLib version
     97    psString psmodules = psModulesVersionLong(); // psModules version
     98    psString ppStats = ppStatsVersionLong(); // ppStats version
     99    psString psastro = psastroVersionLong(); // psastro version
     100
     101    psLogMsg("psastro", PS_LOG_INFO, "%s", pslib);
     102    psLogMsg("psastro", PS_LOG_INFO, "%s", psmodules);
     103    psLogMsg("psastro", PS_LOG_INFO, "%s", ppStats);
     104    psLogMsg("psastro", PS_LOG_INFO, "%s", psastro);
     105
     106    psFree(pslib);
     107    psFree(psmodules);
     108    psFree(ppStats);
     109    psFree(psastro);
     110
     111    return;
     112}

  • trunk/psphot/src/psphot.c

    r20411 r23195  
    99
    1010    psTimerStart ("complete");
    11     pmErrorRegister();                  // register psModule's error codes/messages
     11    pmErrorRegister();                  // register psModule's error codes/messages
    1212    psphotInit();
    1313
    … …  
    1515    pmConfig *config = psphotArguments (argc, argv);
    1616    if (!config) {
    17         psErrorStackPrint(stderr, "Error reading arguments\n");
    18         usage ();
     17        psErrorStackPrint(stderr, "Error reading arguments\n");
     18        usage ();
    1919    }
     20
     21    psphotVersionPrint();
    2022
    2123    // load input data (config and images (signal, noise, mask)

  • trunk/psphot/src/psphot.h

    r23167 r23195  
    2020bool            psphotVersionHeader(psMetadata *header);
    2121bool            psphotVersionHeaderFull(psMetadata *header);
     22void            psphotVersionPrint(void);
    2223
    2324bool            psphotModelTest (pmConfig *config, const pmFPAview *view, psMetadata *recipe);

  • trunk/psphot/src/psphotVersion.c

    r23168 r23195  
    9696    return true;
    9797}
     98
     99
     100void psphotVersionPrint(void)
     101{
     102    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     103    psString timeString = psTimeToISO(time); // The time in an ISO string
     104    psFree(time);
     105    psLogMsg("psphot", PS_LOG_INFO, "psphot at %s", timeString);
     106    psFree(timeString);
     107
     108    psString pslib = psLibVersionLong();// psLib version
     109    psString psmodules = psModulesVersionLong(); // psModules version
     110    psString psphot = psphotVersionLong(); // psphot version
     111
     112    psLogMsg("psphot", PS_LOG_INFO, "%s", pslib);
     113    psLogMsg("psphot", PS_LOG_INFO, "%s", psmodules);
     114    psLogMsg("psphot", PS_LOG_INFO, "%s", psphot);
     115
     116    psFree(pslib);
     117    psFree(psmodules);
     118    psFree(psphot);
     119
     120    return;
     121}

  • trunk/pswarp/src/pswarp.c

    r21442 r23195  
    3939    if (!config) usage();
    4040
     41    pswarpVersionPrint();
     42
    4143    // load identify the data sources
    4244    if (!pswarpParseCamera(config)) {

  • trunk/pswarp/src/pswarp.h

    r23170 r23195  
    126126    psMetadata *header                  ///< Header to populate
    127127    );
     128
     129/// Print version information
     130void pswarpVersionPrint(void);

  • trunk/pswarp/src/pswarpVersion.c

    r23170 r23195  
    9292    return true;
    9393}
     94
     95void pswarpVersionPrint(void)
     96{
     97    psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     98    psString timeString = psTimeToISO(time); // The time in an ISO string
     99    psFree(time);
     100    psLogMsg("pswarp", PS_LOG_INFO, "pswarp at %s", timeString);
     101    psFree(timeString);
     102
     103    psString pslib = psLibVersionLong();// psLib version
     104    psString psmodules = psModulesVersionLong(); // psModules version
     105    psString psphot = psphotVersionLong(); // psphot version
     106    psString ppStats = ppStatsVersionLong(); // ppStats version
     107    psString pswarp = pswarpVersionLong(); // pswarp version
     108
     109    psLogMsg("pswarp", PS_LOG_INFO, "%s", pslib);
     110    psLogMsg("pswarp", PS_LOG_INFO, "%s", psmodules);
     111    psLogMsg("pswarp", PS_LOG_INFO, "%s", psphot);
     112    psLogMsg("pswarp", PS_LOG_INFO, "%s", ppStats);
     113    psLogMsg("pswarp", PS_LOG_INFO, "%s", pswarp);
     114
     115    psFree(pslib);
     116    psFree(psmodules);
     117    psFree(psphot);
     118    psFree(ppStats);
     119    psFree(pswarp);
     120
     121    return;
     122}
Note: See TracChangeset for help on using the changeset viewer.