Merge pull request #10 from thompsonte-4o2/main

PV name and readback adjustments

Author: thompsonte-4o2

tests/btf_test.py

@@ -25,7 +25,7 @@ def va_process():
 def test_pv_connection(va_process):
 
     assert va_process.poll() is None
-    x = caget('ITSF_Diag:BPM04:xAvg', connection_timeout=0.1)
+    x = caget('ITSF_Diag:BPM04_4:xAvg', connection_timeout=0.1)
     assert x is not None
 
 
@@ -39,7 +39,7 @@ def test_bad_pv(va_process):
 def test_corrector(va_process):
     corrector = "BTF_MEBT_Mag:DCH00:B"
     corrector_set = "BTF_MEBT_Mag:PS_DCH00:I_Set"
-    bpm_device = "ITSF_Diag:BPM04:xAvg"
+    bpm_device = "ITSF_Diag:BPM04_4:xAvg"
 
     original_val = caget(corrector_set)
     settings = [(0.0, -0.03, 0.0),

virtaccl/site/BTF/btf_config.json

@@ -281,7 +281,7 @@
                 }
 	},
 	"BPM": {
-		"ITSF_Diag:BPM04": {
+		"ITSF_Diag:BPM04_4": {
 			"PyORBIT_Name": "MEBT:BPM04",
 			"Frequency": 805000000.0
 		}
@@ -382,7 +382,7 @@
                 }
 	},
 	"BS": {
-		"ITSF_Diag:BS36": {
+		"ITSF_Diag:BS36_LP": {
 			"PyORBIT_Name": "MEBT:BS36",
 			"State": 1
 		},

virtaccl/site/BTF/orbit_model/virtual_devices_BTF.py

@@ -182,7 +182,7 @@ class BTF_FC(Device):
     current_pv = 'CurrentAvrGt' # [mA]
     state_set_pv = 'State_Set'
     state_readback_pv = 'State'
-    current_noise = 7e-2
+    current_noise = -7e-2
 
     #PyORBIT parameter keys
     current_key = 'current'
@@ -224,7 +224,7 @@ def update_measurements(self, new_params: Dict[str, Dict[str, Any]] = None):
 
         if current_state == 1:
             fc_params = new_params[self.model_name]
-            current = fc_params[BTF_FC.current_key]
+            current = -1.0*fc_params[BTF_FC.current_key]
         else:
             current = 0
         self.update_measurement(BTF_FC.current_pv, current)
@@ -233,7 +233,7 @@ def update_measurements(self, new_params: Dict[str, Dict[str, Any]] = None):
 class BTF_BCM(Device):
     #EPICS PV names
     current_pv = 'CurrentAvrGt' # [mA]
-    current_noise = 7e-2
+    current_noise = -7e-2
 
     #PyORBIT parameter keys
     current_key = 'current'
@@ -257,7 +257,7 @@ def __init__(self, name: str, model_name: str = None):
     # This is where the measurement PV name is associated with it's model key.
     def update_measurements(self, new_params: Dict[str, Dict[str, Any]] = None):
         bcm_params = new_params[self.model_name]
-        current = bcm_params[BTF_BCM.current_key]
+        current = -1.0*bcm_params[BTF_BCM.current_key]
         self.update_measurement(BTF_BCM.current_pv, current)
 
 class BTF_Quadrupole(Device):