[LIBISIS-code-svn] r1462 - in trunk: applications/matlab/MAPS applications/matlab/MERLIN tests/maps_files tests/merlin_files unit_tests xml

[apache at libisis.org]

Author: Toby Perring
Date: Sun Jun 14 19:44:48 2009
New Revision: 1462

Added:
   trunk/tests/maps_files/4to1_mid_lowang.map
   trunk/tests/maps_files/maps_monitors.map
   trunk/tests/merlin_files/hard_mask_sp.msk
   trunk/tests/merlin_files/mask_DIMprb.msk
   trunk/tests/merlin_files/merlin_monitors_2-9.map
   trunk/tests/merlin_files/mon3_map.map   (contents, props changed)
   trunk/tests/merlin_files/mono_van_map.map
   trunk/tests/merlin_files/one2one_082.map
   trunk/tests/merlin_files/one2one_082.phx
   trunk/tests/merlin_files/one2one_083.phx
   trunk/tests/merlin_files/one2one_084.map
   trunk/tests/merlin_files/one2one_091.map
   trunk/tests/merlin_files/onetoone_doors2-6.map
   trunk/tests/merlin_files/onetoone_doors2-9.map
   trunk/tests/merlin_files/rings_091.map
   trunk/tests/merlin_files/rings_fine_082.map
   trunk/tests/merlin_files/rings_fine_082.phx
   trunk/tests/merlin_files/rings_map_all_082.map
   trunk/tests/merlin_files/rings_map_all_082.phx
   trunk/tests/merlin_files/rings_map_all_084.map
   trunk/tests/merlin_files/rings_map_doors2-9.map
Removed:
   trunk/tests/merlin_files/MER00205.raw
   trunk/tests/merlin_files/MER00579.RAW
   trunk/tests/merlin_files/MER00603.RAW
   trunk/tests/merlin_files/merlin_test.m
   trunk/tests/merlin_files/onetoone.map
   trunk/tests/merlin_files/rings_map.map
Modified:
   trunk/applications/matlab/MAPS/setup_maps_white_beam.m
   trunk/applications/matlab/MERLIN/setup_merlin_inst.m
   trunk/applications/matlab/MERLIN/setup_merlin_white_beam.m
   trunk/tests/merlin_files/merlin_monitors.map
   trunk/unit_tests/unit_tests.vfproj
   trunk/xml/xml.vfproj

Log:
Update the instrument map, mask, and setup files up to 14 June 2009

refs #82

Modified: trunk/applications/matlab/MAPS/setup_maps_white_beam.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/applications/matlab/MAPS/setup_maps_white_beam.m?r1=1461&r2=1462

Modified: trunk/applications/matlab/MERLIN/setup_merlin_inst.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/applications/matlab/MERLIN/setup_merlin_inst.m?r1=1461&r2=1462

Modified: trunk/applications/matlab/MERLIN/setup_merlin_white_beam.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/applications/matlab/MERLIN/setup_merlin_white_beam.m?r1=1461&r2=1462

Added: trunk/tests/maps_files/4to1_mid_lowang.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/maps_files/4to1_mid_lowang.map?view=markup&revision=1462

Added: trunk/tests/maps_files/maps_monitors.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/maps_files/maps_monitors.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/hard_mask_sp.msk
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/hard_mask_sp.msk?view=markup&revision=1462

Added: trunk/tests/merlin_files/mask_DIMprb.msk
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/mask_DIMprb.msk?view=markup&revision=1462

Modified: trunk/tests/merlin_files/merlin_monitors.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/merlin_monitors.map?r1=1461&r2=1462

Added: trunk/tests/merlin_files/merlin_monitors_2-9.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/merlin_monitors_2-9.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/mon3_map.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/mon3_map.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/mono_van_map.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/mono_van_map.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/one2one_082.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/one2one_082.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/one2one_082.phx
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/one2one_082.phx?view=markup&revision=1462

Added: trunk/tests/merlin_files/one2one_083.phx
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/one2one_083.phx?view=markup&revision=1462

Added: trunk/tests/merlin_files/one2one_084.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/one2one_084.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/one2one_091.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/one2one_091.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/onetoone_doors2-6.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/onetoone_doors2-6.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/onetoone_doors2-9.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/onetoone_doors2-9.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_091.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_091.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_fine_082.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_fine_082.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_fine_082.phx
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_fine_082.phx?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_map_all_082.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_map_all_082.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_map_all_082.phx
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_map_all_082.phx?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_map_all_084.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_map_all_084.map?view=markup&revision=1462

Added: trunk/tests/merlin_files/rings_map_doors2-9.map
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/tests/merlin_files/rings_map_doors2-9.map?view=markup&revision=1462

Modified: trunk/unit_tests/unit_tests.vfproj
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/unit_tests/unit_tests.vfproj?r1=1461&r2=1462

Modified: trunk/xml/xml.vfproj
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/xml/xml.vfproj?r1=1461&r2=1462