Skip to content

Commit

Permalink
Avoid reading/writing parameter file when location is I24
Browse files Browse the repository at this point in the history
  • Loading branch information
noemifrisina committed Jun 12, 2023
1 parent e20d141 commit 1d836ee
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 122 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from time import sleep

from mx_bluesky.I24.serial.dcid import DCID
from mx_bluesky.I24.serial.parameters import SSXType
from mx_bluesky.I24.serial.parameters import SSXType, read_parameters
from mx_bluesky.I24.serial.setup_beamline import Extruder, caget, caput, pv
from mx_bluesky.I24.serial.setup_beamline import setup_beamline as sup
from mx_bluesky.I24.serial.write_nexus import call_nexgen
Expand Down Expand Up @@ -206,19 +206,19 @@ def run_extruderi24():
start_time = datetime.now()
print("Start time", start_time.ctime())

write_parameter_file()
params, filepath = read_parameters(Extruder, sup.get_detector_type())
(
visit,
directory,
filename,
num_imgs,
exp_time,
det_dist,
det_type,
pump_status,
det_dist,
num_imgs,
pump_exp,
pump_delay,
) = scrape_parameter_file()
pump_status,
) = params.values()

lg.info("%s Start Time = % s" % (name, start_time))

Expand All @@ -237,7 +237,7 @@ def run_extruderi24():
caput(pv.ioc12_gp8, 0)

# For pixel detector
filepath = visit + directory
# filepath = visit + directory
print("Filepath", filepath)
print("Filename", filename)
lg.info("%s Filepath %s" % (name, filepath))
Expand Down Expand Up @@ -356,9 +356,8 @@ def run_extruderi24():

dcid.notify_start()

param_file_tuple = scrape_parameter_file()
if det_type == "eiger":
call_nexgen(None, start_time, param_file_tuple, "extruder")
call_nexgen(None, start_time, params, "extruder")

print("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")

Expand Down
Loading

0 comments on commit 1d836ee

Please sign in to comment.