Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Commit

Permalink
(#698) fix up from merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@d-perl
d-perl committed Apr 11, 2024
1 parent b3e7cfe commit 3588167
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 39 deletions.
5 changes: 0 additions & 5 deletions src/hyperion/parameters/components.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,7 @@ class Config:
focal_spot_size_x: float
focal_spot_size_y: float
resolution: float | None = None
sample_barcode: str | None = None
flux: float | None = None
undulator_gap: float | None = None
synchrotron_mode: str | None = None
slit_gap_size_x: float | None = None
slit_gap_size_y: float | None = None
xtal_snapshots_omega_start: list[str] | None = None
xtal_snapshots_omega_end: list[str] | None = None
xtal_snapshots: list[str] | None = None
Expand Down
7 changes: 0 additions & 7 deletions src/hyperion/parameters/gridscan.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,14 @@ def ispyb_params(self):
microns_per_pixel_x=self.ispyb_extras.microns_per_pixel_x,
microns_per_pixel_y=self.ispyb_extras.microns_per_pixel_y,
position=np.array(self.ispyb_extras.position),
transmission_fraction=self.transmission_frac,
current_energy_ev=self.demand_energy_ev,
beam_size_x=self.ispyb_extras.beam_size_x,
beam_size_y=self.ispyb_extras.beam_size_y,
focal_spot_size_x=self.ispyb_extras.focal_spot_size_x,
focal_spot_size_y=self.ispyb_extras.focal_spot_size_y,
comment=self.comment,
resolution=self.ispyb_extras.resolution,
sample_id=str(self.sample_id),
sample_barcode=self.ispyb_extras.sample_barcode,
flux=self.ispyb_extras.flux,
undulator_gap=self.ispyb_extras.undulator_gap,
synchrotron_mode=self.ispyb_extras.synchrotron_mode,
slit_gap_size_x=self.ispyb_extras.slit_gap_size_x,
slit_gap_size_y=self.ispyb_extras.slit_gap_size_x,
xtal_snapshots_omega_start=self.ispyb_extras.xtal_snapshots_omega_start
or [],
xtal_snapshots_omega_end=self.ispyb_extras.xtal_snapshots_omega_end or [],
Expand Down
7 changes: 0 additions & 7 deletions src/hyperion/parameters/rotation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,24 +82,17 @@ def ispyb_params(self): # pyright: ignore
microns_per_pixel_x=self.ispyb_extras.microns_per_pixel_x,
microns_per_pixel_y=self.ispyb_extras.microns_per_pixel_y,
position=np.array(self.ispyb_extras.position),
transmission_fraction=self.transmission_frac,
current_energy_ev=self.demand_energy_ev,
beam_size_x=self.ispyb_extras.beam_size_x,
beam_size_y=self.ispyb_extras.beam_size_y,
focal_spot_size_x=self.ispyb_extras.focal_spot_size_x,
focal_spot_size_y=self.ispyb_extras.focal_spot_size_y,
comment=self.comment,
resolution=self.ispyb_extras.resolution,
sample_id=str(self.sample_id),
sample_barcode=self.ispyb_extras.sample_barcode,
undulator_gap=self.ispyb_extras.undulator_gap,
synchrotron_mode=self.ispyb_extras.synchrotron_mode,
slit_gap_size_x=self.ispyb_extras.slit_gap_size_x,
slit_gap_size_y=self.ispyb_extras.slit_gap_size_y,
xtal_snapshots_omega_start=self.ispyb_extras.xtal_snapshots_omega_start,
xtal_snapshots_omega_end=self.ispyb_extras.xtal_snapshots_omega_end,
ispyb_experiment_type="SAD",
flux=self.ispyb_extras.flux,
)

@property
Expand Down
3 changes: 0 additions & 3 deletions tests/test_data/new_parameter_json_files/good_test_parameters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,8 @@
"test_2",
"test_3"
],
"flux": 10.0,
"beam_size_x": 1.0,
"beam_size_y": 1.0,
"slit_gap_size_x": 1.0,
"slit_gap_size_y": 1.0,
"focal_spot_size_x": 1.0,
"focal_spot_size_y": 1.0,
"resolution": 1.0
Expand Down
3 changes: 0 additions & 3 deletions tests/test_data/new_parameter_json_files/good_test_rotation_scan_parameters_nomove.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"zocalo_environment": "dev_artemis",
"transmission_frac": 0.1,
"ispyb_extras": {
"flux": 10.0,
"microns_per_pixel_x": 1.0,
"microns_per_pixel_y": 1.0,
"upper_left": [
Expand Down Expand Up @@ -51,8 +50,6 @@
],
"beam_size_x": 1.0,
"beam_size_y": 1.0,
"slit_gap_size_x": 1.0,
"slit_gap_size_y": 1.0,
"focal_spot_size_x": 1.0,
"focal_spot_size_y": 1.0,
"resolution": 1.0
Expand Down
14 changes: 0 additions & 14 deletions tests/unit_tests/parameters/test_parameter_model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,8 @@ def test_pin_then_xray(self):
"microns_per_pixel_y": self.microns_per_pixel_y,
"sample_barcode": "",
"position": self.position,
"flux": 1000000,
"beam_size_x": self.beam_size_x,
"beam_size_y": self.beam_size_y,
"slit_gap_size_x": 200 / 1000.0,
"slit_gap_size_y": 200 / 1000.0,
"focal_spot_size_x": self.focal_spot_size_x,
"focal_spot_size_y": self.focal_spot_size_y,
"resolution": 1.57,
Expand Down Expand Up @@ -261,11 +258,7 @@ def test_pin_then_xray(self):
# This should all be stuff that is no longer needed because
# we get it from devices!
old_params.hyperion_params.ispyb_params.resolution = None
old_params.hyperion_params.ispyb_params.flux = None
old_params.hyperion_params.ispyb_params.sample_barcode = None
old_params.hyperion_params.ispyb_params.undulator_gap = None
old_params.hyperion_params.ispyb_params.slit_gap_size_x = None
old_params.hyperion_params.ispyb_params.slit_gap_size_y = None
old_params.hyperion_params.ispyb_params.xtal_snapshots_omega_end = []
old_params.hyperion_params.ispyb_params.xtal_snapshots_omega_start = []

Expand Down Expand Up @@ -330,11 +323,8 @@ def test_rotation_new_params(self):
"microns_per_pixel_y": self.microns_per_pixel_y,
"sample_barcode": "",
"position": self.position,
"flux": 1000000,
"beam_size_x": self.beam_size_x,
"beam_size_y": self.beam_size_y,
"slit_gap_size_x": 200 / 1000.0,
"slit_gap_size_y": 200 / 1000.0,
"focal_spot_size_x": self.focal_spot_size_x,
"focal_spot_size_y": self.focal_spot_size_y,
"resolution": 1.57,
Expand Down Expand Up @@ -368,10 +358,6 @@ def test_rotation_new_params(self):
# This should all be stuff that is no longer needed because
# we get it from devices!
old_params.hyperion_params.ispyb_params.resolution = None
old_params.hyperion_params.ispyb_params.flux = None
old_params.hyperion_params.ispyb_params.sample_barcode = None
old_params.hyperion_params.ispyb_params.undulator_gap = None
old_params.hyperion_params.ispyb_params.slit_gap_size_x = None
old_params.hyperion_params.ispyb_params.slit_gap_size_y = None

assert new_old_params == old_params

0 comments on commit 3588167

Please sign in to comment.