Commit Graph

1193 Commits

Author SHA1 Message Date
Ferdi Franceschini
e6e3c3be52 Merged in-situ modifications for Release 2.5 candidate 5
r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
2012-11-15 17:00:43 +11:00
Jing Chen
a2ca46ab67 put the init log file under log folder
r2894 | jgn | 2010-04-29 08:47:45 +1000 (Thu, 29 Apr 2010) | 2 lines
2012-11-15 17:00:38 +11:00
Ferdi Franceschini
d8e391ea90 Added protec and http protocols which had been removed during merge.
r2889 | ffr | 2010-04-19 14:33:37 +1000 (Mon, 19 Apr 2010) | 2 lines
2012-11-15 17:00:34 +11:00
Ferdi Franceschini
d9da95a5df sct_protek608.c
Implements a protocol handler for the protek  608 multimeters which just allows us to read the display.
It reports all elements of the display including the bar graph, it does not provide remote control of the multimeter.  The protocol handler broadcasts a warning to all clients if the auto-off function is enabled.

sct_rfamp.c
This is a protocol handler for the Mirrortron 35V 7A AC Generator (ANSFR-83B).

sinqhttpprot.c
Copied the PSI script context http protocol handler.

sct_orhvpsprot.c
Ordela high voltage power supply protocol handler now catches unknown commands.

sct_eurotherm_2000.tcl
Eurotherm controller for the kowari load frame by Douglas Clowes.

sct_lakeshore_3xx.tcl
Latest update from Arndt.  The two control loops are now independent, settletime and tolerance now work properly.

common_instrument_dictionary.tcl
Make instrument/status saveable.

sct_orhvps_common.tcl
Provides voltage ramping and implements the dhv1 command for the Ordela HVPS via the sct_orhpsprot.c protocol handler.

hmm_configuration_common_1.tcl
Adds new "histmem clockscale" subcommand to get and set the clock scale from the fat_clock_scale FAT parameter.
You can now upload the FAT FRAME_BUFFER and FRAME_DUTYCYCLE parameters to the histogram memory.
The veto commands are now "histmem veto on" and "histmem veto off".

hmm_object.tcl
The axis order for the histmem object has been restore to t,y,x

sct_positmotor_common.tcl
Code has been simplified.

nxscripts_common_1.tcl
Removed obsolete ::nexus::data function.  TOF axis now correctly report time_of_flight instead of "time".

plc_common_1.tcl
Make PLC info saveable.

scan_common_1.tcl
SICS-385 The scan command should check the final scan variable value against he soft upper and lower limits, not against the hard limits.
Make sure that the scan variable axis is saved.

platypus, kowari, quokka hmm_configuration.tcl
Use the HOR and VER entries in the new histmem_axes hash to select the horizontal and vertical axes for the histmem.

kowari motor_configuration.tcl secondary_slit_configuration.tcl
Flatten slits motor structure to match old layout in data files.

quokka commands.tcl
SICS-380 EApPosYmm -> EApPosY

quokka detector.tcl
Use new script context controller for Ordela HVPS

quokka hmm_configuration.tcl
Set detector height to 5.08*192 the same as the width

quokka motor_configuration.tcl
Code cleanup

quokka positmotor_configuration.tcl
Use new positmotor code.

quokka aperture_configuration.tcl
Added attenuation factor column to AttRotLookupTable

quokka parameters.tcl
SICS-380 Refactor nexus, remove redundant parameters.

site_ansto.c
Added the following protocols, Httpl, Protek608, aand RFAmp.

scriptcontext.c
SICS-386 SctActionHandler: set "send" string to NULL when a chain of scripts completes with state=idle.
It turns out that if none of the scripts in the "read chain" call [sct send] each time the chain is executed, then SICS will hammer the device with calls to AsconWrite(). This can be avoided if SctActionHandler sets the 'send' string to NULL before "goto finish" in the idle state. This will be safer and still let you have chains with multiple [sct send] and read scripts.

asyncprotocol.c
Fix platypus memory leak.

devser.c
SICS-387 Started adding code to pass signals on to script context drivers.

ascon.c
AsconTask(): Make sure we return to the AsconIdle state when sending a command which expect no response, also only reconnect if there is a Timeout when there has been an error.

