IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 6, 2012, 6:32:19 PM (14 years ago)
Author:
watersc1
Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:
branches/czw_branch/20120906/psModules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20120906/psModules

  • branches/czw_branch/20120906/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        77pmSourceIO_CMF_PS1_V1.c
        88pmSourceIO_CMF_PS1_V2.c
         9pmSourceIO_CMF_PS1_V2.v1.c
        910pmSourceIO_CMF_PS1_V3.c
         11pmSourceIO_CMF_PS1_V3.v1.c
         12pmSourceIO_CMF_PS1_V1.v1.c
        1013pmSourceIO_CMF_PS1_V4.c
        1114pmSourceIO_CMF_PS1_SV1.c
         15pmSourceIO_CMF_PS1_SV2.c
        1216pmSourceIO_CMF_PS1_DV1.c
        1317pmSourceIO_CMF_PS1_DV2.c
         18pmSourceIO_CMF_PS1_DV3.c
         19

  • branches/czw_branch/20120906/psModules/src/objects/pmSourceIO.c

    r34403 r34772  
    10281028        if (strcmp (xtension, "BINTABLE")) {
    10291029            psWarning ("no binary table in extension %s, skipping\n", dataname);
     1030            psFree(tableHeader);
    10301031            return false;
    10311032        }
    … …  
    12321233{
    12331234    if (!psFitsMoveExtNameClean (file->fits, xsrcname)) {
    1234         psWarning ("cannot find xsrc extension %s in %s, skipping", xsrcname, file->filename);
     1235        psTrace ("pmFPAfile", 1, "cannot find xsrc extension %s in %s, skipping", xsrcname, file->filename);
    12351236        return false;
    12361237    }
    … …  
    12421243    if (!xtension) psAbort("cannot read table type");
    12431244    if (strcmp (xtension, "BINTABLE")) {
     1245        psFree(tableHeader);
    12441246        psWarning ("no binary table in extension %s, skipping\n", xsrcname);
    12451247        return false;
    … …  
    12701272{
    12711273    if (!psFitsMoveExtNameClean (file->fits, extname)) {
    1272         psWarning ("cannot find xfit extension %s in %s, skipping", extname, file->filename);
     1274        psTrace ("pmFPAfile", 1, "cannot find xfit extension %s in %s, skipping", extname, file->filename);
    12731275        return false;
    12741276    }
    … …  
    12811283    if (strcmp (xtension, "BINTABLE")) {
    12821284        psWarning ("no binary table in extension %s, skipping\n", extname);
     1285        psFree(tableHeader);
    12831286        return false;
    12841287    }
    … …  
    13071310{
    13081311    if (!psFitsMoveExtNameClean (file->fits, extname)) {
    1309         psWarning ("cannot find xrad extension %s in %s, skipping", extname, file->filename);
     1312        psTrace ("pmFPAfile", 1, "cannot find xrad extension %s in %s, skipping", extname, file->filename);
    13101313        return false;
    13111314    }
    … …  
    13181321    if (strcmp (xtension, "BINTABLE")) {
    13191322        psWarning ("no binary table in extension %s, skipping\n", extname);
     1323        psFree(tableHeader);
    13201324        return false;
    13211325    }
Note: See TracChangeset for help on using the changeset viewer.