Commit Graph

33 Commits

Author SHA1 Message Date
Ferdi Franceschini
4558e50ff8 SICS-664: statemon reports STARTED = histmem but doesn't report FINISH.
Removed the started message, we get enough feedback from the HistogramMemory.
2013-09-11 19:47:26 +10:00
Ferdi Franceschini
39497e2810 SICS-638 Send a pause to the histmem when SICS receives an INT1712 interrupt.
This is done by mapping AnstoHttpPauseNoCon() to Halt in the histmem interface.
An ANSTO stop command astop has been added to send a Stop to the histmem which
is needed when uploading a new configuration.
2013-09-10 14:39:03 +10:00
Douglas Clowes
9e343223ea Revert "Run ghttp_process in async mode, call TaskYield and add an abort action"
This reverts commit 2cf74d16c504549247305ad4cfcba5e5704157ab.
2013-08-21 16:00:08 +10:00
Douglas Clowes
606e73b221 Run ghttp_process in async mode, call TaskYield and add an abort action 2013-08-01 17:13:38 +10:00
Douglas Clowes
69925baaf6 Reset asyncRunning earlier to prevent ghttp_process calls and cover both paths 2013-07-31 11:44:49 +10:00
Jing Chen
f3eb27c282 dynamicly setting the xAT tables
r3443 | jgn | 2012-03-12 09:48:42 +1100 (Mon, 12 Mar 2012) | 1 line
2012-11-15 17:25:15 +11:00
Jing Chen
ce113f26fd Updated file anstohttp.c to fixed the bug raised in issue #SICS378, checked the number of the arguments passed on to the hmm command to aovid a crash.
r2880 | jgn | 2010-01-27 14:18:00 +1100 (Wed, 27 Jan 2010) | 2 lines
2012-11-15 17:00:06 +11:00
Ferdi Franceschini
2ec6505ef8 Merged 2.4 branch
r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
2012-11-15 16:57:26 +11:00
Ferdi Franceschini
d2f57e4615 SICS-294 anstohttp.c
Histmem now only calls TaskYield after SICS has finished initalising, this stops the statusfile task from being called early and overwriting the status file. Created ANSTO_MakeHistMemory command to install ANSTO_HistAction
Added veto functions.  Mapped the HistDriver interface Pause() and Continue() commands to AnstoHttpVeto and AnstoHttpNoVeto. Implemented an ANSTO_Histaction to call AnstoHttpPause when sent a "pause" subcommand.

hmcontrol_ansto.c
Call AnstoHttpPause() directly when Pause_HM_After_Count is set to preserver current behaviour.

counterdriv.c
Now sends the correct "SICS RESUME" command to resume a paused count.

ansto_sctdriveadapter.c NEW
This lets you create driveable objects from script-context controllers which have one node for setting a parameter and another node for reading the parameter (eg temperature controllers, choppers, velocity selectors)

sctemonadapter.c NEW
This generates an environment monitor interface for script-context controllers so that the emon object in SICS will be able to pause counters if the controller goes out of tolerance.

sct_usbtmcprot.c, usbtmc.h NEW
First attempt at a protocol handler for USB Test and Measurement Class devices

sct_julabo_lh45.tcl NEW
Implements script-context controller for the Julabo LH45 temperature controller.

Makefile
Added ansto_sctdriveadapter and sctemonadapter

hardsup/makefile
Added velocity selector and usbtmc protocol handlers

hardsup/sct_velselprot.c
Simplified, don't worry about trying to implement a login handler for now, just implement a "Reading" handler.

site_ansto.c
Add the velocity selector and USBTMC protocol handlers.
Added the ANSTO_MakeHM command

instrument/config/hipadaba/common_instrument_dictionary.tcl
Added support for auxiliary data, ie extra meta-data entries in the "data" group of the nexus file.
Add new NXvelocity_selector object under /instrument.

instrument/config/hipadaba/hipadaba_configuration_common.tcl
Add the new "sct_object" script-context controller objects to the hdb tree.

instrument/config/hipadaba/instdict_specification.tcl
Define the new sct_object controllers.

instrument/config/hmm/hmm_configuration_common_1.tcl
Use the new ANSTO_MakeHM command to create histmem drivers which support veto.
Define allowed attributes and elements for the BAT_TABLE and FAT_TABLE
Stop between counts instead of pausing because setting pause now sends a veto.

instrument/config/motors/sct_jogmotor_common.tcl
You now need to specify klass when creating a jogmotor.

instrument/config/motors/sct_positmotor_common.tcl
You can now specify an optional function which calculates the instrument parameter (eg attenuation) from a posit table entry when defining a posit motor.

instrument/config/nexus/nxscripts_common_1.tcl
Report file status info in the /experiment section of the hdb tree.  Add auxiliary data to data file.
Handle saving data from script-context controller objects.

