Merge pull request #1788 from willend/main

Two minor fixes
mccode-dev · Dec 4, 2024 · dd0363f · dd0363f
2 parents 7d9766a + 1d9b285
commit dd0363f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mcstas-comps/examples/ILL/ILL_H22_VIVALDI/ILL_H22_VIVALDI.instr b/mcstas-comps/examples/ILL/ILL_H22_VIVALDI/ILL_H22_VIVALDI.instr
@@ -120,15 +120,15 @@ COMPONENT Environment_in=PowderN(
   p_transmit=0.95, p_inc=0, barns=1)
   AT (0, 0, 0) RELATIVE SamplePos
 EXTEND %{
-  flag_env=SCATTERED;
+  if (SCATTERED) flag_env++;
 %}
 
 COMPONENT Container_in=PowderN(radius=0.008/2+1e-4, thickness=1e-4, yheight=0.05,
   reflections=container, concentric=1, d_phi=RAD2DEG*atan2(0.5,L3) ,
   p_transmit=0.93, p_inc=0.05)
   AT (0, 0, 0) RELATIVE SamplePos
 EXTEND %{
-  flag_container=SCATTERED;
+ if (SCATTERED) flag_container++;
 %}
 
 COMPONENT Sample=Single_crystal(
@@ -145,13 +145,13 @@ EXTEND %{
 COMPONENT Container_out=COPY(Container_in)(concentric=0)
   AT (0, 0, 0) RELATIVE SamplePos
 EXTEND %{
-  if (SCATTERED) flag_container=1;
+ if (SCATTERED) flag_container++;
 %}
 
 COMPONENT Environment_out=COPY(Environment_in)(concentric=0)
   AT (0, 0, 0) RELATIVE SamplePos
 EXTEND %{
-  if (SCATTERED) flag_env=1;
+  if (SCATTERED) flag_env++;
 %}
 
 COMPONENT PSD_Vivaldi = Monitor_nD(

diff --git a/tools/Python/mcplot/pyqtgraph/mcplot.in b/tools/Python/mcplot/pyqtgraph/mcplot.in
@@ -25,7 +25,7 @@ canrun() {
     done
     python3 -c "${cmd}"
 
-    python3 -c "import PySide6"
+    python3 -c "import PySide6" 2> /dev/null
     if [ $? == 0 ]; then
 	mcstas_errmsg Your Python has PySide6 - ${TOOL} will not function correctly. Please run in an environment with PyQt5 only.
 	exit 127;