Merging of changes from FRAM branch

.gitignore

@@ -1,10 +1,19 @@
+*~
 *.a
 *.la
 *.lo
 *.o
 *.py[cod]
+*.fits
+*.fts
+*.patch
+*.log
+*.pid
+*.ipynb
+*.orig
 .deps/
 .libs/
+tmp/
 .DS_Store
 Makefile
 Makefile.in
@@ -19,6 +28,9 @@ config.sub
 configure
 depcomp
 doc/doxyfile
+doc/html
+doc/latex
+doc/man
 m4/
 _configs.sed
 aclocal.m4
@@ -120,4 +132,4 @@ scripts/rts2-start
 scripts/rts2-stop
 conf/logrotate/logrotate-rts2.conf
 conf/rts2.service
-conf/[email protected]
+conf/[email protected]

conf/constraints.xsd

@@ -41,6 +41,8 @@
       <xs:element name="dec" type="doubleInterval" minOccurs="0"/>
       <xs:element name="measuredSeeing" type="doubleInterval" minOccurs="0"/>
       <xs:element name="expectedSeeing" type="doubleInterval" minOccurs="0"/>
+      <xs:element name="altitude" type="doubleInterval" minOccurs="0"/>
+      <xs:element name="azimuth" type="doubleInterval" minOccurs="0"/>
       <xs:element name="lunarDistance" type="doubleInterval" minOccurs="0"/>
       <xs:element name="lunarAltitude" type="doubleInterval" minOccurs="0"/>
       <xs:element name="lunarPhase" type="doubleInterval" minOccurs="0"/>

conf/events