r2888 | ffr | 2010-04-19 14:04:41 +1000 (Mon, 19 Apr 2010) | 90 lines
2012-11-15 17:00:29 +11:00
Ferdi Franceschini
aa6bb7f1da Added rfamp protocol handler
r2887 | ffr | 2010-04-16 15:02:23 +1000 (Fri, 16 Apr 2010) | 2 lines
2012-11-15 17:00:24 +11:00
Douglas Clowes
8fbe8b29d0 Adding script context MODBUS protocol and Eurotherm 2000 series driver
r2886 | dcl | 2010-04-16 09:45:27 +1000 (Fri, 16 Apr 2010) | 2 lines
2012-11-15 17:00:19 +11:00
Jing Chen
1679e9fe29 Add timestamp info to the server00.log file name -> server00_hh:mm:sec-daymonyear
r2885 | jgn | 2010-02-15 12:24:12 +1100 (Mon, 15 Feb 2010) | 2 lines
2012-11-15 17:00:15 +11:00
Ferdi Franceschini
4f3fb5e250 sct_julabo_lh45.tcl
Create object when in simulation mode

nxscripts_common_1.tcl
Set units attributes on script context objects data

sans aperture_configuration.tcl
Update rotary attenuator lookup table. Set parameters when motors positions are
within tolerance of the lookup table positions.

sans, parameters.tcl sct_velsel.tcl
Set units and update parameter names to be consistent

quokka_configuration.tcl
Add convenience command to load environment controllers.

server_config.tcl
Make sure that controllers are properly generated when loading them from the ext
raconfig.tcl.

r2881 | ffr | 2010-01-29 16:50:51 +1100 (Fri, 29 Jan 2010) | 20 lines
2012-11-15 17:00:10 +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
Jing Chen
eedaf4b675 Updated the deploytment.sh file on Monday Feb 25, Ferdi
:
CS: ----------------------------------------------------------------------

r2879 | jgn | 2010-01-27 14:15:13 +1100 (Wed, 27 Jan 2010) | 4 lines
2012-11-15 17:00:01 +11:00
Ferdi Franceschini
40c57a1590 Only install lh45 when needed.
r2877 | ffr | 2010-01-22 21:02:42 +1100 (Fri, 22 Jan 2010) | 2 lines
2012-11-15 16:59:57 +11:00
Ferdi Franceschini
fbe98a41b7 Fixed stupid typo
r2876 | ffr | 2010-01-22 21:00:23 +1100 (Fri, 22 Jan 2010) | 2 lines
2012-11-15 16:59:52 +11:00
Ferdi Franceschini
3a3b6764ee SICS-377 hipadaba_configuration_common.tcl
One typo and forgetting to clear a temporary variable meant that the list of candidates for removal never shrank while pruning

reflectometer/config/motors/sct_batmotor.tcl
The beam attenuator is on axis D not A.  Also provide statemon feedback, "busy" or "idle"

sans/config/velsel/velsel.tcl
Update velocity selector parameters for NVS 43

SICS-374 sans/config/velsel/sct_velsel.tcl
Set velocity selector identifier

script_context_util.tcl
Don't override the "klass' attribute, just make sure that it matches the hdb klass property if it's defined.

event.h and statemon.c
Added statemon BUSY and IDLE events for the scbat because it when it oscillates it's busy doing something.

r2875 | ffr | 2010-01-22 20:41:36 +1100 (Fri, 22 Jan 2010) | 18 lines
2012-11-15 16:59:48 +11:00
Ferdi Franceschini
4a7bfba81e Make wavelength reporting more like the NVS software.
r2873 | ffr | 2010-01-21 09:38:59 +1100 (Thu, 21 Jan 2010) | 2 lines
2012-11-15 16:59:43 +11:00
Ferdi Franceschini
30002eb404 Eliminate the speed is to low error message when the actual speed is less than 3100 rpm, just set lamba=99999
Update message prefix for new velocity selector controller.

r2872 | ffr | 2010-01-20 15:13:24 +1100 (Wed, 20 Jan 2010) | 3 lines
2012-11-15 16:59:38 +11:00
Ferdi Franceschini
4068f99180 Fixed some deployment problems
r2871 | ffr | 2010-01-15 18:53:30 +1100 (Fri, 15 Jan 2010) | 2 lines
2012-11-15 16:59:34 +11:00
Ferdi Franceschini
724af2d4ca hipadaba_configuration_common.tcl
Oops calling the deleted hlistplainprop function instead of the new hlistprop.

sans/config/commands/commands.tcl
Set beamstop diameter (BSdiam) when selecting a beamstop

sans optics/aperture_configuration.tcl
The entrance app is 50mm when guide config is g1 to g9 or p1 to p9

sans parameters.tcl
Added GuideConfig parameter to record the last configuration set by SICS.

