Context Navigation

psphotFitSourcesLinearStack.c

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

Property svn:mergeinfo changed

/branches/czw_branch/cleanup (added)	merged: 24713,24743,24785,24835,24902,24913,24951-24952,24972,25050-25051,25088,25143-25155,25157-25159,25161,25210-25212
/branches/eam_branches/20090715 (added)	merged: 24799-24800,24990-24992,25018,25020,25022,25032-25035,25102-25105,25128,25175-25179,25203-25204,25268-25277,25286-25298,25303,25306,25343-25365,25384-25410,25433,25451-25455,25476,25496-25499,25501-25507,25523-25536,25585-25628,25632-25663,25666,25671,25673,25678-25681,25683-25687,25694,25696,25698-25700,25719-25723,25725,25727,25744-25750
/branches/pap (added)	merged: 25238,25241-25243,25246,25258-25267,25278,25302,25309-25312,25326-25329,25331-25339,25508,25521,25548,25553,25556,25559-25561,25563-25565,25568-25569,25695,25697,25715,25717-25718
/branches/pap_mops (added)	merged: 25137-25138,25162,25180-25183,25186-25193,25201-25202,25225,25231-25236,25239-25240,25245,25247-25255
/trunk (added)	merged: 25156,25194-25200,25207-25209,25213-25224,25226-25227,25230,25244,25256,25279-25285,25299-25301,25304-25305,25307-25308,25313-25325,25330,25340-25342,25366-25383,25412-25432,25434-25450,25456-25475,25477-25495,25500,25509-25520,25522,25537-25547,25549-25552,25554-25555,25557-25558,25562,25566-25567,25570-25584,25629-25631,25664-25665,25667-25670,25672,25674-25677,25682,25688-25693,25701-25714,25716,25724,25726,25728-25743,25751-25763

Property svn:ignore

old	new
18	18	psphotVersionDefinitions.h
19	19	psphotMomentsStudy
	20	psphotPetrosianStudy

r24584	r25766
168	168	// subtract object
169	169	pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
170		~~source->tmpFlags \|= PM_SOURCE_TMPF_SUBTRACTED;~~
171	170	}
172	171	psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "sub models: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);

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