IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36916


Ignore:
Timestamp:
Jun 19, 2014, 4:14:54 PM (12 years ago)
Author:
eugene
Message:

merge from trunk; add -photcode-rule option to pmConfig

Location:
branches/eam_branches/ipp-20140610/psModules
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/psModules

  • branches/eam_branches/ipp-20140610/psModules/src/config/pmConfig.c

    r36375 r36916  
    964964            psMetadataAddMetadata(filerules, PS_LIST_TAIL, rulename, PS_META_REPLACE,
    965965                                  "Original replaced by -R option", newRule);
     966        }
     967        psFree(camerasIter);
     968    }
     969
     970    // Look for command-line options for files to replace
     971    while ((argNum = psArgumentGet(*argc, argv, "-photcode-rule")) > 0) {
     972        psArgumentRemove(argNum, argc, argv);
     973        if (argNum >= *argc) {
     974            psError(PM_ERR_CONFIG, true,
     975                    "-photcode-rule provided without new rule.");
     976            psFree(config);
     977            return NULL;
     978        }
     979
     980        psString newrule = psStringCopy(argv[argNum]); // The filerule, to be modified
     981        psArgumentRemove(argNum, argc, argv);
     982
     983        psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // List of cameras
     984        if (!cameras) {
     985            psError(PM_ERR_CONFIG, false, "Unable to find CAMERAS in the site configuration.\n");
     986            return false;
     987        }
     988
     989        psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator
     990        psMetadataItem *cameraItem;     // Item from iteration
     991        while ((cameraItem = psMetadataGetAndIncrement(camerasIter))) {
     992            // Silently ignore problems --- they will be caught later, because if the user wants the nominated
     993            // file and it's not available for that camera, then they will know.
     994
     995            if (cameraItem->type != PS_DATA_METADATA) {
     996                psTrace("psModules.config", 2,
     997                        "Entry %s in CAMERAS is not of type METADATA --- ignored.", cameraItem->name);
     998                continue;
     999            }
     1000            psMetadata *camera = cameraItem->data.md; // Camera configuration
     1001
     1002            psMetadataAddStr (camera, PS_LIST_TAIL, "PHOTCODE.RULE", PS_META_REPLACE, "original replaced by -photcode-rule option", newrule);
    9661003        }
    9671004        psFree(camerasIter);

  • branches/eam_branches/ipp-20140610/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1515pmSourceIO_CMF_PS1_SV1.c
        1616pmSourceIO_CMF_PS1_SV2.c
         17pmSourceIO_CMF_PS1_SV3.c
        1718pmSourceIO_CMF_PS1_DV1.c
        1819pmSourceIO_CMF_PS1_DV2.c
        1920pmSourceIO_CMF_PS1_DV3.c
        20 
         21pmSourceIO_CMF_PS1_DV4.c

  • branches/eam_branches/ipp-20140610/psModules/src/objects/Makefile.am

    r36623 r36916  
    5252        pmSourceIO_CMF_PS1_SV1.c \
    5353        pmSourceIO_CMF_PS1_SV2.c \
     54        pmSourceIO_CMF_PS1_SV3.c \
    5455        pmSourceIO_CMF_PS1_DV1.c \
    5556        pmSourceIO_CMF_PS1_DV2.c \
    5657        pmSourceIO_CMF_PS1_DV3.c \
     58        pmSourceIO_CMF_PS1_DV4.c \
    5759        pmSourceIO_MatchedRefs.c \
    5860        pmSourcePlots.c \
    … …  
    152154pmSourceIO_CMF_PS1_DV2.c \
    153155pmSourceIO_CMF_PS1_DV3.c \
     156pmSourceIO_CMF_PS1_DV4.c \
    154157pmSourceIO_CMF_PS1_SV1.c \
    155 pmSourceIO_CMF_PS1_SV2.c
     158pmSourceIO_CMF_PS1_SV2.c \
     159pmSourceIO_CMF_PS1_SV3.c
    156160
    157161pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
    … …  
    179183        mksource.pl pmSourceIO_CMF.c.in PS1_DV3 pmSourceIO_CMF_PS1_DV3.c
    180184
     185pmSourceIO_CMF_PS1_DV4.c : pmSourceIO_CMF.c.in mksource.pl
     186        mksource.pl pmSourceIO_CMF.c.in PS1_DV4 pmSourceIO_CMF_PS1_DV4.c
     187
    181188pmSourceIO_CMF_PS1_SV1.c : pmSourceIO_CMF.c.in mksource.pl
    182189        mksource.pl pmSourceIO_CMF.c.in PS1_SV1 pmSourceIO_CMF_PS1_SV1.c
    … …  
    185192        mksource.pl pmSourceIO_CMF.c.in PS1_SV2 pmSourceIO_CMF_PS1_SV2.c
    186193
     194pmSourceIO_CMF_PS1_SV3.c : pmSourceIO_CMF.c.in mksource.pl
     195        mksource.pl pmSourceIO_CMF.c.in PS1_SV3 pmSourceIO_CMF_PS1_SV3.c
     196
    187197# EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

  • branches/eam_branches/ipp-20140610/psModules/src/objects/pmPSF_IO.c

    r36884 r36916  
    511511        psMetadataAddF32 (header, PS_LIST_TAIL, "SKY_BIAS", PS_DATA_F32, "sky bias level", psf->skyBias);
    512512
    513         float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
    514         if (status) {
     513        if (roAnalysis) {
     514          float PSF_APERTURE =  psMetadataLookupF32(&status, roAnalysis, "PSF_APERTURE");
     515          if (status) {
    515516            psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_APERTURE", PS_DATA_F32, "aperture for psf objects", PSF_APERTURE);
    516         }
    517         float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
    518         if (status) {
     517          }
     518          float PSF_FIT_RADIUS =  psMetadataLookupF32(&status, roAnalysis, "PSF_FIT_RADIUS");
     519          if (status) {
    519520            psMetadataAddF32 (header, PS_LIST_TAIL, "PSF_FIT_RADIUS", PS_DATA_F32, "aperture for psf objects", PSF_FIT_RADIUS);
     521          }
    520522        }
    521523

  • branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO.c

    r36884 r36916  
    365365# define PM_SOURCES_WRITE(NAME,TYPE)                                    \
    366366    if (!strcmp (exttype, NAME)) {                                      \
    367         status &= pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
     367        status = pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
    368368        if (xsrcname) {                                                 \
    369369            status &= pmSourcesWrite_##TYPE##_XSRC(file->fits, readout, sources, file->header, xsrcname, recipe); \
    … …  
    589589
    590590            // these are case-sensitive since the EXTYPE is case-sensitive
    591             status = true;
     591            status = false;
    592592            PM_SOURCES_WRITE("SMPDATA",   SMPDATA);
    593593            PM_SOURCES_WRITE("PS1_DEV_0", PS1_DEV_0);
    … …  
    601601            PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
    602602            PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
     603            PM_SOURCES_WRITE("PS1_SV3",   CMF_PS1_SV3);
    603604            PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
    604605            PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
    605606            PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
     607            PM_SOURCES_WRITE("PS1_DV4",   CMF_PS1_DV4);
    606608
    607609            psFree (outhead);
    … …  
    11211123            PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
    11221124            PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
     1125            PM_SOURCES_READ_PSF("PS1_SV3",   CMF_PS1_SV3);
    11231126            PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
    11241127            PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
    11251128            PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
     1129            PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
    11261130
    11271131            long *sourceIndex = NULL;

  • branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO.h

    r36757 r36916  
    4040MK_PROTO(CMF_PS1_SV1);
    4141MK_PROTO(CMF_PS1_SV2);
     42MK_PROTO(CMF_PS1_SV3);
    4243MK_PROTO(CMF_PS1_DV1);
    4344MK_PROTO(CMF_PS1_DV2);
    4445MK_PROTO(CMF_PS1_DV3);
     46MK_PROTO(CMF_PS1_DV4);
    4547
    4648int pmSourceGetDophotType (pmSource *source);

  • branches/eam_branches/ipp-20140610/psModules/src/objects/pmSourceIO_CMF.c.in

    r36884 r36916  
    358358        @ALL@     axes.theta        = axes.theta * PS_RAD_DEG;
    359359       
    360         @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n >= PM_PAR_7) {
     360        @>PS1_V4,>PS1_SV2,>PS1_DV3@ if (model->params->n > PM_PAR_7) {
    361361        @>PS1_V4,>PS1_SV2,>PS1_DV3@     PAR[PM_PAR_7] = psMetadataLookupF32 (&status, row, "PSF_CORE");
    362362        @>PS1_V4,>PS1_SV2,>PS1_DV3@ }
Note: See TracChangeset for help on using the changeset viewer.