linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,605 Commits 1 Branch 0 Tags
14be249401f40d0e7c3ab39ed7dab1f59df9e536
Commit Graph

36 Commits

Author SHA1 Message Date
Douglas Clowes
14be249401 Pullback from Wombat 2015-02-19 2015-02-19 11:51:51 +11:00
Douglas Clowes
c8057a89aa Changes pulled back from Wombat 2014-09-09 2014-09-09 14:52:47 +10:00
Douglas Clowes
648c8003b7 Merge from Wombat, except sics_config.ini 
Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl
 2014-06-25 13:35:28 +10:00
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Ferdi Franceschini
1af24fcb0a _histmem proc isn't created if the common hmm config file is loaded with the "source" command. 2013-09-10 21:44:45 +10:00
Ferdi Franceschini
5a17bca641 Make sure hmm clock_scale and freq are set or SICS won't start properly. 
If these parameters aren't set on an instrument with a histogram server
then SICS won't create the hdb tree.
 2013-08-22 07:58:20 +10:00
Ferdi Franceschini
ca1e34856a Speed up histmem config when SICS starts up. 
Clock scale, frame freq and source should be set in the instrument specific
hmm_configuration.tcl file, not in hmm_configuration_common_1.tcl.
 2013-08-15 13:56:50 +10:00
Ferdi Franceschini
1762688c7a Adjust detector width to give 121 degrees 
r3350 | ffr | 2012-01-20 15:53:21 +1100 (Fri, 20 Jan 2012) | 2 lines
 2012-11-15 17:23:31 +11:00
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
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
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
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
c35f37420e Added stitch ordering parameter 
r2689 | ffr | 2008-08-29 22:18:17 +1000 (Fri, 29 Aug 2008) | 2 lines
 2012-11-15 13:41:58 +11:00
Ferdi Franceschini
2b02d7d1f1 SICS-215, SICS-234 Fixed two-theta direction. 
r2683 | ffr | 2008-08-29 01:24:56 +1000 (Fri, 29 Aug 2008) | 2 lines
 2012-11-15 13:41:34 +11:00
Ferdi Franceschini
e31aa973a6 Merged release 2.1 
r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines
 2012-11-15 13:40:36 +11:00
Ferdi Franceschini
0f96e4f82f server_config.tcl 
server_init now calls ::counter::isc_initialize, ::histogram_memory::isc_initialize and ::scan::isc_initialize

scan.c
SICS-158  Restrict bmonscan and hmscan to only one scan variable

count_common.tcl
Create a mulicounter which uses the available monitors as channels.  The multicounter is used in bmonscans

hipadaba_configuration_common.tcl
Use _link as the suffix for the nxvgroup name when making nexus file links.

hmm_configuration_common.tcl
SICS-190 Create hdb entries for bm_counts, bm_event_rate, bm_status
SICS-164 Allow running histmem in simulated mode.

hmm_cylindrical_detector_configuration.tcl
Only refer to detector SICSVariables when necessary, otherwise we get dependency problems.

nxscripts_common_1.tcl
Separate histmem_filtype_spec from bmon_filetype_spec so that we can use the histem_filetyp_spec names to restrict the histmem scan filetypes.
Close the data file on error in proc ::nexus::save
Allow int and text types when saving macro data

scan_common_1.tcl
SICS-173  Allow users to force a scan when the instrument isn't ready
Added ic_initialize proc so we can make dependencies explicit in the init_server proc
SICS-186 Allow monitor modes for histmem scans
Allow selection of histmem file policies from runscan command

echidna, wombat, kowari, quokka and platypus component and server configurations
Added instrument specific configuration initialisation functions in the component configuration files.
Add a catch block to the top-level instrument server configuration file and printout the errorContext and callStack

r2641 | ffr | 2008-07-01 17:02:26 +1000 (Tue, 01 Jul 2008) | 34 lines
 2012-11-15 13:39:55 +11:00
Ferdi Franceschini
3a40ea5693 Merged release 2.0 patch-set 1 (RELEASE-2_0P1 ) 
r2624 | ffr | 2008-06-12 09:05:36 +1000 (Thu, 12 Jun 2008) | 2 lines
 2012-11-15 13:39:10 +11:00
Ferdi Franceschini
0749b0effa Merging release 2.0 branch with CVS trunk 
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
 2012-11-15 13:38:17 +11:00
Ferdi Franceschini
e7547a18ab Use ::histogram_memory::upload_config instead of the deprecated ::histogram_memory::configure_server procedure. 
r2283 | ffr | 2008-01-15 14:56:36 +1100 (Tue, 15 Jan 2008) | 2 lines
 2012-11-15 13:32:19 +11:00
