DiffractionExperiment: Storage cell number can be adjusted from the frontend
This commit is contained in:
1 parent
866d70f41c
commit
70bdcfd99d
8 files changed
+152
-135
No files matched your search
@@ -941,11 +941,7 @@ void DiffractionExperiment::LoadDetectorSettings(const JFJochProtoBuf::DetectorS
|
||||
else
|
||||
FrameTime(std::chrono::microseconds(settings.frame_time_us()));
|
||||
|
||||
if (settings.use_storage_cells())
|
||||
StorageCells(16);
|
||||
else
|
||||
StorageCells(1);
|
||||
|
||||
StorageCells(settings.storage_cell_count());
|
||||
UseInternalPacketGenerator(settings.use_internal_packet_generator());
|
||||
|
||||
if (settings.collect_raw_data())
|
||||
@@ -975,7 +971,7 @@ JFJochProtoBuf::DetectorSettings DiffractionExperiment::GetDetectorSettings() co
|
||||
ret.set_count_time_us(GetFrameCountTime().count());
|
||||
ret.set_collect_raw_data(GetDetectorMode() != DetectorMode::Conversion);
|
||||
ret.set_use_internal_packet_generator(IsUsingInternalPacketGen());
|
||||
ret.set_use_storage_cells(GetStorageCellNumber() > 1);
|
||||
ret.set_storage_cell_count(GetStorageCellNumber());
|
||||
ret.set_pedestal_g0_frames(GetPedestalG0Frames());
|
||||
ret.set_pedestal_g1_frames(GetPedestalG1Frames());
|
||||
ret.set_pedestal_g2_frames(GetPedestalG2Frames());
|
||||
|
||||
@@ -4,6 +4,10 @@ import {Switch, Grid, InputAdornment, TextField} from "@mui/material";
|
||||
import Button from "@mui/material/Button";
|
||||
import Paper from "@mui/material/Paper";
|
||||
import {handleErrors} from "./handleErrors";
|
||||
import FormControl from "@mui/material/FormControl";
|
||||
import InputLabel from "@mui/material/InputLabel";
|
||||
import Select, {SelectChangeEvent} from "@mui/material/Select";
|
||||
import MenuItem from "@mui/material/MenuItem";
|
||||
|
||||
type MyProps = {
|
||||
addr: string;
|
||||
@@ -12,7 +16,7 @@ type MyProps = {
|
||||
type MyState = {
|
||||
s: {
|
||||
frameTimeUs: number | string,
|
||||
useStorageCells: boolean,
|
||||
storageCellCount: number | string,
|
||||
useInternalPacketGenerator: boolean,
|
||||
collectRawData: boolean,
|
||||
countTimeUs: number | string,
|
||||
@@ -20,6 +24,7 @@ type MyState = {
|
||||
pedestalG1Frames: number | string,
|
||||
pedestalG2Frames: number | string
|
||||
},
|
||||
storage_cell_list_value: string,
|
||||
frame_time_error: boolean,
|
||||
count_time_error: boolean,
|
||||
connection_error: boolean
|
||||
@@ -35,7 +40,7 @@ class DetectorSettings extends Component<MyProps, MyState> {
|
||||
state = {
|
||||
s: {
|
||||
frameTimeUs: 1000,
|
||||
useStorageCells: false,
|
||||
storageCellCount: 1,
|
||||
useInternalPacketGenerator: false,
|
||||
collectRawData: false,
|
||||
countTimeUs: 980,
|
||||
@@ -43,6 +48,7 @@ class DetectorSettings extends Component<MyProps, MyState> {
|
||||
pedestalG1Frames: 300,
|
||||
pedestalG2Frames: 300
|
||||
},
|
||||
storage_cell_list_value: "1",
|
||||
frame_time_error: false,
|
||||
count_time_error: false,
|
||||
connection_error: true
|
||||
@@ -91,14 +97,6 @@ class DetectorSettings extends Component<MyProps, MyState> {
|
||||
this.updateCollectionTime(this.state.s.frameTimeUs, event.target.value);
|
||||
}
|
||||
|
||||
storageCellToggle = (event: React.ChangeEvent<HTMLInputElement>) => {
|
||||
this.setState(prevState => (
|
||||
{
|
||||
s : {...prevState.s,
|
||||
useStorageCells: event.target.checked}
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
rawDataToggle = (event: React.ChangeEvent<HTMLInputElement>) => {
|
||||
this.setState(prevState => (
|
||||
@@ -123,12 +121,23 @@ class DetectorSettings extends Component<MyProps, MyState> {
|
||||
.catch(error => console.log(error) );
|
||||
}
|
||||
|
||||
handleChange = (event : SelectChangeEvent<String>) => {
|
||||
this.setState(prevState => ({
|
||||
storage_cell_list_value: String(event.target.value).toString(),
|
||||
s : {...prevState.s,
|
||||
storageCellCount: String(event.target.value).toString()
|
||||
}
|
||||
})
|
||||
);
|
||||
};
|
||||
|
||||
getValues = () => {
|
||||
fetch(this.addr + 'detector/settings')
|
||||
.then(handleErrors)
|
||||
.then(res => res.json())
|
||||
.then(data => this.setState({
|
||||
s: data,
|
||||
storage_cell_list_value: String(data.storageCellCount),
|
||||
connection_error: false
|
||||
}))
|
||||
.catch(error => {
|
||||
@@ -175,9 +184,24 @@ class DetectorSettings extends Component<MyProps, MyState> {
|
||||
|
||||
<br/><br/>
|
||||
|
||||
<Switch onChange={this.storageCellToggle} checked={this.state.s.useStorageCells}
|
||||
disabled={this.state.connection_error}/>
|
||||
Measure with storage cells<br/><br/>
|
||||
<FormControl>
|
||||
<InputLabel id="demo-simple-select-label">Storage cell count</InputLabel>
|
||||
<Select
|
||||
labelId="demo-simple-select-label"
|
||||
id="demo-simple-select"
|
||||
value={this.state.storage_cell_list_value}
|
||||
label="Storage cell count"
|
||||
onChange={this.handleChange}
|
||||
disabled={this.state.connection_error}
|
||||
>
|
||||
<MenuItem value={"1"}>1</MenuItem>
|
||||
<MenuItem value={"2"}>2</MenuItem>
|
||||
<MenuItem value={"4"}>4</MenuItem>
|
||||
<MenuItem value={"8"}>8</MenuItem>
|
||||
<MenuItem value={"16"}>16</MenuItem>
|
||||
</Select>
|
||||
</FormControl>
|
||||
<br/><br/>
|
||||
|
||||
<Switch onChange={this.rawDataToggle} checked={this.state.s.collectRawData}
|
||||
disabled={this.state.connection_error}/>
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@ message DetectorSettings {
|
||||
int64 frame_time_us = 1;
|
||||
optional int64 count_time_us = 2;
|
||||
|
||||
bool use_storage_cells = 3;
|
||||
int64 storage_cell_count = 3;
|
||||
bool use_internal_packet_generator = 4;
|
||||
bool collect_raw_data = 5;
|
||||
|
||||
|
||||
+100
-100
@@ -13,7 +13,7 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xa5\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12\x13\n\tsummation\x18\x03 \x01(\x03H\x00\x12\x17\n\rimage_time_us\x18\x04 \x01(\x03H\x00\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x01\x88\x01\x01\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12\x36\n\x11scattering_vector\x18\x0f \x01(\x0b\x32\x16.JFJochProtoBuf.VectorH\x02\x88\x01\x01\x12\x18\n\x10\x61pply_pixel_mask\x18\x10 \x01(\x08\x12\x12\n\nbinning2x2\x18\x11 \x01(\x08\x42\x08\n\x06timingB\x0c\n\n_unit_cellB\x14\n\x12_scattering_vector\"\xf6\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x1a\n\rcount_time_us\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x19\n\x11use_storage_cells\x18\x03 \x01(\x08\x12%\n\x1duse_internal_packet_generator\x18\x04 \x01(\x08\x12\x18\n\x10\x63ollect_raw_data\x18\x05 \x01(\x08\x12\x1f\n\x12pedestal_g0_frames\x18\x06 \x01(\x03H\x01\x88\x01\x01\x12\x1f\n\x12pedestal_g1_frames\x18\x07 \x01(\x03H\x02\x88\x01\x01\x12\x1f\n\x12pedestal_g2_frames\x18\x08 \x01(\x03H\x03\x88\x01\x01\x12\x19\n\x11\x63onversion_on_cpu\x18\t \x01(\x08\x42\x10\n\x0e_count_time_usB\x15\n\x13_pedestal_g0_framesB\x15\n\x13_pedestal_g1_framesB\x15\n\x13_pedestal_g2_frames\"b\n\x16\x44\x65tectorModuleGeometry\x12\x0e\n\x06pixel0\x18\x01 \x01(\x03\x12\x1b\n\x13\x66\x61st_direction_step\x18\x02 \x01(\x03\x12\x1b\n\x13slow_direction_step\x18\x03 \x01(\x03\"z\n\x10\x44\x65tectorGeometry\x12\x11\n\twidth_pxl\x18\x01 \x01(\x03\x12\x12\n\nheight_pxl\x18\x02 \x01(\x03\x12?\n\x0fmodule_geometry\x18\x03 \x03(\x0b\x32&.JFJochProtoBuf.DetectorModuleGeometry\"\xc1\x01\n\x08\x44\x65tector\x12\x10\n\x08nmodules\x18\x01 \x01(\x03\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x15\n\rpixel_size_mm\x18\x03 \x01(\x02\x12\x17\n\x0fmodule_hostname\x18\x04 \x03(\t\x12\x32\n\x08geometry\x18\x05 \x01(\x0b\x32 .JFJochProtoBuf.DetectorGeometry\x12*\n\x04type\x18\x06 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorType\"\xe1\x05\n\x10InternalSettings\x12\"\n\x1a\x66rame_time_pedestalG1G2_us\x18\x01 \x01(\x03\x12\x15\n\rframe_time_us\x18\x03 \x01(\x03\x12\x15\n\rcount_time_us\x18\x04 \x01(\x03\x12*\n\x08\x64\x65tector\x18\x05 \x01(\x0b\x32\x18.JFJochProtoBuf.Detector\x12\x14\n\x0cndatastreams\x18\x06 \x01(\x03\x12&\n\x1einternal_fpga_packet_generator\x18\t \x01(\x08\x12\x15\n\rstorage_cells\x18\n \x01(\x03\x12\x1a\n\x12storage_cell_start\x18\x0b \x01(\x03\x12\x1a\n\x12pedestal_g0_frames\x18\x0c \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\r \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x0e \x01(\x03\x12\x19\n\x11preview_period_us\x18\x0f \x01(\x03\x12\x1e\n\x16spot_finding_period_us\x18\x10 \x01(\x03\x12*\n\x04mode\x18\x13 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorMode\x12\x19\n\x11mask_module_edges\x18\x14 \x01(\x08\x12\x17\n\x0fmask_chip_edges\x18\x15 \x01(\x08\x12\x16\n\x0eipv4_base_addr\x18\x16 \x01(\x03\x12\r\n\x05low_q\x18\x1a \x01(\x02\x12\x0e\n\x06high_q\x18\x1b \x01(\x02\x12\x11\n\tq_spacing\x18\x1c \x01(\x02\x12\x10\n\x08git_sha1\x18\x1d \x01(\t\x12\x10\n\x08git_date\x18\x1e \x01(\t\x12\x19\n\x11\x63onversion_on_cpu\x18\x1f \x01(\x08\x12\x13\n\x0bsource_name\x18 \x01(\t\x12\x19\n\x11source_name_short\x18! \x01(\t\x12\x17\n\x0finstrument_name\x18\" \x01(\t\x12\x1d\n\x15instrument_name_short\x18# \x01(\t\"|\n\x14JungfraujochSettings\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x1f.JFJochProtoBuf.DatasetSettings\x12\x32\n\x08internal\x18\x02 \x01(\x0b\x32 .JFJochProtoBuf.InternalSettings\"\x1e\n\nJFPedestal\x12\x10\n\x08pedestal\x18\x01 \x01(\x0c\"-\n\x11JFGainCalibration\x12\x18\n\x10gain_calibration\x18\x01 \x01(\x0c\"\xb2\x01\n\rJFCalibration\x12\x10\n\x08nmodules\x18\x01 \x01(\x04\x12\x16\n\x0enstorage_cells\x18\x02 \x01(\x04\x12,\n\x08pedestal\x18\x03 \x03(\x0b\x32\x1a.JFJochProtoBuf.JFPedestal\x12\x0c\n\x04mask\x18\Line truncated
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xa5\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12\x13\n\tsummation\x18\x03 \x01(\x03H\x00\x12\x17\n\rimage_time_us\x18\x04 \x01(\x03H\x00\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x01\x88\x01\x01\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12\x36\n\x11scattering_vector\x18\x0f \x01(\x0b\x32\x16.JFJochProtoBuf.VectorH\x02\x88\x01\x01\x12\x18\n\x10\x61pply_pixel_mask\x18\x10 \x01(\x08\x12\x12\n\nbinning2x2\x18\x11 \x01(\x08\x42\x08\n\x06timingB\x0c\n\n_unit_cellB\x14\n\x12_scattering_vector\"\xf7\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x1a\n\rcount_time_us\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x1a\n\x12storage_cell_count\x18\x03 \x01(\x03\x12%\n\x1duse_internal_packet_generator\x18\x04 \x01(\x08\x12\x18\n\x10\x63ollect_raw_data\x18\x05 \x01(\x08\x12\x1f\n\x12pedestal_g0_frames\x18\x06 \x01(\x03H\x01\x88\x01\x01\x12\x1f\n\x12pedestal_g1_frames\x18\x07 \x01(\x03H\x02\x88\x01\x01\x12\x1f\n\x12pedestal_g2_frames\x18\x08 \x01(\x03H\x03\x88\x01\x01\x12\x19\n\x11\x63onversion_on_cpu\x18\t \x01(\x08\x42\x10\n\x0e_count_time_usB\x15\n\x13_pedestal_g0_framesB\x15\n\x13_pedestal_g1_framesB\x15\n\x13_pedestal_g2_frames\"b\n\x16\x44\x65tectorModuleGeometry\x12\x0e\n\x06pixel0\x18\x01 \x01(\x03\x12\x1b\n\x13\x66\x61st_direction_step\x18\x02 \x01(\x03\x12\x1b\n\x13slow_direction_step\x18\x03 \x01(\x03\"z\n\x10\x44\x65tectorGeometry\x12\x11\n\twidth_pxl\x18\x01 \x01(\x03\x12\x12\n\nheight_pxl\x18\x02 \x01(\x03\x12?\n\x0fmodule_geometry\x18\x03 \x03(\x0b\x32&.JFJochProtoBuf.DetectorModuleGeometry\"\xc1\x01\n\x08\x44\x65tector\x12\x10\n\x08nmodules\x18\x01 \x01(\x03\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x15\n\rpixel_size_mm\x18\x03 \x01(\x02\x12\x17\n\x0fmodule_hostname\x18\x04 \x03(\t\x12\x32\n\x08geometry\x18\x05 \x01(\x0b\x32 .JFJochProtoBuf.DetectorGeometry\x12*\n\x04type\x18\x06 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorType\"\xe1\x05\n\x10InternalSettings\x12\"\n\x1a\x66rame_time_pedestalG1G2_us\x18\x01 \x01(\x03\x12\x15\n\rframe_time_us\x18\x03 \x01(\x03\x12\x15\n\rcount_time_us\x18\x04 \x01(\x03\x12*\n\x08\x64\x65tector\x18\x05 \x01(\x0b\x32\x18.JFJochProtoBuf.Detector\x12\x14\n\x0cndatastreams\x18\x06 \x01(\x03\x12&\n\x1einternal_fpga_packet_generator\x18\t \x01(\x08\x12\x15\n\rstorage_cells\x18\n \x01(\x03\x12\x1a\n\x12storage_cell_start\x18\x0b \x01(\x03\x12\x1a\n\x12pedestal_g0_frames\x18\x0c \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\r \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x0e \x01(\x03\x12\x19\n\x11preview_period_us\x18\x0f \x01(\x03\x12\x1e\n\x16spot_finding_period_us\x18\x10 \x01(\x03\x12*\n\x04mode\x18\x13 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorMode\x12\x19\n\x11mask_module_edges\x18\x14 \x01(\x08\x12\x17\n\x0fmask_chip_edges\x18\x15 \x01(\x08\x12\x16\n\x0eipv4_base_addr\x18\x16 \x01(\x03\x12\r\n\x05low_q\x18\x1a \x01(\x02\x12\x0e\n\x06high_q\x18\x1b \x01(\x02\x12\x11\n\tq_spacing\x18\x1c \x01(\x02\x12\x10\n\x08git_sha1\x18\x1d \x01(\t\x12\x10\n\x08git_date\x18\x1e \x01(\t\x12\x19\n\x11\x63onversion_on_cpu\x18\x1f \x01(\x08\x12\x13\n\x0bsource_name\x18 \x01(\t\x12\x19\n\x11source_name_short\x18! \x01(\t\x12\x17\n\x0finstrument_name\x18\" \x01(\t\x12\x1d\n\x15instrument_name_short\x18# \x01(\t\"|\n\x14JungfraujochSettings\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x1f.JFJochProtoBuf.DatasetSettings\x12\x32\n\x08internal\x18\x02 \x01(\x0b\x32 .JFJochProtoBuf.InternalSettings\"\x1e\n\nJFPedestal\x12\x10\n\x08pedestal\x18\x01 \x01(\x0c\"-\n\x11JFGainCalibration\x12\x18\n\x10gain_calibration\x18\x01 \x01(\x0c\"\xb2\x01\n\rJFCalibration\x12\x10\n\x08nmodules\x18\x01 \x01(\x04\x12\x16\n\x0enstorage_cells\x18\x02 \x01(\x04\x12,\n\x08pedestal\x18\x03 \x03(\x0b\x32\x1a.JFJochProtoBuf.JFPedestal\x12\x0c\n\x04mask\x18Line truncated
|
||||
|
||||
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
||||
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
|
||||
@@ -22,18 +22,18 @@ if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
DESCRIPTOR._options = None
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._options = None
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_options = b'8\001'
|
||||
_COMPRESSION._serialized_start=8575
|
||||
_COMPRESSION._serialized_end=8659
|
||||
_DETECTORTYPE._serialized_start=8661
|
||||
_DETECTORTYPE._serialized_end=8700
|
||||
_DETECTORMODE._serialized_start=8702
|
||||
_DETECTORMODE._serialized_end=8792
|
||||
_FPGAFIFOSTATUS._serialized_start=8794
|
||||
_FPGAFIFOSTATUS._serialized_end=8844
|
||||
_STATE._serialized_start=8846
|
||||
_STATE._serialized_end=8940
|
||||
_PLOTTYPE._serialized_start=8942
|
||||
_PLOTTYPE._serialized_end=9018
|
||||
_COMPRESSION._serialized_start=8576
|
||||
_COMPRESSION._serialized_end=8660
|
||||
_DETECTORTYPE._serialized_start=8662
|
||||
_DETECTORTYPE._serialized_end=8701
|
||||
_DETECTORMODE._serialized_start=8703
|
||||
_DETECTORMODE._serialized_end=8793
|
||||
_FPGAFIFOSTATUS._serialized_start=8795
|
||||
_FPGAFIFOSTATUS._serialized_end=8845
|
||||
_STATE._serialized_start=8847
|
||||
_STATE._serialized_end=8941
|
||||
_PLOTTYPE._serialized_start=8943
|
||||
_PLOTTYPE._serialized_end=9019
|
||||
_EMPTY._serialized_start=32
|
||||
_EMPTY._serialized_end=39
|
||||
_UNITCELL._serialized_start=41
|
||||
@@ -47,91 +47,91 @@ if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
_DATASETSETTINGS._serialized_start=330
|
||||
_DATASETSETTINGS._serialized_end=879
|
||||
_DETECTORSETTINGS._serialized_start=882
|
||||
_DETECTORSETTINGS._serialized_end=1256
|
||||
_DETECTORMODULEGEOMETRY._serialized_start=1258
|
||||
_DETECTORMODULEGEOMETRY._serialized_end=1356
|
||||
_DETECTORGEOMETRY._serialized_start=1358
|
||||
_DETECTORGEOMETRY._serialized_end=1480
|
||||
_DETECTOR._serialized_start=1483
|
||||
_DETECTOR._serialized_end=1676
|
||||
_INTERNALSETTINGS._serialized_start=1679
|
||||
_INTERNALSETTINGS._serialized_end=2416
|
||||
_JUNGFRAUJOCHSETTINGS._serialized_start=2418
|
||||
_JUNGFRAUJOCHSETTINGS._serialized_end=2542
|
||||
_JFPEDESTAL._serialized_start=2544
|
||||
_JFPEDESTAL._serialized_end=2574
|
||||
_JFGAINCALIBRATION._serialized_start=2576
|
||||
_JFGAINCALIBRATION._serialized_end=2621
|
||||
_JFCALIBRATION._serialized_start=2624
|
||||
_JFCALIBRATION._serialized_end=2802
|
||||
_JFCALIBRATIONSTATISTICS._serialized_start=2804
|
||||
_JFCALIBRATIONSTATISTICS._serialized_end=2890
|
||||
_ACQUISITIONDEVICESTATISTICS._serialized_start=2893
|
||||
_ACQUISITIONDEVICESTATISTICS._serialized_end=3166
|
||||
_RECEIVERINPUT._serialized_start=3169
|
||||
_RECEIVERINPUT._serialized_end=3305
|
||||
_RECEIVEROUTPUT._serialized_start=3308
|
||||
_RECEIVEROUTPUT._serialized_end=3734
|
||||
_RECEIVERNETWORKCONFIGDEVICE._serialized_start=3736
|
||||
_RECEIVERNETWORKCONFIGDEVICE._serialized_end=3820
|
||||
_RECEIVERNETWORKCONFIG._serialized_start=3822
|
||||
_RECEIVERNETWORKCONFIG._serialized_end=3906
|
||||
_RECEIVERSTATUS._serialized_start=3909
|
||||
_RECEIVERSTATUS._serialized_end=4056
|
||||
_PLOTREQUEST._serialized_start=4058
|
||||
_PLOTREQUEST._serialized_end=4128
|
||||
_RECEIVERDATAPROCESSINGPLOTS._serialized_start=4131
|
||||
_RECEIVERDATAPROCESSINGPLOTS._serialized_end=4341
|
||||
_WRITERINPUT._serialized_start=4343
|
||||
_WRITERINPUT._serialized_end=4405
|
||||
_DATAFILESTATISTICS._serialized_start=4407
|
||||
_DATAFILESTATISTICS._serialized_end=4458
|
||||
_WRITEROUTPUT._serialized_start=4461
|
||||
_WRITEROUTPUT._serialized_end=4602
|
||||
_DETECTORMODULECONFIG._serialized_start=4605
|
||||
_DETECTORMODULECONFIG._serialized_end=4863
|
||||
_DETECTORCONFIG._serialized_start=4865
|
||||
_DETECTORCONFIG._serialized_end=4961
|
||||
_DETECTORINPUT._serialized_start=4964
|
||||
_DETECTORINPUT._serialized_end=5213
|
||||
_DETECTOROUTPUT._serialized_start=5215
|
||||
_DETECTOROUTPUT._serialized_end=5231
|
||||
_DETECTORSTATUS._serialized_start=5233
|
||||
_DETECTORSTATUS._serialized_end=5331
|
||||
_FPGASTATUS._serialized_start=5334
|
||||
_FPGASTATUS._serialized_end=6404
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_start=6323
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_end=6404
|
||||
_INDEXERDATAPROCESSINGPLOTS._serialized_start=6406
|
||||
_INDEXERDATAPROCESSINGPLOTS._serialized_end=6479
|
||||
_DATAPROCESSINGSETTINGS._serialized_start=6482
|
||||
_DATAPROCESSINGSETTINGS._serialized_end=6828
|
||||
_PREVIEWFRAME._serialized_start=6831
|
||||
_PREVIEWFRAME._serialized_end=7100
|
||||
_MODULESTATISTICS._serialized_start=7103
|
||||
_MODULESTATISTICS._serialized_end=7340
|
||||
_IMAGE._serialized_start=7342
|
||||
_IMAGE._serialized_end=7415
|
||||
_MASKTOLOAD._serialized_start=7417
|
||||
_MASKTOLOAD._serialized_end=7463
|
||||
_MEASUREMENTSTATISTICS._serialized_start=7466
|
||||
_MEASUREMENTSTATISTICS._serialized_end=8035
|
||||
_BROKERSTATUS._serialized_start=8038
|
||||
_BROKERSTATUS._serialized_end=8179
|
||||
_BROKERFULLSTATUS._serialized_start=8182
|
||||
_BROKERFULLSTATUS._serialized_end=8346
|
||||
_DETECTORLISTELEMENT._serialized_start=8348
|
||||
_DETECTORLISTELEMENT._serialized_end=8420
|
||||
_DETECTORLIST._serialized_start=8422
|
||||
_DETECTORLIST._serialized_end=8540
|
||||
_DETECTORSELECTION._serialized_start=8542
|
||||
_DETECTORSELECTION._serialized_end=8573
|
||||
_GRPC_JFJOCHRECEIVER._serialized_start=9021
|
||||
_GRPC_JFJOCHRECEIVER._serialized_end=9688
|
||||
_GRPC_JFJOCHWRITER._serialized_start=9691
|
||||
_GRPC_JFJOCHWRITER._serialized_end=9893
|
||||
_GRPC_JFJOCHDETECTOR._serialized_start=9896
|
||||
_GRPC_JFJOCHDETECTOR._serialized_end=10282
|
||||
_GRPC_JFJOCHBROKER._serialized_start=10285
|
||||
_GRPC_JFJOCHBROKER._serialized_end=11874
|
||||
_DETECTORSETTINGS._serialized_end=1257
|
||||
_DETECTORMODULEGEOMETRY._serialized_start=1259
|
||||
_DETECTORMODULEGEOMETRY._serialized_end=1357
|
||||
_DETECTORGEOMETRY._serialized_start=1359
|
||||
_DETECTORGEOMETRY._serialized_end=1481
|
||||
_DETECTOR._serialized_start=1484
|
||||
_DETECTOR._serialized_end=1677
|
||||
_INTERNALSETTINGS._serialized_start=1680
|
||||
_INTERNALSETTINGS._serialized_end=2417
|
||||
_JUNGFRAUJOCHSETTINGS._serialized_start=2419
|
||||
_JUNGFRAUJOCHSETTINGS._serialized_end=2543
|
||||
_JFPEDESTAL._serialized_start=2545
|
||||
_JFPEDESTAL._serialized_end=2575
|
||||
_JFGAINCALIBRATION._serialized_start=2577
|
||||
_JFGAINCALIBRATION._serialized_end=2622
|
||||
_JFCALIBRATION._serialized_start=2625
|
||||
_JFCALIBRATION._serialized_end=2803
|
||||
_JFCALIBRATIONSTATISTICS._serialized_start=2805
|
||||
_JFCALIBRATIONSTATISTICS._serialized_end=2891
|
||||
_ACQUISITIONDEVICESTATISTICS._serialized_start=2894
|
||||
_ACQUISITIONDEVICESTATISTICS._serialized_end=3167
|
||||
_RECEIVERINPUT._serialized_start=3170
|
||||
_RECEIVERINPUT._serialized_end=3306
|
||||
_RECEIVEROUTPUT._serialized_start=3309
|
||||
_RECEIVEROUTPUT._serialized_end=3735
|
||||
_RECEIVERNETWORKCONFIGDEVICE._serialized_start=3737
|
||||
_RECEIVERNETWORKCONFIGDEVICE._serialized_end=3821
|
||||
_RECEIVERNETWORKCONFIG._serialized_start=3823
|
||||
_RECEIVERNETWORKCONFIG._serialized_end=3907
|
||||
_RECEIVERSTATUS._serialized_start=3910
|
||||
_RECEIVERSTATUS._serialized_end=4057
|
||||
_PLOTREQUEST._serialized_start=4059
|
||||
_PLOTREQUEST._serialized_end=4129
|
||||
_RECEIVERDATAPROCESSINGPLOTS._serialized_start=4132
|
||||
_RECEIVERDATAPROCESSINGPLOTS._serialized_end=4342
|
||||
_WRITERINPUT._serialized_start=4344
|
||||
_WRITERINPUT._serialized_end=4406
|
||||
_DATAFILESTATISTICS._serialized_start=4408
|
||||
_DATAFILESTATISTICS._serialized_end=4459
|
||||
_WRITEROUTPUT._serialized_start=4462
|
||||
_WRITEROUTPUT._serialized_end=4603
|
||||
_DETECTORMODULECONFIG._serialized_start=4606
|
||||
_DETECTORMODULECONFIG._serialized_end=4864
|
||||
_DETECTORCONFIG._serialized_start=4866
|
||||
_DETECTORCONFIG._serialized_end=4962
|
||||
_DETECTORINPUT._serialized_start=4965
|
||||
_DETECTORINPUT._serialized_end=5214
|
||||
_DETECTOROUTPUT._serialized_start=5216
|
||||
_DETECTOROUTPUT._serialized_end=5232
|
||||
_DETECTORSTATUS._serialized_start=5234
|
||||
_DETECTORSTATUS._serialized_end=5332
|
||||
_FPGASTATUS._serialized_start=5335
|
||||
_FPGASTATUS._serialized_end=6405
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_start=6324
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_end=6405
|
||||
_INDEXERDATAPROCESSINGPLOTS._serialized_start=6407
|
||||
_INDEXERDATAPROCESSINGPLOTS._serialized_end=6480
|
||||
_DATAPROCESSINGSETTINGS._serialized_start=6483
|
||||
_DATAPROCESSINGSETTINGS._serialized_end=6829
|
||||
_PREVIEWFRAME._serialized_start=6832
|
||||
_PREVIEWFRAME._serialized_end=7101
|
||||
_MODULESTATISTICS._serialized_start=7104
|
||||
_MODULESTATISTICS._serialized_end=7341
|
||||
_IMAGE._serialized_start=7343
|
||||
_IMAGE._serialized_end=7416
|
||||
_MASKTOLOAD._serialized_start=7418
|
||||
_MASKTOLOAD._serialized_end=7464
|
||||
_MEASUREMENTSTATISTICS._serialized_start=7467
|
||||
_MEASUREMENTSTATISTICS._serialized_end=8036
|
||||
_BROKERSTATUS._serialized_start=8039
|
||||
_BROKERSTATUS._serialized_end=8180
|
||||
_BROKERFULLSTATUS._serialized_start=8183
|
||||
_BROKERFULLSTATUS._serialized_end=8347
|
||||
_DETECTORLISTELEMENT._serialized_start=8349
|
||||
_DETECTORLISTELEMENT._serialized_end=8421
|
||||
_DETECTORLIST._serialized_start=8423
|
||||
_DETECTORLIST._serialized_end=8541
|
||||
_DETECTORSELECTION._serialized_start=8543
|
||||
_DETECTORSELECTION._serialized_end=8574
|
||||
_GRPC_JFJOCHRECEIVER._serialized_start=9022
|
||||
_GRPC_JFJOCHRECEIVER._serialized_end=9689
|
||||
_GRPC_JFJOCHWRITER._serialized_start=9692
|
||||
_GRPC_JFJOCHWRITER._serialized_end=9894
|
||||
_GRPC_JFJOCHDETECTOR._serialized_start=9897
|
||||
_GRPC_JFJOCHDETECTOR._serialized_end=10283
|
||||
_GRPC_JFJOCHBROKER._serialized_start=10286
|
||||
_GRPC_JFJOCHBROKER._serialized_end=11875
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -285,14 +285,9 @@ int64_t JFJochReceiver::MiniSummationThread(int d, int m, size_t image_number, b
|
||||
}
|
||||
|
||||
int64_t JFJochReceiver::FrameTransformationThread() {
|
||||
|
||||
|
||||
FrameTransformation transformation(experiment);
|
||||
|
||||
JFJochFrameSerializer serializer(experiment.GetPixelsNum()*sizeof(uint32_t)*2);
|
||||
|
||||
std::binary_semaphore serializer_buffer_sempahore(1);
|
||||
|
||||
std::unique_ptr<GPUImageAnalysis> spot_finder;
|
||||
|
||||
try {
|
||||
|
||||
@@ -817,7 +817,7 @@ TEST_CASE("DiffractionExperiment_LoadDetectorSettings", "[DiffractionExperiment]
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(600);
|
||||
settings.set_count_time_us(400);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(8);
|
||||
settings.set_use_internal_packet_generator(true);
|
||||
settings.set_collect_raw_data(true);
|
||||
settings.set_pedestal_g0_frames(5000);
|
||||
@@ -828,7 +828,7 @@ TEST_CASE("DiffractionExperiment_LoadDetectorSettings", "[DiffractionExperiment]
|
||||
REQUIRE(x.GetFrameTime().count() == 600);
|
||||
REQUIRE(x.GetFrameCountTime().count() == 400);
|
||||
REQUIRE(x.IsUsingInternalPacketGen());
|
||||
REQUIRE(x.GetStorageCellNumber() == 16);
|
||||
REQUIRE(x.GetStorageCellNumber() == 8);
|
||||
REQUIRE(x.GetDetectorMode() == DetectorMode::Raw);
|
||||
REQUIRE(x.GetPedestalG0Frames() == 5000);
|
||||
REQUIRE(x.GetPedestalG1Frames() == 100);
|
||||
@@ -842,7 +842,7 @@ TEST_CASE("DiffractionExperiment_LoadDetectorSettings_invalid", "[DiffractionExp
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(600);
|
||||
settings.set_count_time_us(800);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(16);
|
||||
settings.set_use_internal_packet_generator(true);
|
||||
settings.set_collect_raw_data(true);
|
||||
settings.set_pedestal_g0_frames(5000);
|
||||
@@ -866,7 +866,7 @@ TEST_CASE("DiffractionExperiment_LoadDetectorSettings_inferred", "[DiffractionEx
|
||||
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(600);
|
||||
|
||||
settings.set_storage_cell_count(1);
|
||||
REQUIRE_NOTHROW(x.LoadDetectorSettings(settings));
|
||||
|
||||
REQUIRE(x.GetFrameTime().count() == 600);
|
||||
@@ -898,6 +898,7 @@ TEST_CASE("DiffractionExperiment_ConversionOnCPU","[DiffractionExperiment]") {
|
||||
// Loading detector settings without explicit option should reset to standard behavior
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(600);
|
||||
settings.set_storage_cell_count(1);
|
||||
x.LoadDetectorSettings(settings);
|
||||
REQUIRE(x.GetConversionOnFPGA());
|
||||
REQUIRE(!x.GetConversionOnCPU());
|
||||
|
||||
@@ -63,7 +63,7 @@ TEST_CASE("JFJochStateMachine_State_Pedestal") {
|
||||
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(500);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(16);
|
||||
REQUIRE_THROWS(state_machine.SetDetectorSettings(settings));
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ TEST_CASE("JFJochStateMachine_State_Measure") {
|
||||
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(500);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(16);
|
||||
REQUIRE_THROWS(state_machine.SetDetectorSettings(settings));
|
||||
}
|
||||
|
||||
@@ -124,7 +124,7 @@ TEST_CASE("JFJochStateMachine_State_Error") {
|
||||
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(500);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(16);
|
||||
REQUIRE_NOTHROW(state_machine.SetDetectorSettings(settings));
|
||||
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
@@ -147,7 +147,7 @@ TEST_CASE("JFJochStateMachine_Setup") {
|
||||
settings.set_pedestal_g2_frames(2800);
|
||||
settings.set_pedestal_g1_frames(3000);
|
||||
settings.set_pedestal_g0_frames(2378);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(16);
|
||||
settings.set_frame_time_us(600);
|
||||
settings.set_count_time_us(247);
|
||||
REQUIRE_NOTHROW(state_machine.SetDetectorSettings(settings));
|
||||
@@ -159,7 +159,7 @@ TEST_CASE("JFJochStateMachine_Setup") {
|
||||
REQUIRE(state_machine.NotThreadSafe_Experiment().GetFrameCountTime() == std::chrono::microseconds(247));
|
||||
|
||||
REQUIRE_NOTHROW(settings_save = state_machine.GetDetectorSettings());
|
||||
REQUIRE(settings_save.use_storage_cells());
|
||||
REQUIRE(settings_save.storage_cell_count() == 16);
|
||||
REQUIRE(settings_save.count_time_us() == 247);
|
||||
}
|
||||
|
||||
@@ -200,7 +200,7 @@ TEST_CASE("JFJochStateMachine_StorageCells") {
|
||||
|
||||
JFJochProtoBuf::DetectorSettings settings;
|
||||
settings.set_frame_time_us(500);
|
||||
settings.set_use_storage_cells(true);
|
||||
settings.set_storage_cell_count(16);
|
||||
REQUIRE_NOTHROW(state_machine.SetDetectorSettings(settings));
|
||||
REQUIRE(state_machine.NotThreadSafe_Experiment().GetStorageCellNumber() == 16);
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
|
||||
@@ -365,6 +365,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_RAW", "[JFJochReceiver]") {
|
||||
JFJochProtoBuf::DetectorSettings detector_settings;
|
||||
detector_settings.set_frame_time_us(500);
|
||||
detector_settings.set_collect_raw_data(true);
|
||||
detector_settings.set_storage_cell_count(1);
|
||||
REQUIRE_NOTHROW(state_machine.SetDetectorSettings(detector_settings));
|
||||
REQUIRE_NOTHROW(state_machine.Initialize());
|
||||
logger.Info("Initialized");
|
||||
|
||||
Reference in new issue
Block a user