instrument/util/script_context_util.tcl
Added procedure to set required properties  for saving script-context object data.

instrument/util/utility.tcl
Added set_sct_object_attributes proc to automatically set required attributes on SCT_OBJECTs
Fixed hlistplainprop to deal with empty property fields on hdb nodes.

instrument/server_config.tcl
Call the new nexus initialisation command and set attributes on sct objects.

hrpd/config/motors/motor_configuration.tcl
New absenc home readings for mchi and mphi. New absenc home and range for mf1

hipd/config/commands/commands.tcl
Exported and published the new ajscmds so that they can be used in batch files.

hipd/config/motors/motor_configuration.tcl
New mchi absenc home

rsd/config/hmm/hmm_configuration.tcl
Provide support for saving corrected hmm data

rsd/config/motors/motor_configuration.tcl
Use simple names for motors.

SICS-329

sans/config/INSTCFCOMMON.TXT
Added julabo and lakeshore configuration files to list.

sans/config/optics/guide_configuration.tcl
Added entrance aperture positions to the configuration table and the cn_maps which map the index to the component ID.

sans/commands/commands.tcl
The "guide" command now set EApPosYmm after driving the guides in place.
The indexed position to component maps (cn_map) have been moved to the guide_configuration.tcl file.

sans/motors/motor_configuration.tcl
Set samy home to 56.1mm

sans/config/velsel/sct_velsel.tc NEW
Implements script-context controller object for the NVS40 velocity selector. TODO tilt-angle control, driveable interface.

sans/config/hmm/hmm_configuration.tcl
Set 5.08mm spacing on detector width. Use pixel-offset for vertical and horizontal detector axes.

sans/config/motors/motor_configuration.tcl
Swap directions of beamstops 4 and 5 (the two smallest)
New config parameters for samx, samthet, apx, det, detoff, bsz,

sans/config/motors/positmotor_configuration.tcl
Added descriptive headers to positmotor configuration tables and new synstax for the make positmotor command.

sans/config/nexus/nxscripts.tcl
Implemented initialisation command.

sans/config/parameters/parameters.tcl
Added SampleThickness and TransmissionFlag.  Calculate SamplePosYmm from samy and SamyOffsetmm.
Added beamstops to hdb tree.

reflectometer/config/nexus/nxscripts.tcl
Implement the initialisation procedure.

r2767 | ffr | 2009-03-31 10:16:54 +1100 (Tue, 31 Mar 2009) | 123 lines
2012-11-15 16:57:04 +11:00
Ferdi Franceschini
eec824f98a SICS-294 anstohttp.c
Histmem mow only calls TaskYield after SICS has finished initalising, this
stops the statusfile task from being called early and overwriting the status
file.

r2765 | ffr | 2009-03-03 11:42:26 +1100 (Tue, 03 Mar 2009) | 5 lines
2012-11-15 16:56:59 +11:00
Douglas Clowes
38b588cc47 suppress sign mismatch compiler diagnostic
r2419 | dcl | 2008-04-14 09:19:12 +1000 (Mon, 14 Apr 2008) | 2 lines
2012-11-15 13:34:29 +11:00
Ferdi Franceschini
f3d798689b Merge changes from release 2.0 branch
r2364 | ffr | 2008-02-20 09:00:24 +1100 (Wed, 20 Feb 2008) | 2 lines
2012-11-15 13:33:24 +11:00
Mark Lesha
1cd243f1f4 Added uploading of server parameters srv_xxx in order to allow SICS to control various server features and access/release its control and configuration features.
r2362 | mle | 2008-02-19 14:19:26 +1100 (Tue, 19 Feb 2008) | 2 lines
2012-11-15 13:33:16 +11:00
Douglas Clowes
8325c68cea Fix uninitialized variable
r2269 | dcl | 2008-01-15 12:21:08 +1100 (Tue, 15 Jan 2008) | 2 lines
2012-11-15 13:31:26 +11:00
Ferdi Franceschini
3ff8fe35a9 Remove debugging message.
r2174 | ffr | 2007-10-03 11:57:37 +1000 (Wed, 03 Oct 2007) | 2 lines
2012-11-15 13:25:32 +11:00
Ferdi Franceschini
8fa8fd8806 Don't upload the histogram server configuration twice.
r2173 | ffr | 2007-10-03 11:55:12 +1000 (Wed, 03 Oct 2007) | 2 lines
2012-11-15 13:25:29 +11:00
Ferdi Franceschini
3fb134872b Added support to disable status checking when a scan is aborted.
See JIRA:SICS-65

