Context Navigation

← Previous Change
Next Change →

psphotDefineFiles.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

: 4 edited

. (modified) (1 prop)
psphot (modified) (1 prop)
psphot/src (modified) (2 props)
psphot/src/psphotDefineFiles.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ps2-tc3-20130727

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140206 (added)	merged: 36494,36503-36506,36516-36520,36530-36536,36545,36548-36550,36558,36562,36564-36571,36574-36578,36589-36591,36611-36613,36616-36618,36624-36629
/branches/eam_branches/ipp-20140214 (added)	merged: 36514,36521-36527
/branches/eam_branches/ipp-20140226 (added)	merged: 36561,36563,36619-36622
/branches/eam_branches/ipp-20140402 (added)	merged: 36641,36644,36673-36677
/tags/ipp-20140114 (added)	merged: 36444-36446,36448,36450,36461-36462,36513,36538-36540,36546-36547,36551,36554,36557,36559-36560,36584-36588,36597-36602,36607-36609
/trunk (added)	merged: 35864-35865,35867-35868,35881,35884,35887-35888,35892-35897,35899-35904,35906,35911,35916-35917,35924-35925,35927-35929,35931-35932,35936-35939,35945,35950-35953,35955-35958,35960,35964,35975-35977,35979-36011,36017-36019,36035-36037,36040-36048,36051,36057-36061,36076-36089,36094,36096-36108,36111,36114-36121,36123-36124,36126,36128,36130-36133,36135,36137,36142-36143,36147,36159,36165-36170,36173-36178,36180,36182-36183,36185-36191,36200-36203,36221-36223,36225,36231-36232,36237-36238,36248-36250,36287,36289-36290,36295-36296,36312-36313,36337,36356-36357,36360-36361,36363-36366,36372-36375,36384,36397,36403-36404,36413,36421,36428-36431,36434-36435,36441,36447,36452-36457,36459,36463,36476-36478,36481-36493,36495,36497-36498,36500-36501,36507-36512,36515,36528-36529,36537,36541-36544,36552-36553,36555-36556,36572,36579-36583,36594-36596,36603,36605,36610,36614-36615,36623,36630-36635,36638-36640,36642-36643,36645,36647,36649-36651,36653,36655,36657-36666,36668-36671,36679
/branches/czw_branch/20101203	removed
/branches/czw_branch/20120906	removed
/branches/eam_branches/ipp-20101103	removed
/branches/eam_branches/ipp-20101205	removed
/branches/eam_branches/ipp-20110213	removed
/branches/eam_branches/ipp-20110404	removed
/branches/eam_branches/ipp-20110505	removed
/branches/eam_branches/ipp-20110710	removed
/branches/eam_branches/ipp-20110906	removed
/branches/eam_branches/ipp-20111110	removed
/branches/eam_branches/ipp-20120405	removed
/branches/eam_branches/ipp-20120601	removed
/branches/eam_branches/ipp-20120627	removed
/branches/eam_branches/ipp-20120805	removed
/branches/eam_branches/ipp-20120905	removed
/branches/eam_branches/ipp-20121130	removed
/branches/eam_branches/ipp-20121219	removed
/branches/eam_branches/ipp-20130207	removed
/branches/eam_branches/ipp-20130307	removed
/branches/eam_branches/ipp-20130419	removed
/branches/eam_branches/ipp-20130509	removed
/branches/haf_add201112	removed

branches/eam_branches/ps2-tc3-20130727/psphot
- Property svn:mergeinfo deleted

branches/eam_branches/ps2-tc3-20130727/psphot/src

Property svn:ignore

old	new
24	24	psphotModelTest
25	25	psphotMinimal
	26	psphotFullForce
	27	psmakecff
	28	psphotFullForceSummary

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140206/psphot/src (added)	merged: 36536,36627-36629
/branches/eam_branches/ipp-20140214/psphot/src (added)	merged: 36525-36527
/branches/eam_branches/ipp-20140226/psphot/src (added)	merged: 36619,36621-36622
/branches/eam_branches/ipp-20140402/psphot/src (added)	merged: 36677
/tags/ipp-20140114/psphot/src (added)	merged: 36445,36538-36540,36547,36551,36588,36599,36607
/trunk/psphot/src	merged: 36086,36096,36100,36107-36108,36115,36117-36119,36124,36128,36366,36375,36441,36453,36493,36529,36541-36542,36555,36623,36630,36633,36662-36664,36666,36679
/branches/czw_branch/20100427/psphot/src	removed
/branches/czw_branch/20100519/psphot/src	removed
/branches/czw_branch/20100817/psphot/src	removed
/branches/czw_branch/20101203/psphot/src	removed
/branches/czw_branch/20120906/psphot/src	removed
/branches/eam_branches/ipp-20100823/psphot/src	removed
/branches/eam_branches/ipp-20101103/psphot/src	removed
/branches/eam_branches/ipp-20101205/psphot/src	removed
/branches/eam_branches/ipp-20110213/psphot/src	removed
/branches/eam_branches/ipp-20110404/psphot/src	removed
/branches/eam_branches/ipp-20110505/psphot/src	removed
/branches/eam_branches/ipp-20110710/psphot/src	removed
/branches/eam_branches/ipp-20110906/psphot/src	removed
/branches/eam_branches/ipp-20111110/psphot/src	removed
/branches/eam_branches/ipp-20111122/psphot/src	removed
/branches/eam_branches/ipp-20120405/psphot/src	removed
/branches/eam_branches/ipp-20120601/psphot/src	removed
/branches/eam_branches/ipp-20120627/psphot/src	removed
/branches/eam_branches/ipp-20120805/psphot/src	removed
/branches/eam_branches/ipp-20120905/psphot/src	removed
/branches/eam_branches/ipp-20121130/psphot/src	removed
/branches/eam_branches/ipp-20121219/psphot/src	removed
/branches/eam_branches/ipp-20130207/psphot/src	removed
/branches/eam_branches/ipp-20130307/psphot/src	removed
/branches/eam_branches/ipp-20130419/psphot/src	removed
/branches/eam_branches/ipp-20130509/psphot/src	removed
/branches/haf_add201112/psphot/src	removed
/branches/haf_branches/ipp.20100512/psphot/src	removed
/branches/pap/psphot/src	removed
/tags/ipp-20101029/psphot/src	removed
/tags/ipp-20111110/psphot/src	removed

branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotDefineFiles.c

-              r34528
+              r36680
+    }
+    if (psMetadataLookupPtr(NULL, config->arguments, "FORCE")) {
+        if (!pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT.CFF", "FORCE")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.INPUT.CFF");
+            return status;
+        }
+    }
     if (psMetadataLookupPtr(NULL, config->arguments, "SRCTEXT")) {
         // XXX cannot use pmFPAfileDefineFromArgs: this is explicitly a FITS-based I/O function

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

Context Navigation

Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotDefineFiles.c

Legend:

branches/eam_branches/ps2-tc3-20130727

branches/eam_branches/ps2-tc3-20130727/psphot

branches/eam_branches/ps2-tc3-20130727/psphot/src

branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotDefineFiles.c

Download in other formats: