Skip to content
Snippets Groups Projects
Commit 3e67c9ea authored by Jan Kotanski's avatar Jan Kotanski
Browse files

Updated version 1.1.0 from 'upstream/jessie/1.1.0' 

with Debian dir c3dfbae801e5ec6725d99802a2afa877eba032f7
parents cfb00c4d e5c4baff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
PKG-INFO
+ 5
− 5
View file @ 3e67c9ea
Metadata-Version: 1.0
Name: nexdatas.extrasp10
Version: 1.0.0
Version: 1.1.0
Summary: nexus template components for P10
Home-page: http://github.com/nexdatas/
Author: Jan Kotanski
......@@ -15,10 +15,10 @@ Description: Welcome to nxstools's documentation!
Introduction
------------
Nexus template components for P07.
Nexus template components for P11.
| Source code: https://stash.desy.de/scm/pibc/p07.git
| Source code: https://stash.desy.de/scm/pibc/p11.git
| NexDaTaS Web page: https://nexdatas.github.io
------------
......@@ -34,7 +34,7 @@ Description: Welcome to nxstools's documentation!
Download the latest NXS Tools version from
| https://github.com/nexdatas/tools
| https://stash.desy.de/scm/pibc/p07.git
| https://stash.desy.de/scm/pibc/p11.git
Extract sources and run
......@@ -67,7 +67,7 @@ Description: Welcome to nxstools's documentation!
$ apt-get update
$ apt-get install python-nxstools
$ apt-get install python-nxstools-extras-p07
$ apt-get install python-nxstools-extras-p11
To instal other NexDaTaS packages
......
README.rst
+ 4
− 4
View file @ 3e67c9ea
......@@ -7,10 +7,10 @@ Authors: Jan Kotanski
Introduction
------------
Nexus template components for P07.
Nexus template components for P11.
| Source code: https://stash.desy.de/scm/pibc/p07.git
| Source code: https://stash.desy.de/scm/pibc/p11.git
| NexDaTaS Web page: https://nexdatas.github.io
------------
......@@ -26,7 +26,7 @@ From sources
Download the latest NXS Tools version from
| https://github.com/nexdatas/tools
| https://stash.desy.de/scm/pibc/p07.git
| https://stash.desy.de/scm/pibc/p11.git
Extract sources and run
......@@ -59,7 +59,7 @@ Finally,
$ apt-get update
$ apt-get install python-nxstools
$ apt-get install python-nxstools-extras-p07
$ apt-get install python-nxstools-extras-p11
To instal other NexDaTaS packages
......
nxsextrasp10/__init__.py
+ 3
− 3
View file @ 3e67c9ea
......@@ -19,10 +19,10 @@
""" nexus xml templates for P10"""
__version__ = "1.0.0"
__version__ = "1.1.0"
#: (:obj:`dict` <:obj:`str` , :obj:`dict` <:obj:`str` , :obj:`str` > >)
#: standatd component template variables
#: standard component template variables
#: and its [default value, doc string]
standardComponentVariables = {
'bdu': {
......@@ -273,7 +273,7 @@ standardComponentVariables = {
},
'roll': {
'default': None,
'doc': "chi angle (roll) position of mirror1 (datasource)"
'doc': "chi angle (roll) position (datasource)"
},
},
'shutterstage': {
......
scripts/nxsconf_haspp10e1.sh
+ 54
− 9
View file @ 3e67c9ea
#!/bin/bash
## online.xml file as a first command-line parameter
if [[ -z $1 ]]; then
onlinexml=""
else
onlinexml=$1
onlinexml=""
for i in "${@:1}"
do
if [[ $i == -* ]] ; then
echo "PARAM: $i "
case $i in
-h*|--help*)
HELP=YES
;;
-s*|--set-property*)
NXSPROPERTY=YES
;;
*)
# unknown option
;;
esac
else
onlinexml=$i
fi
done
if [[ ! -z $HELP ]] ; then
echo ""
echo "usage: nxsconf_haspp10e1.sh [<ONLINE.XML>] [-h|--help]"
echo ""
echo "create nexus configuration for online.xml file"
echo ""
echo "possible arguments:"
echo " ONLINE.XML online.xml file, (default: /online_dir/online.xml)"
echo ""
echo "optional arguments:"
echo " -h, --help show this help message and exit"
echo " -s, --set-property set the DefaultPreselectedComponents of NXSRecSelector"
echo ""
echo "examples:"
echo " /usr/share/nxstools/nxsconf_haspp10e1.sh /usr/share/nxstools/online_haspp10e1.xml -s"
echo " /usr/share/nxstools/nxsconf_haspp10e1.sh /usr/share/nxstools/online_haspp10e1.xml"
echo " /usr/share/nxstools/nxsconf_haspp10e1.sh"
echo ""
exit 0
fi
hname=$(hostname)
......@@ -27,10 +63,10 @@ fi
#cpopt="-d . -r $server"
## create the configuration in the NXSConfigServer DB
stdopt="-r $server -o -e haspp10e1:10000/p10/nxsconfigserver/haspp10e1"
stdopt="-b -r $server -o -e haspp10e1:10000/p10/nxsconfigserver/haspp10e1"
tgopt="-b -r $server -o"
dsopt="-b -r $server $onlinexml -e haspp10e1:10000/p10/nxsconfigserver/haspp10e1"
cpopt="-r $server -o $onlinexml -e haspp10e1:10000/p10/nxsconfigserver/haspp10e1"
cpopt="-b -r $server -o $onlinexml -e haspp10e1:10000/p10/nxsconfigserver/haspp10e1"
## online.xml datasources
......@@ -40,7 +76,7 @@ nxscreate onlineds $dsopt
## default
nxscreate stdcomp -t default -c default longname "P10 Coherence Applications Beamline" shortname P10 $stdopt
nxscreate stdcomp -t default -m -c default longname "P10 Coherence Applications Beamline" shortname P10 $stdopt
## beamtime_id
......@@ -328,6 +364,15 @@ nxscreate onlinecp -c pcoedge $cpopt
nxscreate onlinecp -c mythen $cpopt
# # # ## set DefaultPreselectedComponents of NXSRecSelector/haspp10e1
## set DefaultPreselectedComponents of NXSRecSelector/haspp10e1
if ! [ -z $NXSPROPERTY ]; then
# # # ## nxsetup -c -n DefaultPreselectedComponents -w "[\"source\",\"undulator\",\"beamtime_id\",\"pslit1\",\"pslit2\",\"gslit1\",\"oslit1\",\"uslit1\",\"uslit2\",\"rslit1\",\"dcm_mono\",\"dcm_energy\",\"ucc_mono\",\"ucc_energy\",\"rcc_mono\",\"rcc_energy\",\"mirrors\",\"girder\",\"bpm\",\"bm\",\"cryo\",\"usample_table\",\"usample_stage\",\"tomo_stage\",\"afm_stage\",\"diffractometer\",\"rsample_stage\",\"rsample_table\",\"rdet_stage\",\"rdiode_stage\",\"rcrystal\",\"optics_table\",\"rbeamstop\",\"rpinhole\",\"absorber1\",\"absorber2\",\"shutterstage\",\"crl_hexapod\"]" NXSRecSelector/haspp10e1
COMPONENTLIST="[\"source\",\"undulator\",\"beamtime_id\",\"pslit1\",\"pslit2\",\"gslit1\",\"oslit1\",\"uslit1\",\"uslit2\",\"rslit1\",\"dcm_mono\",\"dcm_energy\",\"ucc_mono\",\"ucc_energy\",\"rcc_mono\",\"rcc_energy\",\"mirrors\",\"girder\",\"bpm\",\"bm\",\"cryo\",\"usample_table\",\"usample_stage\",\"tomo_stage\",\"afm_stage\",\"diffractometer\",\"rsample_stage\",\"rsample_table\",\"rdet_stage\",\"rdiode_stage\",\"rcrystal\",\"optics_table\",\"rbeamstop\",\"rpinhole\",\"absorber1\",\"absorber2\",\"shutterstage\",\"crl_hexapod\"]"
if [ "$hname" == "haspp10e1" ]; then
nxsetup change-prop -n DefaultPreselectedComponents -w $COMPONENTLIST NXSRecSelector/haspp10e1
elif [ "$hname" == "haso228k" ]; then
echo "nxsetup change-prop -n DefaultPreselectedComponents -w $COMPONENTLIST NXSRecSelector/haspp10e1"
fi
fi
scripts/nxsconf_haspp10e2.sh
+ 53
− 8
View file @ 3e67c9ea
#!/bin/bash
## online.xml file as a first command-line parameter
if [[ -z $1 ]]; then
onlinexml=""
else
onlinexml=$1
onlinexml=""
for i in "${@:1}"
do
if [[ $i == -* ]] ; then
echo "PARAM: $i "
case $i in
-h*|--help*)
HELP=YES
;;
-s*|--set-property*)
NXSPROPERTY=YES
;;
*)
# unknown option
;;
esac
else
onlinexml=$i
fi
done
if [[ ! -z $HELP ]] ; then
echo ""
echo "usage: nxsconf_haspp10e2.sh [<ONLINE.XML>] [-h|--help]"
echo ""
echo "create nexus configuration for online.xml file"
echo ""
echo "possible arguments:"
echo " ONLINE.XML online.xml file, (default: /online_dir/online.xml)"
echo ""
echo "optional arguments:"
echo " -h, --help show this help message and exit"
echo " -s, --set-property set the DefaultPreselectedComponents of NXSRecSelector"
echo ""
echo "examples:"
echo " /usr/share/nxstools/nxsconf_haspp10e2.sh /usr/share/nxstools/online_haspp10e2.xml -s"
echo " /usr/share/nxstools/nxsconf_haspp10e2.sh /usr/share/nxstools/online_haspp10e2.xml"
echo " /usr/share/nxstools/nxsconf_haspp10e2.sh"
echo ""
exit 0
fi
hname=$(hostname)
......@@ -27,10 +63,10 @@ fi
#cpopt="-d . -r $server"
## create the configuration in the NXSConfigServer DB
stdopt="-r $server -o -e haspp10e2:10000/p10/nxsconfigserver/haspp10e2"
stdopt="-b -r $server -o -e haspp10e2:10000/p10/nxsconfigserver/haspp10e2"
tgopt="-b -r $server -o"
dsopt="-b -r $server $onlinexml -e haspp10e2:10000/p10/nxsconfigserver/haspp10e2"
cpopt="-r $server -o $onlinexml -e haspp10e2:10000/p10/nxsconfigserver/haspp10e2"
cpopt="-b -r $server -o $onlinexml -e haspp10e2:10000/p10/nxsconfigserver/haspp10e2"
## online.xml datasources
......@@ -40,7 +76,7 @@ nxscreate onlineds $dsopt
## default
nxscreate stdcomp -t default -c default longname "P10 Coherence Applications Beamline" shortname P10 $stdopt
nxscreate stdcomp -t default -m -c default longname "P10 Coherence Applications Beamline" shortname P10 $stdopt
## beamtime_id
......@@ -488,4 +524,13 @@ nxscreate onlinecp -c mythen $cpopt
## set DefaultPreselectedComponents of NXSRecSelector/haspp10e2
## nxsetup -c -n DefaultPreselectedComponents -w "[\"source\",\"undulator\",\"beamtime_id\",\"pslit1\",\"pslit2\",\"gslit1\",\"gslit2\",\"oslit1\",\"uslit1\",\"uslit2\",\"rslit1\",\"rslit1_stage\",\"slit1\",\"slit1_stage\",\"slit2\",\"slit2_stage\",\"slit3\",\"laser\",\"dcm_mono\",\"dcm_energy\",\"rcc_mono\",\"rcc_energy\",\"mirrors\",\"girder\",\"bpm\",\"bm\",\"bm2\",\"bm3\",\"cryo\",\"usample_table\",\"usample_stage\",\"afm_stage\",\"diffractometer\",\"rsample_stage\",\"rsample_table\",\"xpcs_sam_table\",\"xpcs_sam_stage\",\"sf_stage\",\"xpcs_twotheta\",\"twotheta\",\"microscope\",\"pil\",\"ecrl\",\"bdu\",\"det_stage\",\"rdet_stage\",\"diode_stage\",\"rdiode_stage\",\"refdiode_stage\",\"rcrystal\",\"optics_table\",\"optics_table2\",\"hbeamstop\",\"rbeamstop\",\"beamstop\",\"beamstop2\",\"eigerbeamstop\",\"rpinhole\",\"fpinhole\",\"absorber1\",\"absorber2\",\"shutterstage\"]" NXSRecSelector/haspp10e2
if ! [ -z $NXSPROPERTY ]; then
COMPONENTLIST="[\"source\",\"undulator\",\"beamtime_id\",\"pslit1\",\"pslit2\",\"gslit1\",\"gslit2\",\"oslit1\",\"uslit1\",\"uslit2\",\"rslit1\",\"rslit1_stage\",\"slit1\",\"slit1_stage\",\"slit2\",\"slit2_stage\",\"slit3\",\"laser\",\"dcm_mono\",\"dcm_energy\",\"rcc_mono\",\"rcc_energy\",\"mirrors\",\"girder\",\"bpm\",\"bm\",\"bm2\",\"bm3\",\"cryo\",\"usample_table\",\"usample_stage\",\"afm_stage\",\"diffractometer\",\"rsample_stage\",\"rsample_table\",\"xpcs_sam_table\",\"xpcs_sam_stage\",\"sf_stage\",\"xpcs_twotheta\",\"twotheta\",\"microscope\",\"pil\",\"ecrl\",\"bdu\",\"det_stage\",\"rdet_stage\",\"diode_stage\",\"rdiode_stage\",\"refdiode_stage\",\"rcrystal\",\"optics_table\",\"optics_table2\",\"hbeamstop\",\"rbeamstop\",\"beamstop\",\"beamstop2\",\"eigerbeamstop\",\"rpinhole\",\"fpinhole\",\"absorber1\",\"absorber2\",\"shutterstage\"]"
if [ "$hname" == "haspp10e2" ]; then
nxsetup change-prop -n DefaultPreselectedComponents -w $COMPONENTLIST NXSRecSelector/haspp10e2
elif [ "$hname" == "haso228k" ]; then
echo "nxsetup change-prop -n DefaultPreselectedComponents -w $COMPONENTLIST NXSRecSelector/haspp10e2"
fi
fi
scripts/nxsconf_haspp10lab.sh
+ 3
− 3
View file @ 3e67c9ea
......@@ -27,10 +27,10 @@ fi
#cpopt="-d . -r $server"
## create the configuration in the NXSConfigServer DB
stdopt="-r $server -o -e haspp10lab:10000/p10/nxsconfigserver/haspp10lab"
stdopt="-b -r $server -o -e haspp10lab:10000/p10/nxsconfigserver/haspp10lab"
tgopt="-b -r $server -o"
dsopt="-b -r $server $onlinexml -e haspp10lab:10000/p10/nxsconfigserver/haspp10lab"
cpopt="-r $server -o $onlinexml -e haspp10lab:10000/p10/nxsconfigserver/haspp10lab"
cpopt="-b -r $server -o $onlinexml -e haspp10lab:10000/p10/nxsconfigserver/haspp10lab"
## online.xml datasources
......@@ -40,7 +40,7 @@ nxscreate onlineds $dsopt
## default
nxscreate stdcomp -t default -c default longname "P10 Coherence Applications Beamline" shortname P10 $stdopt
nxscreate stdcomp -t default -m -c default longname "P10 Coherence Applications Beamline" shortname P10 $stdopt
## beamtime_id
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use