Modifications in preparation to MAX IV experiment
This commit is contained in:
@@ -44,15 +44,10 @@ bool PCIExpressDevice::HW_SendWorkRequest(uint32_t handle) {
|
||||
|
||||
void PCIExpressDevice::FPGA_StartAction(const DiffractionExperiment &experiment) {
|
||||
dev.Start();
|
||||
if (experiment.IsUsingInternalPacketGen()) {
|
||||
FrameGeneratorConfig config{};
|
||||
config.frames = experiment.GetFrameNum() + DELAY_FRAMES_STOP_AND_QUIT + 1;
|
||||
config.modules = experiment.GetModulesNum(data_stream);
|
||||
}
|
||||
|
||||
config.dest_mac_addr = dev.GetMACAddress();
|
||||
config.dest_ipv4_addr = dev.GetIPv4Address();
|
||||
dev.RunFrameGenerator(config);
|
||||
}
|
||||
void PCIExpressDevice::HW_RunInternalGenerator(const FrameGeneratorConfig &config) {
|
||||
dev.RunFrameGenerator(config);
|
||||
}
|
||||
|
||||
void PCIExpressDevice::FPGA_EndAction() {
|
||||
@@ -107,18 +102,6 @@ std::string PCIExpressDevice::GetIPv4Address() const {
|
||||
return IPv4AddressToStr(dev.GetIPv4Address());
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_LoadCalibration(uint32_t in_modules, uint32_t in_storage_cells) {
|
||||
dev.LoadCalibration(in_modules, in_storage_cells);
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_LoadIntegrationMap(uint32_t in_modules) {
|
||||
dev.LoadIntegrationMap(in_modules);
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_LoadInternalGeneratorFrame(uint32_t in_modules) {
|
||||
dev.LoadInternalGeneratorFrame(in_modules);
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_SetSpotFinderParameters(const SpotFinderParameters ¶ms) {
|
||||
dev.SetSpotFinderParameters(params);
|
||||
}
|
||||
@@ -139,3 +122,7 @@ void PCIExpressDevice::HW_SetDataSource(uint32_t val) {
|
||||
return dev.SetDataSource(val);
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_LoadCalibration(const LoadCalibrationConfig &config) {
|
||||
dev.LoadCalibration(config);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user