[Horace-svn] r920 - in branches/HoraceV3.1.1: . @sqw/private DLL/_PCWIN/_R2009a DLL/_PCWIN64/_R2009a _LowLevelCode/cpp/bin_pixels_c/bin_pixels_c _test/common_functions _test/test_gen_sqw_for_powders _test/test_multifit _test/test_sqw _test/test_sqw_file configuration/@hor_config

apache at svr2.nd.rl.ac.uk apache at svr2.nd.rl.ac.uk
Wed Sep 17 10:30:12 BST 2014 

Author: Toby Perring
Date: Wed Sep 17 10:30:04 2014
New Revision: 920

Added:
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/check_sample_output.m
      - copied unchanged from r919, /trunk/_test/test_gen_sqw_for_powders/check_sample_output.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/rm_files.m
      - copied unchanged from r919, /trunk/_test/test_gen_sqw_for_powders/rm_files.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/save_sample_output.m
      - copied unchanged from r919, /trunk/_test/test_gen_sqw_for_powders/save_sample_output.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_1.nxspe
      - copied unchanged from r919, /trunk/_test/test_gen_sqw_for_powders/test_combine_1.nxspe
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_2.nxspe
      - copied unchanged from r919, /trunk/_test/test_gen_sqw_for_powders/test_combine_2.nxspe
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw.nxspe
      - copied unchanged from r919, /trunk/_test/test_gen_sqw_for_powders/test_gen_sqw.nxspe
Modified:
   branches/HoraceV3.1.1/   (props changed)
   branches/HoraceV3.1.1/@sqw/private/cut_sqw_calc_ubins.m
   branches/HoraceV3.1.1/@sqw/private/rundata_write_to_sqw.m
   branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/accumulate_cut_c.mexw32
   branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/bin_pixels_c.mexw32
   branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/calc_projections_c.mexw32
   branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/sort_pixels_by_bins.mexw32
   branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/accumulate_cut_c.mexw64
   branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/bin_pixels_c.mexw64
   branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/calc_projections_c.mexw64
   branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/sort_pixels_by_bins.mexw64
   branches/HoraceV3.1.1/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.cpp
   branches/HoraceV3.1.1/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.vcproj
   branches/HoraceV3.1.1/_test/common_functions/simulate_spe_testfunc.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_cyl.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_cyl_output.mat
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_pow.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_pow_output.mat
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_cylinder.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_cylinder_output.mat
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_powder.m
   branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_powder_output.mat
   branches/HoraceV3.1.1/_test/test_multifit/test_multifit_horace_1.m
   branches/HoraceV3.1.1/_test/test_multifit/test_multifit_horace_1_output.mat
   branches/HoraceV3.1.1/_test/test_sqw/test_gen_runfiles.m
   branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_mex.m
   branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_nomex.m
   branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_output.mat
   branches/HoraceV3.1.1/_test/test_sqw_file/test_sqw_file_read_write.m
   branches/HoraceV3.1.1/configuration/@hor_config/hor_config.m

Log:
Merged revision(s) 878-919 from trunk:
refs #145 implemented thread managment based on the execution time
.......
Development branch based on revision 877 with the addition of sparse format sqw files

refs #142
.......
Store various developments - not yet working!

refs #142
.......
Store various developments - not yet working!

refs #142
.......
Replace calls to fopen with put_sqw_open and get-sqw_open in sqw file access routines. Aim for consistent opening of files.

refs #144
.......
Replace calls to fopen with put_sqw_open and get-sqw_open in sqw file access routines. Aim for consistent opening of files.

Further changes to i/o for sparse format - not yet working!

refs #144 #142
.......
refs #24 - convert s and e to s' and e' in IX_dataset_2d when permute method has been applied to data. Otherwise an error is thrown when plotting later
.......
Store various developments - not yet working!

refs #142

.......
refs #145 nasty multi-threading bug fixed in bin_pixels_c. The bug causes some pixels data not copied to accumulated array. 

.......
refs #145 mex32 files recompiled
.......
refs #145 code rewritten a bit nice using postfix operators and smaller critical area

.......
Store various developments - not yet working!

