Merge branch 'Wombat' into temp

Conflicts: sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl sics/site_ansto/instrument/hipd/config/commands/commands.tcl sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl sics/site_ansto/instrument/hipd/util/sics_config.ini
2015-02-19 15:26:13 +11:00
parent 4e383b2af2 14be249401
commit 8b4ab411fd
8 changed files with 240 additions and 149 deletions
--- a/site_ansto/instrument/hipd/config/commands/commands.tcl
+++ b/site_ansto/instrument/hipd/config/commands/commands.tcl
@@ -150,21 +150,24 @@ proc ::commands::isc_initialize {} {
 proc RadCollScanRange {motor start step fin oscno} {
   if {$step==0} {break}
   if {($start > $fin) && ($step > 0)} {break}
-   if {($start < $fin) && ($step < 0)} {break}   
+   if {($start < $fin) && ($step < 0)} {break}
   set i_bool 0
-   histmem mode unlimited		
+   histmem mode unlimited
   set currentmot $start
-   set i 0		
+   set i 0
   newfile HISTOGRAM_XY
   while {$i_bool==0} {
      drive $motor $currentmot
+      $motor send SH`
      oct oscillate_count $oscno
      oct oscillate start
      hmm countblock
-      save $i
+
      set currentmot [expr {$currentmot + $step}]
      if {($step > 0) && ($currentmot > $fin)} {set i_bool 1}
      if {($step < 0) && ($currentmot < $fin)} {set i_bool 1}
+      if {($i_bool == 0)} {run $motor $currentmot}
+      save $i
      incr i
   }
 }
@@ -172,34 +175,50 @@ proc RadCollScanRange {motor start step fin oscno} {
 publish RadCollScanRange user

 #RadCollScanBi
-proc RadCollScanBi {motor start step fin oscno motdir} { 
+proc RadCollScanBi {motor start step fin oscno motdir} {
+
   set i_bool 0
-   histmem mode unlimited		
+   set spx -12500
+   set spstep [expr {$spx * $step * $motdir}]
+  histmem stop
+  histmem mode unlimited
+
   if {$motdir == 1} {
      set currentmot $start
      set i 0
   } else {
      set currentmot $fin
      set i [expr {int(($fin-$start)/$step)}]
-   }		
+   }
+   drive $motor $currentmot
   newfile HISTOGRAM_XY
+
   while {$i_bool==0} {
-#      drive $motor $currentmot
      oct oscillate_count $oscno
      oct oscillate start
      hmm countblock
- 
+
      if {($motdir > 0)} {
 	 set currentmot [expr {$currentmot + $step}]
 	 if {$currentmot > $fin} {set i_bool 1}
-	 incr i
+
      } else {
        set currentmot [expr {$currentmot - $step}]
        if {$currentmot < $start} {set i_bool 1}
-        incr i -1
+
      }
-      run $motor $currentmot
-      save $i
+
+     if {($i_bool == 0)} {run $motor $currentmot}
+     save $i
+     if {($motdir > 0)} {incr i 1} else {incr i -1}
+
+#      if {($i_bool == 0)} {
+#	$motor send SH`
+#  	$motor send PR` $spstep
+#	$motor send BG`
+#
+#      }
+#     save $i
   }
 }

--- a/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
+++ b/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
@@ -1,7 +1,22 @@
 # Euler cradle scan commands for texture runs
 # AJS Dec 2010

+proc EulerScan {mstart mstep mend oscno} {
+	ephi speed 5
+	ephi accel 5
+	ephi decel 5
+	echi speed 2
+	set motdir 1
+	drive echi 0 ephi $mstart
+	foreach chival {0 15 30 45 60 75 90} {
+		drive echi $chival
+		RadCollScanBi ephi $mstart $mstep $mend $oscno $motdir	
+		set motdir [expr {$motdir * -1}]
+	}
+	drive echi 0 ephi $mstart
+}

+publish EulerScan user

 # continous scan for EPHI- the euler cradle phi stage (innermost axis)
 # note make sure controller 2 has the PHISCAN code in it
--- a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
@@ -28,7 +28,7 @@ proc ::histogram_memory::init_OAT_TABLE {args} {
      hmm configure fat_frame_source INTERNAL


- #     set resolution "double_x"
+#      set resolution "double_x"

      switch $resolution {
      "hires" {
--- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
@@ -26,7 +26,7 @@ set mx_Home 8390583
 #set mom_Home 9274794
 ##set mom_Home 8391038
 #set mom_Home 8147038
-set mom_Home 7736816
+set mom_Home 7979102
 set mtth_Home 19927837
 #set mphi_Home 7613516
 #set mphi_Home 27847793
@@ -34,6 +34,7 @@ set mphi_Home 8384818
 #set mchi_Home 9050090
 #set mchi_Home 25561619
 set mchi_Home 8389526
+#set mchi_Home 6847710
 #set my_Home 6767221
 set my_Home 8378212
 set som_Home 17214054
@@ -343,7 +344,7 @@ Motor $sample_stage_rotate $motor_driver_type [params \
  asyncqueue mc2\
  axis E\
  units degrees\
-  hardlowerlim -71\
+  hardlowerlim -121\
  hardupperlim 116\
  maxSpeed 5\
  maxAccel 3\
@@ -363,8 +364,10 @@ Motor stth $motor_driver_type [params \
  asyncqueue mc2\
  axis F\
  units degrees\
-  hardlowerlim 15.8\
+  hardlowerlim 13\
  hardupperlim 29.7\
+  softlowerlim 13.4\
+  softupperlim 29.6\
  maxSpeed 0.5\
  maxAccel 0.1\
  maxDecel 0.1\
@@ -374,7 +377,7 @@ Motor stth $motor_driver_type [params \
  bias_bits 25\
  bias_bias 932070\
  cntsPerX -93207]
-stth softlowerlim 15.9
+stth softlowerlim 13.4
 stth softupperlim 29.6
 stth home 28.481113
 #stth home 18.981113
@@ -414,28 +417,34 @@ oct long_name oct
 ############################
 #

-# Monochromator Focusing (HOPG)
-#Motor mf1 $motor_driver_type [params \
-#  asyncqueue mc3\
-#  axis A\
-#  units degrees\
-#  hardlowerlim xxxx\
-#  hardupperlim xxxx\
-#  maxSpeed xxxx\
-#  maxAccel xxxx\
-#  maxDecel xxxx\
-#  stepsPerX xxxx\
-#  absEnc 1\
-#  absEncHome $mf1_Home\
-#  cntsPerX xxxx]
-#setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360
-#mf1 speed 1
-#mf1 movecount $move_count
-#mf1 precision 0.01
-#mf1 part monochromator
-#mf1 long_name mf1
+set mf_config 1

+
+switch $mf_config {
+   1 {
+# Monochromator Focusing (HOPG)
+       Motor mf1 $motor_driver_type [params \
+         asyncqueue mc3\
+         axis A\
+         units degrees\
+         hardlowerlim -0.1\
+         hardupperlim 1.1\
+         maxSpeed 0.1\
+         maxAccel 0.1\
+         maxDecel 0.1\
+         stepsPerX 22000\
+         absEnc 1\
+         absEncHome 3965\
+         cntsPerX -3500]
+       setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 1
+       mf1 speed 0.02
+#       mf1 movecount $move_count
+       mf1 precision 0.005
+       mf1 part monochromator
+       mf1 long_name mf1
+      }
 # Monochromator Focusing (Ge)
+
 ## ffr 31/7/2012
 ## absEncHome was found to be 16777217 on 31/7/2012 when the
 ## encoder clocked over to 114 counts to give a posn
@@ -444,26 +453,32 @@ oct long_name oct
 ## and has a 24bit range (ie max cnt=16777216)
 ## I set a bias of 10000 counts with absenchome = 10000
 ## so that SICS can drive the axis to the allowed limits.
-Motor mf2 $motor_driver_type [params \
-  asyncqueue mc3\
-  axis A\
-  units degrees\
-  hardlowerlim -2\
-  hardupperlim 2\
-  maxSpeed 0.1\
-  maxAccel 0.1\
-  maxDecel 0.1\
-  stepsPerX 22000\
-  absEnc 1\
-  absEncHome 42768\
-  bias_bits 24\
-  bias_bias 10000\
-  cntsPerX -3500]
-setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 2
-mf2 speed 0.02
-mf2 precision 0.005
-mf2 part monochromator
-mf2 long_name mf2
+
+   2 {
+
+      Motor mf2 $motor_driver_type [params \
+        asyncqueue mc3\
+        axis A\
+        units degrees\
+        hardlowerlim -0.1\
+        hardupperlim 1.1\
+        maxSpeed 0.1\
+        maxAccel 0.1\
+        maxDecel 0.1\
+        stepsPerX 22000\
+        absEnc 1\
+        absEncHome 10000\
+        bias_bits 24\
+        bias_bias 10000\
+        cntsPerX -3500]
+      setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 1
+      mf2 speed 0.02
+      mf2 precision 0.005
+      mf2 part monochromator
+      mf2 long_name mf2
+   }
+}
+

 # Slit 1, right
 Motor ss1r $motor_driver_type [params \
--- a/site_ansto/instrument/hipd/util/sics_config.ini
+++ b/site_ansto/instrument/hipd/util/sics_config.ini
@@ -324,7 +324,6 @@ driver = "west_6100"
 imptype = temperature
 ip = 10.157.205.24
 port = 502
-timeout = 2000

 [vf2_west4100]
 asyncprotocol = modbus_ap
@@ -334,5 +333,4 @@ driver = "west_6100"
 imptype = temperature
 ip = 10.157.205.25
 port = 502
-timeout = 2000

--- a/site_ansto/instrument/hipd/wombat_configuration.tcl
+++ b/site_ansto/instrument/hipd/wombat_configuration.tcl
@@ -29,8 +29,9 @@ fileeval $cfPath(environment)/sct_agilent_33220A.tcl
 fileeval $cfPath(environment)/sct_hiden_xcs.tcl
 fileeval $cfPath(environment)/sct_huber_pilot.tcl
 fileeval $cfPath(environment)/sct_isotech_ps.tcl
-fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
-fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.tcl
+#fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
+#fileeval $cfPath(environment)/temperature/sct_eurotherm_m2000.tcl
+fileeval $cfPath(environment)/temperature/eurotherm_3200_sct.tcl
 fileeval $cfPath(environment)/sct_keithley_2700.tcl
 fileeval $cfPath(environment)/sct_keithley_m2700.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_218.tcl
@@ -62,13 +63,16 @@ fileeval $cfPath(commands)/pulser.tcl
 fileeval $cfPath(commands)/hvcommands.tcl
 fileeval $cfPath(commands)/vactex.tcl
 fileeval $cfPath(commands)/eulerscan.tcl
+fileeval $cfPath(commands)/cfcommands.tcl
 fileeval $cfPath(anticollider)/anticollider.tcl
+fileeval $cfPath(beamline)/sct_he3_polanal.tcl
 fileeval $cfPath(hmm)/hmm_rapid.tcl
 source gumxml.tcl

 # Wombat only change to hvcommands' scaleval variable
 SetVoltScale 2000.0

+
 # The Alice Thing
 # Qlink : 9600, 8 data, 1 stop, No Parity, None Flow
 # LS340 : 9600, 7 data, 1 stop, Odd Parity, None Flow