diff --git a/cpp/data/frameProcessor/src/XspressProcessPlugin.cpp b/cpp/data/frameProcessor/src/XspressProcessPlugin.cpp index ca43683..b84b0fa 100644 --- a/cpp/data/frameProcessor/src/XspressProcessPlugin.cpp +++ b/cpp/data/frameProcessor/src/XspressProcessPlugin.cpp @@ -27,9 +27,9 @@ const std::string XspressProcessPlugin::CONFIG_FRAMES = "frames"; const std::string XspressProcessPlugin::CONFIG_DTC_FLAGS = "dtc/flags"; const std::string XspressProcessPlugin::CONFIG_DTC_PARAMS = "dtc/params"; - const std::string XspressProcessPlugin::CONFIG_CHUNK = "chunks"; +const std::string XspressProcessPlugin::CONFIG_CHUNK = "chunks"; - const std::string XspressProcessPlugin::CONFIG_OFFSET = "offset"; +const std::string XspressProcessPlugin::CONFIG_OFFSET = "offset"; const std::string META_NAME = "xspress"; const std::string META_XSPRESS_CHUNK = "xspress_meta_chunk"; @@ -141,7 +141,7 @@ XspressProcessPlugin::XspressProcessPlugin() : dtc_memblock_(0), inp_est_memblock_(0), num_scalars_recorded_(0), - offset(0) + offset(0) { // Setup logging for the class logger_ = Logger::getLogger("FP.XspressProcessPlugin"); @@ -229,7 +229,7 @@ void XspressProcessPlugin::configure(OdinData::IpcMessage& config, OdinData::Ipc if(config.has_param(XspressProcessPlugin::CONFIG_OFFSET)) { this->offset = config.get_param(XspressProcessPlugin::CONFIG_OFFSET); - LOG4CXX_INFO(logger_,"\n\nconfigured offset: " << offset << "\n\n"); + LOG4CXX_INFO(logger_,"configured offset: " << offset); } // Check for the live view plugin name @@ -510,12 +510,12 @@ void XspressProcessPlugin::process_frame(boost::shared_ptr frame) } } - void XspressProcessPlugin::send_scalars(uint32_t last_frame_id, uint32_t num_scalars, uint32_t first_channel, uint32_t num_channels) - { - uint32_t num_scalar_values = num_scalars * num_channels; - uint32_t num_dtc_factors = num_channels; - uint32_t num_inp_est = num_channels; - uint32_t frame_id = (last_frame_id - num_scalars_recorded_ + 1) + (this->offset * this->frames_per_block_); //Acquisition frame ID + Offset +void XspressProcessPlugin::send_scalars(uint32_t last_frame_id, uint32_t num_scalars, uint32_t first_channel, uint32_t num_channels) +{ + uint32_t num_scalar_values = num_scalars * num_channels; + uint32_t num_dtc_factors = num_channels; + uint32_t num_inp_est = num_channels; + uint32_t frame_id = (last_frame_id - num_scalars_recorded_ + 1) + (this->offset * this->frames_per_block_); //Acquisition frame ID + Offset rapidjson::Document meta_document; meta_document.SetObject();