IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 36375 for trunk/psphot/src/psphotRoughClass.c

Timestamp:

Dec 10, 2013, 2:55:11 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

Files:

: 4 edited

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

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20130904 (added)

merged: 36095,36144-36146,36148-36158,36160-36164,36192-36199,36204-36220,36226-36230,36233-36236,36239-36247,36251-36264,36266-36286,36291-36294,36297-36311,36314-36336,36338-36355,36358,36362,36367-36371

trunk/psphot

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20130904/psphot (added)

merged: 36146,36148,36153-36154,36156,36161,36164,36198,36210-36213,36216,36218,36227,36241,36247,36257-36258,36263,36271-36272,36292,36298-36299,36301-36302,36304-36305,36307,36310-36311,36315-36318,36325,36327-36328,36330-36331,36333,36336,36339-36343,36347,36351,36353-36355,36358,36369,36371

trunk/psphot/src

Property svn:ignore

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

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20130904/psphot/src (added)

merged: 36146,36148,36153-36154,36156,36161,36164,36198,36210-36213,36216,36218,36241,36247,36257-36258,36263,36271-36272,36298-36299,36301-36302,36304-36305,36307,36310-36311,36315,36318,36325,36327-36328,36330-36331,36333,36336,36339-36343,36347,36351,36353-36355,36358,36369,36371

trunk/psphot/src/psphotRoughClass.c

r32348	r36375
87	87	if (NX > NY) {
88	88	NXuse = ScaleForClump;
89		NYuse = (int) (ScaleForClump * (N~~Y / NX~~) + 0.5);
	89	NYuse = (int) (ScaleForClump * (NX / NY) + 0.5);
90	90	} else {
91	91	NYuse = ScaleForClump;

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

Download in other formats: