small additions to channels and base

acquisition/base.py

@@ -16,23 +16,19 @@ def simple_scan():
 
 
 
-def simple_acquisition(daq, filename, n_pulses=10, sample="LiTbF4 sample (left)", comment="", parameters="", stand_client=None):
+def simple_acquisition(daq, filename, n_pulses=10, sample="--", comment="", parameters="", is_scan_step=False, stand_client=None):
+    """ Performs an acquisition and records the given comments and parameters.
+        is_scan_step = True if we want to continue the current run (which needs to have been acquired in the same way).
+    """
     logger.info("Simple acquisition started.")
 
-    task = daq.acquire(filename, n_pulses=n_pulses, n_repeat=1, is_scan_step=False, wait=True)
+    task = daq.acquire(filename, n_pulses=n_pulses, n_repeat=1, is_scan_step=is_scan_step, wait=True)
     run_number = daq.client.run_number
 
-    # fname = task.filenames[0]
-    # pattern = r"run([0-9]{4})"
-    # match = re.search(pattern, fname)
-    # run_number = int(match.groups()[0])
-
-    # stand_client.add_row(run_number=run_number)
-
     all_things = {}
     all_things["run_number"] = run_number
     all_things["time"] = time.asctime()
-    all_things["topic"] = "Li magnetism"
+    all_things["topic"] = "Beamline commissioning"
     all_things["sample"] = sample
     all_things["comment"] = comment
     all_things["parameters"] = parameters

channels/bs_channels.py

