IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38055


Ignore:
Timestamp:
Mar 29, 2015, 5:47:25 AM (11 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20150112/psastro/src
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150112/psastro/src

    • Property svn:ignore

      •  

        old new  
        1818psastroExtract
        1919psastroVersionDefinitions.h
         20psastroVersionDefinitions.h.tmp

  • branches/eam_branches/ipp-20150112/psastro/src/Makefile.am

    r26173 r38055  
    11lib_LTLIBRARIES = libpsastro.la
    2 
    3 if HAVE_SVNVERSION
    4 PSASTRO_VERSION=`$(SVNVERSION) ..`
    5 else
    6 PSASTRO_VERSION="UNKNOWN"
    7 endif
    8 
    9 if HAVE_SVN
    10 PSASTRO_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
    11 PSASTRO_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
    12 else
    13 PSASTRO_BRANCH="UNKNOWN"
    14 PSASTRO_SOURCE="UNKNOWN"
    15 endif
    162
    173# Force recompilation of psastroVersion.c, since it gets the version information
    184psastroVersion.c: psastroVersionDefinitions.h
    195psastroVersionDefinitions.h: psastroVersionDefinitions.h.in FORCE
    20         -$(RM) psastroVersionDefinitions.h
    21         $(SED) -e "s|@PSASTRO_VERSION@|\"$(PSASTRO_VERSION)\"|" -e "s|@PSASTRO_BRANCH@|\"$(PSASTRO_BRANCH)\"|" -e "s|@PSASTRO_SOURCE@|\"$(PSASTRO_SOURCE)\"|" psastroVersionDefinitions.h.in > psastroVersionDefinitions.h
     6        pslib-setsvnversion.pl PSASTRO psastroVersionDefinitions.h.in psastroVersionDefinitions.h
    227FORCE: ;
    238
    … …  
    8772
    8873libpsastro_la_SOURCES = \
     74        psastroGalaxyShapeErrors.c  \
    8975        psastroMaskUpdates.c        \
    9076        psastroMaskUtils.c          \

  • branches/eam_branches/ipp-20150112/psastro/src/psastro.h

    r37552 r38055  
    197197bool              psastroExtractFreeChipBounds(void);
    198198
     199bool              psastroGalaxyShapeErrors (psMetadata *recipe, pmReadout *readout);
     200
    199201///@}
    200202# endif /* PSASTRO_H */

  • branches/eam_branches/ipp-20150112/psastro/src/psastroConvert.c

    r36868 r38055  
    335335  pmChip *chip = readout->parent->parent;
    336336  char *chipName = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
     337
     338  // skip stacks
     339  if (!strcmp(chipName, "SkyChip")) {
     340    psLogMsg ("psastro.correctKH", PS_LOG_DETAIL, "skipping KH correction: not a gpc1 chip\n");
     341    return true;
     342  }
     343
     344  // only try to address gpc1 chips (should probably check the camera)
     345  if (strncmp(chipName, "XY", 2)) {
     346    psLogMsg ("psastro.correctKH", PS_LOG_DETAIL, "skipping KH correction: not a gpc1 chip\n");
     347    return true;
     348  }
    337349
    338350  psAssert (strlen(chipName) == 4, "error in chip name");

  • branches/eam_branches/ipp-20150112/psastro/src/psastroDataSave.c

    r36441 r38055  
    6969                if (!readout->data_exists) { continue; }
    7070
     71                psastroGalaxyShapeErrors (recipe, readout);
     72
    7173                // Put version information into the header
    7274                pmHDU *hdu = pmHDUGetHighest(output->fpa, chip, cell);
Note: See TracChangeset for help on using the changeset viewer.