From 3de5fefb5e8c8e918c097c5d8aa467d040dd12d2 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Mon, 5 Mar 2007 16:42:42 +1100
Subject: [PATCH] Moved to instrument/config dir to provide a common config
 file.

r1588 | ffr | 2007-03-05 16:42:42 +1100 (Mon, 05 Mar 2007) | 2 lines
---
 .../common_hipadaba_configuration.tcl         | 63 -------------------
 .../instrument/hipd/config/scan/scan.hdd      |  8 ---
 .../common_hipadaba_configuration.tcl         | 63 -------------------
 .../instrument/hrpd/config/scan/scan.hdd      |  8 ---
 4 files changed, 142 deletions(-)
 delete mode 100644 site_ansto/instrument/hipd/config/hipadaba/common_hipadaba_configuration.tcl
 delete mode 100644 site_ansto/instrument/hipd/config/scan/scan.hdd
 delete mode 100644 site_ansto/instrument/hrpd/config/hipadaba/common_hipadaba_configuration.tcl
 delete mode 100644 site_ansto/instrument/hrpd/config/scan/scan.hdd

diff --git a/site_ansto/instrument/hipd/config/hipadaba/common_hipadaba_configuration.tcl b/site_ansto/instrument/hipd/config/hipadaba/common_hipadaba_configuration.tcl
deleted file mode 100644
index b0160aa2..00000000
--- a/site_ansto/instrument/hipd/config/hipadaba/common_hipadaba_configuration.tcl
+++ /dev/null
@@ -1,63 +0,0 @@
-# Defines hashes which map SICS device object names to hipadaba paths
-InstallHdb
-hmake /graphics spy none
-hsetprop /graphics type graphset
-hmake /commands spy none
-hsetprop /commands type commandset
-
-#TODO change this to hparts.tcl
-source $cfPath(hipadaba)/hpaths.tcl 
-set instrument [string tolower [SplitReply [Instrument]] ]
-hmake /$instrument spy none
-hsetprop /$instrument type instrument
-
-# Generate hipadaba nodes for the paths in the hpaths file
-foreach hp $hpaths {
-  hmake /$instrument/$hp spy none;
-  hsetprop /$instrument/$hp type part;
-}
-
-#--- admin
-hattach /$instrument title title
-hattach /$instrument/experiment sample description
-hmake /$instrument/user spy none
-hsetprop /$instrument/user type part
-hattach /$instrument/user user name
-hattach /$instrument/user email email
-hattach /$instrument/user phone phone
-
-#--- Motors
-foreach {obj name part} $motor_hpath {
-  hattach /$instrument/$part $obj $name
-  #TODO Only ignore node deletion errors for simulated motors
-  if [ catch {hdel /$instrument/$part/$name/axis} ] {}
-  if [ catch {hdel /$instrument/$part/$name/units} ] {}
-}
-
-#--- Configurable Virtual Motors
-foreach {obj name part master_obj} $cvirtmotor_hpath {
-  set path /$instrument/$part
-#  hattach /$instrument/$part $obj $name
-  hattach $path $obj $name
-  hchain $path/$name $path/$master_obj
-}
-
-#------------- scan command
-hsetprop /commands type part
-hcommand /commands/scan hdb_hmscan
-hsetprop /commands/scan type command
-hsetprop /commands/scan priv user
-hmake /commands/scan/scan_variable user text
-hsetprop /commands/scan/scan_variable argtype drivable
-hmake /commands/scan/scan_start user float
-hsetprop /commands/scan/scan_start argtype float
-hmake /commands/scan/scan_increment user float
-hsetprop /commands/scan/scan_increment argtype float
-hmake /commands/scan/NP user int
-hsetprop /commands/scan/NP argtype int
-hmake /commands/scan/mode user text
-hsetprop /commands/scan/mode argtype text
-hsetprop /commands/scan/mode values monitor,timer
-hmake /commands/scan/preset user float
-hsetprop /commands/scan/preset argtype float
- 
diff --git a/site_ansto/instrument/hipd/config/scan/scan.hdd b/site_ansto/instrument/hipd/config/scan/scan.hdd
deleted file mode 100644
index 5deec86c..00000000
--- a/site_ansto/instrument/hipd/config/scan/scan.hdd
+++ /dev/null
@@ -1,8 +0,0 @@
-##SICS ASCII at HIPD
-*************************** HIPD SCAN File ********************************
-Original Filename = !!FILE!!
-Title = !!VAR(Title)!!
-User  = !!VAR(User)!!
-Sample Name = !!VAR(sample)!!
-File Creation Date = !!DATE!!
-**************************** DATA ******************************************
diff --git a/site_ansto/instrument/hrpd/config/hipadaba/common_hipadaba_configuration.tcl b/site_ansto/instrument/hrpd/config/hipadaba/common_hipadaba_configuration.tcl
deleted file mode 100644
index b0160aa2..00000000
--- a/site_ansto/instrument/hrpd/config/hipadaba/common_hipadaba_configuration.tcl
+++ /dev/null
@@ -1,63 +0,0 @@
-# Defines hashes which map SICS device object names to hipadaba paths
-InstallHdb
-hmake /graphics spy none
-hsetprop /graphics type graphset
-hmake /commands spy none
-hsetprop /commands type commandset
-
-#TODO change this to hparts.tcl
-source $cfPath(hipadaba)/hpaths.tcl 
-set instrument [string tolower [SplitReply [Instrument]] ]
-hmake /$instrument spy none
-hsetprop /$instrument type instrument
-
-# Generate hipadaba nodes for the paths in the hpaths file
-foreach hp $hpaths {
-  hmake /$instrument/$hp spy none;
-  hsetprop /$instrument/$hp type part;
-}
-
-#--- admin
-hattach /$instrument title title
-hattach /$instrument/experiment sample description
-hmake /$instrument/user spy none
-hsetprop /$instrument/user type part
-hattach /$instrument/user user name
-hattach /$instrument/user email email
-hattach /$instrument/user phone phone
-
-#--- Motors
-foreach {obj name part} $motor_hpath {
-  hattach /$instrument/$part $obj $name
-  #TODO Only ignore node deletion errors for simulated motors
-  if [ catch {hdel /$instrument/$part/$name/axis} ] {}
-  if [ catch {hdel /$instrument/$part/$name/units} ] {}
-}
-
-#--- Configurable Virtual Motors
-foreach {obj name part master_obj} $cvirtmotor_hpath {
-  set path /$instrument/$part
-#  hattach /$instrument/$part $obj $name
-  hattach $path $obj $name
-  hchain $path/$name $path/$master_obj
-}
-
-#------------- scan command
-hsetprop /commands type part
-hcommand /commands/scan hdb_hmscan
-hsetprop /commands/scan type command
-hsetprop /commands/scan priv user
-hmake /commands/scan/scan_variable user text
-hsetprop /commands/scan/scan_variable argtype drivable
-hmake /commands/scan/scan_start user float
-hsetprop /commands/scan/scan_start argtype float
-hmake /commands/scan/scan_increment user float
-hsetprop /commands/scan/scan_increment argtype float
-hmake /commands/scan/NP user int
-hsetprop /commands/scan/NP argtype int
-hmake /commands/scan/mode user text
-hsetprop /commands/scan/mode argtype text
-hsetprop /commands/scan/mode values monitor,timer
-hmake /commands/scan/preset user float
-hsetprop /commands/scan/preset argtype float
- 
diff --git a/site_ansto/instrument/hrpd/config/scan/scan.hdd b/site_ansto/instrument/hrpd/config/scan/scan.hdd
deleted file mode 100644
index 1d74c7c0..00000000
--- a/site_ansto/instrument/hrpd/config/scan/scan.hdd
+++ /dev/null
@@ -1,8 +0,0 @@
-##SICS ASCII at HRPD
-*************************** HRPD SCAN File ********************************
-Original Filename = !!FILE!!
-Title = !!VAR(Title)!!
-User  = !!VAR(User)!!
-Sample Name = !!VAR(sample)!!
-File Creation Date = !!DATE!!
-**************************** DATA ******************************************