From 18363be72b9a80bdca66b3bc1c53990c29478d2d Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 31 Oct 2006 15:14:29 +1100 Subject: [PATCH] Increased maximum speed on som and set limits. Fixed counts per degree multiplier. r1210 | ffr | 2006-10-31 15:14:29 +1100 (Tue, 31 Oct 2006) | 3 lines --- .../instrument/hrpd/echidna_configuration.tcl | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index d97cb42a..05a55a3c 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.2 $ -# $Date: 2006-10-26 00:32:22 $ +# $Revision: 1.3 $ +# $Date: 2006-10-31 04:14:29 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ @@ -236,15 +236,15 @@ Motor som DMC2280 [params \ port $dmc2280_controller2(port)\ axis E\ units degrees\ - maxSpeed 1\ + maxSpeed 4\ maxAccel 1\ maxDecel 1\ stepsPerX -12500\ absEnc 1\ - absEncHome 17694127\ - cntsPerX -8192] -setHomeandRange -motor som -home 0 -lowrange 45 -uprange 45 -som speed 1 + absEncHome 24982987\ + cntsPerX -4096] +setHomeandRange -motor som -home 0 -lowrange 205 -uprange 140 +som speed 2 som precision 0.01 # Sample two-theta, detector rotate @@ -283,7 +283,7 @@ Motor schi DMC2280 [params \ maxDecel 1\ stepsPerX 25000\ absEnc 1\ - absEncHome 7581355\ + absEncHome 7543198\ cntsPerX 8192] setHomeandRange -motor schi -home 90 -lowrange 5 -uprange 5 schi speed 1 @@ -298,10 +298,10 @@ Motor sphi DMC2280 [params \ maxSpeed 1\ maxAccel 1\ maxDecel 1\ - stepsPerX 25000\ + stepsPerX -25000\ absEnc 1\ - absEncHome 7934290\ - cntsPerX 8192] + absEncHome 7924166\ + cntsPerX -8192] setHomeandRange -motor sphi -home 0 -lowrange 5 -uprange 5 sphi speed 1 sphi precision 0.01 @@ -317,7 +317,7 @@ Motor sz DMC2280 [params \ maxDecel 1\ stepsPerX 25000\ absEnc 1\ - absEncHome 7562793\ + absEncHome 7625856\ cntsPerX 8192] setHomeandRange -motor sz -home 0 -lowrange 5 -uprange 5 sz speed 1 @@ -334,7 +334,7 @@ Motor sx DMC2280 [params \ maxDecel 1\ stepsPerX 25000\ absEnc 1\ - absEncHome 7562793\ + absEncHome 24034020\ cntsPerX 8192] setHomeandRange -motor sx -home 0 -lowrange 5 -uprange 5 sx speed 1 @@ -627,3 +627,4 @@ MakeCounter simCtr SIM -1.0 MakeScanCommand xxxscan simCtr echidna.hdd recover.bin source hipadaba_echidna_configuration.tcl +source extraconfig.tcl