diff --git a/tools/jfjoch_fpga_test.cpp b/tools/jfjoch_fpga_test.cpp index 6b650015..9cd98e3a 100644 --- a/tools/jfjoch_fpga_test.cpp +++ b/tools/jfjoch_fpga_test.cpp @@ -286,15 +286,16 @@ int main(int argc, char **argv) { static_cast(nsummation * nimages * x.GetModulesNum() * RAW_MODULE_SIZE * x.GetBitDepthReadout() / 8) / (receiving_time * 1e9)); - logger.Info("Per-image time: (mean; microseconds): compression {:.0f} preprocess {:.0f} spot finding {:.0f} indexing {:.0f} refinement {:.0f} prediction {:.0f} integration {:.0f} total {:.0f}", - output.processing_time.compression * 1e6, - output.processing_time.preprocessing * 1e6, - output.processing_time.spot_finding * 1e6, - output.processing_time.indexing * 1e6, - output.processing_time.refinement * 1e6, - output.processing_time.bragg_prediction * 1e6, - output.processing_time.integration * 1e6, - output.processing_time.processing * 1e6); + logger.Info("Per-image time: (mean; microseconds): compression {:.0f} preprocess {:.0f} spot finding {:.0f} indexing {:.0f} refinement {:.0f} indexing analysis {:.0f} prediction {:.0f} integration {:.0f} total {:.0f}", + output.processing_time.compression * 1e6, + output.processing_time.preprocessing * 1e6, + output.processing_time.spot_finding * 1e6, + output.processing_time.indexing * 1e6, + output.processing_time.refinement * 1e6, + output.processing_time.indexing_analysis * 1e6, + output.processing_time.bragg_prediction * 1e6, + output.processing_time.integration * 1e6, + output.processing_time.processing * 1e6); logger.Info(""); for (int i = 0; i < nstreams; i++) { diff --git a/tools/jfjoch_lite_perf_test.cpp b/tools/jfjoch_lite_perf_test.cpp index e4bef1c4..5840d25f 100644 --- a/tools/jfjoch_lite_perf_test.cpp +++ b/tools/jfjoch_lite_perf_test.cpp @@ -202,13 +202,15 @@ int main(int argc, char **argv) { if (output.status.max_receive_delay) logger.Info("Max delay {}", output.status.max_receive_delay.value()); - logger.Info("Per-image time: (mean; microseconds): decompression {:.0f} preprocess {:.0f} spot finding {:.0f} indexing {:.0f} refinement {:.0f} prediction {:.0f} integration {:.0f} total {:.0f}", + logger.Info("Per-image time: (mean; microseconds): compression {:.0f} preprocess {:.0f} spot finding {:.0f} indexing {:.0f} refinement {:.0f} indexing analysis {:.0f} prediction {:.0f} integration {:.0f} total {:.0f}", output.processing_time.compression * 1e6, - output.processing_time.preprocessing * 1e6, - output.processing_time.spot_finding * 1e6, - output.processing_time.indexing * 1e6, - output.processing_time.refinement * 1e6, - output.processing_time.bragg_prediction * 1e6, - output.processing_time.integration * 1e6, - output.processing_time.processing * 1e6); + output.processing_time.preprocessing * 1e6, + output.processing_time.spot_finding * 1e6, + output.processing_time.indexing * 1e6, + output.processing_time.refinement * 1e6, + output.processing_time.indexing_analysis * 1e6, + output.processing_time.bragg_prediction * 1e6, + output.processing_time.integration * 1e6, + output.processing_time.processing * 1e6); + } diff --git a/tools/jfjoch_process.cpp b/tools/jfjoch_process.cpp index 82c25125..8d59b9dc 100644 --- a/tools/jfjoch_process.cpp +++ b/tools/jfjoch_process.cpp @@ -744,13 +744,14 @@ int main(int argc, char **argv) { } auto image_mean_time = plots.GetMeanProcessingTime(); - logger.Info("Per-image time: (mean; microseconds): decompress {:.0f} preprocess {:.0f} azint {:.0f} spot finding {:.0f} indexing {:.0f} refinement {:.0f} prediction {:.0f} integration {:.0f} total {:.0f}", + logger.Info("Per-image time: (mean; microseconds): decompress {:.0f} preprocess {:.0f} azint {:.0f} spot finding {:.0f} indexing {:.0f} refinement {:.0f} indexing analysis {:.0f} prediction {:.0f} integration {:.0f} total {:.0f}", image_mean_time.compression * 1e6, image_mean_time.preprocessing * 1e6, image_mean_time.azint * 1e6, image_mean_time.spot_finding * 1e6, image_mean_time.indexing * 1e6, image_mean_time.refinement * 1e6, + image_mean_time.indexing_analysis * 1e6, image_mean_time.bragg_prediction * 1e6, image_mean_time.integration * 1e6, image_mean_time.processing * 1e6);