mx/Jungfraujoch
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 53 Wiki Activity

Minor updates when trying the software on xbl-daq-38

Browse Source 
Signed-off-by: Leonarski Filip <leonarski_f@xbl-daq-38.psi.ch>
This commit is contained in:
Leonarski Filip
2023-05-04 15:06:04 +02:00
parent d10201b502
commit d27faed668
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
detector_control/DetectorWrapper.cpp
+11 -12
View File
@@ -9,25 +9,21 @@
void DetectorWrapper::Configure(const JFJochProtoBuf::DetectorConfig &request) {
logger.Info("Configure");
if (det.size() != request.modules_size()) {
logger.Error("Discrepancy in module number between DAQ and detector");
throw JFJochException(JFJochExceptionCategory::Detector,
"Discrepancy in module number between DAQ and detector");
}
try {
InternalStop();
if (det.size() > 0)
InternalStop();
if (request.module_hostname_size() > 0) {
if (det.size() != request.module_hostname_size()) {
logger.Error("Discrepancy in module number between DAQ and detector");
throw JFJochException(JFJochExceptionCategory::Detector,
"Discrepancy in module number between DAQ and detector");
}
std::vector<std::string> module_hostname;
for (const auto &iter: request.module_hostname())
module_hostname.push_back(iter);
logger.Info("Resetting detector module host names");
det.setHostname(module_hostname);
}
if (det.size() != request.modules_size()) {
logger.Error("Discrepancy in module number between DAQ and detector");
throw JFJochException(JFJochExceptionCategory::Detector,
"Discrepancy in module number between DAQ and detector");
}
det.setNumberofUDPInterfaces(2);
@@ -57,10 +53,13 @@ void DetectorWrapper::Configure(const JFJochProtoBuf::DetectorConfig &request) {
det.setTemperatureControl(true);
det.setThresholdTemperature(55);
det.setSynchronization(false);
det.setTimingMode(slsDetectorDefs::timingMode::TRIGGER_EXPOSURE);
det.setMaster(true, 0);
det.setSynchronization(true);
det.setTimingMode(slsDetectorDefs::timingMode::TRIGGER_EXPOSURE);
det.setAutoComparatorDisable(true);
if (!det.getPowerChip().squash(false)) {
det.setPowerChip(true);
etc/broker.json
+1 -1
View File
@@ -34,7 +34,7 @@
"count_time_us": "980 us",
"spot_finding_period_us": "5 ms",
"preview_period_us": "1 s",
"ipv4_subnet": "10.10.85.0"
"detector_ipv4": "10.10.85.0"
},
"detectors": [
{
receiver/jfjoch_action_test.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ int main(int argc, char **argv) {
logger.Info("");
for (int i = 0; i < nstreams; i++) {
auto stalls_hbm = output.device_statistics(i).fpga_status().stalls_hbm();
auto stalls_host = output.device_statistics(i).fpga_status().stalls_hbm();
auto stalls_host = output.device_statistics(i).fpga_status().stalls_host();
uint64_t throughput_MBs = nimages * nmodules * RAW_MODULE_SIZE*sizeof(uint16_t) * clock_MHz / (nimages * nmodules * 128 * 128 + stalls_hbm);
double performance = static_cast<double>(throughput_MBs) / 1000;