Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Andor/andor.h
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ namespace Andor {
* @return "emulator" or "sdk" or "null"
*
*/
inline std::string_view get_andor_object() {
inline std::string_view get_andor_object() const {
if ( this->andor == &emulator ) return ANDOR_OBJ_EMULATOR;
else
if ( this->andor == &sdk ) return ANDOR_OBJ_SDK;
Expand Down
4 changes: 2 additions & 2 deletions Andor/andor_emulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1144,8 +1144,8 @@ namespace Andor {
* @return ERROR | NO_ERROR
*
*/
long SkySim::generate_image( const std::string_view &headerfile,
const std::string_view &outputfile,
long SkySim::generate_image( const std::string headerfile,
const std::string outputfile,
const float exptime,
const bool ismex,
const int simsize ) {
Expand Down
2 changes: 1 addition & 1 deletion Andor/andor_emulator.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace Andor {

PyObject* pSkySimModule;

long generate_image( const std::string_view &headerfile, const std::string_view &outputfile,
long generate_image( const std::string headerfile, const std::string outputfile,
const float exptime, const bool ismex, const int simsize );

void log_python_arguments(PyObject* pFunction, PyObject* pArgs, PyObject* pKwArgs);
Expand Down
19 changes: 19 additions & 0 deletions Config/slicecamd.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,25 @@ PUSH_GUI_SETTINGS=/home/developer/Software/GuiderGUI/push_settings_slicev.sh
#
PUSH_GUI_IMAGE=/home/developer/Software/GuiderGUI/push_image.sh

# FINE_ACQUIRE_AIMPOINT=( <which> <x> <y> )
# camera and location of aimpoint for fine acquisition
# <which> which camera must be { L R }
# <x> x-coordinate (col)
# <y> y-coordinate (row)
# aimpoint x,y may be fractional
#
FINE_ACQUIRE_AIMPOINT=(L 150.0 115.5)

# FINE_ACQUIRE_BACKGROUND=(<x1> <x2> <y1> <y2>)
# defines the bounds of the region for background coorection
# for fine acquisition centroiding
# <x1> x-coordinate lower left
# <x2> x-coordinate lower right
# <y1> y-coordinate upper left
# <y2> y-coordinate upper right
#
FINE_ACQUIRE_BACKGROUND=(80 165 30 210)

# SkySimulator options:
# SKYSIM_IMAGE_SIZE=<is> where <is> is integer
# Sets the keyword argument "IMAGE_SIZE=<is>"
Expand Down
Loading