Context Navigation

camera.config

Timestamp:

Feb 4, 2023, 12:16:25 PM (3 years ago)

Author:

eugene

Message:

merge changes from trunk: new nonlinearity, detections under bad CTE masks, single-time darks

Location:

branches/eam_branches/ipp-20220316/ippconfig

Files:

Property svn:mergeinfo changed

/tags/ipp-ops-20220303-rc/ippconfig (added)	merged: 42111
/tags/ipp-ops-20220705/ippconfig (added)	merged: 42236-42237,42239-42240,42244-42246,42248-42251,42284
/trunk/ippconfig	merged: 42181,42228-42233,42235,42238,42241-42243,42285,42293,42308-42309,42334

Property svn:mergeinfo set to (toggle deleted branches)

/branches/czw_branch/20160809/ippconfig/gpc2/camera.config	merged	eligible
/branches/czw_branch/20170908/ippconfig/gpc2/camera.config	merged	eligible
/branches/eam_branches/ipp-20191011/ippconfig/gpc2/camera.config	merged	eligible
/branches/eam_branches/ipp-20211108/ippconfig/gpc2/camera.config	merged	eligible
/branches/eam_branches/ipp-dev-20210817/ippconfig/gpc2/camera.config	merged	eligible
/branches/ipp-390_update_CHIP_DARKTEST_recipes/gpc2/camera.config	merged	eligible
/branches/ipp-476_gpc2_darktests_with_continuity_on/gpc2/camera.config	merged	eligible
/branches/ipp-482_increase_psastro_sigma_threshold/gpc2/camera.config	merged	eligible
/tags/ipp-ops-20220303-rc/ippconfig/gpc2/camera.config	merged	eligible
/tags/ipp-ops-20220705/ippconfig/gpc2/camera.config	merged	eligible
/tags/ipp-ps1-20210510/ippconfig/gpc2/camera.config	merged	eligible
/tags/ipp-ps1-20210708/ippconfig/gpc2/camera.config	merged	eligible
/tags/ipp-ps2-20190404/ippconfig/gpc2/camera.config	merged	eligible
/trunk/ippconfig/gpc2/camera.config	merged	eligible
/branches/ipp-388_adding_darktest_recipe/gpc2/camera.config	41182-41185
/ipp-ps2-20190404/ippconfig/gpc2/camera.config	40668

r41750	r42373
5	5	MEF STR gpc2/format_mef.config
6	6	# RELPHOT STR gpc2/format_relphot.config
	7	FORMAT_20220616 STR gpc2/format_20220616.config
7	8	FORMAT_20180131 STR gpc2/format_20180131.config
8	9	FORMAT_DEFAULT STR gpc2/format_default.config

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