Skip to content

GitLab

Commit e168782c authored by Samuel Jones's avatar Samuel Jones Committed by Peterson, Peter
Browse files

Create pre-commit framework configuration 

The initial configuration contains only simple
checks that none of our other CI jobs cover.
Further checks sych as clang-format,yapf etc
will be added in due course but require more
extensive code changes.
parent e55d7a78
Hide whitespace changes
Inline Side-by-side
.githooks/pre-commit deleted 100755 → 0
View file @ e55d7a78
#!/usr/bin/env bash
#=============================================================================
# Copyright 2010-2011 Kitware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
die() {
echo 'pre-commit hook failure' 1>&2
echo '-----------------------' 1>&2
echo '' 1>&2
echo "$@" 1>&2
exit 1
}
zero='0000000000000000000000000000000000000000'
#-----------------------------------------------------------------------------
# Check for committer identity.
advice='
Use the commands
git config --global user.name '\''Your Name'\''
git config --global user.email '\''you@yourdomain.com'\''
to introduce yourself to Git before committing.'
# Ensure name and email are available.
git config --get user.name > /dev/null &&
git config --get user.email > /dev/null ||
die 'Identity not configured!' "$advice"
# Validate the name and email.
git config --get user.name | grep ' ' > /dev/null ||
die 'Set user.name to your Real Name (with a space), not a userid.' "$advice"
git config --get user.email | grep '^[^@]*@[^@]*$' > /dev/null ||
die 'Set user.email to an email address (userid@validdomain.com).' "$advice"
#-----------------------------------------------------------------------------
# Check content that will be added by this commit.
if git rev-parse --verify -q HEAD > /dev/null; then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
fi
# Merge ("git commit" after "git merge" with conflicts or --no-commit)
merge_head=$(git rev-parse -q --verify MERGE_HEAD) || merge_head=''
# Disallow non-ascii file names. The printable range starts at the
# space character and ends with tilde.
if test "$(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0')"; then
die 'Non-ascii file names may not be added:
'"$(git diff --cached --name-only --diff-filter=A $against)"
fi
#-----------------------------------------------------------------------------
# Builtin whitespace checks.
bad=$(git diff-index --check --cached $against -- --ignore-space-at-eol) || die "$bad"
# Approximate whitespace=tab-in-indent check with Git < 1.7.2.
git --version | grep -q " \(1\.[0-6]\|1\.7\.[01]\)" &&
approx_tab_in_indent=true || approx_tab_in_indent=false
check_tab() {
lines=$(git diff-index -p --cached $against -- "$1" |
grep '^+ ') &&
echo "$lines" |
while read line; do
echo "$1: tab in indent." &&
echo "$line"
done
}
# Reject addition of a line without a newline at end-of-file.
check_no_lf_at_eof() {
lines=$(git diff-index -p --cached $against -- "$1" | tail -2)
if echo "$lines" | head -1 | grep -q '^+' &&
echo "$lines" | tail -1 | grep -q '^\\ No newline'; then
echo "$1: No newline at end of file"
fi
}
# Custom whitespace checks.
check_whitespace() {
ws=$(git check-attr whitespace -- "$file" |
sed 's/^[^:]*: whitespace: //')
if $approx_tab_in_indent; then
case ",$ws," in
*,tab-in-indent,*) check_tab "$1" ;;
esac
fi
case ",$ws," in
*,no-lf-at-eof,*) check_no_lf_at_eof "$1" ;;
esac
}
bad=$(git diff-index --name-only --cached $against -- |
while read file; do
check_whitespace "$file"
done)
test -z "$bad" || die "$bad"
#-----------------------------------------------------------------------------
# Check file modes and sizes.
mode_looks_exe() {
case "$1" in
*.bat) return 0 ;;
*.cmd) return 0 ;;
*.exe) return 0 ;;
*.com) return 0 ;;
esac
git cat-file blob "$2" | head -1 | grep "^#\!/" > /dev/null
}
mode_not_exe () {
echo "The file '$file' has looks executable but does not have an executable mode."
}
mode_bad_exe () {
echo "The file '$file' has executable mode but does not look executable."
}
mode_non_file () {
echo "The path '$file' has a non-file mode."
}
check_mode() {
case "$dst_mode" in
100755) mode_looks_exe "$file" "$dst_obj" || mode_bad_exe ;;
100644) mode_looks_exe "$file" "$dst_obj" && mode_not_exe ;;
160000) ;;
*) mode_non_file ;;
esac
}
size_max_KiB=$(git config hooks.MaxObjectKiB)
test -n "$size_max_KiB" || size_max_KiB=1024
size_too_large_once=""
size_too_large_once() {
test -z "$size_too_large_once" || return ; size_too_large_once=done
echo 'At least one file is staged for commit with size larger than the limit.
We prefer to keep large files out of the main source tree, especially
binary files that do not compress well. This hook disallows large files.
If it is vital that this file enters the repository, speak to a dev lead.
Remember that unit tests should typically not require loading files (see
http://www.mantidproject.org/Unit_Test_Good_Practice#Using_files_in_Unit_tests).
'
# Instructions for allowing ESSENTIAL files only:
# A limit for specific files or patterns may be set in ".gitattributes" with
# the "hooks.MaxObjectKiBYYMMDD" attribute (where YYMMDD is the current date).
# For example, the line
#
# *.c hooks.MaxObjectKiB121207=2048
#
# sets a limit of 2048 KiB for C source files, but WILL ONLY WORK on the date
# matching the entry. This avoids the previous behaviour that once set the
# hook was forever disabled if the entry was not removed afterwards.
# See "git help attributes" for details on the .gitattributes format.
}
size_too_large() {
size_too_large_once
echo "The path '$file' has size $file_KiB KiB, greater than allowed $max_KiB KiB."
}
size_validate_max_KiB() {
test "$max_KiB" -ge "0" 2>/dev/null && return 0
echo "The path '$file' has invalid attribute \"hooks-MaxObjectKiB=$max_KiB\"."
return 1
}
check_size() {
test "$dst_obj" != "$zero" || return
datesuffix=`date +%y%m%d`
hookname='hooks.MaxObjectKiB'$datesuffix
max_KiB=$(git check-attr $hookname -- "$file" |
sed "s/^[^:]*: ${hookname}: //")
case "$max_KiB" in
'unset') return ;; # No maximum for this object.
'set') max_KiB="$size_max_KiB" ;; # Use local default.
'unspecified') max_KiB="$size_max_KiB" ;; # Use local default.
*) size_validate_max_KiB || return ;;
esac
if test "$max_KiB" -gt "0"; then
file_KiB=$(expr '(' $(git cat-file -s "$dst_obj") + 1023 ')' / 1024)
test "$file_KiB" -le "$max_KiB" || size_too_large
fi
}
short_commit() {
git rev-parse --short "$1" 2>/dev/null || echo "$1"
}
lookup_config_module_update() {
update=$(git config "hooks.$1.update")
# Special-case "true" to accept any update.
test "{$update}" = "{true}" && echo '.' && return
# Format is "aaaaaa..bbbbbb" for update aaaaaa => bbbbbb.
# Convert to regex "^aaaaaa[a-z0-9]* bbbbbb[a-z0-9]*$".
sha1ex='[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]*'
regex='^\('"$sha1ex"'\)\.\.\('"$sha1ex"'\)$'
echo "$update" |
sed -n "/$regex/ {s/$regex/"'^\1[a-z0-9]* \2[a-z0-9]*$/;p;}' |
grep '.' # Return false if result is empty.
}
check_module() {
enabled=$(git config --get --bool hooks.submodule) || enabled=true
test "$enabled" = "false" && return
# Allow merged submodule updates.
test -n "$merge_head" &&
merge_obj=$(git rev-parse -q --verify "$merge_head:$file") &&
test "$merge_obj" = "$dst_obj" && return
# Allow module-only commits without extra work.
test -z "$diffs_normal" && return
# Check if module update is allowed with other changes.
allow=$(lookup_config_module_update "$file") || allow='none'
if echo "$src_obj $dst_obj" | grep "$allow" > /dev/null; then
return
fi
src_short=$(short_commit "$src_obj")
dst_short=$(short_commit "$dst_obj")
echo 'A submodule link is staged for commit (among other changes):
"'"$file"'" '"$src_short => $dst_short"'
This may occur by accident so we require an extra step to commit.
If you intend to include this change in your commit, run
git config "hooks.'"$file"'.update" '"$src_short..$dst_short"'
to explicitly allow the change and try the commit again. Otherwise run
git reset HEAD -- "'"$file"'"
to unstage the change. Furthermore, if you did not intend to modify
the submodule at all, also run
git submodule update -- "'"$file"'"
to checkout the current version of the submodule in your work tree.
Test your changes again to see if they still work with the module.
Finally, try the commit again.
'
return 1
}
check_module_rewind() {
parent_name="$1"
parent_commit="$2"
base=$(GIT_DIR="$file/.git" \
git merge-base $src_obj $dst_obj 2>/dev/null) || base=''
test "$base" != "$dst_obj" && return
parent_short=$(short_commit "$parent_commit")
src_short=$(GIT_DIR="$file/.git" short_commit "$src_obj")
dst_short=$(GIT_DIR="$file/.git" short_commit "$dst_obj")
echo 'This commit would rewind a submodule link:
"'"$file"'" '"$src_short => $dst_short"'
from the newer version in '"$parent_name"' ('"$parent_short"'). Run
git reset '"$parent_name"' -- "'"$file"'"
git submodule update -- "'"$file"'"
to checkout the newer version of the submodule in your work tree.
Then try the commit again.
'
return 1
}
diffs=$(git diff-index --cached $against -- |
sed -n '/^:[^:]/ {s/^://;p;}')
diffs_normal=$(echo "$diffs" | grep -v '^...... 160000')
diffs_module=$(echo "$diffs" | grep '^...... 160000')
bad=$(
test -n "$diffs_normal" && echo "$diffs_normal" |
while read src_mode dst_mode src_obj dst_obj status file; do
if test "$src_mode" != "$dst_mode" -a "$dst_mode" != "000000"; then
check_mode
fi
if test "$dst_mode" != "160000" -a "$dst_mode" != '000000'; then
check_size
fi
done
test -n "$diffs_module" && echo "$diffs_module" |
while read src_mode dst_mode src_obj dst_obj status file; do
check_module_rewind HEAD "$against" &&
check_module ||
break
done
)
test -z "$bad" || die "$bad"
#-----------------------------------------------------------------------------
# Merge checks.
if test -n "$merge_head"; then
merge_diffs=$(git diff-index --cached $merge_head -- |
sed -n '/^:[^:]/ {s/^://;p;}')
else
merge_diffs=''
fi
merge_diffs_normal=$(echo "$merge_diffs" | grep -v '^...... 160000')
merge_diffs_module=$(echo "$merge_diffs" | grep '^...... 160000')
bad=$(
test -n "$merge_diffs_module" && echo "$merge_diffs_module" |
while read src_mode dst_mode src_obj dst_obj status file; do
check_module_rewind MERGE_HEAD "$merge_head" ||
break
done
)
test -z "$bad" || die "$bad"
#-----------------------------------------------------------------------------
# Style hooks.
#. "$GIT_DIR/hooks/pre-commit-style"
#-----------------------------------------------------------------------------
# Chain to project-specific hook.
#. "$GIT_DIR/hooks/hooks-chain.bash"
#hooks_chain pre-commit "$@"
# vim: set filetype=sh tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab :
.pre-commit-config.yaml 0 → 100644
View file @ e168782c
default_language_version:
python: python3
exclude: ^$|instrument
repos:
# Run fast code improvement/checks before running PR specific helpers.
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 2618198e9658cccb4a53f04af0f7d642109f3b54
hooks:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
- id: check-added-large-files
args: ['--maxkb=4096']
- id: check-xml
- id: check-yaml
Framework/API/src/Algorithm.cpp
View file @ e168782c
......@@ -69,7 +69,6 @@ private:
};
template <typename T> struct RunOnFinish {
RunOnFinish(T &&task) : m_onfinsh(std::move(task)) {}
~RunOnFinish() { m_onfinsh(); }
......
buildconfig/CMake/Bootstrap.cmake
View file @ e168782c
......@@ -15,7 +15,7 @@ if(MSVC)
set(THIRD_PARTY_GIT_URL
"https://github.com/mantidproject/thirdparty-msvc2015.git"
)
set(THIRD_PARTY_GIT_SHA1 f834a89d01957e28e28443f132e1d7d546972ebc)
set(THIRD_PARTY_GIT_SHA1 f28751b9093bdc767fe9cfe619ec12b7d715b7a5)
set(THIRD_PARTY_DIR ${EXTERNAL_ROOT}/src/ThirdParty)
# Generates a script to do the clone/update in tmp
set(_project_name ThirdParty)
......@@ -127,6 +127,7 @@ if(MSVC)
set(BOOST_INCLUDEDIR "${CMAKE_INCLUDE_PATH}")
set(BOOST_LIBRARYDIR "${CMAKE_LIBRARY_PATH}")
set(Boost_NO_SYSTEM_PATHS TRUE)
else()
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Homebrew adds qt4 here and we require it to be unlinked from /usr/local to
......
buildconfig/CMake/CommonSetup.cmake
View file @ e168782c
......@@ -228,22 +228,12 @@ if(GIT_FOUND)
# Prefer symlinks on platforms that support it so we don't rely on cmake
# running to be up-to-date On Windows, we have to copy the file
if(WIN32)
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${GIT_TOP_LEVEL}/.githooks/pre-commit
${GIT_TOP_LEVEL}/.git/hooks
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${GIT_TOP_LEVEL}/.githooks/commit-msg
${GIT_TOP_LEVEL}/.git/hooks
)
else()
execute_process(
COMMAND ${CMAKE_COMMAND} -E create_symlink
${GIT_TOP_LEVEL}/.githooks/pre-commit
${GIT_TOP_LEVEL}/.git/hooks/pre-commit
)
execute_process(
COMMAND ${CMAKE_COMMAND} -E create_symlink
${GIT_TOP_LEVEL}/.githooks/commit-msg
......@@ -412,6 +402,33 @@ if(NOT BUNDLES)
set(BUNDLES "./")
endif()
# ##############################################################################
# Setup pre-commit here as otherwise it will be overwritten by earlier
# pre-commit hooks being added
# ##############################################################################
option(ENABLE_PRECOMMIT "Enable pre-commit framework" ON)
if (ENABLE_PRECOMMIT)
if (MSVC)
# Use downloaded ThirdParty version of pre-commit
execute_process(COMMAND "${MSVC_PYTHON_EXECUTABLE_DIR}/Scripts/pre-commit.cmd" install --overwrite WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE PRE_COMMIT_RESULT)
if(NOT PRE_COMMIT_RESULT EQUAL "0")
message(FATAL_ERROR "Pre-commit install failed with ${PRE_COMMIT_RESULT}")
endif()
# Create pre-commit script wrapper to use mantid third party python for pre-commit
file(RENAME "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit" "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit-script.py")
file(WRITE "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit" "#!/usr/bin/env sh\n${MSVC_PYTHON_EXECUTABLE_DIR}/python.exe ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit-script.py")
else()
# Use system installed pre-commit if not present it should just fail but
# continue anyway.
execute_process(COMMAND bash -c "pre-commit install" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE STATUS)
if (STATUS AND NOT STATUS EQUAL 0)
message(FATAL_ERROR "Pre-commit tried to install itself into your repository, but failed to do so. Is it installed on your system?")
endif()
endif()
else()
message(AUTHOR_WARNING "Pre-commit not enabled by CMake, please enable manually.")
endif()
# ##############################################################################
# Set a flag to indicate that this script has been called
# ##############################################################################
......
buildconfig/Jenkins/buildscript
View file @ e168782c
......@@ -347,7 +347,7 @@ rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz
###############################################################################
# CMake configuration
###############################################################################
$SCL_ENABLE "${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=ON -DENABLE_MANTIDPLOT=OFF -DMANTID_DATA_STORE=${MANTID_DATA_STORE} -DDOCS_HTML=ON -DENABLE_CONDA=ON -DCOLORED_COMPILER_OUTPUT=OFF ${DIST_FLAGS} ${PACKAGINGVARS} ${CLANGTIDYVAR} ${SANITIZER_FLAGS} .."
$SCL_ENABLE "${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_PRECOMMIT=OFF -DENABLE_CPACK=ON -DENABLE_MANTIDPLOT=OFF -DMANTID_DATA_STORE=${MANTID_DATA_STORE} -DDOCS_HTML=ON -DENABLE_CONDA=ON -DCOLORED_COMPILER_OUTPUT=OFF ${DIST_FLAGS} ${PACKAGINGVARS} ${CLANGTIDYVAR} ${SANITIZER_FLAGS} .."
###############################################################################
# Coverity build should exit early
......
buildconfig/Jenkins/buildscript.bat
View file @ e168782c
......@@ -185,7 +185,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" (
:: CMake configuration
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
call cmake.exe -G "%CM_GENERATOR%" -A %CM_ARCH% -DCMAKE_SYSTEM_VERSION=%SDK_VERS% -DCONSOLE=OFF -DENABLE_CPACK=ON -DENABLE_MANTIDPLOT=OFF -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON %PACKAGE_OPTS% ..
call cmake.exe -G "%CM_GENERATOR%" -A %CM_ARCH% -DCMAKE_SYSTEM_VERSION=%SDK_VERS% -DCONSOLE=OFF -DENABLE_PRECOMMIT=OFF -DENABLE_CPACK=ON -DENABLE_MANTIDPLOT=OFF -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON %PACKAGE_OPTS% ..
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
......
buildconfig/Jenkins/pre-commit 0 → 100755
View file @ e168782c
#!/bin/bash
# Check that the source conforms to the pre-commit framework
# Args are expected as GIT_SHA1 as $1, PROJECT_SOURCE as $2, JOB_TYPE as $3
if [ $# -ne 3 ]; then
echo "Usage: ./pre-commit branch-sha1 project-root job-type"
echo " job_type=master|pull-request "
exit 1
fi
GIT_SHA=$1
PROJECT_SOURCE=$2
JOB_TYPE=$3
cd "$PROJECT_SOURCE" || exit 127
if [[ $JOB_TYPE == "pull-request" ]]; then
# Find the HEAD of the commit sha
BASE_SHA=$(git merge-base HEAD^2 HEAD^1)
PRE_COMMIT_VERSION=$(pre-commit --version)
# If using the snap version (No longer updated but it doesn't use pip on ubuntu, so it's better to be outdated here) run
# Using the older source
if [[ ${PRE_COMMIT_VERSION} < "pre-commit 1.22.0" ]]; then
SCRIPT_OUTPUT=$(pre-commit run --origin "${BASE_SHA}" --source "${GIT_SHA}" --show-diff-on-failure --verbose)
else
SCRIPT_OUTPUT=$(pre-commit run --from-ref "${BASE_SHA}" --to-ref "${GIT_SHA}" --show-diff-on-failure --verbose)
fi
elif [[ $JOB_TYPE == "master" ]]; then
SCRIPT_OUTPUT=$(pre-commit run --all-files)
else
echo "JOB_TYPE not set, add a 3rd argument (e.g. master or pull-request)"
exit 1
fi
EXIT_CODE=$?
# If last job was a failure echo out how to fix it locally
if [ $EXIT_CODE -ne 0 ]; then
echo "
Pre-commit checks have failed, if you have the pre-commit framework installed locally you can fix this using the following command, otherwise check this file for the pre-commit output to fix manually.
Run this command in the repository locally to fix:
pre-commit run --from-ref ${BASE_SHA} --to-ref ${GIT_SHA}
If this does not work you may have an older version of pre-commit, try:
pre-commit run --origin ${BASE_SHA} --source ${GIT_SHA}
Or if this was run on all files:
pre-commit run --all-files
Pre-commit output:
${SCRIPT_OUTPUT}
"
else
echo "${SCRIPT_OUTPUT}"
fi
# Perform cleanup of unused commit repos.
pre-commit gc
exit $EXIT_CODE
dev-docs/source/GettingStarted.rst
View file @ e168782c
......@@ -72,6 +72,9 @@ Red Hat/Cent OS/Fedora
# Install dependencies
yum install mantid-developer
# Install pre-commit
pip install pre-commit
Ubuntu 18.04
~~~~~~~~~~~~
- Setup the Kitware APT repository to get a recent version of CMake by
......@@ -89,6 +92,10 @@ Ubuntu 18.04
where ``X.Y.Z`` should be replaced with the version that was downloaded.
Install pre-commit for use in our current developer workflow
.. code-block:: sh
snap install pre-commit --classic
if you wish to setup eclipse for use developing mantid, then instructions can be found :ref:`here <Eclipse>`.
Ubuntu 20.04
......@@ -155,10 +162,18 @@ Ubuntu 20.04
and passing the `-DENABLE_MANTIDPLOT=OFF` option to the cmake command line or selecting this in the cmake GUI.
Install pre-commit for use in our current developer workflow
.. code-block:: sh
snap install pre-commit --classic
OSX
---
The build environment on OS X is described here :ref:`BuildingOnOSX`.
Install pre-commit for use in our current developer workflow
.. code-block:: sh
brew install pre-commit
Docker
------
......
dev-docs/source/GitWorkflow.rst
View file @ e168782c
......@@ -37,8 +37,11 @@ The steps for a new piece of work can be summarised as follows:
issue `here <https://github.com/mantidproject/mantid/issues>`__
2. Create a branch from master, using the naming convention described
at :ref:`GitWorkflowPublicPrivateBranches`
3. Do the work and commit changes to the branch. Push the branch
regularly to GitHub to make sure no work is accidentally lost
3. Do the work and commit changes to the branch. On commit, the
`pre-commit <https://pre-commit.com/>`_ framework will run, it will
check all your changes for formatting, linting, and perform static
analysis. Push the branch regularly to GitHub to make sure no work
is accidentally lost.
4. When you are finished with the work, ensure that all of the unit
tests, documentation tests and system tests if necessary pass on
your own machine
......
scripts/Diffraction/isis_powder/gem_routines/Examples/Gem_Mapping.yaml
View file @ e168782c
......@@ -34,7 +34,7 @@
vanadium_run_numbers: "83883" #VNb
empty_run_numbers: "83884"
PDF:
PDF:
vanadium_run_numbers: "83883" #VNb
empty_run_numbers: "83884"
......@@ -46,7 +46,7 @@
vanadium_run_numbers: "84288" #VNb
empty_run_numbers: "84278"
PDF:
PDF:
vanadium_run_numbers: "83883" #VNb
empty_run_numbers: "83884"
......@@ -70,7 +70,7 @@
vanadium_run_numbers: "85590" #VNb
empty_run_numbers: "85591"
#86001-86093:
86001-86093:
label: "cycle_18_2"
offset_file_name: "offsets_2011_cycle111b.cal"
Rietveld:
......@@ -80,7 +80,7 @@
empty_run_numbers: "86018"
PDF:
PDF:
# vanadium_run_numbers: "83883" #VNb
# empty_run_numbers: "83884"
# vanadium_run_numbers: "84856-84858" #VNb
......@@ -101,7 +101,7 @@
vanadium_run_numbers: "86100" #VNb
empty_run_numbers: "86101"
PDF:
PDF:
vanadium_run_numbers: "86333,86344,86355" #VNb
empty_run_numbers: "86343,86354"
......@@ -112,7 +112,7 @@
vanadium_run_numbers: "86576,86580" #VNb
empty_run_numbers: "86577"
PDF:
PDF:
# vanadium_run_numbers: "86581,86583,86584" #VNb
# empty_run_numbers: "86582,86585,86586"
# vanadium_run_numbers: "87154" #VNb
......@@ -128,7 +128,7 @@
vanadium_run_numbers: "87568" #VNb