r2870 | ffr | 2010-01-15 18:19:22 +1100 (Fri, 15 Jan 2010) | 12 lines
2012-11-15 16:59:29 +11:00
Ferdi Franceschini
59101a7d4d Merged Arndt's changes from trunk
version 20100114, deployed on Wombat Today, provides independent tolerance control for control loop one and two. AM

r2869 | ffr | 2010-01-15 09:48:17 +1100 (Fri, 15 Jan 2010) | 4 lines
2012-11-15 16:59:25 +11:00
Ferdi Franceschini
5e2cfbad44 Oops, you can't set a variable after locking it.
r2865 | ffr | 2010-01-14 09:45:02 +1100 (Thu, 14 Jan 2010) | 2 lines
2012-11-15 16:59:20 +11:00
Ferdi Franceschini
018aeac4d8 Put all cvs keyword references in one place to simplify merges.
r2864 | ffr | 2010-01-14 09:31:03 +1100 (Thu, 14 Jan 2010) | 2 lines
2012-11-15 16:59:15 +11:00
Ferdi Franceschini
7970a94acf Remove obsolete hlistplainprop procedure.
r2861 | ffr | 2010-01-13 16:12:16 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:11 +11:00
Ferdi Franceschini
fd6a955d6b Remove keywords to simplify merging branches.
r2859 | ffr | 2010-01-13 15:41:46 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:06 +11:00
Ferdi Franceschini
695c5a8f82 Document handle_exception function.
r2858 | ffr | 2010-01-13 12:53:19 +1100 (Wed, 13 Jan 2010) | 2 lines
2012-11-15 16:59:01 +11:00
Ferdi Franceschini
343f874b70 sans/config/parameters/parameters.tcl
SICS-365 Refactored quokka nexus structure, the parameters group has been greatly simplified.

sans/config/commands/commands.tcl
If "selbs" is called by "selbsn" or "selbsxy" it now reports "startt selbsn/selbsxy" and "stop selbsn/selsxy" as well as start and stop for selbs.
The rotary attenuator and entrance aperture commands now drive the "att" and "srce" motors directly.

quokka_configuration.tcl
Removed obsolete code.

SICS-365  nxscripts_common_1.tcl, instdict_specification.tcl, common_instrument_dictionary.tcl
Don't create unnofficial nexus classes.

r2856 | ffr | 2010-01-11 16:12:40 +1100 (Mon, 11 Jan 2010) | 13 lines
2012-11-15 16:58:57 +11:00
Ferdi Franceschini
3f53864468 Merging changes made in-situ
r2852 | ffr | 2009-12-16 09:01:46 +1100 (Wed, 16 Dec 2009) | 2 lines
2012-11-15 16:58:52 +11:00
Ferdi Franceschini
af6e10a6e1 Correcting for attenuator wheel which was re-installed at -120 degrees.
r2851 | ffr | 2009-12-15 15:38:27 +1100 (Tue, 15 Dec 2009) | 2 lines
2012-11-15 16:58:48 +11:00
Ferdi Franceschini
2af977c1ac Correct overlap positions.
r2849 | ffr | 2009-12-15 12:48:53 +1100 (Tue, 15 Dec 2009) | 2 lines
2012-11-15 16:58:43 +11:00
Ferdi Franceschini
f24284f96d Addded some missing files
r2848 | ffr | 2009-12-11 13:14:03 +1100 (Fri, 11 Dec 2009) | 2 lines
2012-11-15 16:58:39 +11:00
(no author)
7c75771acf This commit was manufactured by cvs2svn to create branch
'RELEASE-2_5-BRANCH'.
r2846 | (no author) | 2009-12-11 13:09:57 +1100 (Fri, 11 Dec 2009) | 2 lines
2012-11-15 16:58:34 +11:00
Ferdi Franceschini
35d1930d1b Initial commit
r2845 | ffr | 2009-12-11 13:09:56 +1100 (Fri, 11 Dec 2009) | 2 lines
2012-11-15 16:58:26 +11:00
Ferdi Franceschini
3abd3effa2 Set detector y lower limit for Quokka
Improve precision of motor position calculation.

