diff --git a/site_ansto/instrument/hipd/hipadaba_wombat_configuration.tcl b/site_ansto/instrument/hipd/hipadaba_wombat_configuration.tcl index 0f572570..8ba7469a 100644 --- a/site_ansto/instrument/hipd/hipadaba_wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/hipadaba_wombat_configuration.tcl @@ -1,39 +1,22 @@ -# $Revision: 1.2 $ -# $Date: 2006-10-15 23:42:18 $ +# $Revision: 1.3 $ +# $Date: 2006-10-31 03:57:57 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ -source motParList.tcl +source hipadaba_support.tcl #------------------------------------------------------------------------- # Install the SICS Hipadaba #------------------------------------------------------------------------- -proc makeHdbMotor {root treename sicsname} { - global parList; - append motName $root "/" $treename - eval hmake $motName spy none - eval hmakescript "$motName/position" \"$sicsname\" \"run $sicsname\" float - foreach par $parList { - set parName [format "%s/%s" $motName $par] - eval hmakescript $parName \"$sicsname $par\" \"$sicsname $par\" float - } -} -proc makeHdbVirtMotor {root treename sicsname} { - append motName $root "/" $treename - eval hmake $motName spy none - eval hmakescript "$motName/position" \"$sicsname\" \"run $sicsname\" float -} -#------------------------------------------------------------------------ -proc hdbReadOnly {} { - error "Parameter is READ ONLY" -} -#------------------------------------------------------------------------- InstallHdb +hmake /counter spy none hmake /sample spy none hmake /monochromator spy none hmake /slits spy none hmake /slits/1 spy none hmake /slits/2 spy none +makeHdbCounter /counter ctr ctr + makeHdbMotor /slits/1 ss1u ss1u makeHdbMotor /slits/1 ss1d ss1d makeHdbMotor /slits/1 ss1l ss1l diff --git a/site_ansto/instrument/qld/hipadaba_koala_configuration.tcl b/site_ansto/instrument/qld/hipadaba_koala_configuration.tcl index f56ca47d..d722a6f9 100644 --- a/site_ansto/instrument/qld/hipadaba_koala_configuration.tcl +++ b/site_ansto/instrument/qld/hipadaba_koala_configuration.tcl @@ -1,32 +1,12 @@ -# $Revision: 1.1 $ -# $Date: 2006-10-15 23:50:25 $ +# $Revision: 1.2 $ +# $Date: 2006-10-31 04:01:14 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ -source motParList.tcl +source hipadaba_support.tcl #------------------------------------------------------------------------- # Install the SICS Hipadaba #------------------------------------------------------------------------- -proc makeHdbMotor {root treename sicsname} { - global parList; - append motName $root "/" $treename - eval hmake $motName spy none - eval hmakescript "$motName/position" \"$sicsname\" \"run $sicsname\" float - foreach par $parList { - set parName [format "%s/%s" $motName $par] - eval hmakescript $parName \"$sicsname $par\" \"$sicsname $par\" float - } -} -proc makeHdbVirtMotor {root treename sicsname} { - append motName $root "/" $treename - eval hmake $motName spy none - eval hmakescript "$motName/position" \"$sicsname\" \"run $sicsname\" float -} -#------------------------------------------------------------------------ -proc hdbReadOnly {} { - error "Parameter is READ ONLY" -} -#------------------------------------------------------------------------- InstallHdb hmake /slits spy none hmake /slits/1 spy none diff --git a/site_ansto/instrument/rsd/hipadaba_kowari_configuration.tcl b/site_ansto/instrument/rsd/hipadaba_kowari_configuration.tcl index dc00d2bd..aa9c7a5c 100644 --- a/site_ansto/instrument/rsd/hipadaba_kowari_configuration.tcl +++ b/site_ansto/instrument/rsd/hipadaba_kowari_configuration.tcl @@ -1,32 +1,12 @@ -# $Revision: 1.1 $ -# $Date: 2006-10-15 23:47:45 $ +# $Revision: 1.2 $ +# $Date: 2006-10-31 04:02:28 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ -source motParList.tcl +source hipadaba_support.tcl #------------------------------------------------------------------------- # Install the SICS Hipadaba #------------------------------------------------------------------------- -proc makeHdbMotor {root treename sicsname} { - global parList; - append motName $root "/" $treename - eval hmake $motName spy none - eval hmakescript "$motName/position" \"$sicsname\" \"run $sicsname\" float - foreach par $parList { - set parName [format "%s/%s" $motName $par] - eval hmakescript $parName \"$sicsname $par\" \"$sicsname $par\" float - } -} -proc makeHdbVirtMotor {root treename sicsname} { - append motName $root "/" $treename - eval hmake $motName spy none - eval hmakescript "$motName/position" \"$sicsname\" \"run $sicsname\" float -} -#------------------------------------------------------------------------ -proc hdbReadOnly {} { - error "Parameter is READ ONLY" -} -#------------------------------------------------------------------------- InstallHdb hmake /sample spy none hmake /monochromator spy none