Context Navigation

Changeset 37960

Timestamp:

Mar 5, 2015, 4:11:23 PM (11 years ago)

Author:

watersc1

Message:

Change copy of crosstalk magnitude from trunk. WIthout knowing the other changes, I didn't want to merge too much into the working branch.

File:

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140206/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140214/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140226/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140402/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140423/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140610/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140717/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-20140813/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psastro.config	merged	eligible
/branches/eam_branches/ps2-tc3-20130727/ippconfig/gpc1/psastro.config	merged	eligible
/tags/ipp-20130712/ippconfig/gpc1/psastro.config	merged	eligible
/tags/ipp-20140114/ippconfig/gpc1/psastro.config	merged	eligible
/trunk/ippconfig/gpc1/psastro.config	merged	eligible

r37470	r37960
267	267
268	268	REFSTAR_MASK_CROSSTALK_MAG_SLOPE F32 3.44
269		REFSTAR_MASK_CROSSTALK_MAG_MAX F32 -14.47
	269	REFSTAR_MASK_CROSSTALK_MAG_MAX F32 -13.47
270	270	CROSSTALK_MAX_MAG F32 20.0
271	271	CROSSTALK_MASK BOOL TRUE

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