IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 10, 2008, 11:15:56 AM (18 years ago)
Author:
Paul Price
Message:

Clobber output stats file.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ppStats/src/ppStats.c

    r18061 r18072  
    2727    if (argc == 2) {
    2828        outName = argv[1];
    29         psString resolved = pmConfigConvertFilename(outName, config, true, false); // Resolved filename
     29        psString resolved = pmConfigConvertFilename(outName, config, true, true); // Resolved filename
    3030
    3131        if (resolved && strlen(resolved) > 0) {
     
    5454    // report on the file disposition
    5555    if (data->fileLevel) {
    56         pmFPALevel level = pmFPAPHULevel(config->format);
     56        pmFPALevel level = pmFPAPHULevel(config->format);
    5757
    5858        const char *levelName = pmFPALevelToName(level); // Level for file
    5959        psMetadataAddStr(results, PS_LIST_HEAD, "FILE.LEVEL", 0, "File level", levelName);
    6060
    61         char *classID = NULL;
    62         switch (level) {
    63           case PM_FPA_LEVEL_FPA:
    64             assert (data->fpa != NULL);
    65             assert (data->fileView->chip == -1);
    66             classID = pmFPANameFromRule ("{FPA.NAME}", data->fpa, data->fileView);
    67             break;
    68           case PM_FPA_LEVEL_CHIP:
    69             assert (data->fpa != NULL);
    70             assert (data->fileView->chip != -1);
    71             assert (data->fileView->cell == -1);
    72             classID = pmFPANameFromRule ("{CHIP.NAME}", data->fpa, data->fileView);
    73             break;
    74           case PM_FPA_LEVEL_CELL:
    75             assert (data->fpa != NULL);
    76             assert (data->fileView->chip != -1);
    77             assert (data->fileView->cell != -1);
    78             classID = pmFPANameFromRule ("{CELL.NAME}", data->fpa, data->fileView);
    79             break;
    80           default:
    81             psErrorStackPrint(stderr, "Error in file level.\n");
    82             exit (PS_EXIT_CONFIG_ERROR);
    83         }
     61        char *classID = NULL;
     62        switch (level) {
     63          case PM_FPA_LEVEL_FPA:
     64            assert (data->fpa != NULL);
     65            assert (data->fileView->chip == -1);
     66            classID = pmFPANameFromRule ("{FPA.NAME}", data->fpa, data->fileView);
     67            break;
     68          case PM_FPA_LEVEL_CHIP:
     69            assert (data->fpa != NULL);
     70            assert (data->fileView->chip != -1);
     71            assert (data->fileView->cell == -1);
     72            classID = pmFPANameFromRule ("{CHIP.NAME}", data->fpa, data->fileView);
     73            break;
     74          case PM_FPA_LEVEL_CELL:
     75            assert (data->fpa != NULL);
     76            assert (data->fileView->chip != -1);
     77            assert (data->fileView->cell != -1);
     78            classID = pmFPANameFromRule ("{CELL.NAME}", data->fpa, data->fileView);
     79            break;
     80          default:
     81            psErrorStackPrint(stderr, "Error in file level.\n");
     82            exit (PS_EXIT_CONFIG_ERROR);
     83        }
    8484        psMetadataAddStr(results, PS_LIST_HEAD, "CLASS.ID", 0, "name for element at file level", classID);
    85         psFree (classID);
     85        psFree (classID);
    8686    }
    8787
Note: See TracChangeset for help on using the changeset viewer.