[Horace-svn] r283 - in trunk: . @sqw/private LowLevelCode/cpp/get_ascii_file LowLevelCode/cpp/get_ascii_file/get_ascii_file LowLevelCode/intel/get_spe_fortran/get_spe_fortran LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug libisis libisis/@speData libisis/@speData/private

[apache at svr2.nd.rl.ac.uk]

Author: Alex Buts
Date: Mon Sep 28 18:44:20 2009
New Revision: 283

Added:
   trunk/LowLevelCode/cpp/get_ascii_file/
   trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/
   trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file.sln
   trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/IIget_acii_file.cpp
   trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.cpp
   trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.h
   trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.vcproj
   trunk/libisis/get_ascii_file.mexw32   (contents, props changed)
   trunk/libisis/get_ascii_file.mexw64   (contents, props changed)
Removed:
   trunk/@sqw/private/accumulate_cut_c.pdb
   trunk/@sqw/private/bin_pixels_c.pdb
   trunk/@sqw/private/get_par_fortran.mexa64
   trunk/@sqw/private/get_par_fortran.mexglx
   trunk/@sqw/private/get_par_fortran.mexw32
   trunk/@sqw/private/get_phx_fortran.mexa64
   trunk/@sqw/private/get_phx_fortran.mexglx
   trunk/@sqw/private/get_phx_fortran.mexw32
   trunk/@sqw/private/get_spe_fortran.mexa64
   trunk/@sqw/private/get_spe_fortran.mexglx
   trunk/@sqw/private/get_spe_fortran.mexw32
   trunk/@sqw/private/get_spe_fortran.mexw64
   trunk/@sqw/private/sort_pixels_by_bins.pdb
   trunk/libisis/@speData/private/get_spe_fortran.mexw32
   trunk/libisis/@speData/private/get_spe_fortran.mexw64
   trunk/libisis/@speData/private/get_spe_fortran.pdb
Modified:
   trunk/@sqw/private/accumulate_cut_c.mexw32
   trunk/@sqw/private/accumulate_cut_c.mexw64
   trunk/@sqw/private/bin_pixels_c.mexw32
   trunk/@sqw/private/bin_pixels_c.mexw64
   trunk/@sqw/private/calc_projections_c.mexw32
   trunk/@sqw/private/calc_projections_c.mexw64
   trunk/@sqw/private/get_par.m
   trunk/@sqw/private/get_phx.m
   trunk/@sqw/private/get_spe.m
   trunk/@sqw/private/sort_pixels_by_bins.mexw32
   trunk/@sqw/private/sort_pixels_by_bins.mexw64
   trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug/get_spe_fortran.mexw32
   trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug/get_spe_fortran.pdb
   trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/get_spe_fortran.vfproj
   trunk/horace_mex.m
   trunk/libisis/@speData/loadData.m

Log:
#refs #78
get_phx_fortran; get_par_fortran and get_spe_fortran replaced by sibgle c++ mex-function 
get_ascii_file(file_name,'type')
where 'type' can be 'spe', 'par', 'phx' or omitted
if omitted, the function tries to identify the file type on the basis of the ASCII file header

horace_mex modified correspondingly.


Modified: trunk/@sqw/private/accumulate_cut_c.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/accumulate_cut_c.mexw32?r1=282&r2=283

Modified: trunk/@sqw/private/accumulate_cut_c.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/accumulate_cut_c.mexw64?r1=282&r2=283

Modified: trunk/@sqw/private/bin_pixels_c.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/bin_pixels_c.mexw32?r1=282&r2=283

Modified: trunk/@sqw/private/bin_pixels_c.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/bin_pixels_c.mexw64?r1=282&r2=283

Modified: trunk/@sqw/private/calc_projections_c.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/calc_projections_c.mexw32?r1=282&r2=283

Modified: trunk/@sqw/private/calc_projections_c.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/calc_projections_c.mexw64?r1=282&r2=283

Modified: trunk/@sqw/private/get_par.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/get_par.m?r1=282&r2=283

Modified: trunk/@sqw/private/get_phx.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/get_phx.m?r1=282&r2=283

Modified: trunk/@sqw/private/get_spe.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/get_spe.m?r1=282&r2=283

Modified: trunk/@sqw/private/sort_pixels_by_bins.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/sort_pixels_by_bins.mexw32?r1=282&r2=283

Modified: trunk/@sqw/private/sort_pixels_by_bins.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/%40sqw/private/sort_pixels_by_bins.mexw64?r1=282&r2=283

Added: trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file.sln
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file.sln?view=markup&revision=283

Added: trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/IIget_acii_file.cpp
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/IIget_acii_file.cpp?view=markup&revision=283

Added: trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.cpp
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.cpp?view=markup&revision=283

Added: trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.h
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.h?view=markup&revision=283

Added: trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.vcproj
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/cpp/get_ascii_file/get_ascii_file/get_ascii_file.vcproj?view=markup&revision=283

Modified: trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug/get_spe_fortran.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug/get_spe_fortran.mexw32?r1=282&r2=283

Modified: trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug/get_spe_fortran.pdb
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/Debug/get_spe_fortran.pdb?r1=282&r2=283

Modified: trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/get_spe_fortran.vfproj
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/LowLevelCode/intel/get_spe_fortran/get_spe_fortran/get_spe_fortran.vfproj?r1=282&r2=283

Modified: trunk/horace_mex.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/horace_mex.m?r1=282&r2=283

Modified: trunk/libisis/@speData/loadData.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/libisis/%40speData/loadData.m?r1=282&r2=283

Added: trunk/libisis/get_ascii_file.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/libisis/get_ascii_file.mexw32?view=markup&revision=283

Added: trunk/libisis/get_ascii_file.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/trunk/libisis/get_ascii_file.mexw64?view=markup&revision=283