r2844 | ffr | 2009-12-11 12:39:12 +1100 (Fri, 11 Dec 2009) | 3 lines
2012-11-15 16:58:22 +11:00
Ferdi Franceschini
82475e1dec Cleanup and add "histmem loadconf" feedback
r2843 | ffr | 2009-12-10 18:29:23 +1100 (Thu, 10 Dec 2009) | 2 lines
2012-11-15 16:58:18 +11:00
Ferdi Franceschini
b6ed01fc13 Merge changes made in-situ.
r2842 | ffr | 2009-12-10 14:57:53 +1100 (Thu, 10 Dec 2009) | 2 lines
2012-11-15 16:58:14 +11:00
Ferdi Franceschini
f494ece7e7 Augment exception handler to allow users to add extra information to error messages.
r2841 | ffr | 2009-12-10 14:57:13 +1100 (Thu, 10 Dec 2009) | 2 lines
2012-11-15 16:58:09 +11:00
Arndt Meiers
d8cd96b69b version 20091209_3. Not tested. Takes the exception handling inside catch blocks one step further. Has additional args argument for optional message in case of a real error and uses the new catch method throughout all subroutines.
r2840 | axm | 2009-12-09 18:43:23 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:58:05 +11:00
Arndt Meiers
ab7774aa4c version 20091209_2. Not tested. Merges the changes from 20091201 and 20091209_1(ffr).
r2839 | axm | 2009-12-09 18:41:43 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:58:01 +11:00
Arndt Meiers
8b6c89ebc1 version 20091209_1 (ffr). Not tested. Introduces new handling of exceptions in some key subroutines - added by ffr based on the version 20091016, not 20091201.
r2838 | axm | 2009-12-09 18:40:39 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:57 +11:00
Arndt Meiers
814fa32408 version 20091201, not tested. Fixed drivestatus return values (insights from Lakeshore 336 driver) and removed obsolete line terminator code.
r2837 | axm | 2009-12-09 18:38:58 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:52 +11:00
Arndt Meiers
f4e26c7e08 Version 20091016, This is the version that has been running on Platypus from mid October to at least mid December 2009. Although users have been happy, we discovered some bits of code that may cause problems under certain circumstances such as the drivestatus return values and the handling of exceptions. We are waiting with the roll-out of the latest version until we will be able to test it and together with the migration to the new power supply controller. Only tested with serial communication because of the TCP/IP port bug in the old controller.
r2836 | axm | 2009-12-09 18:37:03 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:48 +11:00
Ferdi Franceschini
4380176000 reflectometer commands.tcl motor_configuration.tcl parameters.tcl and platypus_configuration.tcl
Merged in-situ changes from ics1-platypus

r2835 | ffr | 2009-12-09 18:16:26 +1100 (Wed, 09 Dec 2009) | 3 lines
2012-11-15 16:57:44 +11:00
Ferdi Franceschini
c73c4c85c8 Merges from ics1-wombat
r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
2012-11-15 16:57:39 +11:00
Ferdi Franceschini
64ab146a44 If there are errors while saving data, make sure that as much data as possible is saved and set the error message in "/entry/data_save_error"
r2833 | ffr | 2009-12-03 16:38:55 +1100 (Thu, 03 Dec 2009) | 2 lines
2012-11-15 16:57:35 +11:00
Ferdi Franceschini
746f495d69 SICS-354 nxscripts_common_1.tcl
Now using a nexus dictionary variable to set the entry name in data files to prevent duplicate or wrong entry names.
Make sure that the isNewFile flag is reset on the first "save" call to prevent file number being incremented multiple times

SICS-394 sans commands.tcl
Added "selbs", "selbsn", and "selbsxz" commands to select and position a beamstop in a safe manner.

SICS-394 sans motor_configuration.tcl
Added new beamstop motor drivers.

SICS-394 sans parameters.tcl
Added BeamStop parameter to record which beamstop has been selected.

r2832 | ffr | 2009-12-03 13:04:57 +1100 (Thu, 03 Dec 2009) | 13 lines
2012-11-15 16:57:31 +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
c58ee9fbcb Allow users to define a batch cleanup function which is called when a batch file finishes or aborts.
r2802 | ffr | 2009-08-11 12:25:26 +1000 (Tue, 11 Aug 2009) | 2 lines
2012-11-15 16:57:21 +11:00
Ferdi Franceschini
86d5b0fef9 Update mom hard upper limit to 103
r2770 | ffr | 2009-03-31 17:48:28 +1100 (Tue, 31 Mar 2009) | 2 lines
2012-11-15 16:57:17 +11:00
Ferdi Franceschini
4a898637b4 Add lakeshore config for RHQ
r2769 | ffr | 2009-03-31 17:28:11 +1100 (Tue, 31 Mar 2009) | 2 lines
2012-11-15 16:57:13 +11:00
Ferdi Franceschini
8e5b7842e3 Merged changes made in-situ
r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
2012-11-15 16:57:09 +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