diff --git a/andor/andor_tcl.c b/andor/andor_tcl.c index 18f035e..20a6ec6 100644 --- a/andor/andor_tcl.c +++ b/andor/andor_tcl.c @@ -131,7 +131,7 @@ void copyline (int *tobuf, int *frombuf, int count, int offset); void create_fits_header(fitsfile *fptr); /** - * \brief Store iamge data to FITS file + * \brief Store image data to FITS file * \param cameraId Andor camera number , 0 or 1 * \param filename Name of FITS file * \param iexp Number of frame (for Kinetics acquisition) @@ -157,7 +157,7 @@ int cAndorDisplaySingle(int cameraId, int ifft); /** - * \brief Store iamge data to FITS file, support ROI and binning + * \brief Store image data to FITS file, support ROI and binning * \param cameraId Andor camera number , 0 or 1 * \param filename Name of FITS file * \param iexp Number of frame (for Kinetics acquisition) diff --git a/cleanRestart.geminiN b/cleanRestart.geminiN index 46619b5..badf213 100755 --- a/cleanRestart.geminiN +++ b/cleanRestart.geminiN @@ -4,6 +4,9 @@ # hardware and software # export INSTRUMENT alopeke +pkill -9 wish +pkill -9 ds9red +pkill -9 ds9blue tclsh $HOME/speckle-control/gui-scripts/powerControl.tcl cleanRestart $HOME/speckle-control/setDevicePermissions $HOME/speckle-control/startspeckle2 diff --git a/cleanRestart.geminiS b/cleanRestart.geminiS index b406466..c3f22d6 100755 --- a/cleanRestart.geminiS +++ b/cleanRestart.geminiS @@ -4,6 +4,9 @@ # hardware and software # export INSTRUMENT zorro +pkill -9 wish +pkill -9 ds9red +pkill -9 ds9blue tclsh $HOME/speckle-control/gui-scripts/powerControl.tcl cleanRestart $HOME/speckle-control/setDevicePermissions $HOME/speckle-control/startspeckle2 diff --git a/cleanRestart.wiyn b/cleanRestart.wiyn index 6951979..2ce1b0c 100755 --- a/cleanRestart.wiyn +++ b/cleanRestart.wiyn @@ -4,6 +4,9 @@ # hardware and software # export INSTRUMENT wiyn +pkill -9 wish +pkill -9 ds9red +pkill -9 ds9blue tclsh $HOME/speckle-control/gui-scripts/powerControl.tcl cleanRestart $HOME/speckle-control/setDevicePermissions $HOME/speckle-control/startspeckle2 diff --git a/doc/.~lock.user-guide.odt# b/doc/.~lock.user-guide.odt# new file mode 100644 index 0000000..0ff38bf --- /dev/null +++ b/doc/.~lock.user-guide.odt# @@ -0,0 +1 @@ +,rfactory,localhost.localdomain,07.03.2021 14:34,file:///home/rfactory/.config/libreoffice/4; \ No newline at end of file diff --git a/doc/Andor SIF API.pdf b/doc/Andor SIF API.pdf new file mode 100644 index 0000000..6bf512f Binary files /dev/null and b/doc/Andor SIF API.pdf differ diff --git a/doc/Software Development Kit.pdf b/doc/Software Development Kit.pdf new file mode 100644 index 0000000..d40d5a9 Binary files /dev/null and b/doc/Software Development Kit.pdf differ diff --git a/doc/code/html/_gen_one_linux_u_s_b_8cpp.html b/doc/code/html/_gen_one_linux_u_s_b_8cpp.html index 8da17cd..5d37fb7 100644 --- a/doc/code/html/_gen_one_linux_u_s_b_8cpp.html +++ b/doc/code/html/_gen_one_linux_u_s_b_8cpp.html @@ -201,7 +201,7 @@ @@ -267,7 +267,7 @@ ANDOR_SOCKET - Array of (2) socket file handles
SCOPE - Array of telescope settings

-

Definition at line 203 of file andor.tcl.

+

Definition at line 215 of file andor.tcl.

@@ -299,7 +299,7 @@

Send command to both cameras if clone setting is selected

Globals : INSTRUMENT - Array of instrument settings

-

Definition at line 265 of file andor.tcl.

+

Definition at line 277 of file andor.tcl.

@@ -318,7 +318,7 @@ ANDOR_SOCKET - Array of (2) socket file handles
INSTRUMENT - Array of instrument settings

-

Definition at line 159 of file andor.tcl.

+

Definition at line 171 of file andor.tcl.

@@ -340,7 +340,7 @@ CAMSTATUS - Array of camera current settings retrieved from Andor servers
ANDOR_CFG - Andor camera properties

-

Definition at line 365 of file andor.tcl.

+

Definition at line 377 of file andor.tcl.

@@ -356,7 +356,7 @@

Documented proc commandAndor . Flush the Andor communication sockets

Globals : ANDOR_SOCKET - Array of (2) socket file handles

-

Definition at line 244 of file andor.tcl.

+

Definition at line 256 of file andor.tcl.

@@ -390,7 +390,7 @@ SPECKLE_DIR - Directory path to speckle software installation
DS9 - Name of a ds9 executable for XPA control (ds9red or ds9blue)

-

Definition at line 125 of file andor.tcl.

+

Definition at line 137 of file andor.tcl.

@@ -421,7 +421,7 @@

Globals : ANDOR_CFG - Array of camera configuration items

This function initializes all the items of the ANDOR_CFG global array to a default value of ? to ensure that we can easily see when they are assigned actual values via the Andor library wrapped calls.

-

Definition at line 53 of file andor.tcl.

+

Definition at line 65 of file andor.tcl.

@@ -437,7 +437,7 @@

Documented proc initControl .

Set inital default values in the SharedMem2 shared memory area which is used for high speed data sharing with the Andor camera servers

-

Definition at line 512 of file andor.tcl.

+

Definition at line 524 of file andor.tcl.

@@ -469,7 +469,7 @@

Globals : SPECKLE_DIR - Directory path to speckle software installation

-

Definition at line 98 of file andor.tcl.

+

Definition at line 110 of file andor.tcl.

@@ -490,7 +490,7 @@ STATUS - Array of exposure statuses
ACQREGION - ROI properties xs,xe,ys,ye

-

Definition at line 285 of file andor.tcl.

+

Definition at line 297 of file andor.tcl.

@@ -521,7 +521,7 @@

Globals : ANDOR_CFG - Array of camera configuration items

-

Definition at line 83 of file andor.tcl.

+

Definition at line 95 of file andor.tcl.

@@ -551,7 +551,7 @@

Globals : ANDOR_CFG - Array of camera configuration items

-

Definition at line 67 of file andor.tcl.

+

Definition at line 79 of file andor.tcl.

@@ -583,7 +583,7 @@

This function uses XPA to start a refresh cycle in a ds9

Globals : DS9 - Name of a ds9 executable for XPA control (ds9red or ds9blue)

-

Definition at line 143 of file andor.tcl.

+

Definition at line 155 of file andor.tcl.

@@ -614,7 +614,7 @@

This function uses XPA to start a refresh cycle in ds9

-

Definition at line 111 of file andor.tcl.

+

Definition at line 123 of file andor.tcl.

@@ -645,7 +645,7 @@ ACQREGION - ROI properties xs,xe,ys,ye

-

Definition at line 606 of file andor.tcl.

+

Definition at line 618 of file andor.tcl.

@@ -674,7 +674,7 @@ ANDOR_SOCKET - Array of (2) socket file handles
ACQREGION - ROI properties xs,xe,ys,ye

-

Definition at line 641 of file andor.tcl.

+

Definition at line 653 of file andor.tcl.

@@ -690,7 +690,7 @@

Documented proc showControl .

Print contents of SharedMem2 shared memory area which is used for high speed data sharing with the Andor camera servers

-

Definition at line 480 of file andor.tcl.

+

Definition at line 492 of file andor.tcl.

@@ -706,7 +706,7 @@

Documented proc startfastvideo .

Initiate fast video mode Globals : STATUS - Array of exposure statuses

-

Definition at line 331 of file andor.tcl.

+

Definition at line 343 of file andor.tcl.

@@ -725,7 +725,7 @@ SCOPE - Array of telescope settings
STATUS - Array of exposure statuses

-

Definition at line 464 of file andor.tcl.

+

Definition at line 476 of file andor.tcl.

@@ -741,7 +741,7 @@

Documented proc testControl .

Test setting values in the SharedMem2 shared memory area which is used for high speed data sharing with the Andor camera servers

-

Definition at line 498 of file andor.tcl.

+

Definition at line 510 of file andor.tcl.

@@ -751,7 +751,7 @@
-

Store iamge data to FITS file.

+

Store image data to FITS file.

Parameters
@@ -715,7 +715,7 @@

Function Documentation

cameraIdAndor camera number , 0 or 1
-

Store iamge data to FITS file, support ROI and binning.

+

Store image data to FITS file, support ROI and binning.

Parameters
@@ -3427,7 +3427,7 @@

Variable Documentation

cameraIdAndor camera number , 0 or 1
-

Find the brightest object , and select an ROI of the requried size around it Show the region on ds9

+

Find the brightest object , and select an ROI of the required size around it Show the region on ds9

Globals :
ANDOR_ARM - Instrument arm this camera is installed in red/blue
ANDOR_ROI - Region of interest parameters
@@ -899,7 +899,7 @@