Merge branch 'fasermc-dev' into 'master'

FLUKA update

See merge request faser/calypso!335

Control/CalypsoExample/Simulation/scripts/submit_faser_simulate.sh

@@ -35,6 +35,11 @@ do
 	  xangle=1 
 	  shift;;  # This 'eats' the argument
 
+      --fshift)
+	  echo "Applying FLUKA crossing-angle shift"
+	  xangle=2
+	  shift;;
+
       -l | --log)
 	  logdest="$2";
 	  shift;
@@ -184,9 +189,13 @@ cd "${file_stem}"
 if [[ -z "$xangle" ]]; then
     faser_simulate.py  --skip "$skip_events" -n "$nevts" "$infile" "$outfile"
     sim_code=$?
-else
+elif [[ $xangle == 1 ]]; then
     faser_simulate.py  --yangle -0.000160 --yshift 12.0 --skip "$skip_events" -n "$nevts" "$infile" "$outfile"
     sim_code=$?
+else
+    echo "Applying double crossing-angle shift for FLUKA!"
+    faser_simulate.py  --yangle -0.000310 --yshift 12.0 --skip "$skip_events" -n "$nevts" "$infile" "$outfile"
+    sim_code=$?
 fi
 echo "Return code: $sim_code"
 #