Commit Graph

40 Commits

Author SHA1 Message Date
Ferdi Franceschini
01be487c52 pelican
Create pas/config/source/source.tcl
config/source/source_common.tcl
pelican_configuration.tcl

deploySICS.sh
Don't deploy script validator configs, they are obsolete

server_config.tcl
Source config has been moved to  config/source and is specialised for each instrument by calling the instrument specific initialiser ::source:isc_initalize

commands_common_1.tcl
The monitor mode and preset are recorded when running the count command

counter_common_1.tcl
Report and record the counts and time for the multicounter and each monitor.  Also record the mode and preset for the multicounter.

hmm_configuration_common_1.tcl
Cleanup, remove obsolete code.
Report and record the hmm total counts and time.
Allow monitor controlled acquisition from the histogram server

nxscripts_common_1.tcl
Add DataType to NXdata section, preserve case in text attributes.

scan_common_1.tcl
Provide sensible feedback for our bmonscan and hmscan objects.
Set run_mode when doing a scan.  Allow users to select the datatype for histmem scans and to force a scan

wombat_configuration.tcl
echidna_configuration.tcl
platypus_configuration.tcl
kowari_configuration.tcl
quokka_configuration.tcl
Load source config.

quokka_configuration.tcl
SICS-198 HACK, Add AttrotDeg and RotApDeg status feedback.

sans/commands/commands.tcl
Add status feedback for quokka "guide" command.

sans/parameters/parameters.tcl
Make sure data can be saved as xml (replace % with _percent)
SICS-198 HACK, add AttRotDeg and RotApDeg status feedback.

utility.tcl
Fix nasty "params array generator" bug.  SICS commands execute at runlevel 0 which means that the params anonymous array must be made at this level.
Provide the normalattlist command to enable creating attribute lists with the case preserved.

Added the runsics, runtestsics and sicsclient scripts to CVS.
Added source configurations for echidna, wombat, kowari, quokka, platypus, and pelican to CVS

r2644 | ffr | 2008-07-11 11:09:57 +1000 (Fri, 11 Jul 2008) | 53 lines
2012-11-15 13:40:07 +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
ef7c2a6f87 histmem.c
sicvar.c
SICS-93 Save histogram data and instrument state during an acquisition

hipadaba_configuration_common.tcl
SICS-185 Preserve case on hdb node names

hmm_configuration_common_1.tcl
nxscripts_common_1.tcl
sicvar.c
SICS-174 Allow saving of histmem data and instrument status during a count operation.

wombat_configuration.tcl
echidna_configuration.tcl
platypus_configuration.tcl
kowari_configuration.tcl
quokka_configuration.tcl
SICS-153 Move setup of statemon to new server_init function for the new sics_uid state variable

server_config.tcl
SICS-153 set attributes on the sics_suid var which is now created by MakeStateMon
SICS-187 Add cold source info (TODO move to platypus,quokka and pelican configs)

utility.tcl
SICS-185 Added normalgetatt to preserve case on hdb node names etc.

sans/config/optics/aperture_configuration.tcl
New file, Provides lookup tables for attenuation and entrance apertures. (SICS-157)

sans/config/optics/optics.tcl
Load the new aperture_configuration.tcl

sans/config/parameters/parameters.tcl
SICS-157 Add instrument parameters section with derived parameters and their dependencies

statemon.c
SICS-153 Create sics_suid sicsvariable when loading statemon and increment it on each status change.

r2635 | ffr | 2008-06-23 12:41:12 +1000 (Mon, 23 Jun 2008) | 38 lines
2012-11-15 13:39:42 +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
643b2bad1b Now supports adding toplevel entries to an NXentry.
Added start_time and end_time.

r2249 | ffr | 2007-11-08 17:04:07 +1100 (Thu, 08 Nov 2007) | 3 lines
2012-11-15 13:30:11 +11:00
Ferdi Franceschini
008249dc18 ::nexus::data report error if trying to link a data axis which doesn't have an hdb node, ie privilege=internal
::nexus::nxscript::save
 support saving mutable data from a sicsdata object
::nexus::nxscript::sdsinfo support mutable data

