diff --git a/RELEASE.txt b/RELEASE.txt index 04397284c..7023cfd88 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -13,8 +13,11 @@ INTRODUCTION The Source Code (Default C++ API): https://github.com/slsdetectorgroup/slsDetectorPackage - The Conda Package: - https://github.com/slsdetectorgroup/sls_detector_software + The Conda Lib Package: + https://github.com/slsdetectorgroup/sls_detector_lib + + The Conda GUI Package: + https://github.com/slsdetectorgroup/sls_detector_gui The Python Interface (including the package): https://github.com/slsdetectorgroup/sls_detector diff --git a/manual/docs/html/angularCalibrationHowTo/images.log b/manual/docs/html/angularCalibrationHowTo/images.log index c6cb1a56a..30fd0c9f3 100644 --- a/manual/docs/html/angularCalibrationHowTo/images.log +++ b/manual/docs/html/angularCalibrationHowTo/images.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 15:46 +This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 16:50 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/manual/docs/html/energyCalibrationHowTo/images.log b/manual/docs/html/energyCalibrationHowTo/images.log index 4e4d2a817..fa6c143ab 100644 --- a/manual/docs/html/energyCalibrationHowTo/images.log +++ b/manual/docs/html/energyCalibrationHowTo/images.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 15:47 +This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 16:50 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/manual/docs/html/energyCalibrationHowTo/img39.png b/manual/docs/html/energyCalibrationHowTo/img39.png index 02183315c..1c79fbccd 100644 Binary files a/manual/docs/html/energyCalibrationHowTo/img39.png and b/manual/docs/html/energyCalibrationHowTo/img39.png differ diff --git a/manual/docs/html/slsDetectorClientHowTo/images.log b/manual/docs/html/slsDetectorClientHowTo/images.log index 0a6543c98..493281009 100644 --- a/manual/docs/html/slsDetectorClientHowTo/images.log +++ b/manual/docs/html/slsDetectorClientHowTo/images.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 15:47 +This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 16:50 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/manual/docs/html/slsDetectorInstall/Install_Binaries_via_Conda.html b/manual/docs/html/slsDetectorInstall/Install_Binaries_via_Conda.html index 5199c5b9b..54bfe8d53 100644 --- a/manual/docs/html/slsDetectorInstall/Install_Binaries_via_Conda.html +++ b/manual/docs/html/slsDetectorInstall/Install_Binaries_via_Conda.html @@ -62,13 +62,12 @@ conda config --add channels conda-forge conda config --add channels slsdetectorgroup #Install latest version -conda install sls_detector_software +conda install sls_detector_lib +conda install sls_detector_gui -#Install specific release (GLIBC2.14) -conda install sls_detector_software=4.0.0 - -#Scientific Linux 6 version (GLIBC2.12) -conda install sls_detector_software=SL6_4.0.0 +#Install specific release +conda install sls_detector_lib=4.0.0 +conda install sls_detector_gui=4.0.0
  • The package including Python interface @@ -80,11 +79,8 @@ conda config --add channels sls_detector #Install latest version conda install sls_detector -#Install specific release (GLIBC2.14) +#Install specific release conda install sls_detector=4.0.0 - -#Scientific Linux 6 version (GLIBC2.12) -conda install sls_detector=SL6_4.0.0
    • diff --git a/manual/docs/html/slsDetectors-FAQ/images.log b/manual/docs/html/slsDetectors-FAQ/images.log index 1ae8db1d0..2fe90a840 100644 --- a/manual/docs/html/slsDetectors-FAQ/images.log +++ b/manual/docs/html/slsDetectors-FAQ/images.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 15:43 +This is pdfTeX, Version 3.1415926-2.5-1.40.14 (TeX Live 2013) (format=latex 2018.8.23) 23 AUG 2018 16:49 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/manual/docs/html/slsDetectors-FAQ/img36.png b/manual/docs/html/slsDetectors-FAQ/img36.png index 7ed2b212a..fcfe9b991 100644 Binary files a/manual/docs/html/slsDetectors-FAQ/img36.png and b/manual/docs/html/slsDetectors-FAQ/img36.png differ diff --git a/manual/docs/html/slsDetectors-FAQ/img38.png b/manual/docs/html/slsDetectors-FAQ/img38.png index 7bf7f3700..234328479 100644 Binary files a/manual/docs/html/slsDetectors-FAQ/img38.png and b/manual/docs/html/slsDetectors-FAQ/img38.png differ diff --git a/manual/docs/pdf/angularCalibrationHowTo.pdf b/manual/docs/pdf/angularCalibrationHowTo.pdf index 67e099dec..531a5653c 100644 Binary files a/manual/docs/pdf/angularCalibrationHowTo.pdf and b/manual/docs/pdf/angularCalibrationHowTo.pdf differ diff --git a/manual/docs/pdf/energyCalibrationHowTo.pdf b/manual/docs/pdf/energyCalibrationHowTo.pdf index a9cf4bcd6..4d16920a5 100644 Binary files a/manual/docs/pdf/energyCalibrationHowTo.pdf and b/manual/docs/pdf/energyCalibrationHowTo.pdf differ diff --git a/manual/docs/pdf/slsDetectorClientDocs.pdf b/manual/docs/pdf/slsDetectorClientDocs.pdf index 738667013..2e6af4a82 100644 Binary files a/manual/docs/pdf/slsDetectorClientDocs.pdf and b/manual/docs/pdf/slsDetectorClientDocs.pdf differ diff --git a/manual/docs/pdf/slsDetectorClientHowTo.pdf b/manual/docs/pdf/slsDetectorClientHowTo.pdf index 61ebda4f5..c94166b2b 100644 Binary files a/manual/docs/pdf/slsDetectorClientHowTo.pdf and b/manual/docs/pdf/slsDetectorClientHowTo.pdf differ diff --git a/manual/docs/pdf/slsDetectorGuiHowTo.pdf b/manual/docs/pdf/slsDetectorGuiHowTo.pdf index cedae8459..1a5c4a657 100644 Binary files a/manual/docs/pdf/slsDetectorGuiHowTo.pdf and b/manual/docs/pdf/slsDetectorGuiHowTo.pdf differ diff --git a/manual/docs/pdf/slsDetectorInstall.pdf b/manual/docs/pdf/slsDetectorInstall.pdf index 2c0594e25..c3267f836 100644 Binary files a/manual/docs/pdf/slsDetectorInstall.pdf and b/manual/docs/pdf/slsDetectorInstall.pdf differ diff --git a/manual/docs/pdf/slsDetectorUsersDocs.pdf b/manual/docs/pdf/slsDetectorUsersDocs.pdf index d7951793f..9f93e1e7c 100644 Binary files a/manual/docs/pdf/slsDetectorUsersDocs.pdf and b/manual/docs/pdf/slsDetectorUsersDocs.pdf differ diff --git a/manual/docs/pdf/slsDetectors-FAQ.pdf b/manual/docs/pdf/slsDetectors-FAQ.pdf index bf4bd3639..7296cb1a4 100644 Binary files a/manual/docs/pdf/slsDetectors-FAQ.pdf and b/manual/docs/pdf/slsDetectors-FAQ.pdf differ diff --git a/manual/manual-main/slsDetectorInstall.tex b/manual/manual-main/slsDetectorInstall.tex index 93d178623..8fe5aa859 100644 --- a/manual/manual-main/slsDetectorInstall.tex +++ b/manual/manual-main/slsDetectorInstall.tex @@ -115,13 +115,13 @@ conda config --add channels conda-forge conda config --add channels slsdetectorgroup #Install latest version -conda install sls_detector_software +conda install sls_detector_lib +conda install sls_detector_gui -#Install specific release (GLIBC2.14) -conda install sls_detector_software=4.0.0 +#Install specific release +conda install sls_detector_lib=4.0.0 +conda install sls_detector_gui=4.0.0 -#Scientific Linux 6 version (GLIBC2.12) -conda install sls_detector_software=SL6_4.0.0 \end{verbatim} \item The package including Python interface \begin{verbatim} @@ -132,11 +132,9 @@ conda config --add channels sls_detector #Install latest version conda install sls_detector -#Install specific release (GLIBC2.14) +#Install specific release conda install sls_detector=4.0.0 -#Scientific Linux 6 version (GLIBC2.12) -conda install sls_detector=SL6_4.0.0 \end{verbatim} \end{itemize}