Ferdi Franceschini
45fb8a2865 Set maximum number of channels when using simulated driver. 
r2245 | ffr | 2007-11-07 15:57:02 +1100 (Wed, 07 Nov 2007) | 2 lines
 2012-11-15 13:29:56 +11:00
Ferdi Franceschini
e8982428e0 Add convenience histmem command wrapper for command line users. 
Improve simulation support.

r2226 | ffr | 2007-11-05 13:25:15 +1100 (Mon, 05 Nov 2007) | 3 lines
 2012-11-15 13:28:44 +11:00
Ferdi Franceschini
a173158d0e Create extra hmm objects to fetch xy, yt, t, ..., etc. data from the histogram server. 
r2166 | ffr | 2007-09-26 16:22:43 +1000 (Wed, 26 Sep 2007) | 2 lines
 2012-11-15 13:25:03 +11:00
Ferdi Franceschini
307e29e60e Added instrument specific initialisation function. 
r2122 | ffr | 2007-08-16 16:31:37 +1000 (Thu, 16 Aug 2007) | 2 lines
 2012-11-15 13:22:25 +11:00
Ferdi Franceschini
717f9beea7 Tidied up indents etc, to make it easy to compare diffs against the echidna config. 
r1950 | ffr | 2007-05-10 13:18:06 +1000 (Thu, 10 May 2007) | 2 lines
 2012-11-15 13:16:34 +11:00
Ferdi Franceschini
86b99280d4 Merged the simulation mode setup from the trunk with the modified setmode command from the branch. 
r1945 | ffr | 2007-05-08 14:59:26 +1000 (Tue, 08 May 2007) | 2 lines
 2012-11-15 13:16:20 +11:00
Ferdi Franceschini
ade5216ea9 Merged Release 1.2 
r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
 2012-11-15 13:15:32 +11:00
Ferdi Franceschini
d0b8de93b1 Provided option to use simulated hmm drivers. 
r1852 | ffr | 2007-04-13 12:57:17 +1000 (Fri, 13 Apr 2007) | 2 lines
 2012-11-15 13:14:39 +11:00
Ferdi Franceschini
e7324b8335 Merged RELEASE-1_1 back into trunk. 
r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
 2012-11-15 13:13:55 +11:00
Ferdi Franceschini
db9a45ff1e The instrument specific hmm configurations are now responsible for creating the hmm and hmc objects. This makes it possible to drop dummy or instrumented histogram memory objects into the common setup and control code. 
r1754 | ffr | 2007-03-31 11:30:31 +1000 (Sat, 31 Mar 2007) | 2 lines
 2012-11-15 13:11:59 +11:00
Ferdi Franceschini
aaba6ffb44 Set new browser view display format. 
r1700 | ffr | 2007-03-22 18:34:14 +1100 (Thu, 22 Mar 2007) | 2 lines
 2012-11-15 13:09:12 +11:00
Ferdi Franceschini
978b06587c Use new hmm setup and initialisation functions and initialise hmm_start to read from the start of the histogram memory for each instrument. 
r1685 | ffr | 2007-03-20 11:59:53 +1100 (Tue, 20 Mar 2007) | 2 lines
 2012-11-15 13:08:28 +11:00
Ferdi Franceschini
da2e771687 Update histogram memory configuration in anticipation of new histogram memory server. 
r1684 | ffr | 2007-03-20 11:57:40 +1100 (Tue, 20 Mar 2007) | 2 lines
 2012-11-15 13:08:24 +11:00
Ferdi Franceschini
1745977df4 Initialise and setup hmm. 
r1627 | ffr | 2007-03-12 08:57:37 +1100 (Mon, 12 Mar 2007) | 2 lines
 2012-11-15 13:05:42 +11:00
Ferdi Franceschini
6acd4f19fd Modified to use common configuration 
r1589 | ffr | 2007-03-05 16:43:33 +1100 (Mon, 05 Mar 2007) | 2 lines
 2012-11-15 13:03:49 +11:00
Ferdi Franceschini
99c55c1a07 Wombat hmm config file from Mark Lesha 
r1580 | ffr | 2007-03-03 09:23:39 +1100 (Sat, 03 Mar 2007) | 2 lines
 2012-11-15 13:03:22 +11:00
Ferdi Franceschini
edfbb73b10 Added config for hmm. 
r1553 | ffr | 2007-02-26 13:14:07 +1100 (Mon, 26 Feb 2007) | 2 lines
 2012-11-15 13:02:03 +11:00