This is an example of displaying HTML text.
") + + ########################### ### move in the X-ray Eye ########################### -def detxeye_in(setdetzpos=200, setdetypos=151.6): +def detxeye_in(setdetzpos=200, setdetypos=151.6): # had been 213.6 """ moves in the Xray eye and the Diode below detector """ @@ -1298,7 +1347,7 @@ def detxeye_in(setdetzpos=200, setdetypos=151.6): setxrpos = 0.0 # setdetzpos = 200 # 200 better? - # setdetypos = 213.6 ; after det pos 62 (?) set to 0 : 151.6 + # setdetypos = 213.6 --> 151.6 detzpos = dev.det_z.user_readback.get() detypos = dev.det_y.user_readback.get() @@ -1335,7 +1384,7 @@ def detxeye_out(): moves det back and down """ setdetzpos = 500 - setdetypos = 0 + setdetypos = 0 ### 70 umv(dev.det_z, setdetzpos) detzpos = dev.det_z.user_readback.get() if detzpos > 300: @@ -1753,6 +1802,7 @@ def fluxcal(start_en=13, stop_en=14, step=1): fitpoly(dat_en, dat_quot_flbsum, 3) +# ############################# check flux measurements ################## def testflux(): import time, datetime @@ -1778,4 +1828,5 @@ def testflux(): print(f'WARNING ! timing issue at {timestamp}') time.sleep(1) count += 1 - return + return + diff --git a/pxii_bec/macros/KB_Class.py b/pxii_bec/macros/KB_Class.py index f90604a..1692692 100644 --- a/pxii_bec/macros/KB_Class.py +++ b/pxii_bec/macros/KB_Class.py @@ -1,6 +1,54 @@ import numpy as np +def readKB(): + """ + reads the focussing params from the KBs + """ + vfm_pitch = dev.vfm_pitch.user_readback.get() + vfm_bu = dev.vfm_bu.user_readback.get() + vfm_bd = dev.vfm_bd.user_readback.get() + + hfm_pitch = dev.hfm_pitch.user_readback.get() + hfm_bu = dev.hfm_bu.user_readback.get() + hfm_bd = dev.hfm_bd.user_readback.get() + + print( + f" KB values vertical: \n pitch = {vfm_pitch} , bend upstream = {vfm_bu} , bend downstream = {vfm_bd}" + ) + + print( + f" KB values horizontal: \n pitch = {hfm_pitch} , bend upstream = {hfm_bu} , bend downstream = {hfm_bd}" + ) + + return vfm_pitch, vfm_bu, vfm_bd, hfm_pitch, hfm_bu, hfm_bd + + +def read_focinput(dir="v"): + """ + reads the input from the User Panel + """ + import epics + + # channels: + # X10SA-ES-VFM:DEFOCUS.RBV + # X10SA-ES-VFM:USER_ASYM_SET + # X10SA-ES-VFM:PARAM_CURV --- calcrec + + str = "VFM" + if dir == "h": + str = "HFM" + + user_defoc = epics.caget(f"X10SA-ES-{str}:DEFOCUS.RBV") + user_asym_set = epics.caget(f"X10SA-ES-{str}:USER_ASYM_SET") + calc_rad = epics.caget(f"X10SA-ES-{str}:PARAM_CURV") + + print( + f"{str} User Set Values: Defoc Dist s = {user_defoc}, Additional asym_set = {user_asym_set}, Radius from input = {calc_rad} " + ) + return user_defoc, user_asym_set, calc_rad + + class KBMirror: def __init__(self, mirror_type="PXII_HFM"): self.mirror_type = mirror_type diff --git a/pxii_bec/macros/Undu_Helpers.py b/pxii_bec/macros/Undu_Helpers.py index 80f45d6..4a4d3b0 100755 --- a/pxii_bec/macros/Undu_Helpers.py +++ b/pxii_bec/macros/Undu_Helpers.py @@ -74,7 +74,8 @@ def return_harmon(): h[18] = np.array([0.1362, 0.9538 ]) h[19] = np.array([0.128, 0.985 ]) - + + fitpar_u19 = np.array([ 2.22322523, 0.50396248, -0.00783873]) # measured from U19 return h # ##### July 2025 Data ###################################### diff --git a/pxii_bec/macros/calculator.py b/pxii_bec/macros/calculator.py index 4f77abd..b35a4a1 100755 --- a/pxii_bec/macros/calculator.py +++ b/pxii_bec/macros/calculator.py @@ -312,7 +312,12 @@ def convert_from_wavelength( return result -def calc_perp_position(energy_ev: float, beam_offset = None, print_result: bool = False) -> float: +def calc_perp_position( + energy_ev: float, + print_result: bool = False, + *, + beam_offset: float | None = None, + ) -> float: """ Calculate the perpendicular motor position based on provided energy in electron-volts (eV). diff --git a/pxii_bec/macros/calibrate_bpm.py b/pxii_bec/macros/calibrate_bpm.py index 8ed2e6d..d2b9b3c 100644 --- a/pxii_bec/macros/calibrate_bpm.py +++ b/pxii_bec/macros/calibrate_bpm.py @@ -17,6 +17,7 @@ def compute_norm_ss(n_readings=5): xn_values = [] yn_values = [] + for _ in range(n_readings): bpm1 = dev.ss_bpm1.read()["ss_bpm1"]["value"] bpm2 = dev.ss_bpm2.read()["ss_bpm2"]["value"] @@ -42,6 +43,7 @@ def compute_norm_ss(n_readings=5): } + def compute_norm_lu(n_readings=5): """Average normalized BPM X/Y from repeated sets of four channels.""" @@ -85,21 +87,22 @@ def run_calibration_ss(): umv(dev.ss_bpm_x, centred_x) # # # Calibrate in X - # umv(dev.bsf_sl_xsize, 0.3) - # umv(dev.bsf_sl_xsize, 0.4) - # filename = bl.env.lut_dir / "bpm_calib" / f"ss_bpm_x_{fnow}.csv" - # xn_data = [] - # x_positions = np.linspace(centred_x - 0.3, centred_x + 0.3, 51) - # with open(filename, "w", encoding="utf-8") as f: - # f.write(f"Xpos,Xnorm,BPM1,BPM2,BPM3,BPM4\n") - # for x in x_positions: - # umv(dev.ss_bpm_x, x) - # print(f"Moving BPM X to {x} mm") - # time.sleep(0.2) - # xn, yn = compute_norm_ss() - # xn_data.append(xn) - # with open(filename, "a", encoding="utf-8") as f: - # f.write(f"{x},{xn}\n") + umv(dev.bsf_sl_xsize, 0.3) + umv(dev.bsf_sl_xsize, 0.4) + filename = bl.env.lut_dir / "bpm_calib" / f"ss_bpm_x_{fnow}.csv" + xn_data = [] + x_positions = np.linspace(centred_x - 0.3, centred_x + 0.3, 51) + with open(filename, "w", encoding="utf-8") as f: + f.write(f"Xpos,Xnorm\n") + for x in x_positions: + umv(dev.ss_bpm_x, x) + print(f"Moving BPM X to {x} mm") + time.sleep(0.2) + result = compute_norm_ss() + xn = result["ss_Xnorm"] + xn_data.append(xn) + with open(filename, "a", encoding="utf-8") as f: + f.write(f"{x},{xn}\n") # # Calibrate in Y umv(dev.ss_bpm_x, centred_x) @@ -109,12 +112,13 @@ def run_calibration_ss(): y_positions = np.linspace(centred_y - 0.04, centred_y + 0.04, 41) yn_data = [] with open(filename, "w", encoding="utf-8") as f: - f.write(f"Ypos,Ynorm,BPM1,BPM2,BPM3,BPM4\n") + f.write(f"Ypos,Ynorm\n") for y in y_positions: umv(dev.ss_bpm_y, y) print(f"Moving BPM Y to {y} mm") time.sleep(0.2) - xn, yn = compute_norm_ss() + result = compute_norm_ss() + yn = result["ss_Ynorm"] yn_data.append(yn) with open(filename, "a", encoding="utf-8") as f: f.write(f"{y},{yn}\n") @@ -135,21 +139,22 @@ def run_calibration_lu(): umv(dev.lu_bpm_x, centred_x) # # Calibrate in X - # umv(dev.bsf_sl_xsize, 0.3) - # umv(dev.bsf_sl_xsize, 0.4) - # filename = bl.env.lut_dir / "bpm_calib" / f"lu_bpm_x_{fnow}.csv" - # xn_data = [] - # x_positions = np.linspace(centred_x - 0.3, centred_x + 0.3, 51) - # with open(filename, "w", encoding="utf-8") as f: - # f.write(f"Xpos,Xnorm\n") - # for x in x_positions: - # umv(dev.lu_bpm_x, x) - # print(f"Moving BPM X to {x} mm") - # time.sleep(0.2) - # xn, yn = compute_norm_lu() - # xn_data.append(xn) - # with open(filename, "a", encoding="utf-8") as f: - # f.write(f"{x},{xn}\n") + umv(dev.bsf_sl_xsize, 0.3) + umv(dev.bsf_sl_xsize, 0.4) + filename = bl.env.lut_dir / "bpm_calib" / f"lu_bpm_x_{fnow}.csv" + xn_data = [] + x_positions = np.linspace(centred_x - 0.3, centred_x + 0.3, 51) + with open(filename, "w", encoding="utf-8") as f: + f.write(f"Xpos,Xnorm\n") + for x in x_positions: + umv(dev.lu_bpm_x, x) + print(f"Moving BPM X to {x} mm") + time.sleep(0.2) + result = compute_norm_lu() + xn = result["lu_Xnorm"] + xn_data.append(xn) + with open(filename, "a", encoding="utf-8") as f: + f.write(f"{x},{xn}\n") # # Calibrate in Y umv(dev.lu_bpm_x, centred_x) @@ -159,12 +164,13 @@ def run_calibration_lu(): y_positions = np.linspace(centred_y - 0.04, centred_y + 0.04, 41) yn_data = [] with open(filename, "w", encoding="utf-8") as f: - f.write(f"Ypos,Ynorm,BPM1,BPM2,BPM3,BPM4\n") + f.write(f"Ypos,Ynorm\n") for y in y_positions: umv(dev.lu_bpm_y, y) print(f"Moving BPM Y to {y} mm") time.sleep(0.2) - xn, yn = compute_norm_lu() + result = compute_norm_lu() + yn = result["lu_Ynorm"] yn_data.append(yn) with open(filename, "a", encoding="utf-8") as f: f.write(f"{y},{yn}\n") @@ -174,6 +180,7 @@ def run_calibration_lu(): umv(dev.bsf_sl_ysize, 3.0) umv(dev.bsf_sl_xsize, 3.0) + def run_calibration(env): """Scan bpm in x and y and record normalised x and y positions""" centred_x = 0.444 @@ -191,7 +198,7 @@ def run_calibration(env): xn_data = [] x_positions = np.linspace(centred_x - 0.4, centred_x + 0.4, 101) with open(filename, "w", encoding="utf-8") as f: - f.write(f"Xpos,Xnorm,BPM1,BPM2,BPM3,BPM4\n") + f.write(f"Xpos,Xnorm\n") for x in x_positions: umv(dev.bcu_bpm_x, x) print(f"Moving BPM X to {x} mm") @@ -209,7 +216,7 @@ def run_calibration(env): y_positions = np.linspace(centred_y - 0.05, centred_y + 0.05, 101) yn_data = [] with open(filename, "w", encoding="utf-8") as f: - f.write(f"Ypos,Ynorm,BPM1,BPM2,BPM3,BPM4\n") + f.write(f"Ypos,Ynorm\n") for y in y_positions: umv(dev.bcu_bpm_y, y) print(f"Moving BPM Y to {y} mm") diff --git a/pxii_bec/macros/daily.py b/pxii_bec/macros/daily.py index 58fc1d5..40820c7 100644 --- a/pxii_bec/macros/daily.py +++ b/pxii_bec/macros/daily.py @@ -1182,7 +1182,7 @@ def daily_beamstop(): result["bs_x_pos"] = x_result["centre"] result["bs_y_pos"] = y_result["centre"] - result["intensity after alignment"] = read_i2() + result['intensity after alignment'] = read_i2() # message = ( # "Intensity after Y scan: " @@ -1324,8 +1324,8 @@ def daily_collimator(): get_value(dev.i1) - result["intensity_coll_out"] = get_value(dev.i1) - print(f"Starting intensity is {result["intensity_coll_out"]:.3e}") + result['intensity_coll_out'] = get_value(dev.i1) + print(f"Starting intensity is {result['intensity_coll_out']:.3e}") bl.d["coll_y"].move("in") @@ -1448,7 +1448,7 @@ def read_bcu_beampos_safe(): """Read calibrated BCU beam position without failing beam alignment.""" try: result = get_bcu_beampos() - return result["bcu_x_um"], result["bcu_y_um"], None + return result['bcu_x_um'], result['bcu_y_um'], None except Exception as exc: warning = f"BCU BPM position unavailable: {exc}" @@ -1930,11 +1930,34 @@ def log_daily_setup_to_csv(results): get_value(dev.hfm_pitch), ".5f" ), } - + fieldnames = list(row.keys()) file_exists = filename.exists() + # Check whether the existing CSV has the current schema + if file_exists: + with open(filename, "r", newline="", encoding="utf-8") as f: + reader = csv.reader(f) + existing_header = next(reader, None) + + if existing_header != fieldnames: + # Archive the old CSV rather than writing incompatible rows to it + timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") + archive_filename = filename.with_name( + f"{filename.stem}_archive_{timestamp}{filename.suffix}" + ) + + filename.rename(archive_filename) + + print( + "⚠ Daily beamline CSV schema has changed.\n" + f" Previous history archived as: {archive_filename.name}\n" + f" Starting new history file: {filename.name}" + ) + + file_exists = False + with open(filename, "a", newline="", encoding="utf-8") as f: - writer = csv.DictWriter(f, fieldnames=row.keys()) + writer = csv.DictWriter(f, fieldnames=fieldnames) if not file_exists: writer.writeheader() diff --git a/pxii_bec/macros/katscripts.py b/pxii_bec/macros/katscripts.py index 5670025..57751ee 100755 --- a/pxii_bec/macros/katscripts.py +++ b/pxii_bec/macros/katscripts.py @@ -190,7 +190,6 @@ def energy_checks(start_energy=8000, end_energy=20000): f.close() - # def scan_gap(gomax = False, close = True, fine = False): # """Scan the gap and monitor on lu_bpmsum or bcu_bpmsum""" # close_fe_slits(close) @@ -352,14 +351,13 @@ def beam_centre_from_ss(): def generate_dcm_lut( - start_energy=6000, - end_energy=30000, - step=1000, - scan_id_gap=False, - scint=True, - prefix = "dcm_calibration", + start_energy=6000, + end_energy=30000, + step=1000, + scan_id_gap=False, + scint=True, + prefix="dcm_calibration", ): - """Generate a DCM calibration lookup table. Parameters @@ -393,13 +391,19 @@ def generate_dcm_lut( if scan_id_gap: with open(filename, "w", encoding="utf-8") as f: if scint: - f.write(f"energy,harmonic,gap,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom={zoom}\n") + f.write( + f"energy,harmonic,gap,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom={zoom}\n" + ) else: - f.write("energy,harmonic,gap,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom={zoom}\n") + f.write( + "energy,harmonic,gap,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom={zoom}\n" + ) else: with open(filename, "w", encoding="utf-8") as f: if scint: - f.write(f"energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom={zoom}\n") + f.write( + f"energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom={zoom}\n" + ) else: f.write("energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y\n") @@ -500,15 +504,14 @@ def generate_dcm_lut( # ------------------------------------------------------------ res = get_bcu_beampos() - bcu_x = res['bcu_x_um'] - bcu_y = res['bcu_y_um'] + bcu_x = res["bcu_x_um"] + bcu_y = res["bcu_y_um"] ss_res = compute_norm_ss() - ss_Xnorm = ss_res['ss_Xnorm'] - ss_Ynorm = ss_res['ss_Ynorm'] + ss_Xnorm = ss_res["ss_Xnorm"] + ss_Ynorm = ss_res["ss_Ynorm"] lu_res = compute_norm_lu() - lu_Xnorm = lu_res['lu_Xnorm'] - lu_Ynorm = lu_res['lu_Ynorm'] - + lu_Xnorm = lu_res["lu_Xnorm"] + lu_Ynorm = lu_res["lu_Ynorm"] pitch = get_value(dev.dcm_pitch) @@ -547,7 +550,7 @@ def generate_dcm_lut( f.write( f"{energy:.0f},{h},{gap_value:.5g},{pitch:.5g}," f"{ss_Xnorm:.5g},{ss_Ynorm:.5g},{bcu_x:.2f},{bcu_y:.2f}\n" - ) + ) else: @@ -555,12 +558,13 @@ def generate_dcm_lut( f.write( f"{energy:.0f},{pitch:.5g},{lu_Xnorm:.5g},{lu_Ynorm:.5g}," f"{ss_Xnorm:.5g},{ss_Ynorm:.5g},{bcu_x:.2f},{bcu_y:.2f},{x:.4g},{y:.4g}\n" - ) + ) else: f.write( - f"{energy:.0f}," f"{pitch:.5g},{lu_Xnorm:.5g},{lu_Ynorm:.5g}," + f"{energy:.0f}," + f"{pitch:.5g},{lu_Xnorm:.5g},{lu_Ynorm:.5g}," f"{ss_Xnorm:.5g},{ss_Ynorm:.5g},{bcu_x:.2f},{bcu_y:.2f}\n" - ) + ) finally: print("\nReturning beamline to safe conditions...") @@ -600,45 +604,24 @@ def generate_dcm_lut( print(f"\nCalibration data written to:\n" f"{filename}") - return { - "filename": filename, - "failure_filename": failure_filename, - "failures": failures, - } + return {"filename": filename, "failure_filename": failure_filename, "failures": failures} -def calibrate_dcm_pitch( - start_energy=6000, - end_energy=30000, - step=2000, - fit_order=3, -): + +def calibrate_dcm_pitch(start_energy=6000, end_energy=30000, step=2000, fit_order=3): """Quickly recalibrate the DCM pitch lookup table.""" print("\nRunning DCM pitch calibration") - print( - f"{start_energy:.0f}–{end_energy:.0f} eV " - f"in {step:.0f} eV steps" - ) + print(f"{start_energy:.0f}–{end_energy:.0f} eV " f"in {step:.0f} eV steps") failures = generate_dcm_lut( - start_energy=start_energy, - end_energy=end_energy, - step=step, - scan_id_gap=False, - scint=False, + start_energy=start_energy, end_energy=end_energy, step=step, scan_id_gap=False, scint=False ) print("\nAnalysing DCM pitch calibration...") - fit = pitch_analysis( - filedate=filenow(date_only=True), - fit_order=fit_order, - ) + fit = pitch_analysis(filedate=filenow(date_only=True), fit_order=fit_order) - return { - "fit": fit, - "failures": failures, - } + return {"fit": fit, "failures": failures} def write_lut(): @@ -657,8 +640,6 @@ def write_lut(): f.write(f"{energy:.0f},{gap:.5g},{pitch:.5g},{roll:.4g},{perp:.5g},{x:.4g},{y:.4g}\n") - - def write_beamsize(): """Write beam size and flux to file""" filename = "luts/beamsizes.csv" @@ -677,8 +658,6 @@ def write_beamsize(): f.write(f"{lens_config},{sx:.4g},{sy:.4g},{i1_reading:.4g}\n") - - def cal_samcam_fixed_x(): # lat = dev.hfm_x.read()["hfm_x"]["value"] # pitch = dev.hfm_pitch.read()["hfm_pitch"]["value"] @@ -1072,8 +1051,6 @@ from epics import caget, caput import time - - # def get_new_beamsizes(mirror): # filename = f"luts/{mirror}_size.csv" # if mirror == "hfm": @@ -1300,7 +1277,6 @@ def mirror_pitch(mirror="vfm"): results = np.array(results) - def vfm_yaw_check(): slit_size = 0.02 slit_point1 = -1.2 @@ -1370,6 +1346,7 @@ def vfm_yaw_check(): plt.tight_layout() plt.show() + # @dataclass # class SlitAxis: # name: str @@ -1495,11 +1472,6 @@ def vfm_yaw_check(): # print(f"=== Finished {slit.name} ===") - - - - - # def define_slits(): # slits = [ # Slit( @@ -1728,9 +1700,9 @@ import matplotlib.pyplot as plt from epics import caget -def scan_scin_focus(planner, type="fine"): +def scan_scin_focus(type="fine"): dev.bcu_shutter.put(0) - planner.move_to(BeamlineState.BEAM_VISUALISATION) + # bl.planner.move_to(BeamlineState.BEAM_VISUALISATION) dev.bcu_shutter.put(1) z0 = dev.diag_z.position @@ -1746,11 +1718,12 @@ def scan_scin_focus(planner, type="fine"): umv(dev.scam_zoom, 1000) dev.transm.put(0.1) + time.sleep(3) auto_exposure("samcam", target=200, max_iter=20) time.sleep(0.2) - go_to_peak(dev.diag_z, dev.scam, min, max, steps, relative=True, gomax=True, confirm=False) + go_to_peak(dev.diag_z, dev.scam, min, max, steps, relative=False, gomax=True, confirm=False) dev.bcu_shutter.put(0) @@ -1829,7 +1802,6 @@ def centre_bcu_bpm_y(): return centre - def centre_ss_bpm_x(): positions = [] errors = [] @@ -1866,7 +1838,7 @@ def centre_ss_bpm_y(): ch1 = get_value(dev.ss_bpm1) ch2 = get_value(dev.ss_bpm2) ch3 = get_value(dev.ss_bpm3) - ch4 = get_value(dev.ss_bpm4) + ch4 = get_value(dev.ss_bpm4) _, y_error = bpm_errors(ch1, ch2, ch3, ch4) print(f"BPM_Y = {float(y)}, Yerror = {y_error}") @@ -1879,6 +1851,7 @@ def centre_ss_bpm_y(): umv(dev.ss_bpm_y, centre) return centre + def centre_lu_bpm_x(): positions = [] errors = [] @@ -1915,7 +1888,7 @@ def centre_lu_bpm_y(): ch1 = get_value(dev.lu_bpm1) ch2 = get_value(dev.lu_bpm2) ch3 = get_value(dev.lu_bpm3) - ch4 = get_value(dev.lu_bpm4) + ch4 = get_value(dev.lu_bpm4) _, y_error = bpm_errors(ch1, ch2, ch3, ch4) print(f"BPM_Y = {float(y)}, Yerror = {y_error}") @@ -1928,6 +1901,8 @@ def centre_lu_bpm_y(): umv(dev.lu_bpm_y, centre) return centre + + def read_i1(): return dev.i1.read()["i1"]["value"] @@ -2159,10 +2134,11 @@ def measure_omega_runout( # def dcm_pitch_calibration(start_energy=6000, end_energy=31000, step=3000): def dcm_pitch_calibration(): """Quick calibration of DCM Pitch against energy""" - energies = [5500, 8000, 10000, 12000, 14000, 16000, 18000, - 20000, 22000, 24000, 27000, 30000] + # energies = [5500, 8000, 10000, 12000, 14000, 16000, 18000, + # 20000, 22000, 24000, 27000, 30000] + energies = [16000, 18000, 20000, 22000, 24000, 27000, 30000] filename = bl.env.lut_dir / f"dcm_pitch_{filenow(date_only=True)}.csv" - with open(filename, "w", encoding="utf-8") as f: + with open(filename, "a", encoding="utf-8") as f: f.write("energy,bragg,pitch\n") # for energy in range(start_energy, end_energy, step): try: @@ -2199,9 +2175,7 @@ def dcm_pitch_calibration(): # import matplotlib.pyplot as plt -def analyse_roll_calibration( - energies=(6000, 9000, 12000, 15000, 18000, 21000), -): +def analyse_roll_calibration(energies=(6000, 9000, 12000, 15000, 18000, 21000)): """ Analyse roll calibration scans at several energies. @@ -2237,20 +2211,13 @@ def analyse_roll_calibration( fits[energy] = (m, b) # Plot measured points - ax.scatter( - roll, - y, - label=f"{energy / 1000:g} keV", - ) + ax.scatter(roll, y, label=f"{energy / 1000:g} keV") # Plot fitted line xx = np.linspace(roll.min(), roll.max(), 100) ax.plot(xx, m * xx + b, "--") - print( - f"{energy / 1000:4.1f} keV: " - f"Y = {m:8.3f} × roll + {b:8.3f}" - ) + print(f"{energy / 1000:4.1f} keV: " f"Y = {m:8.3f} × roll + {b:8.3f}") # ------------------------------------------------------------ # Find roll where fitted lines have minimum spread @@ -2265,12 +2232,7 @@ def analyse_roll_calibration( best_roll = -np.sum(dm * db) / np.sum(dm**2) # Predicted Y position at best roll - predicted_y = np.array( - [ - m * best_roll + b - for m, b in fits.values() - ] - ) + predicted_y = np.array([m * best_roll + b for m, b in fits.values()]) mean_y = predicted_y.mean() std_y = predicted_y.std() @@ -2285,33 +2247,17 @@ def analyse_roll_calibration( print("\nPredicted Y at best roll:") for energy, y in zip(energies, predicted_y): - print( - f" {energy / 1000:4.1f} keV : " - f"{y:8.2f} px" - ) + print(f" {energy / 1000:4.1f} keV : " f"{y:8.2f} px") - print( - f"\nMean Y = {mean_y:.2f} px" - f"\nSpread = {std_y:.2f} px" - ) + print(f"\nMean Y = {mean_y:.2f} px" f"\nSpread = {std_y:.2f} px") # ------------------------------------------------------------ # Plot optimum # ------------------------------------------------------------ - ax.axvline( - best_roll, - color="black", - linestyle=":", - label=f"Best roll = {best_roll:.4f}", - ) + ax.axvline(best_roll, color="black", linestyle=":", label=f"Best roll = {best_roll:.4f}") - ax.axhline( - mean_y, - color="grey", - linestyle=":", - alpha=0.5, - ) + ax.axhline(mean_y, color="grey", linestyle=":", alpha=0.5) ax.set_xlabel("Roll") ax.set_ylabel("Scintillator Y position (px)") @@ -2329,6 +2275,7 @@ def analyse_roll_calibration( "predicted_y": dict(zip(energies, predicted_y)), } + def analyse_roll(low=6000, high=25000, low_file=None, high_file=None): """Find the DCM fine-roll value where low/high-energy beam positions intersect.""" @@ -2417,36 +2364,79 @@ def scan_roll(energy, start, stop, steps=9, settle=0.2, filename=None, overwrite results = read_scintXY() if not results["ok"]: raise RuntimeError( - f"Beam position measurement failed at " - f"{energy / 1000:.1f} keV, roll={roll:.3f}: " - f"{results['message']}" + f"Beam position measurement failed at " + f"{energy / 1000:.1f} keV, roll={roll:.3f}: " + f"{results['message']}" + ) + + print( + f"{energy / 1000:.1f} keV | " + f"roll = {roll:.3f} | " + f"Y = {results['Y_pixels']:.2f}" ) - print(f"{energy / 1000:.1f} keV | " f"roll = {roll:.3f} | " f"Y = {results["Y_pixels"]:.2f}") - - f.write(f"{roll:.6f},{results["Y_pixels"]}\n") + f.write(f"{roll:.6f},{results['Y_pixels']}\n") finally: finish_scint_measurement() return filename -def measure_rolls(): + +def scan_roll_bcu(energy, start, stop, steps=9, settle=0.2, filename=None, overwrite=False): + """Measure scintillator Y position as a function of DCM fine roll.""" + + scanpoints = np.linspace(start, stop, steps) + print(f"Scanning roll from {start} to {stop}") + + if filename is None: + filename = bl.env.lut_dir / f"roll_{filenow(date_only=True)}_{energy:.0f}.csv" + + if filename.exists() and not overwrite: + print(f"{filename.name} already exists.") + print("Use overwrite=True if you want to repeat this energy.") + return filename + + bl_energy(energy) + + with open(filename, "w", encoding="utf-8") as f: + f.write("Roll,Y pos\n") + + for roll in scanpoints: + umv(dev.dcm_froll, roll) + time.sleep(settle) + + result = get_bcu_beampos() + + print( + f"{energy / 1000:.1f} keV | " + f"roll = {roll:.3f} | " + f"Y = {result['bcu_y_um']:.2f}" + ) + + f.write(f"{roll:.6f},{result['bcu_y_um']}\n") + + return filename + + +def measure_rolls(monitor="scint"): energies = [6000, 9000, 12000, 15000, 18000, 21000] - try: - for energy in energies: - scan_roll(energy, start=2, stop=5, overwrite=True) - finally: - print("done") - # bl_energy(12400) + if monitor == "scint": + try: + for energy in energies: + scan_roll(energy, start=2.0, stop=4, overwrite=True) + finally: + print("done") + # bl_energy(12400) + else: + try: + for energy in energies: + scan_roll_bcu(energy, start=2.8, stop=4, overwrite=True) + finally: + print("done") + # bl_energy(12400) -def find_best_roll( - low=6000, - high=25000, - low_range=(2.0, 4.0), - high_range=(1.0, 8.0), - steps=9, -): +def find_best_roll(low=6000, high=25000, low_range=(2.0, 4.0), high_range=(1.0, 8.0), steps=9): """Collect missing roll scans and calculate optimum roll.""" filename_prefix = filenow(date_only=True) @@ -2454,17 +2444,12 @@ def find_best_roll( high_file = bl.env.lut_dir / f"roll_{filename_prefix}_{high:.0f}.csv" # Define the two scans - scans = [ - (low, low_range, low_file), - (high, high_range, high_file), - ] + scans = [(low, low_range, low_file), (high, high_range, high_file)] # Start with whichever energy is closest to the current energy current_energy = get_current_energy() - scans.sort( - key=lambda scan: abs(current_energy - scan[0]) - ) + scans.sort(key=lambda scan: abs(current_energy - scan[0])) print(f"Current energy: {current_energy:.0f} eV") print(f"Scanning {scans[0][0]:.0f} eV first") @@ -2472,12 +2457,7 @@ def find_best_roll( # Run scans in the chosen order for energy, scan_range, filename in scans: if not filename.exists(): - scan_roll( - energy, - *scan_range, - steps=steps, - filename=filename, - ) + scan_roll(energy, *scan_range, steps=steps, filename=filename) else: print(f"Using existing {filename.name}") @@ -2577,6 +2557,7 @@ def test_vfm3(dmove, offset=0.002): f"Position error = {(final-target)*1000:+.3f} µm" ) + def beamstop_check_energies(): bs_in = 0.904 @@ -2588,9 +2569,9 @@ def beamstop_check_energies(): filename = bl.env.lut_dir / f"bs_checks_{filenow(date_only=True)}.csv" with open(filename, "w", encoding="utf-8") as f: f.write("Energy,I2_in,I2_out\n") - + try: - for energy in range (start_energy, end_energy, -2000): + for energy in range(start_energy, end_energy, -2000): print(f"Moving to energy {energy}") bl_energy(energy) dev.transm.put(0.1) @@ -2614,6 +2595,7 @@ def beamstop_check_energies(): umv(dev.bs_y, bs_in) bl_energy(12400) + def check_perp(): Xref = -0.0059957 Yref = -0.000993 @@ -2622,9 +2604,9 @@ def check_perp(): start_perp = get_value(dev.dcm_perp) - perps = [start_perp, start_perp-0.1, start_perp, start_perp+0.1, start_perp] + perps = [start_perp, start_perp - 0.1, start_perp, start_perp + 0.1, start_perp] filename = bl.env.lut_dir / f"perp_check.csv" - with open(filename, 'w', encoding="utf-8") as f: + with open(filename, "w", encoding="utf-8") as f: f.write("Delta perp, Pitch, Xnorm, Delta X") for perp in perps: @@ -2633,9 +2615,9 @@ def check_perp(): mono_pitch_scan() pitch = get_value(dev.dcm_pitch) Xnorm, Ynorm = compute_norm_ss() - Xdelta = -0.247*(Xnorm-Xref) - Ydelta = 0.0420*(Ynorm-Yref) - with open(filename, 'a', encoding="utf-8") as f: + Xdelta = -0.247 * (Xnorm - Xref) + Ydelta = 0.0420 * (Ynorm - Yref) + with open(filename, "a", encoding="utf-8") as f: f.write(f"{delta_perp},{pitch:.5g},{Xnorm:.5g},{Xdelta:.5g}") print( f"Delta perp: {delta_perp}, " @@ -2644,6 +2626,7 @@ def check_perp(): f"delta X: {Xdelta:.5g}" ) + def calibrate_dcm_perp(): """ Determine the DCM perp position required to maintain a fixed beam @@ -2679,16 +2662,7 @@ def calibrate_dcm_perp(): # beam displacement (mm) / perp displacement (mm) beam_per_perp = 1.46 - energies = [ - 6000, - 8000, - 10000, - 12000, - 16000, - 20000, - 24000, - 30000, - ] + energies = [6000, 8000, 10000, 12000, 16000, 20000, 24000, 30000] filename = bl.env.lut_dir / "dcm_perp_calibration.csv" @@ -2800,6 +2774,8 @@ def calibrate_dcm_perp(): print(filename) finally: bl_energy(12400) + + from datetime import datetime @@ -2833,10 +2809,7 @@ def scan_dcm_exit_vs_energy(): 30000, ] - filename = ( - bl.env.lut_dir - / f"dcm_exit_scan_{datetime.now():%Y%m%d_%H%M%S}.csv" - ) + filename = bl.env.lut_dir / f"dcm_exit_scan_{datetime.now():%Y%m%d_%H%M%S}.csv" # -------------------------------------------------------------- # Create CSV @@ -2869,7 +2842,6 @@ def scan_dcm_exit_vs_energy(): # Move to energy using current calibration bl_energy(energy) - # Read actual DCM positions after optimisation perp = get_value(dev.dcm_perp) pitch = get_value(dev.dcm_pitch) @@ -2923,13 +2895,16 @@ def scan_dcm_exit_vs_energy(): finally: bl_energy(12400) + def perp_again(): energies = [8000, 10000, 12400, 15000, 18000, 20000, 22000, 25000] perp_offsets = [-0.05, -0.025, 0.0, 0.025, 0.05, 0.0] filename = bl.env.lut_dir / f"perp_{filenow()}.csv" with open(filename, "w", encoding="utf-8") as f: - f.write("energy,dcm_pitch,dcm_perp,lu_bpmsum,lu_Xnorm,lu_Ynorm,bcu_bpmsum,bcu_x,bcu_y,samcam_x,samcam_y\n") + f.write( + "energy,dcm_pitch,dcm_perp,lu_bpmsum,lu_Xnorm,lu_Ynorm,bcu_bpmsum,bcu_x,bcu_y,samcam_x,samcam_y\n" + ) try: for energy in energies: bl_energy(energy) @@ -2941,13 +2916,12 @@ def perp_again(): for offset in perp_offsets: perp = perp_value + offset - umv(dev.dcm_perp,perp) + umv(dev.dcm_perp, perp) mono_pitch_scan() dcm_pitch = get_value(dev.dcm_pitch) dcm_perp = get_value(dev.dcm_perp) - lu_bpmsum = get_value(dev.lu_bpmsum) lu = compute_norm_lu() lu_Xnorm = lu["lu_Xnorm"] @@ -2961,7 +2935,7 @@ def perp_again(): scint = read_scintXY(image=False) samcam_x = scint["X_diff_microns"] samcam_y = scint["Y_diff_microns"] - + with open(filename, "a", encoding="utf-8") as f: f.write( f"{energy:.0f},{dcm_pitch:.5f},{dcm_perp:.5f},{lu_bpmsum:.1f},{lu_Xnorm:.3f},{lu_Ynorm:.3f}," @@ -2971,6 +2945,7 @@ def perp_again(): finish_scint_measurement() bl_energy(12400) + def perp_ss_xi(): # energies = [8000, 10000, 12400, 15000, 18000, 20000, 22000, 25000] energies = [25000] @@ -2978,11 +2953,11 @@ def perp_ss_xi(): filename = bl.env.lut_dir / f"perp_xi_{filenow()}.csv" with open(filename, "w", encoding="utf-8") as f: - f.write("energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y\n") + f.write("energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y\n") try: for energy in energies: bl_energy(energy) - + prepare_ss_xi_measurement() perp_value = get_value(dev.dcm_perp) @@ -2990,23 +2965,21 @@ def perp_ss_xi(): for offset in perp_offsets: perp = perp_value + offset - umv(dev.dcm_perp,perp) + umv(dev.dcm_perp, perp) mono_pitch_scan() dcm_pitch = get_value(dev.dcm_pitch) dcm_perp = get_value(dev.dcm_perp) - lu_bpmsum = get_value(dev.lu_bpmsum) lu = compute_norm_lu() lu_Xnorm = lu["lu_Xnorm"] lu_Ynorm = lu["lu_Ynorm"] - xi_read = read_ss_xicamXY() xicam_x = xi_read["X_pixels"] xicam_y = xi_read["Y_pixels"] - + with open(filename, "a", encoding="utf-8") as f: f.write( f"{energy:.0f},{dcm_pitch:.5f},{dcm_perp:.5f},{lu_bpmsum:.1f},{lu_Xnorm:.3f},{lu_Ynorm:.3f}," @@ -3016,6 +2989,7 @@ def perp_ss_xi(): finish_ss_xi_measurement() # bl_energy(12400) + def gap_beam(): # energies = [8000, 10000, 12400, 15000, 18000, 20000, 22000, 25000] energies = [22000] @@ -3023,13 +2997,13 @@ def gap_beam(): filename = bl.env.lut_dir / f"gap_xi_{filenow()}.csv" filename2 = bl.env.lut_dir / f"gap_scint_{filenow()}.csv" with open(filename, "w", encoding="utf-8") as f: - f.write("energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y\n") + f.write("energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y\n") with open(filename2, "w", encoding="utf-8") as f: - f.write("energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y\n") + f.write("energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y\n") try: # for energy in energies: # bl_energy(energy) - + # prepare_ss_xi_measurement() # scanpoints=np.linspace(4.535,4.555,20) @@ -3047,7 +3021,7 @@ def gap_beam(): # xi_read = read_ss_xicamXY() # xicam_x = xi_read["X_pixels"] # xicam_y = xi_read["Y_pixels"] - + # with open(filename, "a", encoding="utf-8") as f: # f.write( # f"{energy:.0f},{gap:.4f},{lu_bpmsum:.1f},{lu_Xnorm:.3f},{lu_Ynorm:.3f}," @@ -3059,7 +3033,7 @@ def gap_beam(): finish_ss_xi_measurement() prepare_scint_measurement() - scanpoints=np.linspace(4.535,4.555,20) + scanpoints = np.linspace(4.535, 4.555, 20) for i in scanpoints: umv(dev.id_gap, i) time.sleep(0.2) @@ -3071,33 +3045,30 @@ def gap_beam(): lu_Xnorm = lu["lu_Xnorm"] lu_Ynorm = lu["lu_Ynorm"] - scint_read = read_scintXY(image=False) samcam_x = scint_read["X_diff_microns"] samcam_y = scint_read["Y_diff_microns"] - + with open(filename2, "a", encoding="utf-8") as f: f.write( f"{energy:.0f},{gap:.4f},{lu_bpmsum:.1f},{lu_Xnorm:.3f},{lu_Ynorm:.3f}," f"{samcam_x:.1f},{samcam_y:.1f}\n" - ) + ) finally: finish_ss_xi_measurement() finish_scint_measurement() # bl_energy(12400) + def gap_test(): for energy in range(6000, 30001, 500): try: harmonic, gap = Gap.calculate_gap(energy) - print( - f"{energy:5d} eV " - f"H{harmonic:2d} " - f"{gap:.4f} mm" - ) + print(f"{energy:5d} eV " f"H{harmonic:2d} " f"{gap:.4f} mm") except ValueError as exc: print(energy, exc) + def energy_beam_position(): """ Measure the beam trajectory as a function of energy. @@ -3112,17 +3083,7 @@ def energy_beam_position(): No DCM perp correction or beam steering is applied. """ - energies = [ - 6000, - 8000, - 10000, - 12400, - 15000, - 18000, - 20000, - 22000, - 25000, - ] + energies = [6000, 8000, 10000, 12400, 15000, 18000, 20000, 22000, 25000] filename = bl.env.lut_dir / f"energy_beam_position_{filenow()}.csv" @@ -3208,7 +3169,7 @@ def energy_beam_position(): samcam_y = scint["Y_diff_microns"] # Flux - _,flux = bpm2flux() + _, flux = bpm2flux() # ---------------------------------------------------------- # Save immediately @@ -3255,4 +3216,4 @@ def energy_beam_position(): print("\nReturning to 12400 eV") bl_energy(12400) - print(f"\nResults saved to:\n{filename}") \ No newline at end of file + print(f"\nResults saved to:\n{filename}") diff --git a/pxii_bec/macros/luts/.~lock.dcm_calibration_4thOct.csv# b/pxii_bec/macros/luts/.~lock.dcm_calibration_4thOct.csv# deleted file mode 100644 index 05d0afe..0000000 --- a/pxii_bec/macros/luts/.~lock.dcm_calibration_4thOct.csv# +++ /dev/null @@ -1 +0,0 @@ -,mcauley_k,x10sa-vcons-01.psi.ch,08.10.2026 15:28,file:///home/mcauley_k/.config/libreoffice/4; \ No newline at end of file diff --git a/pxii_bec/macros/luts/.~lock.temp.csv# b/pxii_bec/macros/luts/.~lock.temp.csv# deleted file mode 100644 index fba849b..0000000 --- a/pxii_bec/macros/luts/.~lock.temp.csv# +++ /dev/null @@ -1 +0,0 @@ -,mcauley_k,x10sa-vcons-01.psi.ch,08.10.2026 13:22,file:///home/mcauley_k/.config/libreoffice/4; \ No newline at end of file diff --git a/pxii_bec/macros/luts/20260704-1508_ge_edge.csv b/pxii_bec/macros/luts/20260704-1508_ge_edge.csv deleted file mode 100644 index b3dc9f1..0000000 --- a/pxii_bec/macros/luts/20260704-1508_ge_edge.csv +++ /dev/null @@ -1,6 +0,0 @@ -Energy,bcu_bpmsum -11125.712083383152,25032.909677419353 -11125.50607729644,25067.271582181264 -11125.300078962937,25072.67158218126 -11125.094088382204,25096.84485407066 -11124.888105553806,25110.599078341016 diff --git a/pxii_bec/macros/luts/20260704-1509_ge_edge.csv b/pxii_bec/macros/luts/20260704-1509_ge_edge.csv deleted file mode 100644 index cdbf09b..0000000 --- a/pxii_bec/macros/luts/20260704-1509_ge_edge.csv +++ /dev/null @@ -1,301 +0,0 @@ -Energy,bcu_bpmsum -11125.712083383152,24961.620890937025 -11125.50607729644,24981.217204301076 -11125.300078962937,25013.287557603682 -11125.094088382204,24953.832258064514 -11124.888105553806,24968.10261136713 -11124.682130477306,24990.521351766514 -11124.476163152269,25005.63993855607 -11124.270203578264,25063.171121351766 -11124.064251754857,25083.887864823348 -11123.858307681605,25034.484178187406 -11123.652371358077,25157.456528417817 -11123.44644278384,25144.93886328725 -11123.240521958456,25170.029185867897 -11123.034608881491,25149.173271889398 -11122.828703552512,25147.52995391705 -11122.622805971081,25149.71213517665 -11122.416916136766,25137.73179723502 -11122.211034049127,25144.390783410137 -11122.005159707736,25135.905683563746 -11121.799293112155,25120.55483870968 -11121.593434261951,25120.90721966206 -11121.387583156686,25113.126267281106 -11121.181739795926,25118.79569892473 -11120.97590417924,25090.185560675884 -11120.770076306191,25087.841167434715 -11120.564256176345,25096.89216589862 -11120.358443789264,25089.46850998464 -11120.152639144519,25089.52841781874 -11119.94684224167,25083.528725038406 -11119.74105308029,25073.67465437788 -11119.535271659937,25073.420583717358 -11119.329497980181,25054.83686635945 -11119.123732040585,25056.012596006145 -11118.917973840717,25045.988632872504 -11118.71222338014,25045.18986175115 -11118.506480658425,25016.631643625187 -11118.300745675135,25002.86850998464 -11118.095018429833,24996.630721966205 -11117.889298922086,24984.850998463902 -11117.683587151465,24961.41075268817 -11117.477883117528,24945.807680491554 -11117.272186819848,24942.026113671272 -11117.066498257986,24904.69155145929 -11116.86081743151,24881.899539170507 -11116.655144339988,24854.092165898615 -11116.44947898298,24841.642703533023 -11116.243821360062,24813.291858678953 -11116.038171470791,24788.921044546852 -11115.832529314735,24756.357296466977 -11115.626894891466,24730.055913978496 -11115.421268200545,24695.38371735791 -11115.215649241538,24672.803993855607 -11115.010038014014,24645.320122887864 -11114.804434517539,24609.837173579108 -11114.598838751675,24570.704454685103 -11114.393250715995,24540.299539170508 -11114.187670410061,24512.862365591398 -11113.98209783344,24481.463594470042 -11113.776532985701,24439.637788018434 -11113.570975866407,24422.38801843318 -11113.365426475126,24386.79385560676 -11113.159884811428,24343.7490015361 -11112.954350874874,24314.71766513057 -11112.748824665035,24270.78033794163 -11112.543306181473,24226.929032258064 -11112.337795423762,24210.717972350227 -11112.132292391467,24173.96221198157 -11111.926797084147,24127.41904761905 -11111.721309501376,24086.8623655914 -11111.51582964272,24052.819662058373 -11111.310357507742,24007.22488479263 -11111.104893096015,23978.518586789556 -11110.899436407102,23937.069431643624 -11110.69398744057,23899.32073732719 -11110.48854619599,23866.146850998462 -11110.283112672922,23825.924423963133 -11110.077686870938,23772.336098310294 -11109.872268789606,23744.446082949307 -11109.66685842849,23700.824270353303 -11109.461455787161,23664.30261136713 -11109.256060865184,23605.98617511521 -11109.050673662123,23567.78371735791 -11108.84529417755,23519.990476190476 -11108.63992241103,23482.546850998464 -11108.434558362133,23440.4777265745 -11108.229202030421,23395.72995391705 -11108.023853415469,23352.320737327187 -11107.818512516837,23301.611367127498 -11107.613179334096,23238.146543778807 -11107.407853866816,23187.311520737327 -11107.20253611456,23136.582795698923 -11106.997226076897,23094.012903225805 -11106.791923753395,23042.810752688172 -11106.586629143627,22982.24178187404 -11106.381342247152,22935.69677419355 -11106.17606306354,22877.125652841783 -11105.970791592361,22833.17757296467 -11105.765527833179,22774.91490015361 -11105.560271785567,22723.342242703533 -11105.35502344909,22676.00768049155 -11105.149782823313,22625.849462365593 -11104.94454990781,22568.53425499232 -11104.739324702148,22524.754531490013 -11104.534107205889,22470.708448540707 -11104.328897418609,22409.773886328723 -11104.123695339871,22340.58586789555 -11103.918500969243,22287.800307219662 -11103.7133143063,22235.65806451613 -11103.508135350598,22183.634715821812 -11103.302964101713,22136.050076804917 -11103.097800559211,22079.589247311826 -11102.892644722659,22030.722273425497 -11102.68749659163,21976.06451612903 -11102.482356165689,21925.1757296467 -11102.277223444404,21860.220583717357 -11102.072098427347,21797.601228878648 -11101.86698111408,21735.278648233485 -11101.661871504177,21669.325960061444 -11101.456769597204,21605.887250384025 -11101.25167539273,21537.3133640553 -11101.046588890322,21468.863901689707 -11100.841510089553,21406.59385560676 -11100.63643898999,21343.04915514593 -11100.431375591197,21285.82980030722 -11100.226319892747,21227.479877112135 -11100.021271894206,21169.571428571428 -11099.816231595145,21105.507219662057 -11099.61119899513,21048.31397849462 -11099.406174093734,20998.815053763443 -11099.201156890525,20949.363133640552 -11098.996147385067,20881.60460829493 -11098.791145576935,20814.03256528418 -11098.586151465694,20760.72258064516 -11098.381165050916,20693.347772657453 -11098.176186332168,20627.89861751152 -11097.971215309017,20562.247004608296 -11097.766251981036,20511.227342549922 -11097.561296347792,20441.706912442394 -11097.356348408854,20377.72596006144 -11097.15140816379,20314.96712749616 -11096.946475612174,20254.152995391705 -11096.741550753568,20193.33456221198 -11096.536633587546,20144.413824884792 -11096.331724113677,20077.50967741936 -11096.126822331531,20008.412288786483 -11095.921928240674,19947.427035330264 -11095.717041840675,19876.160061443934 -11095.512163131112,19804.747158218124 -11095.307292111545,19742.05407066052 -11095.102428781545,19680.705990783412 -11094.897573140684,19619.92165898617 -11094.692725188532,19553.37296466974 -11094.487884924658,19492.235330261137 -11094.283052348626,19420.636251920125 -11094.078227460015,19350.31182795699 -11093.873410258386,19277.65560675883 -11093.668600743315,19214.026420890936 -11093.463798914368,19148.83010752688 -11093.259004771118,19077.906605222735 -11093.054218313131,19008.508141321046 -11092.849439539978,18938.75207373272 -11092.644668451232,18875.631950844858 -11092.439905046458,18810.22549923195 -11092.235149325232,18742.97726574501 -11092.030401287118,18675.09585253456 -11091.825660931689,18619.70875576037 -11091.620928258511,18552.845468509982 -11091.41620326716,18476.046697388632 -11091.211485957203,18415.681720430108 -11091.006776328208,18351.75483870968 -11090.80207437975,18285.768356374807 -11090.597380111396,18222.803379416284 -11090.392693522715,18161.50015360983 -11090.188014613283,18094.434715821808 -11089.983343382662,18031.838402457757 -11089.77867983043,17980.873118279567 -11089.574023956155,17916.964362519204 -11089.369375759405,17851.590476190475 -11089.16473523975,17793.384024577572 -11088.960102396763,17731.770814132105 -11088.755477230014,17665.738556067587 -11088.55085973907,17520.424577572965 -11088.346249923507,17459.977880184335 -11088.141647782893,17435.752995391704 -11087.9370533168,17330.449462365592 -11087.732466524796,17303.65560675883 -11087.527887406453,17200.102918586792 -11087.323315961341,17137.39385560676 -11087.11875218903,17119.217204301076 -11086.914196089094,17019.40614439324 -11086.7096476611,17000.34746543779 -11086.505106904624,16892.53640552995 -11086.30057381923,16877.686328725038 -11086.096048404497,16832.635637480802 -11085.891530659987,16743.092473118282 -11085.687020585274,16697.56651305683 -11085.482518179933,16640.899231950847 -11085.27802344353,16601.66113671275 -11085.07353637564,16589.250384024577 -11084.869056975831,16498.01935483871 -11084.664585243674,16441.842089093705 -11084.460121178743,16443.15330261137 -11084.255664780607,16393.89400921659 -11084.05121604884,16308.20307219662 -11083.846774983007,16296.853456221197 -11083.642341582687,16274.386789554532 -11083.437915847444,16226.037788018433 -11083.233497776855,16156.294316436251 -11083.029087370489,16101.73241167435 -11082.824684627914,16029.325038402458 -11082.62028954871,15956.540399385562 -11082.415902132438,15896.660215053762 -11082.211522378679,15839.601228878648 -11082.007150286998,15779.243625192012 -11081.80278585697,15706.726267281105 -11081.598429088164,15646.545622119816 -11081.394079980157,15589.870353302613 -11081.189738532512,15530.167741935486 -11080.985404744806,15474.692165898616 -11080.78107861661,15419.292473118277 -11080.576760147496,15361.777265745006 -11080.372449337041,15306.882949308754 -11080.168146184806,15246.281105990784 -11079.963850690367,15194.35821812596 -11079.759562853296,15138.713056835637 -11079.55528267317,15083.790476190476 -11079.351010149554,15032.803993855608 -11079.146745282025,14971.027342549922 -11078.94248807015,14909.13456221198 -11078.738238513504,14853.784024577573 -11078.53399661166,14785.384639016896 -11078.32976236419,14732.271274961598 -11078.125535770665,14669.355145929341 -11077.921316830652,14611.881105990784 -11077.717105543732,14553.368970814132 -11077.512901909475,14498.884485407067 -11077.30870592745,14437.40122887865 -11077.104517597232,14386.752688172044 -11076.900336918388,14324.829185867897 -11076.6961638905,14276.689708141323 -11076.491998513131,14218.912442396313 -11076.287840785859,14165.363133640552 -11076.083690708254,14099.826420890939 -11075.879548279892,14046.362826420891 -11075.675413500341,13996.261751152075 -11075.471286369175,13935.55975422427 -11075.267166885968,13883.652841781874 -11075.063055050288,13827.098003072195 -11074.858950861715,13767.941935483872 -11074.654854319815,13715.851920122888 -11074.450765424166,13658.257450076804 -11074.246684174335,13605.813824884792 -11074.0426105699,13559.395391705068 -11073.838544610431,13502.741628264212 -11073.634486295503,13445.49062980031 -11073.430435624683,13397.154531490014 -11073.226392597553,13350.433486943166 -11073.022357213678,13300.770199692779 -11072.818329472635,13239.17726574501 -11072.614309373996,13200.020890937021 -11072.410296917333,13152.479877112137 -11072.206292102223,13092.494316436252 -11072.002294928232,13044.951459293396 -11071.798305394937,13004.251612903225 -11071.594323501917,12956.027035330262 -11071.390349248735,12899.447004608295 -11071.186382634969,12856.325038402458 -11070.982423660193,12790.753302611367 -11070.778472323978,12740.55821812596 -11070.574528625899,12694.003379416283 -11070.37059256553,12629.975422427036 -11070.166664142442,12595.487250384025 -11069.96274335621,12535.743164362519 -11069.758830206405,12492.46267281106 -11069.5549246926,12443.222734254992 -11069.351026814378,12390.796620583718 -11069.1471365713,12335.095852534561 -11068.943253962947,12279.6777265745 -11068.73937898889,12236.273732718893 -11068.535511648703,12190.829185867895 -11068.331651941962,12147.52534562212 -11068.127799868234,12092.882642089095 -11067.9239554271,12042.002150537633 -11067.72011861813,12000.626420890938 -11067.516289440899,11955.539170506912 -11067.31246789498,11911.956067588326 -11067.108653979947,11875.755453149002 -11066.904847695374,11817.003072196621 -11066.701049040837,11777.791090629802 -11066.497258015903,11729.952995391704 -11066.293474620155,11679.727496159754 -11066.089698853162,11632.814746543778 -11065.885930714501,11592.792933947772 -11065.68217020374,11555.847311827956 -11065.47841732046,11496.157603686635 -11065.27467206423,11453.51950844854 -11065.070934434627,11411.927188940092 -11064.867204431224,11361.943471582183 -11064.663482053596,11323.37910906298 -11064.459767301316,11278.171121351766 diff --git a/pxii_bec/macros/luts/20260704-1520_ge_edge.csv b/pxii_bec/macros/luts/20260704-1520_ge_edge.csv deleted file mode 100644 index 724c610..0000000 --- a/pxii_bec/macros/luts/20260704-1520_ge_edge.csv +++ /dev/null @@ -1,301 +0,0 @@ -Energy,bcu_bpmsum -11064.46,2897.81 -11064.66,2896.50 -11064.87,2894.71 -11065.07,2896.02 -11065.27,2900.33 -11065.48,2904.01 -11065.68,2912.61 -11065.89,2918.20 -11066.09,2909.84 -11066.29,2923.48 -11066.50,2922.04 -11066.70,2927.25 -11066.90,2941.69 -11067.11,2942.27 -11067.31,2956.41 -11067.52,2958.01 -11067.72,2973.48 -11067.92,2982.97 -11068.13,2986.73 -11068.33,3003.69 -11068.54,3008.42 -11068.74,3026.35 -11068.94,3030.74 -11069.15,3043.02 -11069.35,3052.27 -11069.55,3072.51 -11069.76,3084.80 -11069.96,3090.84 -11070.17,3101.38 -11070.37,3119.29 -11070.57,3124.13 -11070.78,3134.87 -11070.98,3147.15 -11071.19,3166.17 -11071.39,3184.50 -11071.59,3190.73 -11071.80,3201.91 -11072.00,3210.77 -11072.21,3221.14 -11072.41,3232.82 -11072.61,3240.12 -11072.82,3250.71 -11073.02,3260.58 -11073.23,3270.65 -11073.43,3281.65 -11073.63,3291.68 -11073.84,3301.08 -11074.04,3311.16 -11074.25,3320.93 -11074.45,3331.94 -11074.65,3342.25 -11074.86,3350.51 -11075.06,3358.85 -11075.27,3367.26 -11075.47,3377.53 -11075.68,3386.17 -11075.88,3394.92 -11076.08,3403.03 -11076.29,3411.25 -11076.49,3417.66 -11076.70,3426.54 -11076.90,3432.92 -11077.10,3440.91 -11077.31,3446.72 -11077.51,3453.68 -11077.72,3461.62 -11077.92,3467.82 -11078.13,3474.07 -11078.33,3479.91 -11078.53,3487.37 -11078.74,3494.45 -11078.94,3500.53 -11079.15,3505.75 -11079.35,3510.20 -11079.56,3515.00 -11079.76,3520.72 -11079.96,3525.45 -11080.17,3529.48 -11080.37,3532.28 -11080.58,3537.22 -11080.78,3541.03 -11080.99,3542.33 -11081.19,3546.71 -11081.39,3548.56 -11081.60,3549.09 -11081.80,3550.41 -11082.01,3547.99 -11082.21,3544.12 -11082.42,3538.71 -11082.62,3532.49 -11082.82,3526.98 -11083.03,3517.45 -11083.23,3510.66 -11083.44,3506.55 -11083.64,3504.35 -11083.85,3505.10 -11084.05,3505.04 -11084.26,3504.01 -11084.46,3503.11 -11084.66,3500.16 -11084.87,3496.80 -11085.07,3490.23 -11085.28,3482.80 -11085.48,3475.13 -11085.69,3465.94 -11085.89,3457.79 -11086.10,3449.43 -11086.30,3439.50 -11086.51,3432.11 -11086.71,3419.52 -11086.91,3405.64 -11087.12,3390.66 -11087.32,3375.07 -11087.53,3358.38 -11087.73,3342.76 -11087.94,3321.23 -11088.14,3299.54 -11088.35,3277.19 -11088.55,3254.78 -11088.76,3230.88 -11088.96,3204.79 -11089.16,3177.80 -11089.37,3145.85 -11089.57,3114.52 -11089.78,3078.40 -11089.98,3039.81 -11090.19,2998.05 -11090.39,2954.85 -11090.60,2908.30 -11090.80,2859.42 -11091.01,2809.61 -11091.21,2752.69 -11091.42,2692.73 -11091.62,2630.09 -11091.83,2563.42 -11092.03,2491.06 -11092.24,2413.64 -11092.44,2332.69 -11092.64,2247.11 -11092.85,2156.08 -11093.05,2060.02 -11093.26,1957.93 -11093.46,1849.54 -11093.67,1733.77 -11093.87,1614.56 -11094.08,1491.44 -11094.28,1357.39 -11094.49,1233.96 -11094.69,1104.59 -11094.90,977.21 -11095.10,856.60 -11095.31,737.75 -11095.51,624.13 -11095.72,518.62 -11095.92,423.13 -11096.13,340.15 -11096.33,265.78 -11096.54,203.49 -11096.74,151.53 -11096.95,111.34 -11097.15,78.72 -11097.36,54.76 -11097.56,36.50 -11097.77,24.18 -11097.97,15.86 -11098.18,10.17 -11098.38,6.81 -11098.59,4.61 -11098.79,3.60 -11099.00,2.97 -11099.20,2.51 -11099.41,2.40 -11099.61,2.19 -11099.82,2.07 -11100.02,1.91 -11100.23,1.78 -11100.43,1.62 -11100.64,1.54 -11100.84,1.51 -11101.05,1.36 -11101.25,1.26 -11101.46,1.25 -11101.66,1.17 -11101.87,1.12 -11102.07,1.27 -11102.28,1.23 -11102.48,1.23 -11102.69,1.23 -11102.89,1.14 -11103.10,1.11 -11103.30,1.00 -11103.51,1.13 -11103.71,1.08 -11103.92,0.94 -11104.12,0.88 -11104.33,0.81 -11104.53,0.78 -11104.74,0.69 -11104.94,0.75 -11105.15,0.75 -11105.36,0.68 -11105.56,0.59 -11105.77,0.66 -11105.97,0.72 -11106.18,0.64 -11106.38,0.69 -11106.59,0.59 -11106.79,0.65 -11107.00,0.66 -11107.20,0.60 -11107.41,0.57 -11107.61,0.59 -11107.82,0.57 -11108.02,0.63 -11108.23,0.55 -11108.43,0.48 -11108.64,0.57 -11108.85,0.51 -11109.05,0.60 -11109.26,0.64 -11109.46,0.68 -11109.67,0.76 -11109.87,0.84 -11110.08,0.90 -11110.28,1.03 -11110.49,1.10 -11110.69,1.21 -11110.90,1.36 -11111.10,1.41 -11111.31,1.43 -11111.52,1.39 -11111.72,1.52 -11111.93,1.49 -11112.13,1.62 -11112.34,1.45 -11112.54,1.69 -11112.75,1.74 -11112.95,1.73 -11113.16,1.80 -11113.37,1.82 -11113.57,1.79 -11113.78,1.80 -11113.98,1.71 -11114.19,1.67 -11114.39,1.60 -11114.60,1.53 -11114.80,1.57 -11115.01,1.43 -11115.22,1.48 -11115.42,1.55 -11115.63,1.45 -11115.83,1.49 -11116.04,1.41 -11116.24,1.52 -11116.45,1.50 -11116.66,1.41 -11116.86,1.42 -11117.07,1.41 -11117.27,1.49 -11117.48,1.46 -11117.68,1.46 -11117.89,1.38 -11118.10,1.43 -11118.30,1.42 -11118.51,1.43 -11118.71,1.36 -11118.92,1.34 -11119.12,1.36 -11119.33,1.33 -11119.54,1.29 -11119.74,1.27 -11119.95,1.25 -11120.15,1.30 -11120.36,1.30 -11120.56,1.28 -11120.77,1.29 -11120.98,1.20 -11121.18,1.22 -11121.39,1.28 -11121.59,1.17 -11121.80,1.18 -11122.01,1.18 -11122.21,1.16 -11122.42,1.15 -11122.62,1.14 -11122.83,1.25 -11123.03,1.28 -11123.24,1.36 -11123.45,1.42 -11123.65,1.37 -11123.86,1.21 -11124.06,1.44 -11124.27,1.48 -11124.48,1.36 -11124.68,1.12 -11124.89,1.16 -11125.09,1.25 -11125.30,1.31 -11125.51,1.28 -11125.71,1.31 diff --git a/pxii_bec/macros/luts/20260704-1531_ge_edge.csv b/pxii_bec/macros/luts/20260704-1531_ge_edge.csv deleted file mode 100644 index 67eafd2..0000000 --- a/pxii_bec/macros/luts/20260704-1531_ge_edge.csv +++ /dev/null @@ -1,301 +0,0 @@ -Energy,Bragg,bcu_bpmsum -11064.46,179.69,6338.84 -11064.66,179.69,6315.93 -11064.87,179.69,6314.91 -11065.07,179.68,6308.85 -11065.27,179.68,6286.39 -11065.48,179.68,6262.82 -11065.68,179.67,6242.13 -11065.89,179.67,6221.71 -11066.09,179.67,6204.17 -11066.29,179.66,6187.03 -11066.50,179.66,6171.42 -11066.70,179.66,6155.21 -11066.90,179.65,6140.00 -11067.11,179.65,6119.68 -11067.31,179.65,6101.24 -11067.52,179.64,6080.76 -11067.72,179.64,6064.97 -11067.92,179.64,6047.24 -11068.13,179.63,6026.49 -11068.33,179.63,6007.70 -11068.54,179.63,5988.31 -11068.74,179.62,5964.32 -11068.94,179.62,5941.86 -11069.15,179.62,5917.88 -11069.35,179.61,5889.14 -11069.55,179.61,5860.76 -11069.76,179.61,5828.84 -11069.96,179.60,5797.76 -11070.17,179.60,5768.76 -11070.37,179.60,5744.78 -11070.57,179.59,5721.05 -11070.78,179.59,5696.69 -11070.98,179.59,5681.88 -11071.19,179.58,5667.07 -11071.39,179.58,5652.59 -11071.59,179.58,5639.00 -11071.80,179.57,5627.42 -11072.00,179.57,5620.14 -11072.21,179.57,5610.42 -11072.41,179.56,5600.85 -11072.61,179.56,5590.35 -11072.82,179.56,5575.33 -11073.02,179.55,5560.40 -11073.23,179.55,5545.10 -11073.43,179.55,5528.90 -11073.63,179.54,5512.11 -11073.84,179.54,5496.70 -11074.04,179.54,5480.03 -11074.25,179.53,5464.12 -11074.45,179.53,5445.84 -11074.65,179.53,5427.15 -11074.86,179.52,5410.26 -11075.06,179.52,5392.25 -11075.27,179.52,5368.51 -11075.47,179.51,5349.75 -11075.68,179.51,5333.24 -11075.88,179.51,5312.39 -11076.08,179.50,5293.59 -11076.29,179.50,5272.28 -11076.49,179.50,5254.44 -11076.70,179.49,5233.09 -11076.90,179.49,5209.18 -11077.10,179.49,5188.50 -11077.31,179.48,5161.29 -11077.51,179.48,5142.19 -11077.72,179.48,5119.16 -11077.92,179.47,5099.02 -11078.13,179.47,5074.12 -11078.33,179.47,5049.41 -11078.53,179.46,5024.90 -11078.74,179.46,4998.89 -11078.94,179.46,4975.46 -11079.15,179.45,4951.22 -11079.35,179.45,4924.91 -11079.56,179.45,4895.95 -11079.76,179.44,4868.90 -11079.96,179.44,4840.06 -11080.17,179.44,4810.41 -11080.37,179.43,4779.62 -11080.58,179.43,4750.45 -11080.78,179.43,4714.91 -11080.99,179.42,4686.31 -11081.19,179.42,4652.54 -11081.39,179.42,4620.98 -11081.60,179.41,4591.66 -11081.80,179.41,4559.03 -11082.01,179.41,4526.56 -11082.21,179.40,4495.77 -11082.42,179.40,4463.20 -11082.62,179.40,4429.03 -11082.82,179.39,4394.22 -11083.03,179.39,4361.12 -11083.23,179.39,4326.11 -11083.44,179.38,4290.80 -11083.64,179.38,4257.57 -11083.85,179.38,4220.73 -11084.05,179.37,4183.46 -11084.26,179.37,4145.25 -11084.46,179.37,4110.61 -11084.66,179.36,4069.91 -11084.87,179.36,4029.76 -11085.07,179.36,3984.08 -11085.28,179.35,3943.96 -11085.48,179.35,3901.39 -11085.69,179.35,3858.28 -11085.89,179.34,3817.69 -11086.10,179.34,3775.01 -11086.30,179.34,3731.37 -11086.51,179.33,3690.29 -11086.71,179.33,3647.42 -11086.91,179.33,3603.98 -11087.12,179.32,3560.13 -11087.32,179.32,3514.08 -11087.53,179.32,3467.54 -11087.73,179.31,3417.80 -11087.94,179.31,3370.47 -11088.14,179.31,3321.76 -11088.35,179.30,3272.59 -11088.55,179.30,3220.68 -11088.76,179.30,3167.67 -11088.96,179.29,3113.14 -11089.16,179.29,3059.07 -11089.37,179.29,3002.97 -11089.57,179.28,2944.78 -11089.78,179.28,2886.59 -11089.98,179.28,2825.41 -11090.19,179.27,2764.63 -11090.39,179.27,2699.15 -11090.60,179.27,2636.67 -11090.80,179.26,2568.71 -11091.01,179.26,2500.84 -11091.21,179.26,2430.58 -11091.42,179.25,2356.01 -11091.62,179.25,2279.98 -11091.83,179.25,2200.14 -11092.03,179.24,2119.91 -11092.24,179.24,2039.42 -11092.44,179.24,1949.58 -11092.64,179.23,1863.21 -11092.85,179.23,1767.06 -11093.05,179.23,1675.31 -11093.26,179.22,1574.66 -11093.46,179.22,1473.24 -11093.67,179.22,1373.95 -11093.87,179.21,1267.36 -11094.08,179.21,1161.16 -11094.28,179.21,1055.16 -11094.49,179.20,944.31 -11094.69,179.20,839.72 -11094.90,179.20,733.85 -11095.10,179.19,634.54 -11095.31,179.19,537.95 -11095.51,179.19,447.37 -11095.72,179.18,366.14 -11095.92,179.18,292.72 -11096.13,179.18,229.37 -11096.33,179.17,175.79 -11096.54,179.17,130.77 -11096.74,179.17,94.72 -11096.95,179.16,66.02 -11097.15,179.16,45.88 -11097.36,179.16,30.84 -11097.56,179.15,20.47 -11097.77,179.15,13.23 -11097.97,179.15,9.07 -11098.18,179.14,6.11 -11098.38,179.14,4.50 -11098.59,179.14,3.44 -11098.79,179.13,2.70 -11099.00,179.13,2.18 -11099.20,179.13,2.00 -11099.41,179.12,1.83 -11099.61,179.12,1.76 -11099.82,179.12,1.58 -11100.02,179.11,1.49 -11100.23,179.11,1.50 -11100.43,179.11,1.28 -11100.64,179.10,1.23 -11100.84,179.10,0.93 -11101.05,179.10,0.90 -11101.25,179.09,0.75 -11101.46,179.09,0.72 -11101.66,179.09,0.71 -11101.87,179.08,0.69 -11102.07,179.08,0.61 -11102.28,179.08,0.58 -11102.48,179.07,0.80 -11102.69,179.07,0.77 -11102.89,179.07,0.74 -11103.10,179.06,0.64 -11103.30,179.06,0.61 -11103.51,179.06,0.67 -11103.71,179.05,0.61 -11103.92,179.05,0.57 -11104.12,179.05,0.60 -11104.33,179.04,0.51 -11104.53,179.04,0.44 -11104.74,179.04,0.50 -11104.94,179.03,0.48 -11105.15,179.03,0.49 -11105.36,179.03,0.48 -11105.56,179.02,0.46 -11105.77,179.02,0.54 -11105.97,179.02,0.48 -11106.18,179.01,0.51 -11106.38,179.01,0.53 -11106.59,179.01,0.50 -11106.79,179.00,0.52 -11107.00,179.00,0.58 -11107.20,179.00,0.50 -11107.41,178.99,0.40 -11107.61,178.99,0.54 -11107.82,178.99,0.59 -11108.02,178.98,0.61 -11108.23,178.98,0.52 -11108.43,178.98,0.49 -11108.64,178.97,0.33 -11108.85,178.97,0.41 -11109.05,178.97,0.40 -11109.26,178.96,0.37 -11109.46,178.96,0.38 -11109.67,178.96,0.36 -11109.87,178.95,0.38 -11110.08,178.95,0.45 -11110.28,178.95,0.52 -11110.49,178.94,0.54 -11110.69,178.94,0.66 -11110.90,178.94,0.48 -11111.10,178.93,0.40 -11111.31,178.93,0.19 -11111.52,178.93,0.37 -11111.72,178.92,0.14 -11111.93,178.92,0.47 -11112.13,178.92,0.63 -11112.34,178.91,0.57 -11112.54,178.91,0.65 -11112.75,178.91,0.50 -11112.95,178.90,0.65 -11113.16,178.90,0.67 -11113.37,178.90,0.81 -11113.57,178.89,0.74 -11113.78,178.89,0.95 -11113.98,178.89,0.98 -11114.19,178.88,0.80 -11114.39,178.88,0.46 -11114.60,178.88,0.51 -11114.80,178.87,0.45 -11115.01,178.87,0.48 -11115.22,178.87,0.51 -11115.42,178.86,0.48 -11115.63,178.86,0.44 -11115.83,178.85,0.18 -11116.04,178.85,-0.21 -11116.24,178.85,-0.17 -11116.45,178.84,-0.15 -11116.66,178.84,0.41 -11116.86,178.84,0.41 -11117.07,178.83,0.43 -11117.27,178.83,0.37 -11117.48,178.83,0.36 -11117.68,178.82,0.43 -11117.89,178.82,0.54 -11118.10,178.82,0.97 -11118.30,178.81,0.84 -11118.51,178.81,0.84 -11118.71,178.81,0.26 -11118.92,178.80,0.25 -11119.12,178.80,0.27 -11119.33,178.80,0.38 -11119.54,178.79,0.24 -11119.74,178.79,0.32 -11119.95,178.79,0.08 -11120.15,178.78,0.04 -11120.36,178.78,-0.23 -11120.56,178.78,-0.33 -11120.77,178.77,-0.14 -11120.98,178.77,0.12 -11121.18,178.77,0.10 -11121.39,178.76,0.12 -11121.59,178.76,0.10 -11121.80,178.76,0.05 -11122.01,178.75,0.15 -11122.21,178.75,0.26 -11122.42,178.75,0.57 -11122.62,178.74,0.59 -11122.83,178.74,0.50 -11123.03,178.74,0.04 -11123.24,178.73,0.02 -11123.45,178.73,0.03 -11123.65,178.73,0.06 -11123.86,178.72,0.10 -11124.06,178.72,0.07 -11124.27,178.72,0.06 -11124.48,178.71,0.02 -11124.68,178.71,-0.11 -11124.89,178.71,-0.15 -11125.09,178.70,-0.19 -11125.30,178.70,-0.43 -11125.51,178.70,-0.37 -11125.71,178.69,-0.41 diff --git a/pxii_bec/macros/luts/20260828_ge_edge.csv b/pxii_bec/macros/luts/20260828_ge_edge.csv deleted file mode 100644 index a77dc49..0000000 --- a/pxii_bec/macros/luts/20260828_ge_edge.csv +++ /dev/null @@ -1,101 +0,0 @@ -Energy,Bragg,bcu_bpmsum -11125.71,178.69,8.61 -11125.09,178.70,4.35 -11124.47,178.71,3.02 -11123.85,178.72,2.34 -11123.22,178.73,1.91 -11122.60,178.74,1.68 -11121.98,178.76,1.54 -11121.36,178.77,1.46 -11120.74,178.78,1.18 -11120.12,178.79,0.96 -11119.49,178.80,0.83 -11118.87,178.81,0.56 -11118.25,178.82,0.53 -11117.63,178.83,0.47 -11117.01,178.84,0.30 -11116.39,178.85,0.36 -11115.77,178.86,0.40 -11115.15,178.87,0.41 -11114.52,178.88,0.34 -11113.90,178.89,0.22 -11113.28,178.90,0.31 -11112.66,178.91,0.28 -11112.04,178.92,0.27 -11111.42,178.93,0.25 -11110.80,178.94,0.20 -11110.18,178.95,0.18 -11109.56,178.96,0.16 -11108.94,178.97,0.29 -11108.32,178.98,0.43 -11107.70,178.99,0.89 -11107.08,179.00,2.56 -11106.46,179.01,13.47 -11105.84,179.02,50.67 -11105.22,179.03,151.83 -11104.60,179.04,341.29 -11103.98,179.05,612.45 -11103.36,179.06,943.72 -11102.74,179.07,1288.62 -11102.12,179.08,1618.21 -11101.50,179.09,1929.28 -11100.88,179.10,2210.10 -11100.26,179.11,2469.30 -11099.64,179.12,2707.38 -11099.02,179.13,2927.46 -11098.40,179.14,3131.78 -11097.78,179.15,3325.73 -11097.17,179.16,3511.21 -11096.55,179.17,3693.46 -11095.93,179.18,3866.64 -11095.31,179.19,4032.72 -11094.69,179.20,4185.47 -11094.07,179.21,4338.38 -11093.45,179.22,4482.10 -11092.83,179.23,4625.46 -11092.22,179.24,4764.60 -11091.60,179.25,4895.34 -11090.98,179.26,5021.51 -11090.36,179.27,5147.06 -11089.74,179.28,5277.17 -11089.13,179.29,5405.57 -11088.51,179.30,5535.01 -11087.89,179.31,5660.25 -11087.27,179.32,5784.48 -11086.65,179.33,5908.97 -11086.04,179.34,6030.56 -11085.42,179.35,6149.84 -11084.80,179.36,6252.02 -11084.18,179.37,6352.90 -11083.57,179.38,6470.80 -11082.95,179.39,6574.31 -11082.33,179.40,6668.26 -11081.71,179.41,6780.97 -11081.10,179.42,6897.50 -11080.48,179.43,7008.82 -11079.86,179.44,7127.37 -11079.25,179.45,7211.71 -11078.63,179.46,7317.96 -11078.01,179.47,7408.69 -11077.40,179.48,7480.76 -11076.78,179.49,7589.85 -11076.16,179.50,7668.56 -11075.55,179.51,7754.67 -11074.93,179.52,7827.98 -11074.31,179.53,7895.88 -11073.70,179.54,7956.73 -11073.08,179.55,8017.89 -11072.46,179.56,8071.37 -11071.85,179.57,8128.70 -11071.23,179.58,8192.94 -11070.62,179.59,8258.81 -11070.00,179.60,8326.71 -11069.38,179.61,8385.86 -11068.77,179.62,8447.53 -11068.15,179.63,8507.91 -11067.54,179.64,8565.40 -11066.92,179.65,8610.29 -11066.31,179.66,8647.74 -11065.69,179.67,8681.90 -11065.08,179.68,8718.17 -11064.46,179.69,8744.09 diff --git a/pxii_bec/macros/luts/20260930_ge_edge.csv b/pxii_bec/macros/luts/20260930_ge_edge.csv deleted file mode 100644 index 12d1a16..0000000 --- a/pxii_bec/macros/luts/20260930_ge_edge.csv +++ /dev/null @@ -1,62 +0,0 @@ -Energy,Bragg,bcu_bpmsum -10953.10,181.54,470.19 -10957.97,181.46,438.23 -10962.84,181.38,400.62 -10967.71,181.30,356.31 -10972.59,181.22,306.11 -10977.48,181.13,260.07 -10982.37,181.05,220.42 -10987.26,180.97,183.83 -10992.16,180.89,149.68 -10997.06,180.81,118.61 -11001.97,180.73,92.83 -11006.88,180.64,71.99 -11011.79,180.56,55.37 -11016.71,180.48,42.38 -11021.64,180.40,32.61 -11026.57,180.32,25.78 -11031.50,180.24,20.77 -11036.44,180.16,17.35 -11041.38,180.07,14.84 -11046.33,179.99,12.82 -11051.28,179.91,11.37 -11056.23,179.83,10.35 -11061.19,179.75,9.51 -11066.16,179.67,8.88 -11071.13,179.59,8.40 -11076.10,179.50,7.76 -11081.08,179.42,7.14 -11086.06,179.34,6.48 -11091.05,179.26,5.77 -11096.04,179.18,4.60 -11101.04,179.10,2.02 -11106.04,179.01,-0.36 -11111.05,178.93,-0.44 -11116.06,178.85,-0.49 -11121.07,178.77,-0.56 -11126.09,178.69,-0.61 -11131.12,178.61,-0.59 -11136.15,178.53,-0.78 -11141.18,178.44,-0.69 -11146.22,178.36,-0.77 -11151.26,178.28,-0.95 -11156.31,178.20,-0.89 -11161.36,178.12,-0.93 -11166.42,178.04,-0.83 -11171.48,177.95,-0.80 -11176.54,177.87,-0.86 -11181.62,177.79,-0.84 -11186.69,177.71,-0.84 -11191.77,177.63,-0.81 -11196.86,177.55,-0.87 -11201.95,177.47,-0.81 -11207.04,177.38,-0.87 -11212.14,177.30,-0.85 -11217.24,177.22,-0.87 -11222.35,177.14,-0.89 -11227.46,177.06,-0.89 -11232.58,176.98,-0.98 -11237.70,176.89,-1.00 -11242.83,176.81,-0.91 -11247.96,176.73,-0.94 -11253.10,176.65,-0.93 diff --git a/pxii_bec/macros/luts/20260930_ge_edge_coarse.csv b/pxii_bec/macros/luts/20260930_ge_edge_coarse.csv deleted file mode 100644 index 39bbd62..0000000 --- a/pxii_bec/macros/luts/20260930_ge_edge_coarse.csv +++ /dev/null @@ -1,42 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,i1,transmission -11003.00,180.71,40337.50,5034.70,-3.155e-08,0.124814 -11007.91,180.63,37732.95,4708.18,-2.250e-08,0.124776 -11012.83,180.55,34281.68,4266.30,-3.557e-08,0.124448 -11017.75,180.46,30615.46,3784.28,-1.949e-08,0.123607 -11022.67,180.38,26805.50,3293.21,-2.652e-08,0.122856 -11027.60,180.30,22925.68,2777.94,-4.461e-08,0.121172 -11032.54,180.22,19156.72,2341.29,-3.356e-08,0.122218 -11037.47,180.14,15677.61,1953.26,-3.456e-08,0.124589 -11042.42,180.06,12596.19,1561.34,-2.853e-08,0.123954 -11047.36,179.98,9918.65,1227.28,-2.351e-08,0.123734 -11052.32,179.89,7733.56,966.71,-4.260e-08,0.125003 -11057.27,179.81,5977.05,749.14,-2.954e-08,0.125336 -11062.23,179.73,4610.51,573.09,-3.155e-08,0.124301 -11067.20,179.65,3555.33,435.38,-3.758e-08,0.122458 -11072.17,179.57,2781.84,332.98,-3.255e-08,0.119699 -11077.14,179.49,2220.76,256.63,-3.758e-08,0.115557 -11082.12,179.40,1810.15,200.61,-2.552e-08,0.110823 -11087.11,179.32,1511.84,158.34,-3.255e-08,0.104733 -11092.09,179.24,1291.08,122.44,-2.753e-08,0.094832 -11097.09,179.16,1134.07,85.85,4.825e-06,0.075699 -11102.08,179.08,1016.08,26.46,1.285e-06,0.026045 -11107.09,179.00,927.11,1.40,-3.959e-08,0.001512 -11112.09,178.92,851.57,0.96,-3.657e-08,0.001123 -11117.10,178.83,790.39,0.71,-3.657e-08,0.000900 -11122.12,178.75,741.22,0.76,-3.858e-08,0.001029 -11127.14,178.67,701.79,0.69,-3.858e-08,0.000981 -11132.16,178.59,669.60,0.61,-3.858e-08,0.000907 -11137.19,178.51,643.20,0.52,-4.763e-08,0.000803 -11142.23,178.43,621.27,0.48,-3.758e-08,0.000771 -11147.27,178.35,601.54,0.48,-3.959e-08,0.000794 -11152.31,178.26,585.43,0.35,-4.763e-08,0.000592 -11157.36,178.18,565.35,0.36,-3.255e-08,0.000640 -11162.41,178.10,548.24,0.40,-3.858e-08,0.000726 -11167.47,178.02,530.61,0.33,-2.250e-08,0.000621 -11172.53,177.94,516.14,0.36,-4.562e-08,0.000707 -11177.60,177.86,502.31,0.16,-3.054e-08,0.000326 -11182.67,177.77,481.54,0.28,-4.763e-08,0.000577 -11187.74,177.69,458.78,0.00,-2.853e-08,0.000007 -11192.82,177.61,442.42,0.07,-5.064e-08,0.000160 -11197.91,177.53,420.53,0.02,-2.753e-08,0.000050 -11203.00,177.45,401.79,-0.06,-3.255e-08,-0.000153 diff --git a/pxii_bec/macros/luts/20260930_ge_edge_fine.csv b/pxii_bec/macros/luts/20260930_ge_edge_fine.csv deleted file mode 100644 index 5af7022..0000000 --- a/pxii_bec/macros/luts/20260930_ge_edge_fine.csv +++ /dev/null @@ -1,62 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,transmission -11087.00,179.33,38560.26,4535.26,0.117615 -11087.50,179.32,38275.33,4463.22,0.116608 -11088.00,179.31,37999.53,4402.33,0.115852 -11088.50,179.30,37721.18,4343.98,0.115160 -11088.99,179.29,37433.34,4282.19,0.114395 -11089.49,179.28,37162.01,4224.25,0.113671 -11089.99,179.28,36904.09,4161.01,0.112752 -11090.49,179.27,36648.40,4089.77,0.111595 -11090.99,179.26,36323.22,4012.69,0.110472 -11091.49,179.25,36017.72,3929.25,0.109092 -11091.99,179.24,35694.92,3845.33,0.107728 -11092.49,179.24,35384.70,3760.69,0.106280 -11092.99,179.23,35063.40,3678.15,0.104900 -11093.49,179.22,34734.79,3590.19,0.103360 -11093.99,179.21,34414.03,3499.21,0.101680 -11094.48,179.20,34086.77,3403.19,0.099839 -11094.98,179.19,33768.33,3300.05,0.097726 -11095.48,179.19,33447.18,3189.84,0.095369 -11095.98,179.18,33094.10,3068.68,0.092726 -11096.48,179.17,32745.61,2944.15,0.089910 -11096.98,179.16,32377.90,2807.15,0.086699 -11097.48,179.15,31997.60,2661.17,0.083168 -11097.98,179.15,31669.44,2509.51,0.079241 -11098.48,179.14,31301.86,2342.72,0.074843 -11098.98,179.13,30946.58,2168.22,0.070063 -11099.48,179.12,30599.35,1976.57,0.064595 -11099.98,179.11,30238.94,1777.62,0.058786 -11100.48,179.11,29827.78,1551.64,0.052020 -11100.98,179.10,29476.59,1319.85,0.044776 -11101.48,179.09,29100.97,1068.57,0.036719 -11101.98,179.08,28749.53,815.70,0.028373 -11102.48,179.07,28376.86,577.46,0.020350 -11102.98,179.06,27983.70,363.72,0.012998 -11103.48,179.06,27609.67,201.28,0.007290 -11103.98,179.05,27256.50,93.88,0.003444 -11104.48,179.04,26875.74,37.45,0.001394 -11104.98,179.03,26496.50,13.07,0.000493 -11105.48,179.02,26113.35,5.24,0.000200 -11105.98,179.02,25731.34,2.71,0.000105 -11106.48,179.01,25355.73,2.30,0.000091 -11106.98,179.00,24961.87,1.74,0.000070 -11107.48,178.99,24564.77,1.50,0.000061 -11107.98,178.98,24188.86,1.34,0.000055 -11108.48,178.97,23802.97,1.42,0.000059 -11108.98,178.97,23424.93,1.32,0.000056 -11109.48,178.96,23028.96,1.20,0.000052 -11109.99,178.95,22653.38,1.05,0.000047 -11110.49,178.94,22255.46,0.98,0.000044 -11110.99,178.93,21872.37,0.91,0.000041 -11111.49,178.93,21461.83,0.86,0.000040 -11111.99,178.92,21102.15,0.76,0.000036 -11112.49,178.91,20718.33,0.72,0.000035 -11112.99,178.90,20363.01,0.66,0.000033 -11113.49,178.89,19982.21,0.64,0.000032 -11113.99,178.88,19623.79,0.57,0.000029 -11114.49,178.88,19255.10,0.56,0.000029 -11114.99,178.87,18913.77,0.49,0.000026 -11115.50,178.86,18561.76,0.54,0.000029 -11116.00,178.85,18178.33,0.53,0.000029 -11116.50,178.84,17847.83,0.44,0.000024 -11117.00,178.84,17486.73,0.48,0.000028 diff --git a/pxii_bec/macros/luts/20261007_ge_edge_coarse.csv b/pxii_bec/macros/luts/20261007_ge_edge_coarse.csv deleted file mode 100644 index 76646a8..0000000 --- a/pxii_bec/macros/luts/20261007_ge_edge_coarse.csv +++ /dev/null @@ -1,42 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,transmission -11003.00,180.71,39854.34,5135.60,0.128859 -11007.91,180.63,37192.26,4756.05,0.127877 -11012.83,180.55,34019.56,4326.89,0.127188 -11017.75,180.46,30427.58,3878.67,0.127472 -11022.67,180.38,26633.96,3368.52,0.126474 -11027.60,180.30,22820.00,2854.62,0.125093 -11032.54,180.22,19140.74,2436.85,0.127312 -11037.47,180.14,15684.96,1992.82,0.127053 -11042.42,180.06,12620.92,1595.40,0.126409 -11047.36,179.98,9966.27,1272.07,0.127637 -11052.32,179.89,7781.57,998.18,0.128274 -11057.27,179.81,6015.60,772.56,0.128426 -11062.23,179.73,4630.19,586.27,0.126618 -11067.20,179.65,3571.05,441.95,0.123758 -11072.17,179.57,2779.62,332.68,0.119686 -11077.14,179.49,2211.73,253.72,0.114715 -11082.12,179.40,1796.12,194.46,0.108265 -11087.11,179.32,1494.90,146.82,0.098212 -11092.09,179.24,1287.16,101.68,0.078999 -11097.09,179.16,1118.17,35.77,0.031992 -11102.08,179.08,989.75,1.87,0.001892 -11107.09,179.00,896.34,1.43,0.001593 -11112.09,178.92,821.20,1.06,0.001293 -11117.10,178.83,761.17,0.86,0.001135 -11122.12,178.75,714.76,0.70,0.000980 -11127.14,178.67,679.67,0.61,0.000890 -11132.16,178.59,648.22,0.58,0.000899 -11137.19,178.51,615.42,0.41,0.000660 -11142.23,178.43,595.71,0.35,0.000590 -11147.27,178.35,585.79,0.36,0.000606 -11152.31,178.26,561.83,0.28,0.000495 -11157.36,178.18,541.53,0.31,0.000567 -11162.41,178.10,526.27,0.23,0.000435 -11167.47,178.02,506.37,0.19,0.000376 -11172.53,177.94,485.59,0.12,0.000238 -11177.60,177.86,470.40,0.16,0.000341 -11182.67,177.77,449.74,0.08,0.000184 -11187.74,177.69,430.29,0.03,0.000063 -11192.82,177.61,407.55,0.07,0.000167 -11197.91,177.53,388.94,0.07,0.000178 -11203.00,177.45,373.55,0.10,0.000264 diff --git a/pxii_bec/macros/luts/20261007_ge_edge_fine.csv b/pxii_bec/macros/luts/20261007_ge_edge_fine.csv deleted file mode 100644 index f988fb1..0000000 --- a/pxii_bec/macros/luts/20261007_ge_edge_fine.csv +++ /dev/null @@ -1,62 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,transmission -11087.00,179.33,40803.39,4923.21,0.120657 -11087.50,179.32,40632.73,4872.86,0.119925 -11088.00,179.31,40434.30,4822.80,0.119275 -11088.50,179.30,40234.38,4773.51,0.118643 -11088.99,179.29,40033.04,4719.28,0.117885 -11089.49,179.28,39790.80,4665.41,0.117248 -11089.99,179.28,39643.25,4613.48,0.116375 -11090.49,179.27,39445.42,4562.87,0.115676 -11090.99,179.26,39261.94,4506.05,0.114769 -11091.49,179.25,39036.39,4442.76,0.113811 -11091.99,179.24,38813.22,4370.94,0.112615 -11092.49,179.24,38567.29,4298.37,0.111451 -11092.99,179.23,38327.95,4226.19,0.110264 -11093.49,179.22,38047.01,4148.71,0.109042 -11093.99,179.21,37755.27,4065.48,0.107680 -11094.48,179.20,37502.19,3971.56,0.105902 -11094.98,179.19,37253.79,3865.72,0.103767 -11095.48,179.19,36959.52,3760.99,0.101760 -11095.98,179.18,36698.11,3647.32,0.099387 -11096.48,179.17,36424.81,3528.30,0.096865 -11096.98,179.16,36123.06,3406.20,0.094294 -11097.48,179.15,35824.28,3277.61,0.091491 -11097.98,179.15,35526.06,3140.40,0.088397 -11098.48,179.14,35257.47,2991.72,0.084853 -11098.98,179.13,34954.34,2834.08,0.081080 -11099.48,179.12,34632.96,2655.23,0.076668 -11099.98,179.11,34339.50,2471.89,0.071984 -11100.48,179.11,34007.19,2259.99,0.066456 -11100.98,179.10,33662.66,2033.69,0.060414 -11101.48,179.09,33330.11,1786.32,0.053595 -11101.98,179.08,32997.13,1524.36,0.046197 -11102.48,179.07,32674.09,1240.42,0.037963 -11102.98,179.06,32266.53,951.76,0.029497 -11103.48,179.06,31933.44,679.88,0.021291 -11103.98,179.05,31636.60,435.79,0.013775 -11104.48,179.04,31369.22,249.95,0.007968 -11104.98,179.03,31027.85,120.78,0.003893 -11105.48,179.02,30634.91,50.59,0.001651 -11105.98,179.02,30266.85,18.11,0.000598 -11106.48,179.01,30028.47,6.72,0.000224 -11106.98,179.00,29680.09,3.60,0.000121 -11107.48,178.99,29252.87,2.66,0.000091 -11107.98,178.98,28968.99,2.14,0.000074 -11108.48,178.97,28606.73,1.86,0.000065 -11108.98,178.97,28298.05,1.75,0.000062 -11109.48,178.96,27894.51,1.59,0.000057 -11109.99,178.95,27513.24,1.50,0.000055 -11110.49,178.94,27192.70,1.41,0.000052 -11110.99,178.93,26814.59,1.44,0.000054 -11111.49,178.93,26416.19,1.27,0.000048 -11111.99,178.92,26059.44,1.25,0.000048 -11112.49,178.91,25677.19,1.18,0.000046 -11112.99,178.90,25304.06,1.06,0.000042 -11113.49,178.89,24924.72,1.02,0.000041 -11113.99,178.88,24519.39,0.98,0.000040 -11114.49,178.88,24145.24,0.89,0.000037 -11114.99,178.87,23793.34,0.87,0.000037 -11115.50,178.86,23402.14,0.86,0.000037 -11116.00,178.85,23018.34,0.82,0.000035 -11116.50,178.84,22650.08,0.75,0.000033 -11117.00,178.84,22289.77,0.75,0.000034 diff --git a/pxii_bec/macros/luts/20261011_ge_edge_medium.csv b/pxii_bec/macros/luts/20261011_ge_edge_medium.csv deleted file mode 100644 index 3c2f222..0000000 --- a/pxii_bec/macros/luts/20261011_ge_edge_medium.csv +++ /dev/null @@ -1,42 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,transmission -11063.00,179.72,41623.66,5536.06,0.133003 -11064.99,179.69,41032.06,5438.49,0.132542 -11066.97,179.65,40347.29,5330.93,0.132126 -11068.96,179.62,39509.59,5209.13,0.131845 -11070.95,179.59,38586.20,5066.84,0.131312 -11072.94,179.56,37583.59,4918.55,0.130870 -11074.93,179.52,36431.57,4748.50,0.130340 -11076.92,179.49,35194.73,4559.41,0.129548 -11078.91,179.46,34009.67,4379.38,0.128769 -11080.90,179.42,32659.75,4160.74,0.127396 -11082.89,179.39,31263.11,3941.04,0.126061 -11084.88,179.36,29835.56,3709.27,0.124324 -11086.88,179.33,28378.22,3472.39,0.122361 -11088.87,179.29,26821.81,3213.89,0.119824 -11090.87,179.26,25347.66,2946.04,0.116225 -11092.86,179.23,23851.62,2660.02,0.111524 -11094.86,179.20,22343.16,2344.90,0.104949 -11096.86,179.16,20904.96,2001.88,0.095761 -11098.86,179.13,19466.62,1602.34,0.082312 -11100.85,179.10,18046.81,1109.74,0.061492 -11102.85,179.07,16677.32,503.70,0.030202 -11104.85,179.03,15405.53,64.00,0.004154 -11106.85,179.00,14160.19,4.63,0.000327 -11108.86,178.97,12967.10,3.32,0.000256 -11110.86,178.94,11840.61,2.65,0.000224 -11112.86,178.90,10772.04,2.25,0.000209 -11114.87,178.87,9778.05,1.91,0.000195 -11116.87,178.84,8896.02,1.72,0.000193 -11118.88,178.81,8040.33,1.58,0.000196 -11120.88,178.77,7246.21,1.48,0.000205 -11122.89,178.74,6527.67,1.31,0.000200 -11124.90,178.71,5895.60,1.21,0.000205 -11126.91,178.68,5300.24,1.12,0.000211 -11128.92,178.64,4771.84,1.00,0.000209 -11130.93,178.61,4293.77,0.96,0.000225 -11132.94,178.58,3877.26,0.88,0.000227 -11134.95,178.54,3486.78,1.04,0.000298 -11136.96,178.51,3154.25,0.93,0.000296 -11138.97,178.48,2852.14,0.87,0.000306 -11140.99,178.45,2595.68,0.83,0.000321 -11143.00,178.41,2371.33,0.67,0.000284 diff --git a/pxii_bec/macros/luts/20261014_ge_edge_medium.csv b/pxii_bec/macros/luts/20261014_ge_edge_medium.csv deleted file mode 100644 index f1682c0..0000000 --- a/pxii_bec/macros/luts/20261014_ge_edge_medium.csv +++ /dev/null @@ -1,42 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,transmission -11063.00,179.72,41667.03,5562.96,0.133510 -11064.99,179.69,41240.92,5482.80,0.132946 -11066.97,179.65,40665.57,5398.81,0.132761 -11068.96,179.62,40004.77,5296.21,0.132390 -11070.95,179.59,39198.19,5173.20,0.131975 -11072.94,179.56,38308.99,5046.00,0.131718 -11074.93,179.52,37308.79,4891.96,0.131121 -11076.92,179.49,36198.94,4717.20,0.130313 -11078.91,179.46,35098.92,4545.17,0.129496 -11080.90,179.42,33826.54,4338.63,0.128261 -11082.89,179.39,32524.71,4129.39,0.126962 -11084.88,179.36,31194.30,3903.90,0.125148 -11086.88,179.33,29761.99,3672.08,0.123381 -11088.87,179.29,28270.14,3419.86,0.120971 -11090.87,179.26,26795.87,3144.07,0.117334 -11092.86,179.23,25330.33,2849.29,0.112485 -11094.86,179.20,23815.25,2525.76,0.106057 -11096.86,179.16,22366.92,2167.55,0.096909 -11098.86,179.13,20882.63,1743.30,0.083481 -11100.85,179.10,19439.42,1212.69,0.062383 -11102.85,179.07,18039.23,555.41,0.030789 -11104.85,179.03,16717.41,70.81,0.004235 -11106.85,179.00,15439.94,3.98,0.000258 -11108.86,178.97,14174.59,2.53,0.000178 -11110.86,178.94,12986.81,2.03,0.000156 -11112.86,178.90,11820.02,1.62,0.000137 -11114.87,178.87,10770.63,1.37,0.000127 -11116.87,178.84,9786.64,1.23,0.000125 -11118.88,178.81,8871.50,1.20,0.000136 -11120.88,178.77,8014.78,1.10,0.000138 -11122.89,178.74,7217.88,0.99,0.000137 -11124.90,178.71,6508.82,0.77,0.000119 -11126.91,178.68,5862.46,0.69,0.000118 -11128.92,178.64,5274.38,0.64,0.000121 -11130.93,178.61,4750.03,0.55,0.000117 -11132.94,178.58,4265.10,0.37,0.000087 -11134.95,178.54,3846.43,0.35,0.000091 -11136.96,178.51,3456.73,0.28,0.000080 -11138.97,178.48,3116.88,0.37,0.000118 -11140.99,178.45,2832.64,0.18,0.000063 -11143.00,178.41,2559.37,0.18,0.000071 diff --git a/pxii_bec/macros/luts/20261017_ge_edge_medium.csv b/pxii_bec/macros/luts/20261017_ge_edge_medium.csv deleted file mode 100644 index c84429e..0000000 --- a/pxii_bec/macros/luts/20261017_ge_edge_medium.csv +++ /dev/null @@ -1,42 +0,0 @@ -Energy,Bragg,ss_bpmsum,bcu_bpmsum,transmission -11063.00,179.72,42766.45,5706.97,0.133445 -11064.99,179.69,42362.26,5654.93,0.133490 -11066.97,179.65,41803.16,5542.14,0.132577 -11068.96,179.62,41174.13,5428.07,0.131832 -11070.95,179.59,40377.74,5311.25,0.131539 -11072.94,179.56,39491.34,5188.41,0.131381 -11074.93,179.52,38488.72,5029.04,0.130663 -11076.92,179.49,37359.12,4863.41,0.130180 -11078.91,179.46,36273.09,4688.13,0.129245 -11080.90,179.42,35001.62,4488.06,0.128224 -11082.89,179.39,33697.03,4280.96,0.127043 -11084.88,179.36,32311.73,4058.17,0.125594 -11086.88,179.33,30905.01,3822.69,0.123691 -11088.87,179.29,29361.59,3553.22,0.121016 -11090.87,179.26,27887.20,3273.82,0.117395 -11092.86,179.23,26398.36,2972.25,0.112592 -11094.86,179.20,24844.98,2630.87,0.105891 -11096.86,179.16,23367.16,2246.50,0.096139 -11098.86,179.13,21824.37,1790.48,0.082041 -11100.85,179.10,20348.11,1220.85,0.059998 -11102.85,179.07,18918.98,519.55,0.027462 -11104.85,179.03,17522.10,54.03,0.003083 -11106.85,179.00,16196.63,3.72,0.000230 -11108.86,178.97,14868.96,2.51,0.000169 -11110.86,178.94,13647.45,1.93,0.000142 -11112.86,178.90,12456.36,1.56,0.000125 -11114.87,178.87,11361.93,1.55,0.000137 -11116.87,178.84,10313.20,1.33,0.000129 -11118.88,178.81,9359.12,1.24,0.000133 -11120.88,178.77,8462.53,1.27,0.000150 -11122.89,178.74,7636.72,1.05,0.000138 -11124.90,178.71,6880.61,0.96,0.000140 -11126.91,178.68,6203.29,0.83,0.000134 -11128.92,178.64,5572.87,0.78,0.000141 -11130.93,178.61,5016.50,0.64,0.000127 -11132.94,178.58,4503.12,0.62,0.000138 -11134.95,178.54,4049.98,0.54,0.000133 -11136.96,178.51,3653.15,0.48,0.000130 -11138.97,178.48,3302.12,0.44,0.000133 -11140.99,178.45,2969.27,0.38,0.000128 -11143.00,178.41,2685.31,0.35,0.000130 diff --git a/pxii_bec/macros/luts/27061952_vfm_pitch_energy.csv b/pxii_bec/macros/luts/27061952_vfm_pitch_energy.csv deleted file mode 100644 index 37b4f12..0000000 --- a/pxii_bec/macros/luts/27061952_vfm_pitch_energy.csv +++ /dev/null @@ -1,96 +0,0 @@ -energy,pitch,diode -10.00,2.79003,2.5101e-05 -10.00,2.86503,2.7481e-05 -10.00,2.94003,2.7441e-05 -10.00,3.01503,2.7531e-05 -10.00,3.09003,2.7429e-05 -11.00,2.79003,6.7964e-05 -11.00,2.86503,7.9833e-05 -11.00,2.94003,7.9545e-05 -11.00,3.01503,7.9683e-05 -11.00,3.09003,7.9548e-05 -12.00,2.79003,6.4495e-05 -12.00,2.86503,7.3507e-05 -12.00,2.94003,7.3534e-05 -12.00,3.01503,7.3641e-05 -12.00,3.09003,7.292e-05 -13.00,2.79003,5.1657e-05 -13.00,2.86503,5.6129e-05 -13.00,2.94003,5.5938e-05 -13.00,3.01503,5.5935e-05 -13.00,3.09003,5.5824e-05 -14.00,2.79003,5.0019e-05 -14.00,2.86503,5.4959e-05 -14.00,2.94003,5.4717e-05 -14.00,3.01503,5.4711e-05 -14.00,3.09003,5.4572e-05 -15.00,2.79003,3.8514e-05 -15.00,2.86503,4.2182e-05 -15.00,2.94003,4.2072e-05 -15.00,3.01503,4.2056e-05 -15.00,3.09003,4.1897e-05 -16.00,2.79003,2.6391e-05 -16.00,2.86503,2.8237e-05 -16.00,2.94003,2.8187e-05 -16.00,3.01503,2.8078e-05 -16.00,3.09003,2.7934e-05 -17.00,2.79003,1.9654e-05 -17.00,2.86503,2.0669e-05 -17.00,2.94003,2.0592e-05 -17.00,3.01503,2.0495e-05 -17.00,3.09003,2.0409e-05 -18.00,2.79003,1.6418e-05 -18.00,2.86503,1.7321e-05 -18.00,2.94003,1.7276e-05 -18.00,3.01503,1.7201e-05 -18.00,3.09003,1.7058e-05 -19.00,2.79003,1.1114e-05 -19.00,2.86503,1.1688e-05 -19.00,2.94003,1.1616e-05 -19.00,3.01503,1.1486e-05 -19.00,3.09003,1.1229e-05 -20.00,2.79003,1.0067e-05 -20.00,2.86503,1.0474e-05 -20.00,2.94003,1.0233e-05 -20.00,3.01503,9.7442e-06 -20.00,3.09003,8.7702e-06 -21.00,2.79003,6.6035e-06 -21.00,2.86503,6.4392e-06 -21.00,2.94003,5.6891e-06 -21.00,3.01503,4.6277e-06 -21.00,3.09003,3.4547e-06 -22.00,2.79003,3.4235e-06 -22.00,2.86503,2.8148e-06 -22.00,2.94003,2.0854e-06 -22.00,3.01503,1.413e-06 -22.00,3.09003,1.0058e-06 -23.00,2.79003,1.3978e-06 -23.00,2.86503,9.5583e-07 -23.00,2.94003,6.9829e-07 -23.00,3.01503,5.3073e-07 -23.00,3.09003,4.8376e-07 -24.00,2.79003,5.5859e-07 -24.00,2.86503,4.3102e-07 -24.00,2.94003,3.3977e-07 -24.00,3.01503,2.7979e-07 -24.00,3.09003,2.2912e-07 -25.00,2.79003,2.3919e-07 -25.00,2.86503,1.9166e-07 -25.00,2.94003,1.5672e-07 -25.00,3.01503,1.2674e-07 -25.00,3.09003,9.9158e-08 -26.00,2.79003,1.7634e-07 -26.00,2.86503,1.4523e-07 -26.00,2.94003,1.1948e-07 -26.00,3.01503,9.6605e-08 -26.00,3.09003,8.3358e-08 -27.00,2.79003,7.4085e-08 -27.00,2.86503,6.2851e-08 -27.00,2.94003,5.1639e-08 -27.00,3.01503,4.5493e-08 -27.00,3.09003,4.1044e-08 -28.00,2.79003,4.757e-08 -28.00,2.86503,4.0306e-08 -28.00,2.94003,3.6045e-08 -28.00,3.01503,3.1936e-08 -28.00,3.09003,2.5395e-08 diff --git a/pxii_bec/macros/luts/27062057_vfm_pitch_energy.csv b/pxii_bec/macros/luts/27062057_vfm_pitch_energy.csv deleted file mode 100644 index 6849861..0000000 --- a/pxii_bec/macros/luts/27062057_vfm_pitch_energy.csv +++ /dev/null @@ -1,51 +0,0 @@ -energy,pitch,diode -17.00,2.49006,6.9998e-08 -17.00,2.54006,8.0892e-08 -17.00,2.59006,9.3759e-08 -17.00,2.64006,1.1324e-07 -17.00,2.69006,1.4562e-07 -18.00,2.49006,6.122e-08 -18.00,2.54006,7.1592e-08 -18.00,2.59006,8.4016e-08 -18.00,2.64006,1.0291e-07 -18.00,2.69006,1.3362e-07 -19.00,2.49006,3.8423e-08 -19.00,2.54006,4.5515e-08 -19.00,2.59006,5.3896e-08 -19.00,2.64006,6.6516e-08 -19.00,2.69006,8.8274e-08 -20.00,2.49006,2.9234e-08 -20.00,2.54006,3.5421e-08 -20.00,2.59006,4.3305e-08 -20.00,2.64006,5.5004e-08 -20.00,2.69006,7.3772e-08 -21.00,2.49006,1.7361e-08 -21.00,2.54006,2.0553e-08 -21.00,2.59006,2.5132e-08 -21.00,2.64006,3.2485e-08 -21.00,2.69006,4.5865e-08 -22.00,2.49006,1.0198e-08 -22.00,2.54006,1.1792e-08 -22.00,2.59006,1.4037e-08 -22.00,2.64006,1.7411e-08 -22.00,2.69006,2.4266e-08 -23.00,2.49006,7.7011e-09 -23.00,2.54006,8.4929e-09 -23.00,2.59006,9.5513e-09 -23.00,2.64006,1.1054e-08 -23.00,2.69006,1.4002e-08 -24.00,2.49006,5.3858e-09 -24.00,2.54006,5.698e-09 -24.00,2.59006,6.161e-09 -24.00,2.64006,6.804e-09 -24.00,2.69006,8.1435e-09 -25.00,2.49006,4.2137e-09 -25.00,2.54006,4.3605e-09 -25.00,2.59006,4.5837e-09 -25.00,2.64006,4.8794e-09 -25.00,2.69006,5.3341e-09 -26.00,2.49006,4.1207e-09 -26.00,2.54006,4.2034e-09 -26.00,2.59006,4.3481e-09 -26.00,2.64006,4.4824e-09 -26.00,2.69006,4.9786e-09 diff --git a/pxii_bec/macros/luts/27062107_vfm_pitch_energy.csv b/pxii_bec/macros/luts/27062107_vfm_pitch_energy.csv deleted file mode 100644 index f5c08e6..0000000 --- a/pxii_bec/macros/luts/27062107_vfm_pitch_energy.csv +++ /dev/null @@ -1,46 +0,0 @@ -energy,pitch,diode -17.00,2.69000,1.5377e-07 -17.00,2.74000,5.5058e-07 -17.00,2.79000,2.8742e-05 -17.00,2.84000,2.992e-05 -17.00,2.89000,2.9921e-05 -18.00,2.69000,1.3257e-07 -18.00,2.74000,6.2784e-07 -18.00,2.79000,2.3012e-05 -18.00,2.84000,2.4082e-05 -18.00,2.89000,2.3995e-05 -19.00,2.69000,8.7067e-08 -19.00,2.74000,5.28e-07 -19.00,2.79000,1.4786e-05 -19.00,2.84000,1.5433e-05 -19.00,2.89000,1.5369e-05 -20.00,2.69000,7.5571e-08 -20.00,2.74000,5.949e-07 -20.00,2.79000,1.3098e-05 -20.00,2.84000,1.3572e-05 -20.00,2.89000,1.3423e-05 -21.00,2.69000,4.5569e-08 -21.00,2.74000,4.6722e-07 -21.00,2.79000,8.2723e-06 -21.00,2.84000,8.1305e-06 -21.00,2.89000,7.7839e-06 -22.00,2.69000,2.4394e-08 -22.00,2.74000,3.137e-07 -22.00,2.79000,4.103e-06 -22.00,2.84000,3.6481e-06 -22.00,2.89000,3.0803e-06 -23.00,2.69000,1.4056e-08 -23.00,2.74000,2.2905e-07 -23.00,2.79000,1.6164e-06 -23.00,2.84000,1.2537e-06 -23.00,2.89000,9.8993e-07 -24.00,2.69000,8.1539e-09 -24.00,2.74000,8.9029e-08 -24.00,2.79000,6.3203e-07 -24.00,2.84000,5.3339e-07 -24.00,2.89000,4.4881e-07 -25.00,2.69000,5.483e-09 -25.00,2.74000,4.3057e-08 -25.00,2.79000,2.6918e-07 -25.00,2.84000,2.318e-07 -25.00,2.89000,2.0125e-07 diff --git a/pxii_bec/macros/luts/27062148_lut.csv b/pxii_bec/macros/luts/27062148_lut.csv deleted file mode 100644 index 21e7b3f..0000000 --- a/pxii_bec/macros/luts/27062148_lut.csv +++ /dev/null @@ -1,5 +0,0 @@ -energy,harmonic,gap,pitch,roll,perp,samcam_x,samcam_y,zoom=501.0 -6000,H3,5.9369,-5.5214,4.651,0.178,1091,483.8 -6300,H3,6.2143,-5.5161,4.648,0.15925,1091,484.7 -6600,H3,6.5006,-5.513,4.651,0.14414,1089,482.2 -6900,H3,6.8005,-5.5102,4.65,0.1312,1089,482.3 diff --git a/pxii_bec/macros/luts/27062203_lut.csv b/pxii_bec/macros/luts/27062203_lut.csv deleted file mode 100644 index 4d82a61..0000000 --- a/pxii_bec/macros/luts/27062203_lut.csv +++ /dev/null @@ -1,78 +0,0 @@ -energy,harmonic,gap,pitch,roll,perp,samcam_x,samcam_y,zoom=501.0 -7000,H3,6.9059,-5.5096,4.651,0.12717,1089,480.7 -7300,H5,4.551,-5.5071,4.649,0.11594,1088,479.5 -7600,H5,4.697,-5.5057,4.647,0.10671,1087,478.8 -7900,H5,4.8454,-5.5028,4.65,0.09833,1084,478.9 -8200,H5,4.9952,-5.5026,4.649,0.09104,1085,481.3 -8500,H5,5.1461,-5.5018,4.648,0.084215,1086,481.8 -8800,H5,5.2989,-5.5,4.649,0.07845,1086,480.4 -9100,H5,5.4534,-5.5001,4.649,0.0732,1089,479.5 -9400,H5,5.6102,-5.4982,4.651,0.068385,1086,478.2 -9700,H5,5.7706,-5.497,4.651,0.064125,1086,477.8 -10000,H5,5.9309,-5.4964,4.651,0.06021,1085,475.8 -10300,H7,4.5766,-5.4954,4.651,0.056655,1086,474.8 -10600,H7,4.6797,-5.4945,4.651,0.0534,1085,474.5 -10900,H7,4.7853,-5.4938,4.651,0.050445,1085,473.1 -11200,H7,4.8916,-5.4933,4.651,0.04773,1084,472.4 -11500,H7,4.9984,-5.4927,4.651,0.04519,1084,471.9 -11800,H7,5.106,-5.4923,4.648,0.042885,1084,471.5 -12100,H7,5.2144,-5.4917,4.65,0.04069,1084,471.1 -12400,H7,5.3238,-5.491,4.65,0.03866,1083,469.9 -12700,H7,5.434,-5.4907,4.65,0.0369,1084,470 -13000,H7,5.5453,-5.4902,4.65,0.035145,1083,469 -13300,H9,4.5975,-5.4899,4.651,0.033575,1083,470.3 -13600,H9,4.6739,-5.4896,4.65,0.03209,1083,468.8 -13900,H9,4.7564,-5.4892,4.648,0.03027,1083,468.6 -14200,H9,4.8387,-5.4888,4.646,0.0302,1083,467.8 -14500,H9,4.9214,-5.4885,4.651,0.02818,1083,467.8 -14800,H9,5.0041,-5.4885,4.649,0.02704,1085,467.4 -15100,H9,5.0875,-5.488,4.651,0.02703,1084,466.9 -15400,H9,5.1711,-5.4876,4.649,0.024565,1083,466.7 -15700,H9,5.2554,-5.487,4.65,0.024555,1083,466.5 -16000,H9,5.3397,-5.4871,4.648,0.023035,1083,466.1 -16300,H11,4.6154,-5.4868,4.648,0.023025,1083,467.3 -16600,H11,4.6825,-5.4866,4.649,0.021305,1083,467.6 -16900,H11,4.7494,-5.4858,4.649,0.02127,1082,466.9 -17200,H11,4.8184,-5.4858,4.649,0.01983,1083,468.4 -17500,H11,4.8873,-5.4856,4.648,0.01976,1082,467.8 -17800,H11,4.9557,-5.4854,4.65,0.018535,1082,467.9 -18100,H11,5.0243,-5.4853,4.65,0.01849,1083,467.2 -18400,H11,5.0929,-5.4846,4.649,0.017295,1083,466.8 -18700,H11,5.1629,-5.4847,4.648,0.017285,1083,466.9 -19000,H11,5.2347,-5.4846,4.65,0.017285,1083,466.1 -19300,H13,4.6243,-5.4842,4.65,0.015695,1082,465.7 -19600,H13,4.6808,-5.484,4.651,0.01564,1082,465.4 -19900,H13,4.7387,-5.4838,4.649,0.015625,1082,465 -20200,H13,4.7961,-5.4836,4.648,0.0144,1083,464.9 -20500,H13,4.8537,-5.4833,4.649,0.01437,1083,464.2 -20800,H13,4.9126,-5.4829,4.648,0.01436,1083,463.6 -21100,H13,4.971,-5.4833,4.649,0.01317,1082,464.1 -21400,H13,5.0299,-5.4823,4.651,0.01313,1082,464.2 -21700,H13,5.0894,-5.4829,4.649,0.013145,1081,463.8 -22000,H13,5.1481,-5.4828,4.65,0.013135,1083,463.6 -22300,H15,4.6281,-5.4829,4.649,0.01175,1083,463.9 -22600,H15,4.6771,-5.4826,4.651,0.011735,1083,464.4 -22900,H15,4.7273,-5.4825,4.65,0.01174,1082,463.7 -23200,H15,4.7774,-5.4824,4.648,0.01174,1083,463.7 -23500,H15,4.8264,-5.4822,4.649,0.010605,1082,463.8 -23800,H15,4.8783,-5.4821,4.65,0.010585,1082,463.6 -24100,H15,4.9262,-5.482,4.649,0.01058,1082,463.8 -24400,H15,4.9759,-5.4818,4.649,0.010585,1082,463.4 -24700,H15,5.0255,-5.4818,4.649,0.010595,1082,463.4 -25000,H15,5.078,-5.4818,4.648,0.0094,1082,463 -25300,H17,4.6289,-5.482,4.649,0.00939,1082,462.7 -25600,H17,4.6718,-5.4819,4.648,0.009385,1082,462.9 -25900,H17,4.7168,-5.4819,4.649,0.00939,1080,463.4 -26200,H17,4.7603,-5.4819,4.649,0.009385,1082,463.2 -26500,H17,4.803,-5.4817,4.649,0.0094,1081,463.5 -26800,H17,4.8495,-5.4814,4.651,0.00814,1082,463.7 -27100,H17,4.8965,-5.4815,4.649,0.008145,1080,464.1 -27400,H17,4.9377,-5.4816,4.65,0.008145,1081,463.1 -27700,H19,4.5375,-5.4817,4.649,0.008155,1081,461.8 -28000,H19,4.5909,-5.4818,4.65,0.008135,1082,462 -28300,H19,4.6433,-5.4815,4.649,0.00815,1081,463.5 -28600,H19,4.677,-5.4813,4.649,0.008155,1081,462.6 -28900,H19,4.7062,-5.4813,4.651,0.007025,1081,461.5 -29200,H19,4.7429,-5.4812,4.649,0.00701,1081,461.8 -29500,H19,4.7828,-5.4811,4.65,0.00702,1080,461.9 -29800,H19,4.822,-5.4814,4.651,0.007015,1081,462.6 diff --git a/pxii_bec/macros/luts/2706_dcm_lut.csv b/pxii_bec/macros/luts/2706_dcm_lut.csv deleted file mode 100644 index a1d612c..0000000 --- a/pxii_bec/macros/luts/2706_dcm_lut.csv +++ /dev/null @@ -1,83 +0,0 @@ -energy,harmonic,gap,pitch,roll,perp,samcam_x,samcam_y,zoom=501.0 -6000,H3,5.9369,-5.5214,4.651,0.178,1091,483.8 -6300,H3,6.2143,-5.5161,4.648,0.15925,1091,484.7 -6600,H3,6.5006,-5.513,4.651,0.14414,1089,482.2 -6900,H3,6.8005,-5.5102,4.65,0.1312,1089,482.3 -energy,harmonic,gap,pitch,roll,perp,samcam_x,samcam_y,zoom=501.0 -7000,H3,6.9059,-5.5096,4.651,0.12717,1089,480.7 -7300,H5,4.551,-5.5071,4.649,0.11594,1088,479.5 -7600,H5,4.697,-5.5057,4.647,0.10671,1087,478.8 -7900,H5,4.8454,-5.5028,4.65,0.09833,1084,478.9 -8200,H5,4.9952,-5.5026,4.649,0.09104,1085,481.3 -8500,H5,5.1461,-5.5018,4.648,0.084215,1086,481.8 -8800,H5,5.2989,-5.5,4.649,0.07845,1086,480.4 -9100,H5,5.4534,-5.5001,4.649,0.0732,1089,479.5 -9400,H5,5.6102,-5.4982,4.651,0.068385,1086,478.2 -9700,H5,5.7706,-5.497,4.651,0.064125,1086,477.8 -10000,H5,5.9309,-5.4964,4.651,0.06021,1085,475.8 -10300,H7,4.5766,-5.4954,4.651,0.056655,1086,474.8 -10600,H7,4.6797,-5.4945,4.651,0.0534,1085,474.5 -10900,H7,4.7853,-5.4938,4.651,0.050445,1085,473.1 -11200,H7,4.8916,-5.4933,4.651,0.04773,1084,472.4 -11500,H7,4.9984,-5.4927,4.651,0.04519,1084,471.9 -11800,H7,5.106,-5.4923,4.648,0.042885,1084,471.5 -12100,H7,5.2144,-5.4917,4.65,0.04069,1084,471.1 -12400,H7,5.3238,-5.491,4.65,0.03866,1083,469.9 -12700,H7,5.434,-5.4907,4.65,0.0369,1084,470 -13000,H7,5.5453,-5.4902,4.65,0.035145,1083,469 -13300,H9,4.5975,-5.4899,4.651,0.033575,1083,470.3 -13600,H9,4.6739,-5.4896,4.65,0.03209,1083,468.8 -13900,H9,4.7564,-5.4892,4.648,0.03027,1083,468.6 -14200,H9,4.8387,-5.4888,4.646,0.0302,1083,467.8 -14500,H9,4.9214,-5.4885,4.651,0.02818,1083,467.8 -14800,H9,5.0041,-5.4885,4.649,0.02704,1085,467.4 -15100,H9,5.0875,-5.488,4.651,0.02703,1084,466.9 -15400,H9,5.1711,-5.4876,4.649,0.024565,1083,466.7 -15700,H9,5.2554,-5.487,4.65,0.024555,1083,466.5 -16000,H9,5.3397,-5.4871,4.648,0.023035,1083,466.1 -16300,H11,4.6154,-5.4868,4.648,0.023025,1083,467.3 -16600,H11,4.6825,-5.4866,4.649,0.021305,1083,467.6 -16900,H11,4.7494,-5.4858,4.649,0.02127,1082,466.9 -17200,H11,4.8184,-5.4858,4.649,0.01983,1083,468.4 -17500,H11,4.8873,-5.4856,4.648,0.01976,1082,467.8 -17800,H11,4.9557,-5.4854,4.65,0.018535,1082,467.9 -18100,H11,5.0243,-5.4853,4.65,0.01849,1083,467.2 -18400,H11,5.0929,-5.4846,4.649,0.017295,1083,466.8 -18700,H11,5.1629,-5.4847,4.648,0.017285,1083,466.9 -19000,H11,5.2347,-5.4846,4.65,0.017285,1083,466.1 -19300,H13,4.6243,-5.4842,4.65,0.015695,1082,465.7 -19600,H13,4.6808,-5.484,4.651,0.01564,1082,465.4 -19900,H13,4.7387,-5.4838,4.649,0.015625,1082,465 -20200,H13,4.7961,-5.4836,4.648,0.0144,1083,464.9 -20500,H13,4.8537,-5.4833,4.649,0.01437,1083,464.2 -20800,H13,4.9126,-5.4829,4.648,0.01436,1083,463.6 -21100,H13,4.971,-5.4833,4.649,0.01317,1082,464.1 -21400,H13,5.0299,-5.4823,4.651,0.01313,1082,464.2 -21700,H13,5.0894,-5.4829,4.649,0.013145,1081,463.8 -22000,H13,5.1481,-5.4828,4.65,0.013135,1083,463.6 -22300,H15,4.6281,-5.4829,4.649,0.01175,1083,463.9 -22600,H15,4.6771,-5.4826,4.651,0.011735,1083,464.4 -22900,H15,4.7273,-5.4825,4.65,0.01174,1082,463.7 -23200,H15,4.7774,-5.4824,4.648,0.01174,1083,463.7 -23500,H15,4.8264,-5.4822,4.649,0.010605,1082,463.8 -23800,H15,4.8783,-5.4821,4.65,0.010585,1082,463.6 -24100,H15,4.9262,-5.482,4.649,0.01058,1082,463.8 -24400,H15,4.9759,-5.4818,4.649,0.010585,1082,463.4 -24700,H15,5.0255,-5.4818,4.649,0.010595,1082,463.4 -25000,H15,5.078,-5.4818,4.648,0.0094,1082,463 -25300,H17,4.6289,-5.482,4.649,0.00939,1082,462.7 -25600,H17,4.6718,-5.4819,4.648,0.009385,1082,462.9 -25900,H17,4.7168,-5.4819,4.649,0.00939,1080,463.4 -26200,H17,4.7603,-5.4819,4.649,0.009385,1082,463.2 -26500,H17,4.803,-5.4817,4.649,0.0094,1081,463.5 -26800,H17,4.8495,-5.4814,4.651,0.00814,1082,463.7 -27100,H17,4.8965,-5.4815,4.649,0.008145,1080,464.1 -27400,H17,4.9377,-5.4816,4.65,0.008145,1081,463.1 -27700,H19,4.5375,-5.4817,4.649,0.008155,1081,461.8 -28000,H19,4.5909,-5.4818,4.65,0.008135,1082,462 -28300,H19,4.6433,-5.4815,4.649,0.00815,1081,463.5 -28600,H19,4.677,-5.4813,4.649,0.008155,1081,462.6 -28900,H19,4.7062,-5.4813,4.651,0.007025,1081,461.5 -29200,H19,4.7429,-5.4812,4.649,0.00701,1081,461.8 -29500,H19,4.7828,-5.4811,4.65,0.00702,1080,461.9 -29800,H19,4.822,-5.4814,4.651,0.007015,1081,462.6 diff --git a/pxii_bec/macros/luts/I1flcalf.csv b/pxii_bec/macros/luts/I1flcalf.csv deleted file mode 100644 index ee9d3b4..0000000 --- a/pxii_bec/macros/luts/I1flcalf.csv +++ /dev/null @@ -1,22 +0,0 @@ -En,Fl/I1 -8.0,2.8080492027877764e+16 -9.0,1.4927860624483272e+16 -10.0,8417877926653679.0 -12.0,7019853850369172.0 -14.0,7386772914557876.0 -15.0,6750736409573591.0 -16.0,6297543245612219.0 -17.0,5735864463671363.0 -18.0,5573419238195645.0 -19.0,5194271286110376.0 -20.0,5117190891126464.0 -21.0,5255398865151842.0 -22.0,5322717678656602.0 -23.0,5341775365764245.0 -24.0,5666291945190874.0 -25.0,5921432928105373.0 -26.0,6205608339975513.0 -27.0,6811217757122517.0 -28.0,7298249384420157.0 -29.0,7974072533533950.0 -30.0,8936735941779119.0 diff --git a/pxii_bec/macros/luts/bs_checks_20260914.csv b/pxii_bec/macros/luts/bs_checks_20260914.csv deleted file mode 100644 index 6c70646..0000000 --- a/pxii_bec/macros/luts/bs_checks_20260914.csv +++ /dev/null @@ -1,14 +0,0 @@ -Energy,I2_in,I2_out -30000,-2.406e-08, -1.616e-09 -28000,-3.529e-08, 1.249e-07 -26000,-2.202e-08, 5.239e-07 -24000,-3.019e-08, 1.122e-06 -22000,-2.61e-08, -3.223e-08 -20000,-2.508e-08, 9.529e-06 -18000,-3.019e-08, 4.014e-05 -16000,-3.631e-08, 8.072e-05 -14000,-1.998e-08, 0.0001758 -12000,-1.692e-08, 0.0003101 -10000,-1.488e-08, 0.0001962 -8000,-2.202e-08, 4.622e-05 -6000,-2.917e-08, 4.441e-05 diff --git a/pxii_bec/macros/luts/daily_beamline_health.csv b/pxii_bec/macros/luts/daily_beamline_health.csv deleted file mode 100644 index f584aa1..0000000 --- a/pxii_bec/macros/luts/daily_beamline_health.csv +++ /dev/null @@ -1,2 +0,0 @@ -timestamp,energy_eV,flux_ph_s,beam_start_x_px,beam_start_y_px,vfm_ydr_start_mm,hfm_xd_start_mm,vfm_ydr_final_mm,hfm_xd_final_mm,beam_final_x_um,beam_final_y_um,vfm_y_mm,vfm_ydr_mm,vfm_pitch_mrad,hfm_x_mm,hfm_xd_mm,hfm_pitch_mrad -2026-09-20T20:56:20,12400.009895999128,8551180983998.611,992.9837196699019,966.3893864711606,-0.8453499999999963,1.9120150000000038,,1.9120100000000022,0.08792363645093884,0.23523677769901796,-1.5538537499999947,-0.8453549999999908,2.989410000000006,1.4117925000000042,1.9120100000000022,3.0009000000000015 diff --git a/pxii_bec/macros/luts/dcm_calibration_20260902.csv b/pxii_bec/macros/luts/dcm_calibration_20260902.csv deleted file mode 100644 index 63785e3..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_20260902.csv +++ /dev/null @@ -1,65 +0,0 @@ -energy,harmonic,gap,pitch,samcam_x,samcam_y,zoom=800.0 -6000,H3,5.9135,-5.5184,1011,987.4 -6300,H3,6.1926,-5.5135,1006,988.6 -6600,H3,6.4796,-5.5098,1014,991.3 -6900,H3,6.7745,-5.5083,1006,988.3 -7200,H3,7.0913,-5.506,1002,989.1 -7500,H5,4.6331,-5.5042,1004,982.8 -7800,H5,4.783,-5.502,1009,982.2 -8100,H5,4.9292,-5.5005,1011,981.7 -8400,H5,5.0802,-5.498,1019,978 -8700,H5,5.2312,-5.4978,1011,979.4 -9000,H5,5.3823,-5.4967,1011,979.2 -9300,H5,5.5381,-5.4952,1013,977.1 -9600,H5,5.697,-5.4944,1015,973.8 -9900,H5,5.8558,-5.4934,1015,972.4 -10200,H7,4.529,-5.4935,1010,968.3 -10500,H7,4.6331,-5.4921,1010,970 -10800,H7,4.7365,-5.4911,1010,969.1 -11100,H7,4.8437,-5.4913,1006,969.5 -11400,H7,4.9509,-5.4889,1019,968.7 -11700,H7,5.0581,-5.4889,1012,967.4 -12000,H7,5.1654,-5.489,1015,965.4 -12300,H7,5.2726,-5.489,1011,968.2 -12600,H7,5.3847,-5.488,1008,965.8 -12900,H7,5.495,-5.4882,1005,967.8 -13200,H9,4.5498,-5.4873,1013,964.4 -13500,H9,4.6331,-5.4873,1010,965.8 -13800,H9,4.7121,-5.4864,1014,963.7 -14100,H9,4.7949,-5.4864,1008,963.5 -14400,H9,4.8826,-5.4864,1008,964.7 -14700,H9,4.9605,-5.4853,1013,963.3 -15000,H9,5.0433,-5.4852,1011,963.9 -15300,H9,5.1261,-5.4844,1013,964.9 -15600,H9,5.2089,-5.4844,1012,964.2 -15900,H9,5.2949,-5.4836,1012,965.6 -16200,H11,4.565,-5.4838,1006,962.4 -16500,H11,4.6331,-5.483,1012,964 -16800,H11,4.6955,-5.483,1009,963 -17100,H11,4.7631,-5.4821,1014,963.6 -17400,H11,4.8308,-5.4819,1010,961.8 -17700,H11,4.8984,-5.4822,1007,962 -18000,H11,4.9661,-5.4824,1003,960.8 -18300,H11,5.0337,-5.4811,1010,961.9 -18600,H11,5.1014,-5.4811,1010,962 -18900,H13,4.5186,-5.481,1006,960.6 -19200,H13,4.5804,-5.4804,1007,960.3 -19500,H13,4.6282,-5.4803,1012,960.7 -19800,H13,4.6857,-5.48,1013,959.8 -20100,H13,4.7407,-5.4803,1013,960 -20400,H13,4.7993,-5.4802,1012,958.4 -20700,H13,4.856,-5.4801,1013,958.4 -21000,H13,4.9129,-5.48,1012,956.8 -21300,H13,4.9746,-5.4798,1013,953.9 -21600,H13,5.0313,-5.4795,1015,949.9 -21900,H15,4.5338,-5.4796,1010,943.4 -22200,H15,4.5812,-5.4795,1009,940 -22500,H15,4.6331,-5.4773,1026,933.5 -22800,H15,4.6764,-5.4796,1010,943 -23100,H15,4.7355,-5.4795,1000,934.7 -23400,H15,4.6169,-5.5042,990.5,936.9 -23700,H15,4.8339,-5.4789,1001,933.7 -24000,H15,4.7202,-5.4796,996.7,936.3 -24300,H15,4.7823,-5.4789,996.7,936.3 -24600,H15,4.809,-5.479,996.7,936.3 -24900,H17,4.5417,-5.4789,999,944.1 diff --git a/pxii_bec/macros/luts/dcm_calibration_20260903.csv b/pxii_bec/macros/luts/dcm_calibration_20260903.csv deleted file mode 100644 index 0c4e913..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_20260903.csv +++ /dev/null @@ -1,2 +0,0 @@ -energy,harmonic,gap,pitch,samcam_x,samcam_y,zoom=800.0 -25000,H17,4.5812,-5.4766,956.3,919.7 diff --git a/pxii_bec/macros/luts/dcm_calibration_20260923.csv b/pxii_bec/macros/luts/dcm_calibration_20260923.csv deleted file mode 100644 index d78ba22..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_20260923.csv +++ /dev/null @@ -1,14 +0,0 @@ -energy,scan,reason -6000,-5.561 -8000,-5.5432 -10000,-5.5349 -12000,-5.5297 -14000,-5.5268 -16000,-5.5244 -18000,-5.5218 -20000,-5.5203 -22000,-5.5194 -24000,-5.519 -26000,-5.5183 -28000,-5.5179 -30000,-5.518 diff --git a/pxii_bec/macros/luts/dcm_calibration_20261004.csv b/pxii_bec/macros/luts/dcm_calibration_20261004.csv deleted file mode 100644 index 4d6df5c..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_20261004.csv +++ /dev/null @@ -1,15 +0,0 @@ -energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom=1000.0 -18500,-5.5278,0.079312,0.031407,0.57597,0.41821,21.95,0.86,0.4968,0.9468 -19000,-5.5277,0.10892,0.034869,0.672,-0.043649,22.96,0.79,1.274,0.7789 -19500,-5.5273,0.1123,0.037979,0.65287,0.41444,29.04,0.98,1.399,0.7602 -20000,-5.527,0.10889,0.042196,0.76301,0.55486,280.03,-0.09,1.669,0.9976 -20500,-5.5268,0.11885,0.048114,0.94538,0.64762,25.79,1.31,1.943,0.8993 -21000,-5.5264,0.11568,0.055515,1.157,0.84596,22.99,2.12,2.15,1.261 -21500,-5.5257,0.10583,0.061478,1.4832,1.0726,22.62,4.43,1.107,2.616 -22000,-5.5253,0.14069,0.053697,1.1677,0.83326,25.98,7.66,1.164,7.532 -22500,-5.5251,0.14969,0.059799,1.1592,-0.24509,26.08,6.51,1.278,8.663 -23000,-5.5247,0.14373,0.075002,1.5391,0.66679,26.93,7.41,1.376,5.2 -23500,-5.5243,0.14984,0.091189,2.0988,1.5083,27.65,6.24,0.9794,6.096 -24000,-5.5242,0.14755,0.10074,2.6501,1.955,29.90,6.02,0.9268,5.937 -24500,-5.5239,0.15082,0.11364,3.4195,2.5418,32.97,4.64,1.019,4.126 -25000,-5.5237,0.18897,0.10096,2.2261,1.6208,39.12,3.63,2.495,3.873 diff --git a/pxii_bec/macros/luts/dcm_calibration_20261004.csv_2 b/pxii_bec/macros/luts/dcm_calibration_20261004.csv_2 deleted file mode 100644 index ab54bce..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_20261004.csv_2 +++ /dev/null @@ -1,15 +0,0 @@ -energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom=1000.0 -6000,-5.5651,0.031085,0.036155,0.0052168,0.0041921,10.75,-1.11,-8.771,-4.583 -7000,-5.5546,0.026899,0.026529,-0.0073424,0.053473,6.16,-1.84,-0.7224,-2.887 -8000,-5.5484,0.066689,0.032268,0.005212,0.0042436,7.95,-2.62,0.9412,-3.068 -9000,-5.5441,0.041593,0.029141,-0.010786,0.042077,12.07,-0.95,-0.5363,-2.653 -10000,-5.5411,0.042201,0.013278,0.025073,0.053635,13.84,-0.60,1.682,-1.665 -11000,-5.5382,0.065656,0.022891,0.027213,0.041838,21.11,-0.06,1.831,-3.373 -12000,-5.5358,0.045707,0.02277,0.021949,0.053366,12.55,0.30,-0.132,-0.07301 -13000,-5.5344,0.046219,0.014825,0.079975,0.088181,17.28,0.47,0.2965,0.02576 -14000,-5.5325,0.071565,0.024777,0.096642,0.083641,20.87,0.44,-0.04888,0.1838 -15000,-5.5313,0.063579,0.021258,0.15225,0.12223,18.18,0.67,0.06056,0.4581 -16000,-5.5304,0.11033,0.023619,0.2533,0.17271,22.24,0.90,1.668,0.6958 -17000,-5.529,0.094652,0.026446,0.32328,0.23969,23.89,0.86,0.6903,0.5908 -18000,-5.5278,0.088299,0.029077,0.57684,0.074821,21.01,0.89,0.9228,0.9236 -energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom=1000.0 diff --git a/pxii_bec/macros/luts/dcm_calibration_20261004_first_half.csv b/pxii_bec/macros/luts/dcm_calibration_20261004_first_half.csv deleted file mode 100644 index 566bb36..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_20261004_first_half.csv +++ /dev/null @@ -1,14 +0,0 @@ -energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom=1000.0 -6000,-5.5651,0.031085,0.036155,0.0052168,0.0041921,10.75,-1.11,-8.771,-4.583 -7000,-5.5546,0.026899,0.026529,-0.0073424,0.053473,6.16,-1.84,-0.7224,-2.887 -8000,-5.5484,0.066689,0.032268,0.005212,0.0042436,7.95,-2.62,0.9412,-3.068 -9000,-5.5441,0.041593,0.029141,-0.010786,0.042077,12.07,-0.95,-0.5363,-2.653 -10000,-5.5411,0.042201,0.013278,0.025073,0.053635,13.84,-0.60,1.682,-1.665 -11000,-5.5382,0.065656,0.022891,0.027213,0.041838,21.11,-0.06,1.831,-3.373 -12000,-5.5358,0.045707,0.02277,0.021949,0.053366,12.55,0.30,-0.132,-0.07301 -13000,-5.5344,0.046219,0.014825,0.079975,0.088181,17.28,0.47,0.2965,0.02576 -14000,-5.5325,0.071565,0.024777,0.096642,0.083641,20.87,0.44,-0.04888,0.1838 -15000,-5.5313,0.063579,0.021258,0.15225,0.12223,18.18,0.67,0.06056,0.4581 -16000,-5.5304,0.11033,0.023619,0.2533,0.17271,22.24,0.90,1.668,0.6958 -17000,-5.529,0.094652,0.026446,0.32328,0.23969,23.89,0.86,0.6903,0.5908 -18000,-5.5278,0.088299,0.029077,0.57684,0.074821,21.01,0.89,0.9228,0.9236 diff --git a/pxii_bec/macros/luts/dcm_calibration_4thOct.csv b/pxii_bec/macros/luts/dcm_calibration_4thOct.csv deleted file mode 100644 index 18b28e9..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_4thOct.csv +++ /dev/null @@ -1,28 +0,0 @@ -energy,pitch,lu_Xnorm,lu_Ynorm,ss_Xnorm,ss_Ynorm,bcu_x,bcu_y,samcam_x,samcam_y,zoom=1000.0 -6000,-5.5651,0.031085,0.036155,0.0052168,0.0041921,10.75,-1.11,-8.771,-4.583 -7000,-5.5546,0.026899,0.026529,-0.0073424,0.053473,6.16,-1.84,-0.7224,-2.887 -8000,-5.5484,0.066689,0.032268,0.005212,0.0042436,7.95,-2.62,0.9412,-3.068 -9000,-5.5441,0.041593,0.029141,-0.010786,0.042077,12.07,-0.95,-0.5363,-2.653 -10000,-5.5411,0.042201,0.013278,0.025073,0.053635,13.84,-0.60,1.682,-1.665 -11000,-5.5382,0.065656,0.022891,0.027213,0.041838,21.11,-0.06,1.831,-3.373 -12000,-5.5358,0.045707,0.02277,0.021949,0.053366,12.55,0.30,-0.132,-0.07301 -13000,-5.5344,0.046219,0.014825,0.079975,0.088181,17.28,0.47,0.2965,0.02576 -14000,-5.5325,0.071565,0.024777,0.096642,0.083641,20.87,0.44,-0.04888,0.1838 -15000,-5.5313,0.063579,0.021258,0.15225,0.12223,18.18,0.67,0.06056,0.4581 -16000,-5.5304,0.11033,0.023619,0.2533,0.17271,22.24,0.90,1.668,0.6958 -17000,-5.529,0.094652,0.026446,0.32328,0.23969,23.89,0.86,0.6903,0.5908 -18000,-5.5278,0.088299,0.029077,0.57684,0.074821,21.01,0.89,0.9228,0.9236 -18500,-5.5278,0.079312,0.031407,0.57597,0.41821,21.95,0.86,0.4968,0.9468 -19000,-5.5277,0.10892,0.034869,0.672,-0.043649,22.96,0.79,1.274,0.7789 -19500,-5.5273,0.1123,0.037979,0.65287,0.41444,29.04,0.98,1.399,0.7602 -20000,-5.527,0.10889,0.042196,0.76301,0.55486,280.03,-0.09,1.669,0.9976 -20500,-5.5268,0.11885,0.048114,0.94538,0.64762,25.79,1.31,1.943,0.8993 -21000,-5.5264,0.11568,0.055515,1.157,0.84596,22.99,2.12,2.15,1.261 -21500,-5.5257,0.10583,0.061478,1.4832,1.0726,22.62,4.43,1.107,2.616 -22000,-5.5253,0.14069,0.053697,1.1677,0.83326,25.98,7.66,1.164,7.532 -22500,-5.5251,0.14969,0.059799,1.1592,-0.24509,26.08,6.51,1.278,8.663 -23000,-5.5247,0.14373,0.075002,1.5391,0.66679,26.93,7.41,1.376,5.2 -23500,-5.5243,0.14984,0.091189,2.0988,1.5083,27.65,6.24,0.9794,6.096 -24000,-5.5242,0.14755,0.10074,2.6501,1.955,29.90,6.02,0.9268,5.937 -24500,-5.5239,0.15082,0.11364,3.4195,2.5418,32.97,4.64,1.019,4.126 -25000,-5.5237,0.18897,0.10096,2.2261,1.6208,39.12,3.63,2.495,3.873 diff --git a/pxii_bec/macros/luts/dcm_calibration_fail_20261004.csv b/pxii_bec/macros/luts/dcm_calibration_fail_20261004.csv deleted file mode 100644 index c04fc12..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_fail_20261004.csv +++ /dev/null @@ -1 +0,0 @@ -energy,scan,reason diff --git a/pxii_bec/macros/luts/dcm_calibration_failures_20260902.csv b/pxii_bec/macros/luts/dcm_calibration_failures_20260902.csv deleted file mode 100644 index 5396b71..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_failures_20260902.csv +++ /dev/null @@ -1,7 +0,0 @@ -energy,scan,reason -23400,mono_pitch,Peak FWHM spans only 0.00 scan steps (minimum 1.5); centre uncertainty is large (0.000267) -24900,gap,An alarm has occurred. Severity: MAJOR. -ValueError. - An error occurred during 'set' on device 'id_gap'. - -ValueError: 4.4999 outside of user-specified limits diff --git a/pxii_bec/macros/luts/dcm_calibration_failures_20260903.csv b/pxii_bec/macros/luts/dcm_calibration_failures_20260903.csv deleted file mode 100644 index f2ad276..0000000 --- a/pxii_bec/macros/luts/dcm_calibration_failures_20260903.csv +++ /dev/null @@ -1,3 +0,0 @@ -energy,scan,reason -25400,gap,User abort. -25400,mono_pitch_exception,User abort. diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1702.csv b/pxii_bec/macros/luts/gap_scint_20261005-1702.csv deleted file mode 100644 index 0399820..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1702.csv +++ /dev/null @@ -1 +0,0 @@ -energy,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1703.csv b/pxii_bec/macros/luts/gap_scint_20261005-1703.csv deleted file mode 100644 index 0399820..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1703.csv +++ /dev/null @@ -1 +0,0 @@ -energy,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1707.csv b/pxii_bec/macros/luts/gap_scint_20261005-1707.csv deleted file mode 100644 index 0399820..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1707.csv +++ /dev/null @@ -1 +0,0 @@ -energy,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1709.csv b/pxii_bec/macros/luts/gap_scint_20261005-1709.csv deleted file mode 100644 index 69170d4..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1709.csv +++ /dev/null @@ -1 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1710.csv b/pxii_bec/macros/luts/gap_scint_20261005-1710.csv deleted file mode 100644 index 69170d4..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1710.csv +++ /dev/null @@ -1 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1713.csv b/pxii_bec/macros/luts/gap_scint_20261005-1713.csv deleted file mode 100644 index 69170d4..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1713.csv +++ /dev/null @@ -1 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y diff --git a/pxii_bec/macros/luts/gap_scint_20261005-1716.csv b/pxii_bec/macros/luts/gap_scint_20261005-1716.csv deleted file mode 100644 index a8bab1f..0000000 --- a/pxii_bec/macros/luts/gap_scint_20261005-1716.csv +++ /dev/null @@ -1,21 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,samcam_x,samcam_y -22000,4.5350,44.8,0.232,0.093,5.3,7.1 -22000,4.5360,46.0,0.230,0.092,5.3,7.2 -22000,4.5371,48.7,0.223,0.086,5.3,7.4 -22000,4.5381,52.3,0.216,0.081,5.1,7.6 -22000,4.5392,56.5,0.205,0.076,5.3,7.8 -22000,4.5403,61.0,0.199,0.074,5.1,7.9 -22000,4.5413,65.0,0.193,0.070,5.3,8.0 -22000,4.5424,69.7,0.188,0.066,5.4,8.2 -22000,4.5434,74.5,0.181,0.064,5.4,8.3 -22000,4.5445,79.0,0.179,0.063,5.4,8.4 -22000,4.5455,83.5,0.177,0.066,5.6,8.5 -22000,4.5466,88.1,0.175,0.058,5.7,8.7 -22000,4.5476,92.8,0.173,0.059,5.7,8.8 -22000,4.5487,96.8,0.172,0.058,5.9,8.9 -22000,4.5497,101.2,0.171,0.056,6.2,9.0 -22000,4.5508,105.2,0.175,0.058,6.3,9.1 -22000,4.5518,109.1,0.173,0.055,6.5,9.2 -22000,4.5529,112.5,0.174,0.057,6.8,9.3 -22000,4.5540,115.8,0.177,0.057,7.0,9.4 -22000,4.5550,120.1,0.181,0.056,7.3,9.5 diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1702.csv b/pxii_bec/macros/luts/gap_xi_20261005-1702.csv deleted file mode 100644 index 2181078..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1702.csv +++ /dev/null @@ -1 +0,0 @@ -energy,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1703.csv b/pxii_bec/macros/luts/gap_xi_20261005-1703.csv deleted file mode 100644 index 2181078..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1703.csv +++ /dev/null @@ -1 +0,0 @@ -energy,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1707.csv b/pxii_bec/macros/luts/gap_xi_20261005-1707.csv deleted file mode 100644 index 5fedbf4..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1707.csv +++ /dev/null @@ -1,21 +0,0 @@ -energy,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -22000,44.0,0.231,0.097,151.6,207.8 -22000,45.2,0.229,0.090,151.7,207.7 -22000,47.8,0.219,0.085,151.8,207.7 -22000,51.2,0.211,0.084,151.8,207.7 -22000,55.3,0.200,0.079,152.0,207.9 -22000,59.2,0.199,0.075,152.1,208.2 -22000,63.9,0.191,0.074,152.3,208.3 -22000,68.3,0.188,0.069,152.5,208.3 -22000,72.8,0.179,0.067,152.6,208.5 -22000,77.3,0.180,0.065,152.8,208.7 -22000,82.3,0.175,0.063,152.9,208.9 -22000,86.3,0.174,0.063,152.9,209.0 -22000,90.6,0.175,0.062,153.1,209.1 -22000,94.9,0.174,0.060,153.2,209.3 -22000,99.3,0.173,0.059,153.2,209.5 -22000,102.7,0.177,0.058,153.5,209.6 -22000,106.3,0.179,0.060,153.7,209.7 -22000,110.0,0.179,0.059,153.9,210.0 -22000,113.4,0.182,0.055,154.5,210.1 -22000,117.0,0.185,0.056,155.2,210.0 diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1709.csv b/pxii_bec/macros/luts/gap_xi_20261005-1709.csv deleted file mode 100644 index 9ecbccc..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1709.csv +++ /dev/null @@ -1 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1710.csv b/pxii_bec/macros/luts/gap_xi_20261005-1710.csv deleted file mode 100644 index 9ecbccc..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1710.csv +++ /dev/null @@ -1 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1713.csv b/pxii_bec/macros/luts/gap_xi_20261005-1713.csv deleted file mode 100644 index 00bdff2..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1713.csv +++ /dev/null @@ -1,21 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -22000,4.5350,45.1,0.229,0.099,151.0,208.2 -22000,4.5360,46.7,0.229,0.096,151.3,207.8 -22000,4.5371,49.5,0.218,0.093,151.5,207.8 -22000,4.5381,53.0,0.206,0.081,151.5,207.7 -22000,4.5392,57.0,0.203,0.080,151.7,207.8 -22000,4.5403,61.7,0.194,0.073,151.7,208.1 -22000,4.5413,66.2,0.190,0.073,151.7,208.2 -22000,4.5424,71.0,0.183,0.069,151.9,208.4 -22000,4.5434,75.8,0.177,0.065,152.2,208.4 -22000,4.5445,80.2,0.175,0.061,152.3,208.7 -22000,4.5455,85.3,0.174,0.061,152.4,208.6 -22000,4.5466,90.0,0.172,0.057,152.4,208.8 -22000,4.5476,94.1,0.171,0.058,152.5,209.1 -22000,4.5487,98.4,0.170,0.057,152.6,209.3 -22000,4.5497,102.6,0.170,0.057,152.7,209.5 -22000,4.5508,106.7,0.173,0.058,152.8,209.6 -22000,4.5518,110.3,0.174,0.053,153.0,209.9 -22000,4.5529,114.3,0.175,0.054,153.2,209.9 -22000,4.5540,118.7,0.179,0.054,153.8,210.1 -22000,4.5550,122.2,0.181,0.054,154.5,210.2 diff --git a/pxii_bec/macros/luts/gap_xi_20261005-1716.csv b/pxii_bec/macros/luts/gap_xi_20261005-1716.csv deleted file mode 100644 index 9ecbccc..0000000 --- a/pxii_bec/macros/luts/gap_xi_20261005-1716.csv +++ /dev/null @@ -1 +0,0 @@ -energy,gap,lu_bpmsum,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y diff --git a/pxii_bec/macros/luts/perp.csv b/pxii_bec/macros/luts/perp.csv deleted file mode 100644 index 3452773..0000000 --- a/pxii_bec/macros/luts/perp.csv +++ /dev/null @@ -1,49 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpmsum,lu_Xnorm,lu_Ynorm,bcu_bpmsum,bcu_x,bcu_y,samcam_x,samcam_y -8000,-5.55286,0.04620,10382.0,0.379,0.033,18703.1,52.99,-2.43,5.80,-4.14 -8000,-5.55214,0.07155,10235.3,0.224,0.031,18875.3,32.89,-1.90,3.28,-2.77 -8000,-5.55106,0.09660,10155.7,0.061,0.028,19050.1,12.94,-1.35,0.74,-1.51 -8000,-5.55060,0.12182,10114.6,-0.106,0.027,19252.7,-7.66,-1.17,-1.65,-0.76 -8000,-5.55019,0.14665,10160.7,-0.265,0.026,19396.7,-26.18,-1.09,-3.81,-0.36 -8000,-5.55156,0.09607,10148.6,0.061,0.031,19026.9,13.57,-2.09,1.09,-3.13 -10000,-5.54291,0.01022,2145.7,0.395,0.016,1868.8,57.74,-2.20,5.52,-2.71 -10000,-5.54193,0.03547,2119.8,0.223,0.012,1888.9,35.16,-1.53,3.19,-1.74 -10000,-5.54112,0.06052,2115.2,0.041,0.010,1901.9,13.97,-0.88,0.97,-0.60 -10000,-5.53993,0.08536,2125.5,-0.146,0.010,1909.1,-7.71,-0.39,-0.88,0.21 -10000,-5.53949,0.11065,2135.9,-0.326,0.009,1918.2,-28.53,-0.10,-3.06,0.73 -10000,-5.54126,0.06029,2112.4,0.038,0.013,1902.3,13.15,-1.30,1.00,-1.26 -12400,-5.53642,-0.01161,1782.3,0.388,0.022,657.9,277.26,-1.42,16.68,-1.23 -12400,-5.53584,0.01365,1738.8,0.226,0.022,564.8,278.98,-1.21,17.51,-0.86 -12400,-5.53465,0.03877,1731.9,0.050,0.021,471.9,279.66,-1.04,17.41,-0.62 -12400,-5.53410,0.06384,1734.4,-0.126,0.021,386.5,280.28,-0.83,18.10,-0.14 -12400,-5.53311,0.08874,1732.0,-0.296,0.020,308.4,281.61,-0.73,18.66,-0.46 -12400,-5.53485,0.03841,1747.4,0.050,0.023,472.2,279.84,-1.26,17.85,-0.81 -15000,-5.53253,-0.02426,695.1,0.421,0.022,866.3,62.69,-0.41,4.32,-0.26 -15000,-5.53230,0.00104,674.9,0.253,0.022,861.4,43.33,-0.29,2.93,0.14 -15000,-5.53088,0.02619,680.6,0.071,0.023,866.8,20.76,-0.07,0.83,0.76 -15000,-5.53015,0.05115,677.3,-0.114,0.023,865.9,-0.27,0.16,-1.30,1.36 -15000,-5.52958,0.07602,681.4,-0.292,0.023,870.8,-23.02,0.32,-3.59,1.77 -15000,-5.53126,0.02545,679.7,0.072,0.024,866.9,20.39,-0.25,0.46,0.23 -18000,-5.52928,-0.03216,243.5,0.435,0.029,640.6,69.31,-0.13,5.19,0.32 -18000,-5.52882,-0.00703,239.0,0.274,0.028,631.6,49.69,0.09,3.54,0.90 -18000,-5.52757,0.01802,238.9,0.097,0.030,629.4,29.03,0.24,3.00,1.11 -18000,-5.52697,0.04316,238.0,-0.088,0.027,626.1,6.21,0.37,-0.28,1.66 -18000,-5.52659,0.06831,238.2,-0.264,0.027,617.7,-14.69,0.48,-2.01,1.87 -18000,-5.52807,0.01776,238.7,0.095,0.029,633.1,27.99,0.08,2.48,0.71 -20000,-5.52754,-0.03533,149.7,0.435,0.037,527.0,66.01,-0.08,5.24,0.54 -20000,-5.52694,-0.01034,147.6,0.285,0.043,521.3,47.09,0.16,3.74,1.26 -20000,-5.52627,0.01477,145.6,0.120,0.042,518.5,26.86,0.26,2.06,1.62 -20000,-5.52534,0.03981,146.5,-0.055,0.043,519.0,4.67,0.36,-0.09,1.78 -20000,-5.52508,0.06494,145.3,-0.225,0.042,517.6,-16.06,0.51,-1.62,2.37 -20000,-5.52659,0.01419,147.6,0.120,0.043,522.5,25.43,0.11,1.45,1.26 -22000,-5.52673,-0.03786,94.7,0.439,0.053,313.7,67.87,7.18,5.76,6.28 -22000,-5.52583,-0.01278,94.1,0.300,0.052,317.2,48.70,7.29,3.82,6.87 -22000,-5.52511,0.01219,93.3,0.150,0.053,318.1,28.92,7.35,1.98,7.38 -22000,-5.52459,0.03735,91.3,-0.004,0.053,312.0,11.65,7.40,0.96,7.75 -22000,-5.52372,0.06234,92.6,-0.162,0.051,315.6,-8.83,7.44,-0.71,7.89 -22000,-5.52560,0.01166,91.8,0.148,0.051,317.4,28.94,7.29,2.31,7.03 -25000,-5.52520,-0.04066,48.7,0.451,0.079,29.4,77.93,3.13,7.55,3.69 -25000,-5.52441,-0.01570,47.4,0.338,0.080,28.9,61.02,3.24,6.35,3.91 -25000,-5.52372,0.00941,47.9,0.200,0.082,29.0,44.01,3.26,4.56,4.15 -25000,-5.52285,0.03461,47.3,0.061,0.079,28.8,25.60,3.33,1.59,4.69 -25000,-5.52227,0.05956,47.3,-0.066,0.086,28.3,9.14,3.37,-0.05,4.98 -25000,-5.52407,0.00896,47.0,0.204,0.089,28.7,44.89,3.06,4.34,4.10 diff --git a/pxii_bec/macros/luts/perp_1.csv b/pxii_bec/macros/luts/perp_1.csv deleted file mode 100644 index fe939b1..0000000 --- a/pxii_bec/macros/luts/perp_1.csv +++ /dev/null @@ -1,50 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpmsum,lu_Xnorm,lu_Ynorm,bcu_bpmsum,bcu_x,bcu_y,samcam_x,samcam_y -8000,-5.54961,0.04605,10420.1,0.376,0.029,3631.0,49.15,0.67,11.52,5.97 -8000,-5.54898,0.07155,10266.3,0.220,0.027,3667.0,29.02,1.31,8.43,7.53 -8000,-5.54793,0.09656,10161.7,0.059,0.025,3697.5,11.59,1.91,6.77,8.73 -8000,-5.54753,0.12181,10166.7,-0.108,0.025,3752.0,-7.62,2.08,4.52,9.47 -8000,-5.54718,0.14661,10209.4,-0.268,0.027,3797.2,-25.53,1.91,2.31,9.32 -8000,-5.54866,0.09602,10151.4,0.060,0.030,3694.3,11.21,0.85,6.54,6.97 -10000,-5.53996,0.01018,2146.7,0.395,0.012,4173.7,66.21,1.79,12.24,7.50 -10000,-5.53888,0.03533,2129.8,0.223,0.012,4200.4,45.58,2.36,10.50,8.66 -10000,-5.53822,0.06040,2110.5,0.041,0.009,4217.4,23.42,2.99,8.02,9.71 -10000,-5.53729,0.08533,2123.7,-0.144,0.009,4260.4,1.73,3.14,5.71,9.93 -10000,-5.53651,0.11049,2146.2,-0.325,0.006,4305.9,-21.45,3.52,4.00,10.60 -10000,-5.53804,0.06020,2128.3,0.039,0.008,4249.9,22.88,2.71,7.66,9.10 -12400,-5.53337,-0.01144,1757.7,0.387,0.020,1127.9,58.33,2.14,10.95,9.30 -12400,-5.53288,0.01365,1743.4,0.225,0.020,1130.1,39.95,2.37,9.01,10.02 -12400,-5.53198,0.03880,1723.4,0.051,0.020,1129.9,21.41,2.61,7.42,10.79 -12400,-5.53123,0.06387,1726.8,-0.127,0.020,1140.3,0.12,2.72,4.85,11.23 -12400,-5.53050,0.08882,1727.8,-0.297,0.020,1142.7,-19.63,2.69,2.72,11.42 -12400,-5.53219,0.03821,1723.1,0.052,0.022,1130.2,20.94,2.23,7.10,9.85 -15000,-5.52989,-0.02420,705.4,0.420,0.020,836.9,69.62,2.37,11.75,9.80 -15000,-5.52923,0.00090,694.1,0.253,0.020,838.2,48.10,2.62,9.44,10.55 -15000,-5.52836,0.02601,681.9,0.074,0.020,831.4,28.62,2.82,8.14,10.89 -15000,-5.52743,0.05101,684.3,-0.113,0.020,837.3,6.72,3.04,6.66,11.74 -15000,-5.52688,0.07591,684.6,-0.288,0.020,837.2,-16.52,3.02,3.41,11.76 -15000,-5.52865,0.02558,681.3,0.073,0.021,833.9,27.52,2.50,7.92,10.32 -18000,-5.52676,-0.03221,243.0,0.439,0.026,634.8,75.86,2.82,12.73,10.09 -18000,-5.52612,-0.00702,238.4,0.278,0.025,626.2,55.97,2.96,11.24,10.60 -18000,-5.52531,0.01797,236.0,0.102,0.025,626.6,33.48,3.05,8.88,10.80 -18000,-5.52351,0.04318,243.1,-0.093,0.026,641.4,6.43,3.06,6.04,11.37 -18000,-5.52377,0.06826,237.3,-0.260,0.025,626.7,-11.72,3.15,4.89,11.57 -18000,-5.52575,0.01770,237.0,0.100,0.027,630.1,33.64,2.92,9.20,10.65 -20000,-5.52563,-0.03533,150.2,0.437,0.033,526.3,75.57,2.70,13.15,10.34 -20000,-5.52511,-0.01018,146.9,0.289,0.038,522.3,55.49,2.87,11.72,10.80 -20000,-5.52424,0.01472,145.2,0.127,0.038,520.9,35.38,2.91,9.80,11.07 -20000,-5.52293,0.03993,151.1,-0.055,0.039,526.7,11.34,3.04,7.27,11.70 -20000,-5.52270,0.06493,143.6,-0.216,0.040,519.3,-9.14,3.19,5.32,12.17 -20000,-5.52456,0.01452,145.2,0.125,0.039,522.2,34.39,2.85,9.25,10.98 -22000,-5.52438,-0.03785,95.3,0.442,0.050,307.4,74.28,8.27,13.62,17.13 -22000,-5.52351,-0.01287,94.0,0.309,0.052,306.3,56.94,8.33,12.47,17.58 -22000,-5.52293,0.01218,93.2,0.156,0.054,307.2,36.00,8.32,9.40,17.66 -22000,-5.52198,0.03724,91.8,-0.001,0.053,304.4,16.82,8.36,7.67,18.17 -22000,-5.52038,0.06232,95.9,-0.166,0.048,323.4,-11.03,8.43,3.74,18.77 -22000,-5.52334,0.01195,93.4,0.156,0.054,310.4,35.98,8.32,10.02,17.56 -25000,-5.52259,-0.04064,50.9,0.457,0.078,29.2,82.32,5.17,14.04,13.07 -25000,-5.52192,-0.01571,49.8,0.333,0.084,28.7,66.11,5.27,12.11,13.34 -25000,-5.52146,0.00935,49.5,0.200,0.084,28.4,48.09,5.35,9.55,13.67 -25000,-5.52038,0.03446,48.4,0.067,0.078,28.1,32.60,5.32,7.63,13.82 -25000,-5.52000,0.05949,47.6,-0.066,0.083,27.7,15.18,5.40,6.00,14.10 -25000,-5.52198,0.00916,48.5,0.204,0.085,28.1,48.98,5.29,9.77,13.60 - diff --git a/pxii_bec/macros/luts/perp_actual_calc.csv b/pxii_bec/macros/luts/perp_actual_calc.csv deleted file mode 100644 index ebb7060..0000000 --- a/pxii_bec/macros/luts/perp_actual_calc.csv +++ /dev/null @@ -1,9 +0,0 @@ -energy,calc_perp,actual_perp -8000,0.0961,0.1716 -10000,0.0604,0.1549 -12400,0.0389,0.1239 -15000,0.0264,0.1273 -18000,0.0183,0.1242 -20000,0.0148,0.1322 -22000,0.0122,0.1089 -25000,0.0094,0.1293 diff --git a/pxii_bec/macros/luts/perp_xi_20261005-1539.csv b/pxii_bec/macros/luts/perp_xi_20261005-1539.csv deleted file mode 100644 index 8eafe5b..0000000 --- a/pxii_bec/macros/luts/perp_xi_20261005-1539.csv +++ /dev/null @@ -1,7 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -12400,-5.54257,-0.01078,1691.2,0.385,0.022,154.5,207.5 -12400,-5.54190,0.01438,1661.5,0.220,0.021,151.8,207.5 -12400,-5.54071,0.03945,1650.8,0.043,0.021,149.4,207.8 -12400,-5.54013,0.06453,1660.1,-0.135,0.019,146.7,207.9 -12400,-5.53943,0.08952,1668.0,-0.309,0.018,144.3,207.8 -12400,-5.54117,0.03912,1656.2,0.043,0.021,149.4,207.9 diff --git a/pxii_bec/macros/luts/perp_xi_20261005-1541.csv b/pxii_bec/macros/luts/perp_xi_20261005-1541.csv deleted file mode 100644 index 2362c28..0000000 --- a/pxii_bec/macros/luts/perp_xi_20261005-1541.csv +++ /dev/null @@ -1,37 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -8000,-5.55530,0.04620,10382.2,0.377,0.034,155.1,206.7 -8000,-5.55463,0.07151,10210.1,0.224,0.032,152.4,207.1 -8000,-5.55347,0.09661,10150.2,0.060,0.030,149.9,207.1 -8000,-5.55318,0.12173,10188.8,-0.105,0.027,147.2,207.1 -8000,-5.55286,0.14660,10257.9,-0.265,0.026,144.9,207.2 -8000,-5.55422,0.09602,10208.3,0.062,0.032,149.9,206.8 -10000,-5.54581,0.01000,2154.1,0.399,0.014,154.9,206.8 -10000,-5.54492,0.03521,2131.2,0.227,0.012,152.5,207.2 -10000,-5.54387,0.06022,2124.8,0.043,0.011,149.8,206.9 -10000,-5.54294,0.08527,2117.4,-0.142,0.010,147.2,207.1 -10000,-5.54245,0.11042,2132.4,-0.321,0.009,144.6,207.2 -10000,-5.54396,0.06000,2123.1,0.043,0.015,149.8,206.8 -12400,-5.53932,-0.01168,1777.2,0.393,0.025,154.7,208.1 -12400,-5.53857,0.01372,1753.2,0.226,0.023,151.9,208.0 -12400,-5.53758,0.03879,1741.0,0.051,0.023,149.3,207.8 -12400,-5.53680,0.06381,1746.4,-0.127,0.022,146.6,207.9 -12400,-5.53578,0.08885,1735.1,-0.297,0.021,144.3,207.9 -12400,-5.53784,0.03831,1738.9,0.053,0.024,149.4,207.9 -15000,-5.53508,-0.02455,702.0,0.424,0.025,155.1,207.9 -15000,-5.53491,0.00059,688.9,0.258,0.025,152.5,207.9 -15000,-5.53346,0.02566,686.8,0.076,0.025,149.7,207.5 -15000,-5.53282,0.05075,673.3,-0.108,0.023,147.2,207.7 -15000,-5.53201,0.07570,676.5,-0.287,0.023,144.6,207.8 -15000,-5.53387,0.02524,687.1,0.078,0.026,150.0,207.9 -18000,-5.53155,-0.03228,247.5,0.441,0.031,155.1,207.5 -18000,-5.53117,-0.00715,244.3,0.278,0.033,152.4,207.9 -18000,-5.52992,0.01783,240.1,0.100,0.029,149.9,207.9 -18000,-5.52894,0.04301,240.7,-0.085,0.029,147.3,207.7 -18000,-5.52873,0.06809,238.2,-0.259,0.028,144.9,207.9 -18000,-5.53033,0.01710,241.8,0.101,0.032,149.9,207.7 -20000,-5.53007,-0.03591,151.9,0.442,0.041,155.5,208.0 -20000,-5.52940,-0.01040,150.2,0.288,0.042,152.8,207.8 -20000,-5.52841,0.01479,143.4,0.122,0.045,150.1,207.8 -20000,-5.52754,0.03992,148.1,-0.056,0.042,147.5,207.7 -20000,-5.52720,0.06484,147.1,-0.223,0.040,145.0,207.7 -20000,-5.52897,0.01418,149.5,0.122,0.041,150.2,208.0 diff --git a/pxii_bec/macros/luts/perp_xi_20261005-1607.csv b/pxii_bec/macros/luts/perp_xi_20261005-1607.csv deleted file mode 100644 index 751a9dc..0000000 --- a/pxii_bec/macros/luts/perp_xi_20261005-1607.csv +++ /dev/null @@ -1,7 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -22000,-5.52975,-0.03800,95.9,0.445,0.057,155.6,208.2 -22000,-5.52920,-0.01307,95.4,0.305,0.054,153.2,208.1 -22000,-5.52841,0.01204,94.1,0.155,0.059,150.5,207.8 -22000,-5.52737,0.03716,91.9,-0.005,0.057,147.8,208.0 -22000,-5.52685,0.06211,90.4,-0.163,0.055,145.3,208.3 -22000,-5.52868,0.01139,93.3,0.156,0.058,150.5,207.9 diff --git a/pxii_bec/macros/luts/perp_xi_20261005-1615.csv b/pxii_bec/macros/luts/perp_xi_20261005-1615.csv deleted file mode 100644 index 9855ae2..0000000 --- a/pxii_bec/macros/luts/perp_xi_20261005-1615.csv +++ /dev/null @@ -1,7 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -25000,-5.52920,-0.09079,52.0,0.654,0.081,164.6,209.6 -25000,-5.52891,-0.06548,50.5,0.556,0.083,161.6,209.5 -25000,-5.52778,-0.04040,49.8,0.454,0.092,158.6,209.5 -25000,-5.52694,-0.01548,49.0,0.332,0.090,155.7,209.5 -25000,-5.52641,0.00966,47.2,0.207,0.088,152.7,209.4 -25000,-5.51861,-0.04039,29.1,0.349,0.120,149.6,208.4 diff --git a/pxii_bec/macros/luts/perp_xi_20261005-1620.csv b/pxii_bec/macros/luts/perp_xi_20261005-1620.csv deleted file mode 100644 index 63c0487..0000000 --- a/pxii_bec/macros/luts/perp_xi_20261005-1620.csv +++ /dev/null @@ -1,6 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -25000,-5.52807,-0.04030,49.4,0.453,0.083,156.2,208.6 -25000,-5.52737,-0.01540,49.3,0.331,0.086,153.0,208.6 -25000,-5.52682,0.00982,47.5,0.208,0.088,150.5,208.3 -25000,-5.52612,0.03493,46.4,0.075,0.087,148.0,208.2 -25000,-5.52557,0.05990,47.5,-0.060,0.079,145.4,208.1 diff --git a/pxii_bec/macros/luts/perp_xi_20261005-1631.csv b/pxii_bec/macros/luts/perp_xi_20261005-1631.csv deleted file mode 100644 index 75d5e11..0000000 --- a/pxii_bec/macros/luts/perp_xi_20261005-1631.csv +++ /dev/null @@ -1,7 +0,0 @@ -energy,dcm_pitch,dcm_perp,lu_bpms,lu_Xnorm,lu_Ynorm,xi_cam_x,xi_cam_y -25000,-5.52821,-0.04084,50.0,0.455,0.088,157.8,209.4 -25000,-5.52786,-0.01596,49.2,0.338,0.087,155.0,209.1 -25000,-5.52714,0.00910,48.2,0.205,0.088,152.1,209.2 -25000,-5.52633,0.03430,47.3,0.074,0.094,149.2,209.0 -25000,-5.52589,0.05926,46.6,-0.062,0.092,146.4,209.2 -25000,-5.52743,0.00884,47.8,0.203,0.094,152.1,209.0 diff --git a/pxii_bec/macros/luts/pitch_comparison.csv b/pxii_bec/macros/luts/pitch_comparison.csv deleted file mode 100644 index 7fd4b7f..0000000 --- a/pxii_bec/macros/luts/pitch_comparison.csv +++ /dev/null @@ -1,14 +0,0 @@ -energy,23rd Sep,6th Sep,offset -6000,-5.561,-5.5182,-0.0428 -8000,-5.5432,-5.5032,-0.04 -10000,-5.5349,-5.4956,-0.039300000000001 -12000,-5.5297,-5.4906,-0.0391 -14000,-5.5268,-5.4877,-0.0391 -16000,-5.5244,-5.4856,-0.0388 -18000,-5.5218,-5.4833,-0.0385 -20000,-5.5203,-5.482,-0.0383 -22000,-5.5194,-5.4807,-0.0387 -24000,-5.519,-5.4791,-0.0399 -26000,-5.5183,-5.4791,-0.0392 -28000,-5.5179,-5.4791,-0.0388 -30000,-5.518,, diff --git a/pxii_bec/macros/luts/roll_20000.csv b/pxii_bec/macros/luts/roll_20000.csv deleted file mode 100644 index aed035c..0000000 --- a/pxii_bec/macros/luts/roll_20000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll, Y pos -1,313.4 -2,351.5 -3,388.1 -4,425 -5,460 -6,494.7 -7,526.9 -8,558.8 -9,590.4 diff --git a/pxii_bec/macros/luts/roll_20260923_6000.csv b/pxii_bec/macros/luts/roll_20260923_6000.csv deleted file mode 100644 index 87b60f1..0000000 --- a/pxii_bec/macros/luts/roll_20260923_6000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -3.000000,532.1747746692758 -3.375000,646.8383766556484 -3.750000,758.2370844371503 -4.125000,870.6457787689487 -4.500000,980.6793737229799 -4.875000,1080.7759963202259 -5.250000,1182.3265384715614 -5.625000,1290.697731056017 -6.000000,1376.2798011728055 diff --git a/pxii_bec/macros/luts/roll_20260924_25000.csv b/pxii_bec/macros/luts/roll_20260924_25000.csv deleted file mode 100644 index 81fac3c..0000000 --- a/pxii_bec/macros/luts/roll_20260924_25000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -1.000000,692.942650491312 -1.875000,755.6432908308136 -2.750000,819.8962183038443 -3.625000,883.0441749851776 -4.500000,944.625963858652 -5.375000,1004.513235574581 -6.250000,1061.1821742077382 -7.125000,1116.371127886505 -8.000000,1169.189245633994 diff --git a/pxii_bec/macros/luts/roll_20260924_6000.csv b/pxii_bec/macros/luts/roll_20260924_6000.csv deleted file mode 100644 index 87b60f1..0000000 --- a/pxii_bec/macros/luts/roll_20260924_6000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -3.000000,532.1747746692758 -3.375000,646.8383766556484 -3.750000,758.2370844371503 -4.125000,870.6457787689487 -4.500000,980.6793737229799 -4.875000,1080.7759963202259 -5.250000,1182.3265384715614 -5.625000,1290.697731056017 -6.000000,1376.2798011728055 diff --git a/pxii_bec/macros/luts/roll_20260930_25000.csv b/pxii_bec/macros/luts/roll_20260930_25000.csv deleted file mode 100644 index 49bead9..0000000 --- a/pxii_bec/macros/luts/roll_20260930_25000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -1.000000,620.3258474297603 -1.875000,727.3412656967532 -2.750000,831.2895400246484 -3.625000,936.7106895320477 -4.500000,1039.8208898439514 -5.375000,1139.02499725308 -6.250000,1232.640351083367 -7.125000,1322.7239076386252 -8.000000,1408.4337046604637 diff --git a/pxii_bec/macros/luts/roll_20260930_6000.csv b/pxii_bec/macros/luts/roll_20260930_6000.csv deleted file mode 100644 index 766f783..0000000 --- a/pxii_bec/macros/luts/roll_20260930_6000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -3.000000,367.5626514183679 -3.250000,490.76539071940647 -3.500000,614.0409323259951 -3.750000,734.2089839347528 -4.000000,854.3453573633882 -4.250000,969.9637066596362 -4.500000,1084.8613752711697 -4.750000,1195.432631465686 -5.000000,1299.759493848411 diff --git a/pxii_bec/macros/luts/roll_20261008_25000.csv b/pxii_bec/macros/luts/roll_20261008_25000.csv deleted file mode 100644 index 0c958e1..0000000 --- a/pxii_bec/macros/luts/roll_20261008_25000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -1.000000,645.3410172392396 -1.875000,716.7857063422749 -2.750000,798.4006801804591 -3.625000,879.2062486869808 -4.500000,948.0120679453303 -5.375000,1010.590100145263 -6.250000,1067.4532506840437 -7.125000,1123.6687191435465 -8.000000,1176.749800578109 diff --git a/pxii_bec/macros/luts/roll_20261008_6000.csv b/pxii_bec/macros/luts/roll_20261008_6000.csv deleted file mode 100644 index 09e4e20..0000000 --- a/pxii_bec/macros/luts/roll_20261008_6000.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -2.000000,329.981417633099 -2.250000,405.3057428861756 -2.500000,483.27540977301703 -2.750000,554.0746091974096 -3.000000,630.9466804651072 -3.250000,706.8771151250418 -3.500000,782.8947653437505 -3.750000,857.5768007188707 -4.000000,931.2567888482613 diff --git a/pxii_bec/macros/luts/roll_20261009_6000.csv b/pxii_bec/macros/luts/roll_20261009_6000.csv deleted file mode 100644 index 6f06e59..0000000 --- a/pxii_bec/macros/luts/roll_20261009_6000.csv +++ /dev/null @@ -1 +0,0 @@ -Roll,Y pos diff --git a/pxii_bec/macros/luts/roll_6000.csv b/pxii_bec/macros/luts/roll_6000.csv deleted file mode 100644 index 35bd5d2..0000000 --- a/pxii_bec/macros/luts/roll_6000.csv +++ /dev/null @@ -1,12 +0,0 @@ -Roll, Y pos -2,125.4 -2.5,194.1 -3,260.1 -3.5,325.8 -4,387.4 -4.5,446.9 -5,504.4 -5.5,558.2 -6,609.9 -6.5,658.1 -7,705.2 diff --git a/pxii_bec/macros/luts/temp.csv b/pxii_bec/macros/luts/temp.csv deleted file mode 100644 index 09e4e20..0000000 --- a/pxii_bec/macros/luts/temp.csv +++ /dev/null @@ -1,10 +0,0 @@ -Roll,Y pos -2.000000,329.981417633099 -2.250000,405.3057428861756 -2.500000,483.27540977301703 -2.750000,554.0746091974096 -3.000000,630.9466804651072 -3.250000,706.8771151250418 -3.500000,782.8947653437505 -3.750000,857.5768007188707 -4.000000,931.2567888482613 diff --git a/pxii_bec/macros/luts/vfm_pitch_energy.csv b/pxii_bec/macros/luts/vfm_pitch_energy.csv deleted file mode 100644 index fa5bcae..0000000 --- a/pxii_bec/macros/luts/vfm_pitch_energy.csv +++ /dev/null @@ -1,96 +0,0 @@ -energy,pitch,diode -10.00,2.89010,2.778e-05 -10.00,2.91510,2.7708e-05 -10.00,2.94010,2.7698e-05 -10.00,2.96510,2.7769e-05 -10.00,2.99010,2.7757e-05 -11.00,2.89010,7.9613e-05 -11.00,2.91510,7.9352e-05 -11.00,2.94010,7.9336e-05 -11.00,2.96510,7.9483e-05 -11.00,2.99010,7.9565e-05 -12.00,2.89010,7.449e-05 -12.00,2.91510,7.4458e-05 -12.00,2.94010,7.4567e-05 -12.00,2.96510,7.4801e-05 -12.00,2.99010,7.4712e-05 -13.00,2.89010,5.6131e-05 -13.00,2.91510,5.6056e-05 -13.00,2.94010,5.5966e-05 -13.00,2.96510,5.5828e-05 -13.00,2.99010,5.5948e-05 -14.00,2.89010,5.5324e-05 -14.00,2.91510,5.5195e-05 -14.00,2.94010,5.5113e-05 -14.00,2.96510,5.5187e-05 -14.00,2.99010,5.508e-05 -15.00,2.89010,4.1622e-05 -15.00,2.91510,4.1965e-05 -15.00,2.94010,4.2153e-05 -15.00,2.96510,4.2094e-05 -15.00,2.99010,4.2148e-05 -16.00,2.89010,2.8267e-05 -16.00,2.91510,2.8252e-05 -16.00,2.94010,2.8214e-05 -16.00,2.96510,2.8193e-05 -16.00,2.99010,2.8145e-05 -17.00,2.89010,2.1235e-05 -17.00,2.91510,2.1204e-05 -17.00,2.94010,2.1172e-05 -17.00,2.96510,2.1117e-05 -17.00,2.99010,2.1088e-05 -18.00,2.89010,1.7443e-05 -18.00,2.91510,1.7463e-05 -18.00,2.94010,1.7414e-05 -18.00,2.96510,1.7132e-05 -18.00,2.99010,1.7091e-05 -19.00,2.89010,1.1583e-05 -19.00,2.91510,1.1553e-05 -19.00,2.94010,1.1521e-05 -19.00,2.96510,1.1486e-05 -19.00,2.99010,1.144e-05 -20.00,2.89010,1.0526e-05 -20.00,2.91510,1.0445e-05 -20.00,2.94010,1.036e-05 -20.00,2.96510,1.0243e-05 -20.00,2.99010,1.0096e-05 -21.00,2.89010,6.2969e-06 -21.00,2.91510,6.0377e-06 -21.00,2.94010,5.7381e-06 -21.00,2.96510,5.4072e-06 -21.00,2.99010,5.0424e-06 -22.00,2.89010,2.5998e-06 -22.00,2.91510,2.3461e-06 -22.00,2.94010,2.0986e-06 -22.00,2.96510,1.8549e-06 -22.00,2.99010,1.6269e-06 -23.00,2.89010,8.4958e-07 -23.00,2.91510,7.6319e-07 -23.00,2.94010,6.9276e-07 -23.00,2.96510,6.2826e-07 -23.00,2.99010,5.6922e-07 -24.00,2.89010,3.8721e-07 -24.00,2.91510,3.5652e-07 -24.00,2.94010,3.3073e-07 -24.00,2.96510,3.0885e-07 -24.00,2.99010,2.892e-07 -25.00,2.89010,1.7873e-07 -25.00,2.91510,1.6681e-07 -25.00,2.94010,1.5642e-07 -25.00,2.96510,1.4637e-07 -25.00,2.99010,1.3626e-07 -26.00,2.89010,1.3718e-07 -26.00,2.91510,1.2827e-07 -26.00,2.94010,1.1991e-07 -26.00,2.96510,1.1148e-07 -26.00,2.99010,1.0365e-07 -27.00,2.89010,5.8959e-08 -27.00,2.91510,5.5025e-08 -27.00,2.94010,5.1655e-08 -27.00,2.96510,4.9044e-08 -27.00,2.99010,4.715e-08 -28.00,2.89010,3.8685e-08 -28.00,2.91510,3.7246e-08 -28.00,2.94010,3.6209e-08 -28.00,2.96510,3.5094e-08 -28.00,2.99010,3.3689e-08 diff --git a/pxii_bec/macros/pxii_energy.py.bak b/pxii_bec/macros/pxii_energy.py.bak deleted file mode 100755 index aa4e86a..0000000 --- a/pxii_bec/macros/pxii_energy.py.bak +++ /dev/null @@ -1,347 +0,0 @@ -"""Script to change energy at PXII by setting gap, DCM motors and mirror stripe - -Moving DCM motors - implemented for Bragg, pitch and perp -Gap - optional, can be switched off using move_gap=False -Mirrors - change of mirror stripe is not yet implemented -Plotting optional - -""" - -import numpy as np - -# from pxii_gap import set_gap -# from mx_methods import go_to_peak -# from pxii_parameters import EnergyDefaults, Calibration - -# from calculator import ( -# calc_perp_position, -# validate_energy, -# convert_from_bragg, -# convert_from_energy, -# ) - - -def get_current_energy(): - """ - Returns the energy in eV from the current bragg angle. - """ - current_bragg_angle = dev.dcm_bragg.user_readback.get(cached=True) - current_energy = convert_from_bragg(current_bragg_angle, print_result=False)["energy_ev"] - return current_energy - - -# Functions below are common to all beamlines -def calculate_energy_difference(current_energy, target_energy): - """ - Calculate the absolute difference in energy between the current energy level - and the target energy level. - """ - return abs(target_energy - current_energy) - - -def get_mirror_stripe(energy_ev): - """ - Determines the mirror stripe material based on the energy level provided - and the specified thresholds for silicon, rhodium, and platinum. - - Args: - energy_ev (float): Energy level in electron volts, used to determine - the corresponding material type. - - Returns: - str: A string indicating the material type corresponding to the provided - energy level. Possible values are "silicon", "rhodium", or "platinum". - """ - if energy_ev <= EnergyDefaults.stripe_thresholds["silicon"]: - return "silicon" - if ( - EnergyDefaults.stripe_thresholds["silicon"] - < energy_ev - <= EnergyDefaults.stripe_thresholds["rhodium"] - ): - return "rhodium" - return "platinum" - - -def set_mirror_stripe(energy_ev): - """ - Selects and sets the appropriate mirror stripe based on the given energy value - in electron volts (eV). - - Args: - energy_ev (float): The energy value in electron volts - - Returns: - None - """ - selected_stripe = get_mirror_stripe(energy_ev) - print(f"Selected mirror stripe: {selected_stripe}") - - -def mono_pitch_scan(plot=True, window_name="Fitting", plot_widget=None): - """Scan the monochromator pitch and move to the peak.""" - # Move to the calculated pitch value for the current energy - print("Starting Mono Pitch Scan.") - energy = get_current_energy() - pos = get_dcm_motors_positions(energy) - print(f"Setting DCM Pitch to default value of {pos['dcm_pitch']}") - # Set fine pitch to middle of its' travel range - scans.umv(EnergyDefaults.mono_fpitch, pos["dcm_fine_pitch"], relative=False) - # Move DCM pitch to starting value - scans.umv(EnergyDefaults.mono_pitch, pos["dcm_pitch"]-0.12, relative=False) - - # Go to peak using default parameters from EnergyDefaults - if plot: - print("Scanning monochromator pitch and moving to peak, with plotting.") - result = go_to_peak( - EnergyDefaults.mono_pitch, - EnergyDefaults.signals["sig1"], - -EnergyDefaults.pitch_scan["halfwidth"], - EnergyDefaults.pitch_scan["halfwidth"], - steps=EnergyDefaults.pitch_scan["steps"], - relative=True, - settle=0.01, - plot=True, - confirm=False, - min_fwhm_steps=1.1, - window_name=window_name, - plot_widget=plot_widget, - ) - else: - print("Scanning monochromator pitch and moving to peak, without plotting.") - result = go_to_peak( - EnergyDefaults.mono_pitch, - EnergyDefaults.signals["sig1"], - -EnergyDefaults.pitch_scan["halfwidth"], - EnergyDefaults.pitch_scan["halfwidth"], - steps=EnergyDefaults.pitch_scan["steps"], - relative=True, - settle=0.01, - plot=False, - min_fwhm_steps=1.5, - confirm=False, - ) - - return result - - -# Specific functions - need to be edited for each beamline - - -def move_gap_if_needed(energy_ev, move_gap=True): - """ - Move the gap position based on energy if the move_gap flag is set. - - Args: - energy_ev (float): The energy value in electron volts (eV) used for gap movement. - move_gap (bool): A flag indicating whether the gap position should be moved or not. - - Returns: - None - """ - if move_gap: - set_gap(energy_ev) - else: - print("Not moving gap.") - - -# def get_roll(energy_ev): -# """Calculates the roll based on calibration data.""" -# calib = Calibration() -# roll = np.poly1d(calib.roll)(energy_ev) -# if roll < 0: -# return 0 -# if roll >= 9.95: -# return 9.95 -# return float(roll) - - -def get_dcm_motors_positions(energy_ev): - """ - Pitch and roll are calculated based on fits of the measured calibration values. - Perp and Bragg are calculated based on the energy value via calculator.py. - - Arguments: - energy_ev (float): The energy value in electron volts for which the - DCM motor positions are to be calculated. - - Returns: - dict: A dictionary containing the calculated DCM motor positions - including values retrieved from the lookup table, Bragg angle - in milliradians, and perpendicular position. - """ - # dcm_motor_values = get_value_from_lut(energy_ev) - dcm_motor_values = {} - pitch = float(np.poly1d(Calibration.pitch_calib)(energy_ev)) - # pitch = -5.5 - fpitch = 5.0 - roll = EnergyDefaults.mono_roll_value - perp = calc_perp_position(energy_ev, print_result=False) - bragg_angle = convert_from_energy(energy_ev, print_result=False)["bragg_angle_mrad"] - dcm_motor_values.update( - { - "bragg_angle": bragg_angle, - "perp": perp, - "dcm_pitch": pitch, - "dcm_roll": roll, - "dcm_fine_pitch": fpitch, - } - ) - return dcm_motor_values - - -def move_dcm_motors(energy_ev): - """ - Move the DCM bragg, pitch and perp motors to the required positions - for the given energy in eV. - - """ - dcm_pos = get_dcm_motors_positions(energy_ev) - print( - f"Moving DCM bragg: {dcm_pos['bragg_angle']: .5g} mrad, " - f"DCM perp: {dcm_pos['perp']: .3g} mm, " - # f"DCM pitch fixed at -5.304 mrad, " - f"DCM pitch: {dcm_pos['dcm_pitch']: .5g} mrad, " - f"DCM Roll: {dcm_pos['dcm_roll']:.5g} V" - ) - # umv(EnergyDefaults.energy, dcm_pos["bragg_angle"]) - # umv(EnergyDefaults.mono_perp, dcm_pos["perp"]) - # umv(EnergyDefaults.mono_pitch, dcm_pos["dcm_pitch"]) - # umv(EnergyDefaults.mono_roll, dcm_pos["dcm_roll"]) - # print("\n***DCM Roll movement is currently disabled ***\n") - scans.umv(EnergyDefaults.mono_fpitch, dcm_pos["dcm_fine_pitch"], relative=False) - scans.umv( - EnergyDefaults.energy, - dcm_pos["bragg_angle"], - EnergyDefaults.mono_perp, - dcm_pos["perp"], - EnergyDefaults.mono_pitch, - dcm_pos["dcm_pitch"], - EnergyDefaults.mono_roll, - dcm_pos["dcm_roll"], - relative=False, - ) - - -def bl_energy( - energy_ev, move_gap=True, mono_scan=True, plot=True, window_name="Fitting", plot_widget=None -): - """ - Adjusts the beamline's energy to the specified energy in electron volts (eV). - The function validates the target energy, checks the current energy, and makes - adjustments only if the energy difference is significant enough. It performs - necessary operations including moving the gap, changing DCM motors, updating - the mirror stripe, and scanning to find the optimal DCM pitch. - - Args: - energy_ev: Target energy in electron volts to which the beamline should be adjusted. - move_gap: Boolean flag indicating whether to adjust the gap before setting energy. - plot: Boolean flag indicating whether to plot the DCM pitch scan for finding the peak. - - Returns: - None - """ - energy_ev = validate_energy(energy_ev) # Ensure energy is valid. - - # Check current energy to avoid unnecessary adjustments. - - current_energy = get_current_energy() - energy_diff = calculate_energy_difference(current_energy, energy_ev) - - if energy_diff <= EnergyDefaults.min_energy_change: - print(f"Energy change of {energy_diff:.2f} eV is too small, not changing energy.") - return - - transmission = get_value(dev.transm) - - # Step 1: Move the gap if needed. - move_gap_if_needed(energy_ev, move_gap) - - # Step 2: Move and set the DCM motors. - move_dcm_motors(energy_ev) - - # Step 3: Reset the transmission after the energy change - print(f"Setting transmission to {transmission}") - dev.transm.put(transmission) - - # Step 4: Update the mirror stripe. - set_mirror_stripe(energy_ev) - - # Step 5: Perform DCM pitch scan and move to peak. - if mono_scan: - if plot: - result = mono_pitch_scan(plot=True, window_name=window_name, plot_widget=plot_widget) - return result - else: - mono_pitch_scan(plot=False) - - -# def new_calc_gap(energy_ev): -# """ -# Calculates the gap based on the given energy -# """ -# gapval = Gap() -# harmonic_values = gapval.get_harmonic_values(energy_ev) -# if harmonic_values is not None: -# fit = np.poly1d(harmonic_values)(energy_ev) -# gap_value = fit * 0.9994 -# return gap_value -# return None - -# def set_gap(energy_ev, print_result=True): -# """ -# set the gap -# """ -# gap = new_calc_gap(energy_ev) -# # else: -# # gap = calc_gap(energy_kev) -# if gap is not None and Harmonics.min_gap_value <= gap <= 20: -# umv(dev.id_gap, gap) -# if print_result: -# print(f"Setting gap to {gap:.3f} mm") -# else: -# umv(dev.id_gap, Harmonics.min_gap_value) -# # msg = ( -# # f"Position {gap: .3f} mm is outside the allowed scan range of " -# # f"4.5 to 20 mm. Not changing the gap." -# # ) -# # raise ValueError(msg) -# return gap - - -def calc_gap(energy_ev, print_result=True): - """Calculate the undulator gap for the given energy.""" - - harmonic_values = Gap.get_harmonic_values(energy_ev) - - if harmonic_values is None: - return None - - gap = np.poly1d(harmonic_values)(energy_ev) - gap *= Gap.correction_factor - - if print_result: - harmonic = Gap.get_harmonic_by_energy(energy_ev) - print(f"Calculated gap is {gap:.3f} mm " f"using {harmonic}") - - return gap - - -def set_gap(energy_ev, print_result=False): - """Set the undulator gap.""" - - gap = calc_gap(energy_ev) - - if gap is not None and Gap.minimum_gap <= gap <= 20: - umv(dev.id_gap, gap) - - if print_result: - harmonic = Gap.get_harmonic_by_energy(energy_ev) - print(f"Setting gap to {gap:.3f} mm " f"using {harmonic}") - - else: - raise ValueError( - f"Cannot calculate a valid gap for {energy_ev:.0f} eV. " f"Calculated gap: {gap}" - ) - - return gap diff --git a/pxii_bec/macros/pxii_parameters.py b/pxii_bec/macros/pxii_parameters.py index d3f9e44..9b08a3e 100755 --- a/pxii_bec/macros/pxii_parameters.py +++ b/pxii_bec/macros/pxii_parameters.py @@ -20,7 +20,7 @@ class EnergyDefaults: mono_fpitch = dev.dcm_fpitch mono_perp = dev.dcm_perp mono_roll = dev.dcm_froll - mono_roll_value = 3.88 + mono_roll_value = 3.186 stripe_thresholds = {"silicon": 9000, "rhodium": 20000, "platinum": 40000} pitch_scan = {"halfwidth": 0.075, "steps": 20} @@ -29,9 +29,8 @@ class EnergyDefaults: class Calibration: """Calibration parameters for PXII optics""" - # pitch_calib = [-7.60082220e-19, 6.09893342e-14, -1.81702221e-09, 2.45457520e-05, -5.61275367e00] - - pitch_calib = [-1.84031410e-07,-6.76777668e-05, -5.59684124] + # pitch_calib = [-1.84031410e-07,-6.76777668e-05, -5.59684124] + pitch_calib = [-1.75794156e-07, -6.68437530e-05, -5.66961048e+00] # roll = np.array([2.28291039e-03, -2.41928101e01]) diff --git a/pxii_bec/macros/pxii_setup.py b/pxii_bec/macros/pxii_setup.py index a361a80..59dfb5d 100644 --- a/pxii_bec/macros/pxii_setup.py +++ b/pxii_bec/macros/pxii_setup.py @@ -263,7 +263,7 @@ def scan_ge(edge=11103.1, mode="coarse"): if mode == "coarse": scan_range, scanpoints = 100, 41 if mode == "medium": - scan_range, scanpoints = 40, 41 + scan_range, scanpoints = 40, 61 elif mode == "fine": scan_range, scanpoints = 15, 61 else: diff --git a/pxii_bec/macros/temp.py b/pxii_bec/macros/temp.py deleted file mode 100644 index bd98ad9..0000000 --- a/pxii_bec/macros/temp.py +++ /dev/null @@ -1,30 +0,0 @@ -import time -import subprocess -import shlex -import csv -import base64 -import numpy as np -from datetime import datetime -from contextlib import contextmanager -from dataclasses import dataclass -from pxii_bec.scripts import beamline_context as bl -from pxii_bec.macros.beamline_planner import BeamlineState -import matplotlib.pyplot as plt -from matplotlib.patches import Ellipse - -def test_daily_html_report(): - filename = bl.env.daily_setup_dir / "daily_beam.png" - image_src = image_to_data_uri(filename) - - html = f""" -| Pre- checks | OK | -||
|---|---|---|---|
| Set energy | OK | -Measure flux | OK | -