r2225 | ffr | 2007-11-05 13:20:36 +1100 (Mon, 05 Nov 2007) | 5 lines
2012-11-15 13:28:41 +11:00
Ferdi Franceschini
f8c64b55a0 Save scratch files in data directory.
Refactor to have explicit ::nexus:: prefix on procedures.

r2204 | ffr | 2007-10-31 16:44:38 +1100 (Wed, 31 Oct 2007) | 3 lines
2012-11-15 13:27:22 +11:00
Ferdi Franceschini
8e6d4e4da6 hipadaba_configuration_common.tcl
Check all kinds of hdb nodes for units.

nxscripts_common_1.tcl
Make units optional when saving data.
Catch histogram memory savecmd errors.

r2188 | ffr | 2007-10-23 12:32:41 +1000 (Tue, 23 Oct 2007) | 7 lines
2012-11-15 13:26:23 +11:00
Ferdi Franceschini
75e7862cc6 Fix order of axes to match the order in which the histogram memory is written
ie Time, Vertical, Horizontal.

r2171 | ffr | 2007-10-03 10:07:27 +1000 (Wed, 03 Oct 2007) | 3 lines
2012-11-15 13:25:21 +11:00
Ferdi Franceschini
0edaa1d5d0 Added code and filetype spec for data file policy
Added  environment controller save and sdsinfo commands.
Dynamically set histogram memory rank and dimensions for data file

r2165 | ffr | 2007-09-26 16:21:23 +1000 (Wed, 26 Sep 2007) | 4 lines
2012-11-15 13:25:00 +11:00
Ferdi Franceschini
69afaec27e Removed legacy code and added Doxygen annotations.
r2146 | ffr | 2007-09-03 13:55:26 +1000 (Mon, 03 Sep 2007) | 2 lines
2012-11-15 13:23:51 +11:00
Mark Lesha
0ed6ecbffb Fixed insane typo.
r2142 | mle | 2007-08-23 17:05:35 +1000 (Thu, 23 Aug 2007) | 2 lines
2012-11-15 13:23:37 +11:00
Mark Lesha
943b0c8293 Added evcontroller sdsinfo and save commands
r2141 | mle | 2007-08-23 16:42:40 +1000 (Thu, 23 Aug 2007) | 2 lines
2012-11-15 13:23:33 +11:00
Ferdi Franceschini
01890b5cff Initial scratch file support
Added support for aliasing data.

r2117 | ffr | 2007-08-16 15:11:07 +1000 (Thu, 16 Aug 2007) | 3 lines
2012-11-15 13:22:07 +11:00
Ferdi Franceschini
8770acc191 Merged new hdb and nexus code.
r2099 | ffr | 2007-07-22 15:23:41 +1000 (Sun, 22 Jul 2007) | 2 lines
2012-11-15 13:21:03 +11:00
Ferdi Franceschini
55347984ec Checked files modified by the merge with:
cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines
2012-11-15 13:16:23 +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
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
aded505558 The run number should be written when making a new scan entry.
r1776 | ffr | 2007-04-01 15:29:08 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:12 +11:00
Ferdi Franceschini
cae44262ab Match up x and y pixel_offsets with the corresponding dimension.
r1774 | ffr | 2007-04-01 15:15:44 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:13:06 +11:00
Ferdi Franceschini
935116cb9b dim0 is vertical
dim1 is horizontal
It's the C order thing, rows columns.

r1773 | ffr | 2007-04-01 15:01:27 +1000 (Sun, 01 Apr 2007) | 4 lines
2012-11-15 13:13:02 +11:00
Ferdi Franceschini
374151be26 Fixed mixups between sics variables and tcl variables, and nxdict aliases with nexus dataset names.
r1772 | ffr | 2007-04-01 14:53:39 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:59 +11:00
Ferdi Franceschini
2d7cf89385 Set x and y pixel offsets and run number.
The run number is used as the first dimension axis for
simple count and save operations.

