Context Navigation

← Previous Change
Next Change →

pmSourceIO.h

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

: 3 edited

. (modified) (1 prop)
psModules/src/objects (modified) (1 prop)
psModules/src/objects/pmSourceIO.h (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ps2-tc3-20130727

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140423 (added)	merged: 36693-36694,36737-36741,36745-36746,36748-36750,36764-36770,36790-36798,36800,36803-36809,36813-36814,36816-36820,36823-36832
/branches/eam_branches/ipp-20140610 (added)	merged: 36845,36884-36885,36898-36912,36916-36923,36925,36928,36932-36947,36974-36980,36982-36999,37001-37012,37014,37017-37029
/branches/eam_branches/ipp-20140717 (added)	merged: 37083-37086,37089-37093,37097-37101,37107-37113,37115,37127-37129,37132-37138,37156-37163,37166-37186,37189-37192,37197-37201,37204-37244
/branches/eam_branches/ipp-20140813 (added)	merged: 37260,37305-37310,37344,37348,37350-37351,37353
/branches/eam_branches/ipp-ops-20130712 (added)	merged: 37064-37069
/tags/ipp-20130712 (added)	merged: 35815,35819,35822-35825,35832,35834-35835,35840,35847,35851,35855,35857-35858,35863,35866,35879-35880,35885-35886,35891,35898,35905,35907-35910,35912-35915,35922-35923,35930,35933-35935,35940-35941,35949,35954,35959,35965,35974,35978,36016,36020,36034,36038-36039,36049,36052,36056,36109-36110,36112,36122,36125,36127,36129,36134,36136,36138-36141,36171-36172,36179,36181,36184,36224,36265,36288,36359,36376-36381,36402,36405,36414,36432,36451,36458,36460,36464,36475,36496,36499,36502,36573,36592-36593,36604,36606,36636-36637,36646,36648,36652,36654,36656,36667,36672,36686,36689-36690,36692,36703,36705,36751,36774-36778,36780,36782-36783,36822,36842,36881,36915,36971,37058-37063
/trunk	merged: 36681,36683-36685,36687-36688,36691,36695,36697-36702,36704,36706-36732,36734-36736,36744,36747,36752-36763,36771-36773,36779,36781,36784-36789,36799,36801-36802,36810-36812,36815,36821,36833-36841,36844,36846-36871,36874,36879,36882,36886,36888,36890,36892,36894,36896-36897,36913-36914,36924,36948,36950-36951,36953,36955,36957,36959,36961,36963,36966,36968,36970,36972,36981,37000,37013,37015-37016,37030-37056,37070-37071,37073,37075-37081,37087,37094-37096,37102,37104,37106,37114,37116-37118,37120,37122-37123,37125,37130-37131,37139,37142-37143,37145,37148,37151-37152,37154,37164-37165,37187,37193,37195,37202,37245-37254,37256,37259,37261,37274,37279,37290,37311-37313,37315,37318-37319,37321,37325-37327,37334,37354-37362,37364-37365,37368-37369,37375,37381,37384-37385
/branches/eam_branches/ipp-20140206	removed
/branches/eam_branches/ipp-20140214	removed
/branches/eam_branches/ipp-20140226	removed
/branches/eam_branches/ipp-20140402	removed
/tags/ipp-20140114	removed

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects

Property svn:ignore

-              old
+              new
 pmSourceIO_CMF_PS1_SV1.c
 pmSourceIO_CMF_PS1_SV2.c
+pmSourceIO_CMF_PS1_SV3.c
+pmSourceIO_CMF_PS1_SV4.c
 pmSourceIO_CMF_PS1_DV1.c
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+pmSourceIO_CMF_PS1_DV4.c

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO.h

-              r36680
+              r37403
 MK_PROTO(CMF_PS1_SV1);
 MK_PROTO(CMF_PS1_SV2);
+MK_PROTO(CMF_PS1_SV3);
+MK_PROTO(CMF_PS1_SV4);
 MK_PROTO(CMF_PS1_DV1);
 MK_PROTO(CMF_PS1_DV2);
 MK_PROTO(CMF_PS1_DV3);
+MK_PROTO(CMF_PS1_DV4);
 int pmSourceGetDophotType (pmSource *source);
 …
 psArray *pmSourcesReadCMP (char *filename, psMetadata *header);
 psArray *pmSourcesRead_CFF (psFits *fits, psMetadata *header);
+psArray *pmSourcesRead_CFF (psFits *fits, psMetadata *header, psMetadata *recipe);
 bool pmSourcesWrite_CFF (pmReadout *readout, psFits *fits, psArray *sources, psMetadata *header, psMetadata *recipe);

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO.h

Legend:

branches/eam_branches/ps2-tc3-20130727

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects

branches/eam_branches/ps2-tc3-20130727/psModules/src/objects/pmSourceIO.h

Download in other formats: