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

195 Commits

Author SHA1 Message Date
Douglas Clowes
e317e4b341 Change names from sct_*.tcl to *_sct.tcl in config/deploy files 2015-01-22 13:16:09 +11:00
Douglas Clowes
3ce5ae0977 Merge branch 'RELEASE-3_1' 
Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
 2014-11-06 14:13:20 +11:00
Ferdi Franceschini
80ad9cff2a Load sics_config.ini wrapper code for Legacy drivers on Playtpus and update config. 2014-10-17 16:42:53 +11:00
Ferdi Franceschini
a6ff6346ed Fix typo in Platypus motor_configuration.tcl 2014-10-17 16:42:49 +11:00
Ferdi Franceschini
11d008620a SICS-742 spin flipper is instructed to power up but doesn't reach the target current. 2014-10-15 09:14:58 +11:00
Ferdi Franceschini
6183182c78 A sics_config.ini for Platypus with the new Knauer pump driver. 2014-10-13 14:16:27 +11:00
Douglas Clowes
ba72e77d4c Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl
 2014-09-26 17:04:19 +10:00
Douglas Clowes
99fae91ff9 Add sics_simulation.tcl to each instrument MANIFEST.TXT file 2014-09-10 10:14:46 +10:00
Douglas Clowes
499c5c422d Break simulation flagss out of the server_config.tcl 
These are the most frequent instrument-specific changes
 2014-09-09 15:14:57 +10:00
Douglas Clowes
507ddafb2a Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
 2014-08-06 13:53:18 +10:00
Ferdi Franceschini
7b6b11eef2 Let everyone have a magnet sample stick motor. 2014-08-06 10:08:12 +10:00
Ferdi Franceschini
8a6da09326 Deploy all environment control drivers. 2014-08-06 10:08:10 +10:00
Douglas Clowes
972e3232cd Change the names in all of the files 2014-07-23 17:30:44 +10:00
Douglas Clowes
e9191c1d62 Pull back Platypus Command changes 2014-06-24 12:36:53 +10:00
Douglas Clowes
3ea1f3bf5f Pull back Platypus detector config change 2014-06-24 12:33:59 +10:00
Douglas Clowes
fce610a142 Add a driver for the Omron ZS-HLDC Laser Displacement device 2014-06-16 17:37:20 +10:00
Douglas Clowes
92d3acb5d5 Remove superfluous trailing white space from TCL files 2014-05-16 17:23:58 +10:00
Ferdi Franceschini
0ae4d40470 Deploy all environment drivers to all instruments. 2014-05-16 13:56:51 +10:00
Ferdi Franceschini
bea943ddf2 Add new reactor status object to instruments. 2014-03-25 09:23:57 +11:00
Ferdi Franceschini
0bf0af0847 Updated detector voltage range and OAT_TABLE configuration from ics1-platypus 2013-12-20 09:08:55 +11:00
Ferdi Franceschini
d35e7079a2 Copied modifications from ics1-platypus. 2013-10-29 09:06:57 +11:00
Ferdi Franceschini
090d80e166 SICS-683 Add x_pixels_per_mm and y_pixels_per_mm parameters for Platypus. 2013-10-28 15:33:43 +11:00
Ferdi Franceschini
bcd9f89b85 Get new st4vt lower limit from Platypus 2013-09-18 16:12:23 +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
83ae576551 Get changes to the Platypus motor config made in-situ by Andrew Nelson. 2013-09-10 14:23:13 +10:00
Ferdi Franceschini
20aa91ee4d Add IP and PORT for the "histmem textstatus" command. 
The initialisation of SICS fails to create the histmem command if this entry is missing
 2013-09-10 14:23:13 +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
23c9928bc8 Slit motor limits on Platypus as measured by Andrew Nelson. 2013-08-15 23:16:25 +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
4434d97239 Don't load the broken batmotor controller on Platypus. 2013-08-15 08:09:55 +10:00
Ferdi Franceschini
f315d8bbf1 SICS-635: runscan on platypus takes too long to start. 2013-08-09 05:30:56 +10:00
Ferdi Franceschini
923f056b2c The voltage range for the repaired DENEX 250TN detector is now +2800 and -1000. 2013-06-17 08:28:45 +10:00
Ferdi Franceschini
babc5fe17e A new runsics script has been implemented in python (runsics.py). 
It supports the new "fakedev" simulation mode which runs SICS with real
drivers for devices which have simulated controllers.
There are advance options which allow multiple instances of SICS to be
launched on development and test environments.
Also we no longer depend on having serverport numbers in /etc/services.
 2013-05-13 23:11:15 +10:00
