Merge pull request #1755 from willend/main

Work toward fixing SX issue from @minghuisvn
McStasMcXtrace · Nov 4, 2024 · 8f60547 · 8f60547
2 parents a75b001 + e0d33dc
commit 8f60547
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml
@@ -23,8 +23,9 @@ jobs:
           - { os: ubuntu-22.04, CC: gcc,      CXX: g++,        python: '3.10' }
           - { os: ubuntu-22.04, CC: clang,    CXX: clang++,    python: '3.11' }
           - { os: ubuntu-22.04, CC: gcc-12,   CXX: g++-12,     python: '3.11' }
-          - { os: macos-12,      CC: clang,    CXX: clang++,    python: "3.11" }
           - { os: macos-13,      CC: clang,    CXX: clang++,    python: "3.11" }
+#         - { os: macos-14,      CC: clang,    CXX: clang++,    python: "3.11" }
+#         - { os: macos-15,      CC: clang,    CXX: clang++,    python: "3.11" }
           - { os: windows-latest,  CC: gcc,    CXX: g++,        python: "3.11" }
 
     name: ${{ matrix.os }}.${{ matrix.CC }}.python-${{ matrix.python }}

diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml
@@ -23,8 +23,9 @@ jobs:
           - { os: ubuntu-22.04, CC: gcc,      CXX: g++,        python: '3.10' }
           - { os: ubuntu-22.04, CC: clang,    CXX: clang++,    python: '3.11' }
           - { os: ubuntu-22.04, CC: gcc-12,   CXX: g++-12,     python: '3.11' }
-          - { os: macos-12,      CC: clang,    CXX: clang++,    python: "3.11" }
           - { os: macos-13,      CC: clang,    CXX: clang++,    python: "3.11" }
+#         - { os: macos-14,      CC: clang,    CXX: clang++,    python: "3.11" }
+#         - { os: macos-15,      CC: clang,    CXX: clang++,    python: "3.11" }
           - { os: windows-latest,  CC: gcc,    CXX: g++,        python: "3.11" }
 
     name: ${{ matrix.os }}.${{ matrix.CC }}.python-${{ matrix.python }}

diff --git a/mcstas-comps/samples/Single_crystal.comp b/mcstas-comps/samples/Single_crystal.comp
@@ -533,9 +533,9 @@ double tau;                 /* Length of (tau_x, tau_y, tau_z) */
     if (nb_atoms > 1) { info->sigma_a *= nb_atoms; info->sigma_i *= nb_atoms; }
 
     /* special cases for the structure definition */
-    if (info->m_ax || info->m_ay || info->m_az) info->m_a=0; /* means we specify by hand the vectors */
-    if (info->m_bx || info->m_by || info->m_bz) info->m_b=0;
-    if (info->m_cx || info->m_cy || info->m_cz) info->m_c=0;
+    if (info->m_ax || info->m_ay || info->m_az) {info->m_a=0; info->m_aa=0;} /* means we specify by hand the vectors */
+    if (info->m_bx || info->m_by || info->m_bz) {info->m_b=0; info->m_bb=0;}
+    if (info->m_cx || info->m_cy || info->m_cz) {info->m_c=0; info->m_cc=0;};
 
     /* compute the norm from vector a if missing */
     if (info->m_ax || info->m_ay || info->m_az) {

diff --git a/mcxtrace-comps/samples/Single_crystal.comp b/mcxtrace-comps/samples/Single_crystal.comp
@@ -567,9 +567,9 @@ SHARE
     if (nb_atoms > 1) { info->sigma_i *= nb_atoms; }
 
     /* special cases for the structure definition */
-    if (info->m_ax || info->m_ay || info->m_az) info->m_a=0; /* means we specify by hand the vectors */
-    if (info->m_bx || info->m_by || info->m_bz) info->m_b=0;
-    if (info->m_cx || info->m_cy || info->m_cz) info->m_c=0;
+    if (info->m_ax || info->m_ay || info->m_az) {info->m_a=0; info->m_aa=0;} /* means we specify by hand the vectors */
+    if (info->m_bx || info->m_by || info->m_bz) {info->m_b=0; info->m_bb=0;}
+    if (info->m_cx || info->m_cy || info->m_cz) {info->m_c=0; info->m_cc=0;};
 
     /* compute the norm from vector a if missing */
     if (info->m_ax || info->m_ay || info->m_az) {