CDPP / AMDA_Kernel

Commit 7abf24a081e0decf4a12ac0f406330599d64ce72

Authored by Hacene SI HADJ MOHAND
1 parent c057fb1b
Exists in master and in 85 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_6015, rm_6616, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, test-merge, ubuntu

correcting bug

Showing 3 changed files with 4 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/ExternLib/GetClbInfo/GetClbInfoProcess.cc
  Diff comments   View file @7abf24a
... ... @@ -54,9 +54,7 @@ TimeStamp GetClbInfoProcess::init() {
54 54 int i = 0;
55 55 unsigned int nbHeader = 0;
56 56 for (auto info : lInfoList){
57   - std::stringstream index;
58   - index << std::setw(3) << std::setfill('0') <<i;
59   - semiVariableTableElements.tabValues[index.str()] = *info.second;
  57 + semiVariableTableElements.tabValues[std::to_string(i)] = *info.second;
60 58 if (nbHeader < (*info.second).size())
61 59 nbHeader = (*info.second).size();
62 60 i++;
... ...
src/Info/ParamTable.cc
  Diff comments   View file @7abf24a
... ... @@ -211,8 +211,7 @@ namespace AMDA {
211 211 }
212 212 }
213 213  
214   - bool ParamTable::addSemiVariableTableInfo(ParameterManager* parameterManager, int dim, std::string paramId, std::string tabKey, std::vector<std::pair<std::string, std::string>>&infoMap) {
215   - bool isAddedTable = false;
  214 + void ParamTable::addSemiVariableTableInfo(ParameterManager* parameterManager, int dim, std::string paramId, std::string tabKey, std::vector<std::pair<std::string, std::string>>&infoMap) {
216 215 AMDA::Parameters::ParameterSPtr pParam = parameterManager->getParameter(paramId);
217 216 Process* lProcess = dynamic_cast<Process*> (pParam->getDataWriterTemplate().get());
218 217 if (lProcess != NULL) {
... ... @@ -220,7 +219,6 @@ namespace AMDA {
220 219 std::list<std::string>::iterator it;
221 220 it = std::find(_printedTables.begin(), _printedTables.end(), paramId);
222 221 if (!semiVariableTable.tabHeader.empty() && it == _printedTables.end()) {
223   - isAddedTable = true;
224 222 std::stringstream head;
225 223 head.str("");
226 224 head << "mode" << " ";
... ... @@ -295,7 +293,7 @@ namespace AMDA {
295 293 const std::vector<std::string>& paramLinkedParams = paramInfo->getLinkedParamList();
296 294 for (auto pId : paramLinkedParams)
297 295 addSemiVariableTableInfo(parameterManager, dim, pId, tabKey, infoMap);
298   - return isAddedTable;
  296 + return;
299 297 }
300 298  
301 299 void ParamTable::addVariableTableInfo(ParameterManager * parameterManager, int dim, std::vector<std::pair<std::string, std::string>>&tableInfo) {
... ...
src/Info/ParamTable.hh
  Diff comments   View file @7abf24a
... ... @@ -80,7 +80,7 @@ namespace Info {
80 80  
81 81 void addTableInfo(ParameterManager *parameterManager, int dim, std::vector<std::pair<std::string,std::string>>& infoMap);
82 82  
83   - bool addSemiVariableTableInfo(ParameterManager *parameterManager, int dim, std::string paramId, std::string key, std::vector<std::pair<std::string,std::string>>& infoMap);
  83 + void addSemiVariableTableInfo(ParameterManager *parameterManager, int dim, std::string paramId, std::string key, std::vector<std::pair<std::string,std::string>>& infoMap);
84 84  
85 85 void addRelatedParams(ParameterManager *parameterManager, std::string paramId, std::list<std::string>relatedParams);
86 86  
... ...