Ferdi Franceschini
e28ef59bd0 Added fake disk chopper controller. 2013-04-23 14:32:24 +10:00
Ferdi Franceschini
e5d6d44d8d Code cleanup. 2013-04-21 14:55:41 +10:00
Ferdi Franceschini
49e6a584c0 SICS-587 (in progress) Put IP and PORT configuration in one file. 
Platypus TODO hmm, environment, and devices like multimeters and the
sylvac.
 2013-04-21 11:14:10 +10:00
Ferdi Franceschini
47a1d0aa4e Added configuration file modifications from ics1-platypus 2013-04-18 07:00:17 +10:00
Ferdi Franceschini
16e744be12 Moved MakeDrive to instrument specific configuration. 
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
 2013-04-09 14:15:55 +10:00
Ferdi Franceschini
af90872ef7 Add julabo driver 
r3349 | ffr | 2012-01-20 15:49:59 +1100 (Fri, 20 Jan 2012) | 2 lines
 2012-11-15 17:23:26 +11:00
Ferdi Franceschini
a8203ffa6e Copied changes which were made in-situ. 
r3236 | ffr | 2011-08-02 14:20:46 +1000 (Tue, 02 Aug 2011) | 2 lines
 2012-11-15 17:15:54 +11:00
Ferdi Franceschini
0b90dfc0dc Remove files accidentally added in rev 3071 
D    site_ansto/hardsup/oldsct_modbusprot.c
D    site_ansto/hardsup/libhlib.a
D    site_ansto/instrument/deploySICS.sh.new
D    site_ansto/instrument/reflectometer/config/beamline/old_polanal.tcl
D    site_ansto/instrument/reflectometer/config/beamline/old_sct_RFGen.tcl
D    .cproject
D    cscope.out
D    tags
D    psi/hardsup/libhlib.a
D    psi/tecs/libtecsl.a

r3234 | ffr | 2011-07-24 13:13:46 +1000 (Sun, 24 Jul 2011) | 13 lines
 2012-11-15 17:15:46 +11:00
Ferdi Franceschini
3404e4670c Set chnspeed as actual speed instead of the requested speed. 
r3229 | ffr | 2011-06-26 12:19:01 +1000 (Sun, 26 Jun 2011) | 1 line
 2012-11-15 17:15:24 +11:00
Ferdi Franceschini
6b1c629a43 Guard against misinterpreting readings that have a leading zero as octal. 
Set the current to the target value when we're within one step rather than within tolerance to avoid undershooting the target.
Do not try and get the state when initialising the driver because it will fail to create the driver properly if the RF generator is unavailable on SICS startup.  The current is zero when the RF gen is power cycled so it is safe to set the current reading and target current as zero in initialisation so we just set the operating frequency and everything else is left at zero.
r3228 | ffr | 2011-06-26 12:18:27 +1000 (Sun, 26 Jun 2011) | 3 lines
 2012-11-15 17:15:19 +11:00
Ferdi Franceschini
edc7639d65 Set operation current for polariser and analyser 
r3227 | ffr | 2011-06-26 12:17:28 +1000 (Sun, 26 Jun 2011) | 1 line
 2012-11-15 17:15:15 +11:00
Ferdi Franceschini
41a4f28517 platypus sct_batmotor.tcl 
Check for motor on when changing state to idle.
r3142 | ffr | 2011-05-19 08:45:25 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:18 +11:00
Ferdi Franceschini
2e0729532a platypus sct_chopper.tcl 
New scriptcontext chopper driver.
r3141 | ffr | 2011-05-19 08:44:53 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:14 +11:00
Ferdi Franceschini
dea8c2c1bb platypus chopper.tcl 
Configures the new chopper driver.
r3140 | ffr | 2011-05-19 08:44:20 +1000 (Thu, 19 May 2011) | 2 lines
 2012-11-15 17:13:10 +11:00
Ferdi Franceschini
8ddb808119 Don't load Bruker driver by default. This should really go in the extraconfig file. 
r3139 | ffr | 2011-05-19 08:43:49 +1000 (Thu, 19 May 2011) | 1 line
 2012-11-15 17:13:05 +11:00
Ferdi Franceschini
7371a561d9 Make sure spin flipper code in rfamp.c is initialised 
Fixed drive bugs in lakeshore drivers.
r3071 | ffr | 2011-02-25 18:27:31 +1100 (Fri, 25 Feb 2011) | 2 lines
 2012-11-15 17:08:46 +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