refs #142

.......
Store various developments - not yet working!

refs #142

.......
Store various developments - not yet working!

refs #142

.......
Store various developments - not yet working!

refs #142

.......
Store various developments - not yet working!

refs #142

.......
Store various developments - not yet working!

refs #142

.......
Store various developments - not yet working, but getting close!

refs #142

.......
refs #93 fixed gen_sqw unit tests

though more efforts are needed to check range equivalence between gen_sqw and accumulate_sqw

.......
refs #93 fixed powder tests on my machine. 

but I suspect substantial problems on other machines. 

.......
refs #93 Attempt to fix multifit test
.......
refs #93 Attempt to fix multifit test

.......
refs #93 Almost disabling fitpar check to fix test_multifit_horace_1.m
.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
refs #93 Notional (RelErr=2.e-2) fix for test_gen_sqw_for_powders on different machines

.......
refs #93 SPE tesftun generates nxspe

.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
refs #93 fixed unit tests failing due to changes to nxspe


+ improved mex/nomex option in test_gen_sqw_accumulate_sqw_*.m tests
.......
refs #93 fixed unit tests for powders.
.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......
refs #145 testing omp3 on Unix

.......
refs #145 back to basics in bin_pixels_c.cpp
.......
refs #145 commenting and fixing long operations

.......
refs #145 possible performance improvement within omp2 scope


.......
refs #145 final version of bin_pixels_c changed to run copying in multithreaded mode

.......
refs #145 trying to resolve IO problems on unix
.......
Store various developments - passes first tests of I/O, but not yet complete

refs #142

.......


Modified: branches/HoraceV3.1.1/@sqw/private/cut_sqw_calc_ubins.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/%40sqw/private/cut_sqw_calc_ubins.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/@sqw/private/rundata_write_to_sqw.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/%40sqw/private/rundata_write_to_sqw.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/accumulate_cut_c.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/accumulate_cut_c.mexw32?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/bin_pixels_c.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/bin_pixels_c.mexw32?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/calc_projections_c.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/calc_projections_c.mexw32?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/sort_pixels_by_bins.mexw32
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN/_R2009a/sort_pixels_by_bins.mexw32?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/accumulate_cut_c.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/accumulate_cut_c.mexw64?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/bin_pixels_c.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/bin_pixels_c.mexw64?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/calc_projections_c.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/calc_projections_c.mexw64?r1=919&r2=920

Modified: branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/sort_pixels_by_bins.mexw64
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/DLL/_PCWIN64/_R2009a/sort_pixels_by_bins.mexw64?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.cpp
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.cpp?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.vcproj
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_LowLevelCode/cpp/bin_pixels_c/bin_pixels_c/bin_pixels_c.vcproj?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/common_functions/simulate_spe_testfunc.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/common_functions/simulate_spe_testfunc.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_cyl.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_cyl.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_cyl_output.mat
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_cyl_output.mat?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_pow.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_pow.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_pow_output.mat
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_combine_pow_output.mat?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_cylinder.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_cylinder.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_cylinder_output.mat
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_cylinder_output.mat?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_powder.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_powder.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_powder_output.mat
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_gen_sqw_for_powders/test_gen_sqw_powder_output.mat?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_multifit/test_multifit_horace_1.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_multifit/test_multifit_horace_1.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_multifit/test_multifit_horace_1_output.mat
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_multifit/test_multifit_horace_1_output.mat?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_sqw/test_gen_runfiles.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_sqw/test_gen_runfiles.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_mex.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_mex.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_nomex.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_nomex.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_output.mat
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_sqw/test_gen_sqw_accumulate_sqw_output.mat?r1=919&r2=920

Modified: branches/HoraceV3.1.1/_test/test_sqw_file/test_sqw_file_read_write.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/_test/test_sqw_file/test_sqw_file_read_write.m?r1=919&r2=920

Modified: branches/HoraceV3.1.1/configuration/@hor_config/hor_config.m
Url: http://svn.isis.rl.ac.uk/viewvc/Horace/branches/HoraceV3.1.1/configuration/%40hor_config/hor_config.m?r1=919&r2=920

More information about the Horace-svn mailing list