IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37451


Ignore:
Timestamp:
Oct 2, 2014, 11:02:07 AM (12 years ago)
Author:
eugene
Message:

add PS1_SIM output format

Location:
branches/eam_branches/ipp-20140904/Ohana/src
Files:
8 added
8 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140904/Ohana/src/libautocode/Makefile.Targets

    r37390 r37451  
    1414$(ASRC)/average-ps1-v4.$(ARCH).o \
    1515$(ASRC)/average-ps1-v5.$(ARCH).o \
     16$(ASRC)/average-ps1-sim.$(ARCH).o \
    1617$(ASRC)/average-ps1-ref.$(ARCH).o \
    1718$(ASRC)/secfilt.$(ARCH).o \
    … …  
    2728$(ASRC)/secfilt-ps1-v4.$(ARCH).o \
    2829$(ASRC)/secfilt-ps1-v5.$(ARCH).o \
     30$(ASRC)/secfilt-ps1-sim.$(ARCH).o \
    2931$(ASRC)/secfilt-ps1-ref.$(ARCH).o \
    3032$(ASRC)/measure.$(ARCH).o \
    … …  
    4042$(ASRC)/measure-ps1-v4.$(ARCH).o \
    4143$(ASRC)/measure-ps1-v5.$(ARCH).o \
     44$(ASRC)/measure-ps1-sim.$(ARCH).o \
    4245$(ASRC)/measure-ps1-ref.$(ARCH).o \
    4346$(ASRC)/lensing.$(ARCH).o \
    … …  
    4750$(ASRC)/starpar.$(ARCH).o \
    4851$(ASRC)/starpar-ps1-v5.$(ARCH).o \
     52$(ASRC)/starpar-ps1-sim.$(ARCH).o \
    4953$(ASRC)/missing.$(ARCH).o \
    5054$(ASRC)/photcode.$(ARCH).o \
    … …  
    7175$(ASRC)/image-ps1-v4.$(ARCH).o \
    7276$(ASRC)/image-ps1-v5.$(ARCH).o \
     77$(ASRC)/image-ps1-sim.$(ARCH).o \
    7378$(ASRC)/image-ps1-ref.$(ARCH).o \
    7479$(ASRC)/regimage.$(ARCH).o \
    … …  
    114119$(AINC)/average-ps1-v4.h \
    115120$(AINC)/average-ps1-v5.h \
     121$(AINC)/average-ps1-sim.h \
    116122$(AINC)/average-ps1-ref.h \
    117123$(AINC)/secfilt.h \
    … …  
    127133$(AINC)/secfilt-ps1-v4.h \
    128134$(AINC)/secfilt-ps1-v5.h \
     135$(AINC)/secfilt-ps1-sim.h \
    129136$(AINC)/secfilt-ps1-ref.h \
    130137$(AINC)/measure.h \
    … …  
    140147$(AINC)/measure-ps1-v4.h \
    141148$(AINC)/measure-ps1-v5.h \
     149$(AINC)/measure-ps1-sim.h \
    142150$(AINC)/measure-ps1-ref.h \
    143151$(AINC)/lensing.h \
    … …  
    147155$(AINC)/starpar.h \
    148156$(AINC)/starpar-ps1-v5.h \
     157$(AINC)/starpar-ps1-sim.h \
    149158$(AINC)/missing.h \
    150159$(AINC)/photcode.h \
    … …  
    171180$(AINC)/image-ps1-v4.h \
    172181$(AINC)/image-ps1-v5.h \
     182$(AINC)/image-ps1-sim.h \
    173183$(AINC)/image-ps1-ref.h \
    174184$(AINC)/regimage.h \

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/Makefile

    r37445 r37451  
    3838$(DESTINC)/ps1_v5_defs.h \
    3939$(DESTINC)/ps1_ref_defs.h \
     40$(DESTINC)/ps1_sim_defs.h \
    4041$(DESTINC)/cmf-ps1-dv3.h \
    4142$(DESTINC)/cmf-ps1-v5.h \
    … …  
    8283$(SRC)/dvo_convert_PS1_V5.$(ARCH).o \
    8384$(SRC)/dvo_convert_PS1_REF.$(ARCH).o \
     85$(SRC)/dvo_convert_PS1_SIM.$(ARCH).o \
    8486$(SRC)/flatcorr_io.$(ARCH).o    \
    8587$(SRC)/skyregion_io.$(ARCH).o    \

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvo.h

    r37435 r37451  
    2424  DVO_FORMAT_PS1_DEV_3,
    2525  DVO_FORMAT_PS1_REF,
     26  DVO_FORMAT_PS1_SIM,
    2627  DVO_FORMAT_PS1_V1,
    2728  DVO_FORMAT_PS1_V2,
    … …  
    898899# include "ps1_v5_defs.h"
    899900# include "ps1_ref_defs.h"
     901# include "ps1_sim_defs.h"
    900902
    901903/*** DVO image db I/O Functions ***/

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_catalog.c

    r37402 r37451  
    5858  if (!strcasecmp (catformat, "PS1_V5"))          return (DVO_FORMAT_PS1_V5);
    5959  if (!strcasecmp (catformat, "PS1_REF"))         return (DVO_FORMAT_PS1_REF);
     60  if (!strcasecmp (catformat, "PS1_SIM"))         return (DVO_FORMAT_PS1_SIM);
    6061  return (DVO_FORMAT_UNDEF);
    6162}

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r37035 r37451  
    9292      FORMAT_CASE (PS1_V5,    PS1_V5);
    9393      FORMAT_CASE (PS1_REF,   PS1_REF);
     94      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    9495
    9596    default:
    … …  
    287288  if (catalog[0].catformat == DVO_FORMAT_PS1_V5)          gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5");
    288289  if (catalog[0].catformat == DVO_FORMAT_PS1_REF)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF");
     290  if (catalog[0].catformat == DVO_FORMAT_PS1_SIM)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_SIM");
    289291
    290292  /* rewind file pointers and truncate file */
    … …  
    391393      FORMAT_CASE (PS1_V5,    PS1_V5);
    392394      FORMAT_CASE (PS1_REF,   PS1_REF);
     395      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    393396
    394397    default:
    … …  
    443446      FORMAT_CASE (PS1_V5,    PS1_V5);
    444447      FORMAT_CASE (PS1_REF,   PS1_REF);
     448      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    445449
    446450    default:
    … …  
    498502      FORMAT_CASE (PS1_V5,    PS1_V5);
    499503      FORMAT_CASE (PS1_REF,   PS1_REF);
     504      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    500505
    501506    default:
    … …  
    550555      FORMAT_CASE (PS1_V5,    PS1_V5);
    551556      FORMAT_CASE (PS1_REF,   PS1_REF);
     557      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    552558
    553559    default:
    … …  
    606612      FORMAT_CASE (PS1_V5,    PS1_V5);
    607613      FORMAT_CASE (PS1_REF,   PS1_REF);
     614      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    608615
    609616    default:
    … …  
    658665      FORMAT_CASE (PS1_V5,    PS1_V5);
    659666      FORMAT_CASE (PS1_REF,   PS1_REF);
     667      FORMAT_CASE (PS1_SIM,   PS1_SIM);
    660668
    661669    default:

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_convert.c

    r37435 r37451  
    4343  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5",          PS1_V5);
    4444  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF);
     45  CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM",         PS1_SIM);
    4546# undef CONVERT_FORMAT
    4647
    … …  
    129130  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5",          PS1_V5,          PS1_V5);
    130131  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF,         PS1_REF);
     132  CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM",         PS1_SIM,         PS1_SIM);
    131133# undef CONVERT_FORMAT
    132134
    … …  
    165167      FORMAT_CASE (PS1_V5,          PS1_V5);
    166168      FORMAT_CASE (PS1_REF,         PS1_REF);
     169      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    167170# undef FORMAT_CASE
    168171
    … …  
    240243  CONVERT_FORMAT ("DVO_MEASURE_PS1_V5",          PS1_V5,          PS1_V5,          TRUE);
    241244  CONVERT_FORMAT ("DVO_MEASURE_PS1_REF",         PS1_REF,         PS1_REF,         FALSE);
     245  CONVERT_FORMAT ("DVO_MEASURE_PS1_SIM",         PS1_SIM,         PS1_SIM,         TRUE);
    242246# undef CONVERT_FORMAT
    243247
    … …  
    278282      FORMAT_CASE (PS1_V5,          PS1_V5,          TRUE);
    279283      FORMAT_CASE (PS1_REF,         PS1_REF,         FALSE);
     284      FORMAT_CASE (PS1_SIM,         PS1_SIM,         TRUE);
    280285# undef FORMAT_CASE
    281286
    … …  
    350355  CONVERT_FORMAT ("DVO_SECFILT_PS1_V5",          PS1_V5,          PS1_V5);
    351356  CONVERT_FORMAT ("DVO_SECFILT_PS1_REF",         PS1_REF,         PS1_REF);
     357  CONVERT_FORMAT ("DVO_SECFILT_PS1_SIM",         PS1_SIM,         PS1_SIM);
    352358# undef CONVERT_FORMAT
    353359
    … …  
    386392      FORMAT_CASE (PS1_V5,          PS1_V5);
    387393      FORMAT_CASE (PS1_REF,         PS1_REF);
     394      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    388395# undef FORMAT_CASE
    389396
    … …  
    626633  }
    627634
     635   CONVERT_FORMAT ("DVO_STARPAR_PS1_SIM",         PS1_SIM,         PS1_SIM);
    628636// CONVERT_FORMAT ("DVO_STARPAR_PS1_REF",         PS1_REF,         PS1_REF);
    629637// CONVERT_FORMAT ("DVO_STARPAR_ELIXIR",          ELIXIR,          Elixir);
    … …  
    665673      break; }
    666674
     675      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    667676//    FORMAT_CASE (PS1_REF,         PS1_REF);
    668677//    FORMAT_CASE (ELIXIR,          Elixir);
    … …  
    751760  CONVERT_FORMAT ("DVO_IMAGE_PS1_V5",          PS1_V5,          PS1_V5);
    752761  CONVERT_FORMAT ("DVO_IMAGE_PS1_REF",         PS1_REF,         PS1_REF);
     762  CONVERT_FORMAT ("DVO_IMAGE_PS1_SIM",         PS1_SIM,         PS1_SIM);
    753763
    754764# undef CONVERT_FORMAT
    … …  
    787797      FORMAT_CASE (PS1_V5,          PS1_V5);
    788798      FORMAT_CASE (PS1_REF,         PS1_REF);
     799      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    789800
    790801# undef FORMAT_CASE
    … …  
    837848      FORMAT_CASE (PS1_V5,          PS1_V5);
    838849      FORMAT_CASE (PS1_REF,         PS1_REF);
     850      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    839851
    840852# undef FORMAT_CASE

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image.c

    r37426 r37451  
    221221  if (db[0].format == DVO_FORMAT_PS1_V5)          gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V5");
    222222  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF");
     223  if (db[0].format == DVO_FORMAT_PS1_SIM)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_SIM");
    223224 
    224225  return;

  • branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/dvo_image_raw.c

    r37035 r37451  
    6161  if (db[0].format == DVO_FORMAT_PS1_V5)          ImageSize = sizeof(Image_PS1_V5);
    6262  if (db[0].format == DVO_FORMAT_PS1_REF)         ImageSize = sizeof(Image_PS1_REF);
     63  if (db[0].format == DVO_FORMAT_PS1_SIM)         ImageSize = sizeof(Image_PS1_SIM);
    6364
    6465  /* check that filesize makes sense */
    … …  
    9293  if (db[0].format == DVO_FORMAT_PS1_V5)          gfits_table_mkheader_Image_PS1_V5 (&db[0].theader);
    9394  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_table_mkheader_Image_PS1_REF (&db[0].theader);
     95  if (db[0].format == DVO_FORMAT_PS1_SIM)         gfits_table_mkheader_Image_PS1_SIM (&db[0].theader);
    9496   
    9597  /* read data from file */
Note: See TracChangeset for help on using the changeset viewer.