source: sasview/src/sas/sascalc

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @109afbd   6 years jkrzywon Prevent ValueErrors? magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @c7c8143   6 years jkrzywon Load and save mask from NXcanSAS properly. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @9220e89c   6 years jkrzywon Code cleanup and py3 compatibility fixes. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @c222c27   6 years jkrzywon Merge branch 'master' into ticket-1111 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @a165bee   6 years jkrzywon Don't throw out last data frame in multi frame data. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @802fc18   6 years jkrzywon Support for multi-frame NXcanSAS data sets. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @c1dc994   6 years jkrzywon Differentiate between array and scalar datasets when loading meta data. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @fee520ec   6 years ricleal ticket #1212 fixed the qx.data bug magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @9b08354   6 years jkrzywon Revert error handling change. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @282bc3f   6 years jkrzywon Change errors in NXcanSAS reader to a list to match the rest of the … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @dfcdbf8   6 years jkrzywon Handle INTs attributes properly, better handling of unrecognized units … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @57e48ca   6 years pkienzle fix rcond requires float error in pr magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @3e6829d   6 years pkienzle default to floating point division in pr magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @9fb4572   6 years krzywon Reinstate shape check. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @845144e   6 years krzywon Merge branch master into ticket-1111 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @b204004   6 years krzywon Remove unneeded shape check, give better error when saving fails, and data … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @b1ec23d   6 years krzywon Remove unneeded shape check, give better error when saving fails, and data … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @7ba6470   6 years pkienzle remove deprecation warnings for old buffer protocol from py37 build magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @952ea1f   6 years pkienzle move c extensions from core/module.so to _module.so magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249
(edit) @863ac2c   6 years butler Update fix to pagestate.py for ticket-1179 branch as per P. Kienzle Use … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @e9920cd   6 years krzywon Add SasView? version to report files. refs #1179 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @357a65a   6 years smk78 Added /sasview/src/sas/sascalc/corfunc/LICENSE.TXT from GitHub? magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @926ece5   6 years krzywon Py3 compatibility and code cleanup. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @feec1cb   6 years krzywon Differentiate between scalars and arrays. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @2ca5d57b   6 years krzywon Code cleanup and additional unit tests. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @4fdcc65   6 years krzywon File loader fixes and code cleanup. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @8d5e11c   6 years krzywon File loader code cleanup. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @9dc1500   6 years krzywon Take value directly instead of slice to avoid value errors. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @c2525bf   6 years krzywon Properly load in 2D data using attributes from the NXcanSAS reader. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @35ac8df   6 years krzywon Merge branch 'master' into ticket-1111 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @636cf8d   6 years noreply Merge pull request #162 from SasView?/beta_load_project Beta Load Project … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @59873e1   6 years krzywon Remove any non-numeric characters from the version number when loading … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @bd5c3b1   6 years krzywon Use q_mean from ABS files to match Igor analysis. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @96d06a4   6 years krzywon Separate 1d and 2d data processing, and add new NXcanSAS compliant data … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @cf29187   6 years krzywon Fix typo in writer, output new files, and fix reader to properly read in … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @0bd8fac   6 years krzywon Code cleanup and removal of non-standard NXcanSAS files. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @ac38ab4   6 years krzywon Save process and transmission spectrum and fix issues with loading them. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @fc51d06   6 years krzywon Fix broken unit tests and general cleanup. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @b011ecb   6 years krzywon Fix conversion factor in nxunit. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @369ed11d   6 years krzywon Save dQ values as resolutions, not uncertainties. refs #1129 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @02c1608e   6 years krzywon Allow for multiple Q resolutions/uncertainties for USANS data. refs #976 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @f5483ef   6 years krzywon Save uncertainties and resolutions, but only if they are present in the … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @cf820f5   6 years krzywon Give proper label to NXcanSAS data files in file browser window. refs #976 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @8f882fe   6 years krzywon Changes to NXcanSAS reader to comply with specification. refs #976 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @058f6c3   6 years krzywon Fixes for failing ascii, cansasXML, red2D, and sesans reader unit tests. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @3bab401   6 years krzywon Create a universal unit converter for all data loaders. refs #1111 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @c7634fd   6 years krzywon Merge branch 'ticket-976' into ticket-1111 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @1176137   7 years noreply Merge pull request #149 from SasView?/ticket-1079 Removing save button … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @3b070a0   7 years wojciech fixed imaged width for win magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @47c44f0   7 years wojciech Reverting Windows page layout magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @a8e368b   7 years wojciech Fixing width for printing magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @5818dae   7 years wojciech Reverted save button as potential solution to the problem has been found magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @4a8d55c   7 years krzywon Propagate through loader when errors are thrown regardless of the error. … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @2924532   7 years krzywon Cleanup of the SasView? GUI data loader error handling and a more specific … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @425feff   7 years krzywon Move the deprecation check so it is always called, regardless of file … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @c36c09f   7 years krzywon Show a dialog warning the user the data set may not load properly. All … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @6bd4235   7 years krzywon Merge branch 'master' into ticket-976 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @18af6d2   7 years krzywon Clear data locations when a new data set is created and coerce I and Q to … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @a40e913   7 years noreply Merge pull request #135 from SasView?/ticket-1037 Ticket 1037: Remove nan … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @a58b5a0   7 years krzywon Update documentation to match code. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @340291a   7 years krzywon Fix nan removal code to truncate search through and truncate 2D mask data. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @6fd7b20   7 years krzywon Simplified nan removal code. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @f02a0c6   7 years krzywon Extend nan removal to 2D data. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @e3133dc   7 years krzywon Remove nan values from data 1D objects instead of coercing to 0. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @5a4d022   7 years krzywon Remove instance variables from class definition. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @d7fd7be   7 years krzywon Merge branch 'master' into ticket-976 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249unittest-saveload
(edit) @8475d16   7 years krzywon Coerce all nan values to 0 when loading data files. refs #1037 magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @e3775c6   7 years krzywon Use startswith instead of count for line matching in ABS reader. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @a32c19c   7 years krzywon Associate .cor files with the ABS reader. If they are in XMl format, they … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @11112b2   7 years krzywon Properly handle negative dx values in the ABS reader. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @5bb05a4   7 years noreply Merge pull request 127 from SasView?/ticket-1032-sldi. Closes #1032. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @3053a4a   7 years noreply remove infinite loop from sesans reader (#129) magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @79c9ce5   7 years noreply Merge pull request #122 from llimeht/tmp/filereader-class Fix instance vs … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @0a9cbc3   7 years pkienzle update old MultiplicationModel? so that fun_list defaults to list magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @2469df7   7 years pkienzle lint: update 'if x==True/False?' to 'if x/not x:' magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @144e032a   7 years pkienzle tinycc doesn't return structures, so must pass return structure as pointer magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @a57ae07   7 years pkienzle use LF rather than CRLF in .c/.h files magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @a1daf86   7 years pkienzle hack around broken isfinite/isnan in tinycc magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @7e82256   7 years pkienzle declare all variables at the start of the block so C89 compilers don't … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @f926abb   7 years pkienzle add smoke test for generic scattering calculator magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @54b0650   7 years pkienzle fix C interface to sldi after py3 conversion magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @0957bb3a   7 years pkienzle convert sldi from C++ to C magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @cb11a25   7 years stuart Fix instance vs class variables in FileReader? Class variables get … magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @90961b4   7 years stuart Delete unreferenced file uniquelist.py magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @20fa5fe   7 years stuart Fix lots more typos in comments and docs magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @f4775563   7 years stuart Fix spelling in docstring magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @a52f32f   7 years stuart Fix typo in P(r) peaks description magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @1576693   7 years krzywon Move state reset to end of file read to be more thread friendly. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @61f329f0   7 years krzywon Reset file reader class data state each time a new data file is loaded. magnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @c22b621   7 years pkienzle Merge branch 'py3' into ticket-947-sasmodels-docs ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @a26f67f   7 years pkienzle fixup api doc errors ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @2b538cd   7 years krzywon Modify documentation and add instance check for numpy arrays in HDF5 … ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @b916afa   7 years pkienzle Merge branch 'ticket-853-fit-gui-to-calc' into py3 ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @9be22cd   7 years pkienzle Merge branch 'ticket-887-reorg' into ticket-853-fit-gui-to-calc ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @83db1cc   7 years pkienzle Merge branch 'ticket-869' into ticket-887-reorg ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @4b001f3   7 years pkienzle Merge branch 'master' into ticket-915 ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @1efbc190   7 years pkienzle fix merge errors ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @b58265c3   7 years pkienzle use logger rather than print for error notifications ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @d5aeaa3   7 years pkienzle add CLoader to the correct module ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
(edit) @15fa31d   7 years smk78 Merge branch 'master' of ​https://github.com/SasView/sasview.git ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalcmagnetic_scattrelease-4.2.2ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
Note: See TracRevisionLog for help on using the revision log.