From 86e1d87de74da2b36e1f75af60b003a7f7221c76 Mon Sep 17 00:00:00 2001 From: Jorge Blanco Alonso Date: Wed, 6 Apr 2022 11:22:18 +0200 Subject: [PATCH] Clang format and other minor changes --- coreneuron/io/reports/report_event.cpp | 29 ++++++++++++------------ coreneuron/io/reports/report_handler.cpp | 3 ++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coreneuron/io/reports/report_event.cpp b/coreneuron/io/reports/report_event.cpp index 5a943bf02..6189c4526 100644 --- a/coreneuron/io/reports/report_event.cpp +++ b/coreneuron/io/reports/report_event.cpp @@ -89,19 +89,19 @@ void ReportEvent::lfp_calc(NrnThread* nt) { int count = 0; double sum = 0.0; for (const auto& kv: cell_mapping->lfp_factors) { - int segment_id = kv.first; - double factor = kv.second; - if(std::isnan(factor)) { - factor = 0.0; - } - double iclamp = 0.0; - for (const auto& value: summation_report.currents_[segment_id]) { - double current_value = *value.first; - int scale = value.second; - iclamp += current_value * scale; - } - sum += (fast_imem_rhs[segment_id] + iclamp) * factor; - count++; + int segment_id = kv.first; + double factor = kv.second; + if (std::isnan(factor)) { + factor = 0.0; + } + double iclamp = 0.0; + for (const auto& value: summation_report.currents_[segment_id]) { + double current_value = *value.first; + int scale = value.second; + iclamp += current_value * scale; + } + sum += (fast_imem_rhs[segment_id] + iclamp) * factor; + count++; } *(to_report.front().var_value) = sum; } @@ -115,8 +115,7 @@ void ReportEvent::deliver(double t, NetCvode* nc, NrnThread* nt) { { if (report_type == ReportType::SummationReport) { summation_alu(nt); - } - else if (report_type == ReportType::LFPReport) { + } else if (report_type == ReportType::LFPReport) { lfp_calc(nt); } // each thread needs to know its own step diff --git a/coreneuron/io/reports/report_handler.cpp b/coreneuron/io/reports/report_handler.cpp index 53efb137d..e720f331e 100644 --- a/coreneuron/io/reports/report_handler.cpp +++ b/coreneuron/io/reports/report_handler.cpp @@ -62,7 +62,8 @@ void ReportHandler::create_report(double dt, double tstop, double delay) { case LFPReport: // 1 lfp value per gid mapinfo->_lfp.resize(nt.ncell); - vars_to_report = get_lfp_vars_to_report(nt, m_report_config, mapinfo->_lfp.data(), nodes_to_gid); + vars_to_report = + get_lfp_vars_to_report(nt, m_report_config, mapinfo->_lfp.data(), nodes_to_gid); is_soma_target = m_report_config.section_type == SectionType::Soma || m_report_config.section_type == SectionType::Cell; register_section_report(nt, m_report_config, vars_to_report, is_soma_target);