Fix fieldname prefixes

pcdshub · Feb 26, 2020 · 7678236 · 7678236
1 parent 8d9231b
commit 7678236
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/scripts/deviceDict.json b/scripts/deviceDict.json
@@ -1,13 +1,13 @@
 {
     "CXI_stdCfg": {
-        "pcdssetup-areadet-setup": [
+        "pcdssetup-areadet": [
             {
                 "alias": "DscCsPad",
                 "record": "DSC rack",
                 "type": "CSPAD-2.3M"
             }
         ],
-        "pcdssetup-camera-setup": [
+        "pcdssetup-camera": [
             {
                 "alias": "TimeTool",
                 "purpose": "Time Tool",
@@ -39,14 +39,14 @@
                 "purpose": "X-ray simulator EVR for LeCroy"
             }
         ],
-        "pcdssetup-digitized-setup": [
+        "pcdssetup-digitized": [
             {
                 "device": "Agilent",
                 "purpose": "Fast Diode",
                 "rate": "8 Gs/s"
             }
         ],
-        "pcdssetup-motors-setup": [
+        "pcdssetup-motors": [
             {
                 "invac": "Yes",
                 "location": "CXI SC1",
@@ -328,10 +328,10 @@
                 "stageidentity": "Newport"
             }
         ],
-        "pcdssetup-trig-setup": []
+        "pcdssetup-trig": []
     },
     "JJslit": {
-        "pcdssetup-motors-setup": [
+        "pcdssetup-motors": [
             {
                 "name": "jj_vg",
                 "purpose": "slit vertical gap",
@@ -355,7 +355,7 @@
         ]
     },
     "fastDiode": {
-        "pcdssetup-digitized-setup": [
+        "pcdssetup-digitized": [
             {
                 "device": "Agilent",
                 "purpose": "Fast Diode",
@@ -364,13 +364,13 @@
         ]
     },
     "vonHamos": {
-        "pcdssetup-areadet-setup": [
+        "pcdssetup-areadet": [
             {
                 "alias": "epix_1",
                 "type": "Epix100"
             }
         ],
-        "pcdssetup-motors-setup": [
+        "pcdssetup-motors": [
             {
                 "name": "vH_v",
                 "purpose": "von Hamos common vertical",
@@ -389,13 +389,13 @@
         ]
     },
     "vonHamos_small": {
-        "pcdssetup-areadet-setup": [
+        "pcdssetup-areadet": [
             {
                 "alias": "epix_1",
                 "type": "Epix100"
             }
         ],
-        "pcdssetup-motors-setup": [
+        "pcdssetup-motors": [
             {
                 "name": "vHs_v",
                 "purpose": "von Hamos common vertical",
@@ -414,13 +414,13 @@
         ]
     },
     "vonHamos_large": {
-	"pcdssetup-areadet-setup": [
+	"pcdssetup-areadet": [
 	    {
 		"alias": "epix_1",
 		"type": "Epix100"
 	    }
 	],
-	"pcdssetup-motors-setup": [
+	"pcdssetup-motors": [
 		{
 		    "name": "vHl_v",
 		    "purpose": "von Hamos common vertical",

diff --git a/scripts/questionnaire_tools b/scripts/questionnaire_tools
@@ -144,7 +144,7 @@ class QuestionnaireTools():
         return device
 
     def addDeviceToProposal(self, expname, devicename, location=None):
-        proposal, runNo = _propRun_from_name(self, expname)
+        proposal, runNo = self._propRun_from_name(expname)
 
         deviceSetup = self._parseDeviceName(devicename)
         if deviceSetup['name'] not in self.deviceDict.keys():
@@ -168,11 +168,11 @@ class QuestionnaireTools():
                     if numDev>numNewDevice: numNewDevice=numDev+1
 
             for item in addDevice[lineItem]:
-                if lineItem=='pcdssetup-motors-setup' and 'pvbase' not in item.keys():
+                if lineItem=='pcdssetup-motors' and 'pvbase' not in item.keys():
                     item['pvbase']='%s:USR:MMS:'%(expname[:3].upper())
                 if 'location' in deviceSetup.keys() and \
                    deviceSetup['location'] in self.allowedLocations and \
-                   (lineItem=='pcdssetup-motors-setup' or lineItem=='pcdssetup-areadet-setup') \
+                   (lineItem=='pcdssetup-motors' or lineItem=='pcdssetup-areadet') \
                    and 'location' not in item.keys():
                     item['location']=location
                 if 'basename' in deviceSetup.keys():