From b6a9d082f53787f2867debfa85defdca8eb7e7fb Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 19 May 2016 21:44:44 +0200 Subject: [PATCH] Update compiling script to output NeXus and add VS ToF detector --- simulation/Estia_preliminary.instr | 17 +++++++--- simulation/run_simu.sh | 50 ++++++++++++++++-------------- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/simulation/Estia_preliminary.instr b/simulation/Estia_preliminary.instr index 52c0c4e..3a9503d 100644 --- a/simulation/Estia_preliminary.instr +++ b/simulation/Estia_preliminary.instr @@ -525,6 +525,13 @@ COMPONENT virtual_source_BL = Slit( // AT (0,0,0.019) RELATIVE arm_virtual_source_beam // Beam monitoring after VS + COMPONENT tof_behind_virtual_source = Monitor_nD( + filename = "tof_behind_virtual_source", + options = "x limits=[-0.1 0.1] bins=1000 y limits=[-0.1 0.1] bins=1000 xdiv limits=[-0.8 0.8] bins=160 ydiv limits=[-0.8 0.8] bins=160 time limits=[0 0.2] bins=2000 lambda limits=[0 35] bins=3500, list all", + xwidth=0.2, yheight = 0.2) + WHEN sample!=4 + AT (0, 0, 0.019) RELATIVE arm_virtual_source_beam + COMPONENT DL_behind_virtual_source = DivLambda_monitor( filename = "DL_behind_virtual_source", nL = 200, nh = 200, @@ -815,11 +822,11 @@ COMPONENT ac_slit = Slit( COMPONENT tof_sample = Monitor_nD( filename = "tof_sample", - options = "x limits=[-0.1 0.1] bins=1000 y limits=[-0.1 0.1] bins=1000 time limits=[0 0.2] bins=2000 lambda limits=[0 20] bins=2000, list all", - xwidth=4*sample_length, yheight = 4*sample_height) + options = "x limits=[-0.1 0.1] bins=1000 y limits=[-0.1 0.1] bins=1000 xdiv limits=[-0.8 0.8] bins=160 ydiv limits=[-0.8 0.8] bins=160 time limits=[0 0.2] bins=2000 lambda limits=[0 35] bins=3500, list all", + xwidth=0.2, yheight = 0.2) WHEN sample!=4 - AT (0, 0, -0.0005) RELATIVE arm_sample - ROTATED (0, 90, 0) RELATIVE arm_sample + AT (0, 0, -0.0005) RELATIVE arm_sample_beam + ROTATED (0, 0, 0) RELATIVE arm_sample_beam /* monitor for full beam at sample position ( n/cm²/s ) */ COMPONENT PP_small_sample = PSD_monitor( @@ -896,7 +903,7 @@ COMPONENT si_sample = Mirror( COMPONENT tof_detector = Monitor_nD( filename = "tof_detector", - options = "x limits=[-0.25 0.25] bins=1000 y limits=[-0.25 0.25] bins=500 time limits=[0 0.2] bins=2000 lambda limits=[0 20] bins=2000, list all", + options = "x limits=[-0.25 0.25] bins=1000 y limits=[-0.25 0.25] bins=500 time limits=[0 0.2] bins=2000 lambda limits=[0 35] bins=3500, list all", xwidth = 0.5, yheight = 0.5) AT (0, 0, detector_arm+0.001) RELATIVE arm_detector diff --git a/simulation/run_simu.sh b/simulation/run_simu.sh index 4dc369e..f0d159c 100755 --- a/simulation/run_simu.sh +++ b/simulation/run_simu.sh @@ -1,43 +1,47 @@ #!/bin/tcsh setenv ncount 1e10 -setenv focus_shift 0.0 setenv use_cores 40 setenv sample 1 -setenv omega 2.0 +setenv omega 6.0 +setenv sample_length 0.01 +setenv sample_height 0.01 module load mcstas/mcstas2.2a if ( -M Estia.inst > -M Estia.inst.out ) then rm Estia.inst.c Estia.inst.out /afs/psi.ch/project/sinq/sl6-64/mcstas2.2a/mcstas/2.2a/bin/mcstas -t -o Estia.inst.c Estia.inst - mpicc -O3 -o Estia.inst.out Estia.inst.c -lm -DUSE_MPI + mpicc -O3 -o Estia.inst.out Estia.inst.c -lm -DUSE_MPI -DUSE_NEXUS -lNeXus endif setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/double_vertical/reference_2deg_no_gravity if ( -e "$DEST" ) then rm -r "$DEST" endif -mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.000 enable_gravity=0 +mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out \ + --dir="$DEST" --format=NeXuS --ncount=$ncount \ + omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample over_illumination=0.000 sample_length=$sample_length sample_height=$sample_height \ + enable_gravity=0 enable_chopper=0 -setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/add_gravity/reference_2deg_no_gravity -if ( -e "$DEST" ) then - rm -r "$DEST" -endif -mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --gravitation --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.0 enable_gravity=1 - - -setenv sample 4 -setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/double_vertical/sample_flux_no_gravity -if ( -e "$DEST" ) then - rm -r "$DEST" -endif -mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.000 enable_gravity=0 - -setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/add_gravity/sample_flux_no_gravity -if ( -e "$DEST" ) then - rm -r "$DEST" -endif -mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --gravitation --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.0 enable_gravity=1 +# setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/add_gravity/reference_2deg_no_gravity +# if ( -e "$DEST" ) then +# rm -r "$DEST" +# endif +# mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --gravitation --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.0 enable_gravity=1 +# +# +# setenv sample 4 +# setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/double_vertical/sample_flux_no_gravity +# if ( -e "$DEST" ) then +# rm -r "$DEST" +# endif +# mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.000 enable_gravity=0 +# +# setenv DEST /home/l_mc01/mpi/glavic/mcstas/results/add_gravity/sample_flux_no_gravity +# if ( -e "$DEST" ) then +# rm -r "$DEST" +# endif +# mpirun -machinefile /home/l_mc01/mpi/glavic/mcstas/simulation/hosts -np $use_cores /home/l_mc01/mpi/glavic/mcstas/simulation/Estia.inst.out --gravitation --dir="$DEST" --format=PGPLOT --ncount=$ncount omegaa=$omega operationmode=0 theta_resolution=0.04 sample=$sample focus_shift=$focus_shift beam_port_angle=15 vertical_inclination=-0.7 over_illumination=0.0 enable_gravity=1 #/afs/psi.ch/project/sinq/sl6-64/mcstas2.2a/mcstas/2.2a/bin/mcplot $DEST&