@@ -8,8 +8,6 @@
     <docroot>/home/observer</docroot>
     <public>/graph/SD/*</public>
     <dir path="/images/luthien" to="/luthien"/>
-    <default-channel>0</default-channel>
-    <defaultImageLabel>@OBJECT @EXPTIME @FILTER</defaultImageLabel>
   </http>
   <events>
     <device name="C0">

conf/rts2.ini

@@ -8,11 +8,11 @@
 ;
 ; Values names and values are separated by =.
 ;
-; Reasonable defaults are build into code. 
+; Reasonable defaults are build into code.
 ; Please see comments int this example config file for they value.
 ;
 ; For values which myst be filled in, search for xxxx in this example file.
-; 
+;
 ; String values can be given surrounded by "", but escaping (yet) doesn't work,
 ; so do not use something like "\ntest".
 ;
@@ -32,9 +32,9 @@ name = stars
 ; username for database access (optional). This is for PostgreSQL database, it has nothing
 ; to do with Web username and password. To set web (rts2-xmlrpcd) users, please use
 ; rts2-user binary.
-;username = 
+;username =
 ; password for database access (optional).
-;password = 
+;password =
 
 ; URL for Simbad name resolver. Defaults to http://cdsws.u-strasbg.fr/axis/services/Sesame?method=sesame&resultType=ui&all=true&service=NS&name=.
 ;simbadurl = "http://cdsws.u-strasbg.fr/axis/services/Sesame?method=sesame&resultType=ui&all=true&service=NS&name="
@@ -46,12 +46,12 @@ name = stars
 [observatory]
 ; You must provide your observatory altitude (above see level) in meters.
 altitude = xxxx
-; You must provide your observatory longitude in degrees. Please bear in mind, 
+; You must provide your observatory longitude in degrees. Please bear in mind,
 ; that negative is W from Greenwich, positive values are for E from Greenwich.
 ; Central Europe have positive longitude, all America have negative longitude.
 longitude = xxxx
-; You must provide your observatory latitude in degrees. Positive values are 
-; for north, negative for south. Europe have positive latitude, 
+; You must provide your observatory latitude in degrees. Positive values are
+; for north, negative for south. Europe have positive latitude,
 ; Australia negative.
 latitude = xxxx
 
@@ -60,7 +60,7 @@ latitude = xxxx
 ; consecutive nights. If current time is after 12 + UT offset, then the night is
 ; current local day. If current time is before 12 + UT offset, then the night
 ; is preceeding local day.
-; ut_offset = xxxx (default to longitude / 15.0) 
+; ut_offset = xxxx (default to longitude / 15.0)
 
 ; Governs writing of RA/DEC to FITS headers. If true, store those values as sexadecimal. Defaults to false.
 ; sexadecimals = false
@@ -123,7 +123,7 @@ open_sequence = ""
 ; Default to -10 degrees.
 ; night_horizon = -10
 
-; Horizon file. If not specified, horizon is taken as 0 altitude degrees on 
+; Horizon file. If not specified, horizon is taken as 0 altitude degrees on
 ; full circle. Please see rts2-horizon(1) for details describing horizon file.
 ; horizon = ""
 
@@ -149,8 +149,8 @@ flat_sun_min = -7
 flat_sun_max = -5
 
 ; Telescope speed (in degrees/seconds). Average telescope movement speed.
-; Should include overhead for ramp up/down times. Typically you will set this to 
-; 30-50 % of top telescope speed, depending on how long is the ramp and how much 
+; Should include overhead for ramp up/down times. Typically you will set this to
+; 30-50 % of top telescope speed, depending on how long is the ramp and how much
 ; it spend on additional overheads. You can get estimate of average speed by running
 ; rts2-nightreport on some full nights - average telescope movement speed is
 ; printed with every observation in the output list. Default to 0.
@@ -177,7 +177,7 @@ flat_sun_max = -5
 ; morning_off = true
 
 ; If system shall be switched to standby mode on morning. This value change
-; behaviour of the system only if morning_off is set to false. Similary to 
+; behaviour of the system only if morning_off is set to false. Similary to
 ; morning_off, put that to false once you reach maturity and trust your
 ; meteo data and roof closing.
 ; Default to true.
@@ -268,7 +268,7 @@ onlyvisibletonight = false
 
 ; Optional executable, which will be passed various parameters about GRB. On
 ; command line, this program will receive values (in following order) of tar_id
-; grb_id grb_seqn grb_type grb_ra grb_dec grb_is_grb grb_date grb_errorbox and 
+; grb_id grb_seqn grb_type grb_ra grb_dec grb_is_grb grb_date grb_errorbox and
 ; grb_isnew. Those values are:
 ; tar_id - RTS2 target id
 ; grb_id = GCN GRB id
@@ -366,7 +366,7 @@ astrometry_devices = ""
 [scriptexec]
 
 ; Default expand path
-; To expand with local date, use 
+; To expand with local date, use
 ; expand_path = "%L%f"
 expand_path = "%f"
 
@@ -419,19 +419,28 @@ after_exposure_cmd_arg = "%x%m%d"
 ; CCD readout time. Default to 0.
 ; readout_time = 0
 
-; Filter moving time (in seconds). If set, script length for the camera will include 
+; Filter moving time (in seconds). If set, script length for the camera will include
 ; time for moving the filter. In current implementation dump, cannot count filters to move
 ; and calculate filter movement time depending on how long filter wheel must move (e.g. how many
 ; filters are between target and current filter). Default to 0.
 ; filter_movement = 0
 
 ; Template filename. Holds default template for device. Template
 ; is used to specify FITS cards which should be created, their value and comment.
-; template = 
+; template =
 
 ; If true, do not write RTS2 metadata - write only what is in FITS template.
 ; no-metadata = false
 
+; Per-camera JPEG preview image generation. Preview is generated as soon as
+; executor receives the image data from camera (i.e. before processing).
+; Disabled if empty.
+; preview_path = "%b/last_%c.jpg"
+; preview_zoom = 1
+; preview_color = 0
+; previewQuantiles = 0.005
+
+
 [xmlrpcd]
 
 ; Prefix for all pages generated by embedded HTTP server. This is usefull if
@@ -449,7 +458,7 @@ page_prefix = ""
 ; true.
 auth_localhost = true
 
-; Login files for non-DB instances of RTS2. Please check carefuly how RTS2 was build, e.g. if 
+; Login files for non-DB instances of RTS2. Please check carefuly how RTS2 was build, e.g. if
 ; with database support or without it. This value will have effect only if RTS2 was build without
 ; database.
 ;
@@ -466,3 +475,18 @@ script_dir = "/usr/local/share/rts2/bb"
 
 ; Prefix for observatory shared data
 cache_dir = "/usr/local/var/cache/rts2"
+
+[auger]
+
+; Configuration for main Auger Shower operation script, to be executed on given camera using given mount
+; The final script looks like that:
+; <script_preamble> <mount>.WOFFS=(...) <script_main> <mount>.WOFFS=(...) <script_main> ... <script_end>
+;
+; camera = "C0"
+; mount = "T0"
+; script_preamble = "filter=B"
+; script_main = "E 30"
+; script_end = ""
+
+; Default script for all other cameras
+; default_script = "sleep 10"