r2109 | ffr | 2007-08-16 14:18:23 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:21:39 +11:00
Mark Lesha
79ac59740f MJL 4/4/07 Added upload of any dictonary entries starting with 'read_data_' as HTTP options in data read reques to histogram server, allows read data source & format to be adjusted on-the-fly.
r1795 | mle | 2007-04-04 07:57:29 +1000 (Wed, 04 Apr 2007) | 2 lines
2012-11-15 13:13:52 +11:00
Mark Lesha
bc4813b4ba MJL 20/3/07 Didn't quite get MAX_HTTP_REQUEST_BYTES declaration right (needed long long type), fixed.
r1687 | mle | 2007-03-20 13:46:01 +1100 (Tue, 20 Mar 2007) | 2 lines
2012-11-15 13:08:34 +11:00
Mark Lesha
c28223584b MJL 19/3/07 Effectively disabled HTTP chunk transfer code (see MAX_HTTP_TRANSFER_BYTES), was causing problems where start and end were not specified.
r1671 | mle | 2007-03-19 17:02:17 +1100 (Mon, 19 Mar 2007) | 2 lines
2012-11-15 13:07:43 +11:00
Mark Lesha
4da6d932fb MJL 16/3/07 Added transitional statuses, removed blocking code, improved performance under error conditions.
r1664 | mle | 2007-03-16 16:57:36 +1100 (Fri, 16 Mar 2007) | 2 lines
2012-11-15 13:07:21 +11:00
Ferdi Franceschini
1b061bf8da Show filename when hm fails to read data file.
r1495 | ffr | 2007-02-16 16:32:21 +1100 (Fri, 16 Feb 2007) | 2 lines
2012-11-15 12:59:22 +11:00
Ferdi Franceschini
877b46164b Added option to get histograms from filesystem as well as from socket.
Added: direct, hmdatapath, and scanpoint config parameters.

r1492 | ffr | 2007-02-16 09:46:51 +1100 (Fri, 16 Feb 2007) | 3 lines
2012-11-15 12:59:13 +11:00
Ferdi Franceschini
788161264c Increased retries and timeout
r1367 | ffr | 2006-12-12 09:03:49 +1100 (Tue, 12 Dec 2006) | 2 lines
2012-11-15 12:55:34 +11:00
Mark Lesha
fc9c909c84 MJL 21/11/06 Applied transfer size limitation in AnstoHttpGetHistogram code; see comments re AppWeb HTTP 1.1 chunking
r1313 | mle | 2006-11-22 12:56:56 +1100 (Wed, 22 Nov 2006) | 2 lines
2012-11-15 12:53:51 +11:00
Mark Lesha
295eafefe8 MJL 21/11/06 Fixed bugs in HttpConfigure as per SINQ version.
r1306 | mle | 2006-11-21 09:53:38 +1100 (Tue, 21 Nov 2006) | 2 lines
2012-11-15 12:53:41 +11:00
Mark Lesha
98ae293764 MJL 17/11/06 Fixed a problem in anstoHttpGet - first-try code OK but second try code buggy. Mailed to Mark K to update sinqHttp to match.
r1300 | mle | 2006-11-17 16:25:40 +1100 (Fri, 17 Nov 2006) | 2 lines
2012-11-15 12:53:25 +11:00
Mark Lesha
c24c60b0c3 MJL 17/11/06 Fixed status checking problem on slow servers; return HWRedo instead of HWBusy
r1299 | mle | 2006-11-17 11:54:08 +1100 (Fri, 17 Nov 2006) | 2 lines
2012-11-15 12:53:23 +11:00
Mark Lesha
3c7c269705 MJL 8/11/06 Improved start/stop/pause status checking.
r1254 | mle | 2006-11-08 16:58:57 +1100 (Wed, 08 Nov 2006) | 2 lines
2012-11-15 12:51:41 +11:00
Mark Lesha
7e43aa3e16 Contains kludge to present assumed histogram server statuses to the client in the list command. Will work, but should be improved to read real status instead (one day).
r1197 | mle | 2006-10-26 13:59:10 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:41 +11:00
Mark Lesha
4a74ec3404 Removed disabling of status checking in Paused mode (not appropriate for ANSTO histogram server)
r1195 | mle | 2006-10-26 12:21:18 +1000 (Thu, 26 Oct 2006) | 2 lines
2012-11-15 12:49:36 +11:00
Mark Lesha
45f86cb928 MJL 13/10/06 Added support for dynamic FAT configuration changes
r1141 | mle | 2006-10-13 15:10:11 +1000 (Fri, 13 Oct 2006) | 2 lines
2012-11-15 12:48:13 +11:00
Mark Lesha
c592673f3d MJL 11/10/06 Original version (based on sinqhttp)
r1131 | mle | 2006-10-11 13:58:13 +1000 (Wed, 11 Oct 2006) | 2 lines
2012-11-15 12:47:49 +11:00