r1770 | ffr | 2007-04-01 14:36:09 +1000 (Sun, 01 Apr 2007) | 4 lines
2012-11-15 13:12:52 +11:00
Ferdi Franceschini
e67510e6bd Fetch descriptive motor name from the motor's long_name field.
r1769 | ffr | 2007-04-01 12:34:29 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:49 +11:00
Ferdi Franceschini
abb82d02ea Restored $Name:$ and $Revision:$ keywords.
r1760 | ffr | 2007-04-01 09:40:39 +1000 (Sun, 01 Apr 2007) | 2 lines
2012-11-15 13:12:19 +11:00
Ferdi Franceschini
8d6b79db3a Link scanvariable to scan dataset and set axes attribute on data.
r1759 | ffr | 2007-03-31 14:49:10 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:12:16 +11:00
Ferdi Franceschini
53e7a69cb0 Removed duplicate parameters for hmm in putslab call.
r1752 | ffr | 2007-03-31 09:44:06 +1000 (Sat, 31 Mar 2007) | 2 lines
2012-11-15 13:11:53 +11:00
Ferdi Franceschini
7391c7122d Make sure that putslab gets the histogram memory directly just in case we need to do an unbuffered hmm get as is the case for wombat.
r1746 | ffr | 2007-03-30 17:54:55 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:33 +11:00
Ferdi Franceschini
e0e6bed82e Initial support for growing multidimensional histogram memory datasets.
r1744 | ffr | 2007-03-30 17:21:49 +1000 (Fri, 30 Mar 2007) | 2 lines
2012-11-15 13:11:26 +11:00
Ferdi Franceschini
fd8e8a6a3f Ensure zero offset for index into cvs keyword list values.
r1737 | ffr | 2007-03-28 13:24:36 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:11:04 +11:00
Ferdi Franceschini
ee3fc81807 Fixed setting of nx_content_revision_num variable.
r1736 | ffr | 2007-03-28 13:15:08 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:11:00 +11:00
Ferdi Franceschini
932bf1bf18 Handle cases when only the cvs key value is set for $Revision:$ and $Name:$
r1735 | ffr | 2007-03-28 13:04:29 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:57 +11:00
Ferdi Franceschini
3df6a5a8da Added release tag and revision number info for SICS and the nexus data files.
r1731 | ffr | 2007-03-28 11:55:39 +1000 (Wed, 28 Mar 2007) | 2 lines
2012-11-15 13:10:44 +11:00
Ferdi Franceschini
d49a7be3bb Create single entry nexus files for scans with instrument state in 1D arrays indexed by scan point.
Use putslab and sics data objects to grow arrays.

r1725 | ffr | 2007-03-27 08:04:19 +1000 (Tue, 27 Mar 2007) | 3 lines
2012-11-15 13:10:24 +11:00
Ferdi Franceschini
63fc628e89 Added hmm_save function and refactored hmm_addnxscanentry to use it.
r1717 | ffr | 2007-03-24 19:17:54 +1100 (Sat, 24 Mar 2007) | 2 lines
2012-11-15 13:10:04 +11:00
Ferdi Franceschini
bfa6c2f887 bm_addnxscanentry is now more dynamic. It sets nexus dictionary variables for the scan variable attributes.
r1697 | ffr | 2007-03-22 18:19:56 +1100 (Thu, 22 Mar 2007) | 2 lines
2012-11-15 13:09:03 +11:00
Ferdi Franceschini
d958acecd8 Use hmm start, length, and long name variables to write instrument specific histogram data.
Writing of motor units and long name has been parameterized so that we can fetch this values from a motor object.
Scan variable is now written directly instead of linking to another entry.

r1680 | ffr | 2007-03-20 11:40:26 +1100 (Tue, 20 Mar 2007) | 4 lines
2012-11-15 13:08:11 +11:00
Ferdi Franceschini
4037d5ca4d Use dataFileName SICS variable.
Refactoring:
Renamed addnxentry functions to addnxscanentry functions in preparation for code which will compose nxentries from primitives.

r1625 | ffr | 2007-03-12 08:45:50 +1100 (Mon, 12 Mar 2007) | 4 lines
2012-11-15 13:05:36 +11:00
Ferdi Franceschini
ce28a1fcc8 Common files for powder instrument nexus files
r1599 | ffr | 2007-03-05 20:56:02 +1100 (Mon, 05 Mar 2007) | 2 lines
2012-11-15 13:04:20 +11:00