diff --git a/doc/changelog.rst b/doc/changelog.rst index 865e15db20848086b9fb80abb6b6c1bf7534e9e8..e84ffce5fe567e60f1b0695d2b8317ba2ab3b8ec 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -12,6 +12,7 @@ unreleased - fix :issue:`47` SLURM script not using the correct kernel :mr:`176` - fix :issue:`51` make sure that BAM units are in ps :mr:`183` - fix :issue:`50` and :issue:`54` relating to package dependencies + - fix :issue:`57` adds target mono energy mnemonic - **Improvements** diff --git a/doc/scripts/bin_dssc_module_job.sh b/doc/scripts/bin_dssc_module_job.sh index efdf5f90007c01de425e056615b8f92bf5e26d44..09f5b95377e4c28cd6925109cb84d4875a93746d 100644 --- a/doc/scripts/bin_dssc_module_job.sh +++ b/doc/scripts/bin_dssc_module_job.sh @@ -25,7 +25,7 @@ done # Load xfel environment source /etc/profile.d/modules.sh module load exfel -module load exfel_anaconda3/1.1 +module load exfel_anaconda3 echo processing run $RUN PDIR=$(find-proposal $PROPOSAL) diff --git a/doc/scripts/boz_parameters_job.sh b/doc/scripts/boz_parameters_job.sh index ef7fd34a26e4efc87037523a089f30fe3294919c..4107d3b37b3c3d13dba36dd2a5011d344e096273 100644 --- a/doc/scripts/boz_parameters_job.sh +++ b/doc/scripts/boz_parameters_job.sh @@ -30,7 +30,7 @@ done # Load xfel environment source /etc/profile.d/modules.sh module load exfel -module load exfel_anaconda3/1.1 +module load exfel_anaconda3 echo processing run $RUN PDIR=$(find-proposal $PROPOSAL) diff --git a/doc/scripts/format_data.sh b/doc/scripts/format_data.sh index 01e6659ece073ab8b8011d149c3f71af16e57334..efc21f4720a9493f19126bb9aaf27cb9d70484dc 100755 --- a/doc/scripts/format_data.sh +++ b/doc/scripts/format_data.sh @@ -8,11 +8,11 @@ if [ -d $RUN_DIR ] then echo creating formatted .h5 file for run $RUN_NR in $RUN_DIR # module load exfel -# module load exfel_anaconda3/1.1 +# module load exfel_anaconda3 python format_data.py --run-number $RUN_NR --run-folder $RUN_DIR #chgrp -R 60002711-part $RUN_DIR chmod -R 777 $RUN_DIR else echo run folder $RUN_DIR does not exist echo please provide a valid run number -fi \ No newline at end of file +fi diff --git a/doc/scripts/start_job_single.sh b/doc/scripts/start_job_single.sh index d3934e9a0b522432006b7c8147d6768b2e948d09..d23a9cef81dfa1cdb7ee6cfa5403a3604acbf699 100755 --- a/doc/scripts/start_job_single.sh +++ b/doc/scripts/start_job_single.sh @@ -11,7 +11,7 @@ RUNTYPE=$3 source /etc/profile.d/modules.sh module load exfel -module load exfel_anaconda3/1.1 +module load exfel_anaconda3 echo processing modules $MODULES of run $RUN python process_data_201007_23h.py --run-number $RUN --module ${MODULES} --runtype $RUNTYPE diff --git a/doc/scripts/start_processing_all.sh b/doc/scripts/start_processing_all.sh index f0fba41a6f57b748d30194f5e60769e288dba364..a6f694b7ed8cd84628c8af6e878ea3231c5bb932 100755 --- a/doc/scripts/start_processing_all.sh +++ b/doc/scripts/start_processing_all.sh @@ -8,7 +8,7 @@ if [ $RUN ] && [ $RUNTYPE ] echo processing run $RUN source /etc/profile.d/modules.sh module load exfel - module load exfel_anaconda3/1.1 + module load exfel_anaconda3 sbatch ./start_job_single.sh $RUN '0 1 2 3' $RUNTYPE sbatch ./start_job_single.sh $RUN '4 5 6 7' $RUNTYPE diff --git a/src/toolbox_scs/constants.py b/src/toolbox_scs/constants.py index 064ed851a6f1688e0f47a7546e8009b2efee97b9..6a266d0bbd883e58419f83d41d58a85d4a8a181b 100644 --- a/src/toolbox_scs/constants.py +++ b/src/toolbox_scs/constants.py @@ -62,7 +62,9 @@ mnemonics = { "nrj": ({'source': 'SA3_XTD10_MONO/MDL/PHOTON_ENERGY', 'key': 'actualEnergy.value', 'dim': None},), - + "nrj_target": ({'source': 'SA3_XTD10_MONO/MDL/PHOTON_ENERGY', + 'key': 'targetEnergy.value', + 'dim': None},), "M2BEND": ({'source': 'SA3_XTD10_MIRR-2/MOTOR/BENDER', 'key': 'actualPosition.value', 'dim': None},),