@@ -29,12 +29,13 @@ detectors = [
 
 detectors_with_config = DetectorConfig(detectors)
 detectors_with_config["JF16T03V01"]['save_dap_results'] = True
+detectors_with_config["JF16T03V01"]['disabled_modules'] = [0, 1] # bottom module:0, middle module:1, top module:2
 
 
 camera_channels = [
     # "SARES30-CAMS156-PCO1:FPICTURE",       # PCO edge camera for the wavefront analysis (from Alvra)
     # "SARES30-CAMS156-SMX-OAV:FPICTURE",    # SwissMX OAV camera picture
-    # "SARES30-CAMS156-XE:FPICTURE",         # X-ray eye
+    "SARES30-CAMS156-XE:FPICTURE",         # X-ray eye
 ]
 
 ####################

channels/pv_channels.py

@@ -140,6 +140,8 @@ pvs_PSSS059 = [
     "SARFE10-PSSS059:MOTOR_Z5.RBV",
     "SARFE10-PSSS055:GRATING_SP",
     "SARFE10-PSSS059:CRYSTAL_SP",
+    "SARFE10-PSSS059:SPC_ROI_YMIN",
+    "SARFE10-PSSS059:SPC_ROI_YMAX",
 ]
 
 ####################
@@ -293,8 +295,11 @@ pvs_OATA150 = [
     "SAROP31-OATA150:MOTOR_4.RBV",
     "SAROP31-OATA150:MOTOR_5.RBV",
     "SAROP31-OATA150:MOTOR_6.RBV",
+    "SAROP31-OATA150:ENERGY",
     "SAROP31-OATA150:TRANS_SP",
     "SAROP31-OATA150:TRANS_RB",
+    "SAROP31-OATA150:TRANS3EDHARM_RB",
+    "SAROP31-OATA150:MOT2TRANS.VALD"
 ]
 
 ####################
@@ -304,6 +309,7 @@ pvs_OPPI151 = [
     "SAROP31-OPPI151:MOTOR_Y.RBV",
 ]
 
+
 ####################
 ## Horizontal offset mirror ODMV152
 pvs_ODMV152 = [
@@ -319,30 +325,6 @@ pvs_ODMV152 = [
     "SAROP31-ODMV152:TX.RBV",
 ]
 
-#######################
-# from _proc process
-pvs_PPRM150 = [
-    "SAROP31-PPRM150:intensity",
-    "SAROP31-PPRM150:x_center_of_mass",
-    "SAROP31-PPRM150:x_fit_amplitude",
-    "SAROP31-PPRM150:x_fit_mean",
-    "SAROP31-PPRM150:x_fit_offset",
-    "SAROP31-PPRM150:x_fit_standard_deviation",
-    "SAROP31-PPRM150:x_fwhm",
-    "SAROP31-PPRM150:x_profile",
-    "SAROP31-PPRM150:x_rms",
-    "SAROP31-PPRM150:y_center_of_mass",
-    "SAROP31-PPRM150:y_fit_amplitude",
-    "SAROP31-PPRM150:y_fit_mean",
-    "SAROP31-PPRM150:y_fit_offset",
-    "SAROP31-PPRM150:y_fit_standard_deviation",
-    "SAROP31-PPRM150:y_fwhm",
-    "SAROP31-PPRM150:y_profile",
-    "SAROP31-PPRM150:y_rms",
-    # "SAROP31-PPRM150:FPICTURE",                         # full pictures for debugging purposes at the moment, from _ib process
-]
-
-
 ###########################
 # Vertical KB mirror OKBV153
 pvs_OKBV153 = [
@@ -362,9 +344,8 @@ pvs_OKBV153 = [
 
 ####################
 # Screen between the KB's PSCD153
-# Not implemented yet
 pvs_PSCD153 = [
-    # "SAROP31-PSCD153"
+    "SAROP31-PSCD153:MOTOR_PROBE.RBV"
 ]
 
 ###########################
@@ -391,6 +372,13 @@ pvs_standa = [
     "SARES30-MOBI1:MOT_3.RBV",
 ]
 
+####################
+# Newport 300 mm stage
+pvs_newport_300 = [
+    "SARES30-MOBI1:MOT_5.RBV",
+]
+
+
 ###############################
 # Smaract stages mini XYZ from SwissMX
 pvs_smaract_xyz = [
@@ -427,9 +415,9 @@ pvs = (
     + pvs_gas_monitor
     + pvs_OAPU044
     + pvs_PBPS053
-    + pvs_PSSS059
     + pvs_OATT053
     + pvs_PPRM053
+    + pvs_PSSS059
     + pvs_OOMH067
     + pvs_PSCR068
     + pvs_OOMH084
@@ -447,8 +435,9 @@ pvs = (
     + pvs_OKBV153
     + pvs_PSCD153
     + pvs_OKBH154
-#    + pvs_standa
-#    + pvs_smaract_xyz
+    + pvs_standa
+    + pvs_newport_300
+    + pvs_smaract_xyz
 #    + pvs_Bernina
 )
 

cristallina.py

@@ -112,7 +112,7 @@ def test_attenuator():
         logger.warning("No transmission value reported from {attenuator.ID}")
 
 
-test_attenuator()
+# test_attenuator()
 
 front_end_attenuator = Attenuator(
     "SARFE10-OATT053", description="Front end attenuator OATT053"
@@ -195,13 +195,14 @@ instrument = "cristallina"
 # pgroup = "p21238"  # Cristallina photon diagnostics p-group with Chris
 # pgroup = "p21224"  # SwissMX commissioning 7
 
-pgroup = "p19150"  # Scratch
+# pgroup = "p19150"  # Scratch
 # pgroup = "p19152"  # Scratch
 
 # pgroup = "p20840"  # Cr beamline commisioning (Jan-Feb 2023)
 # pgroup = "p21261"  # CrQ PMS-3 July 2023
 
 # pgroup = "p21528"  # Cr-MX Colletier 2023-09-05
+pgroup = "p21516" # Beamline commissioning September 26-27, 2023
 
 daq = SFAcquisition(
     instrument,
@@ -211,6 +212,8 @@ daq = SFAcquisition(
     default_detectors=detectors,
     rate_multiplicator=1,
 )
+
+
 # There is a new EPICS buffer, so the archiver is no longer used. This makes sure we are taking PVs from the right place.
 daq.update_config_pvs()