- Timestamp:
- Mar 26, 2017 4:33:22 AM (7 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 9a5097c, 2de23521, 27109e5
- Parents:
- e0125d6 (diff), 311d00a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Andrew Jackson <andrew.jackson@…> (03/26/17 04:33:22)
- git-committer:
- GitHub <noreply@…> (03/26/17 04:33:22)
- Location:
- sasview
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasview/README.txt
rb485253 r9146ed9 483 483 =============== 484 484 485 486 4.1- All systems: 487 The conversion to sasmodels infrastructure is ongoing and should be 488 completed in the next release. In the meantime this leads to a few known 489 issues: 490 - The way that orientation is defined is being refactored to address 491 long standing issues and comments. In release 4.1 however only models 492 with symmetry (e.g. a=b) have been converted to the new definitions. 493 The rest (a <> b <> c - e.g. parellelepiped) maintain the same 494 definition as before and will be converted in 4.2. Note that 495 orientational distribution also makes much more sense in the new 496 framework. The documentation should indicate which definition is being 497 used for a given model. 498 - The infrastructure currently handles internal conversion of old style 499 models so that user created models in previous versions should continue 500 to work for now. At some point in the future such support will go away. 501 Everyone is encouraged to convert to the new structure which should be 502 relatively straight forward and provides a number of benefits. 503 - In that vein, the distributed models and those generated by the new 504 plugin model editor are in the new format, however those generated by 505 sum|multiply models are the old style sum|multiply models. This should 506 also disappear in the near future 507 - The on the fly discovery of plugin models and changes thereto behave 508 inconsistently. If a change to a plugin model does not seem to 509 register, the Load Plugin Models (under fitting -> Plugin Model 510 Operations) can be used. However, after calling Load Plugin Models, the 511 active plugin will no longer be loaded (even though the GUI looks like 512 it is) unless it is a sum|multiply model which works properly. All 513 others will need to be recalled from the model dropdown menu to reload 514 the model into the calculation engine. While it might be annoying it 515 does not appear to prevent SasView from working.. 516 - The model code and documentation review is ongoing. At this time the 517 core shell parellelepiped is known to have the C shell effectively fixed 518 at 0 (noted in documentation) while the triaxial ellipsoid does not seem 519 to reproduce the limit of the oblate or prolate ellipsoid. If errors are 520 found and corrected, corrected versions will be uploaded to the 521 marketplace. 522 485 523 3.1- All systems: 486 524 - The documentation window may take a few seconds to load the first time -
sasview/local_config.py
r73cbeec rf9d1f60 33 33 ''' remember to:''' 34 34 _acknowledgement_preamble_bullet1 =\ 35 '''Acknowledge its use in your publications as suggested below;'''35 '''Acknowledge its use in your publications as :''' 36 36 _acknowledgement_preamble_bullet2 =\ 37 '''Reference SasView as : M. Doucet, et al. SasView Version 4.0, Zenodo''' +\ 38 ''', http://doi.org/10.5281/zenodo.159083;''' 37 '''Reference SasView as:''' 39 38 _acknowledgement_preamble_bullet3 =\ 40 '''Reference the model you used if appropriate (see documentation for refs) ;'''39 '''Reference the model you used if appropriate (see documentation for refs)''' 41 40 _acknowledgement_preamble_bullet4 =\ 42 41 '''Send us your reference for our records: developers@sasview.org''' 43 42 _acknowledgement_publications = \ 44 '''This work benefited from the use of the SasView application, originally developed under NSF Award 45 DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme 46 under the SINE2020 project Grant No 654000, and by Patrick O'Brien & Adam Washington.'''43 '''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.''' 44 _acknowledgement_citation = \ 45 '''M. Doucet et al. SasView Version 4.1, Zenodo, 10.5281/zenodo.438138''' 47 46 48 47 _acknowledgement = \ 49 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained 50 by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft. SasView also contains code developed with funding from the 51 EU Horizon 2020 programme under the SINE2020 project (Grant No 654000), and by Patrick O'Brien (pycrust) and Adam Washington (corfunc-py).''' 48 '''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: https://github.com/orgs/SasView/people 49 ''' 52 50 53 51 _homepage = "http://www.sasview.org" … … 89 87 _corner_image = os.path.join(icon_path, "angles_flat.png") 90 88 _welcome_image = os.path.join(icon_path, "SVwelcome.png") 91 _copyright = "(c) 2009 - 201 6, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft"89 _copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO and TU Delft" 92 90 marketplace_url = "http://marketplace.sasview.org/" 93 91
Note: See TracChangeset
for help on using the changeset viewer.