From 54dc69b6d7a4588267ce6afe4ca3720fadac1c64 Mon Sep 17 00:00:00 2001 From: Patrick Herrington Date: Fri, 11 Oct 2024 12:07:07 -0500 Subject: [PATCH] Clean up --- include/trick/DRAscii.hh | 2 +- include/trick/DataRecordGroup.hh | 2 +- trick_source/sim_services/DataRecord/DRAscii.cpp | 2 +- trick_source/sim_services/DataRecord/DataRecordGroup.cpp | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/trick/DRAscii.hh b/include/trick/DRAscii.hh index da512981..6da2c839 100644 --- a/include/trick/DRAscii.hh +++ b/include/trick/DRAscii.hh @@ -69,7 +69,7 @@ namespace Trick { @code = trick.DRAscii("") @endcode @copydoc Trick::DataRecordGroup::DataRecordGroup(string in_name) */ - DRAscii( std::string in_name, DR_Buffering drb = DR_Buffering::DR_Buffer /*Trick::DR_Type dr_type = Trick::DR_Type::DR_Type_Ascii*/ ) ; + DRAscii( std::string in_name, Trick::DR_Type dr_type = Trick::DR_Type::DR_Type_Ascii ) ; /** @copybrief Trick::DataRecordGroup::format_specific_header diff --git a/include/trick/DataRecordGroup.hh b/include/trick/DataRecordGroup.hh index f6d39eeb..184a65ec 100644 --- a/include/trick/DataRecordGroup.hh +++ b/include/trick/DataRecordGroup.hh @@ -414,7 +414,7 @@ namespace Trick { virtual int add_time_variable() ; /** - @brief This function adds jobs to the DRG based on job_config bits. By default a DRG should be constructed with all jobs on. + @brief This function adds jobs to the DRG based on the dr type. @returns void */ void configure_jobs(DR_Type type) ; diff --git a/trick_source/sim_services/DataRecord/DRAscii.cpp b/trick_source/sim_services/DataRecord/DRAscii.cpp index 94c6b79a..55ce144a 100644 --- a/trick_source/sim_services/DataRecord/DRAscii.cpp +++ b/trick_source/sim_services/DataRecord/DRAscii.cpp @@ -18,7 +18,7 @@ PROGRAMMERS: #include "trick/message_type.h" #include "trick/bitfield_proto.h" -Trick::DRAscii::DRAscii( std::string in_name, DR_Buffering drb /*Trick::DR_Type dr_type*/ ) : Trick::DataRecordGroup( in_name/*, dr_type*/ ) { +Trick::DRAscii::DRAscii( std::string in_name, Trick::DR_Type dr_type ) : Trick::DataRecordGroup( in_name, dr_type ) { ascii_float_format = "%20.8g" ; ascii_double_format = "%20.16g" ; diff --git a/trick_source/sim_services/DataRecord/DataRecordGroup.cpp b/trick_source/sim_services/DataRecord/DataRecordGroup.cpp index 846b9e32..13d057fe 100644 --- a/trick_source/sim_services/DataRecord/DataRecordGroup.cpp +++ b/trick_source/sim_services/DataRecord/DataRecordGroup.cpp @@ -419,9 +419,6 @@ int Trick::DataRecordGroup::init() { } void Trick::DataRecordGroup::configure_jobs(DR_Type type) { - - //std::cout << "!!!!!!!!!! DataRecordGroup::configure_jobs: " << (int)type << std::endl; - switch(type) { default: // run the restart job in phase 60001