CDPP / AMDA_Kernel

Commit b6295191e4fa10834d65eec59ffd5076e217b652

Authored by Hacene SI HADJ MOHAND
1 parent e06e49a1
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

mav-sta print ok

Showing 2 changed files with 22 additions and 30 deletions   Show diff stats
Inline Side-by-side
src/Info/ParamInfo.cc
  Diff comments   View file @b629519
... ... @@ -113,6 +113,27 @@ std::vector<std::pair<std::string,std::string>> ParamInfo::getInfoMap(ParameterM
113 113 table.second->addTableInfo(parameterManager, table.first, infoMap);
114 114 }
115 115 }
  116 + ParameterSPtr param = parameterManager->getParameter(getId());
  117 + AMDA::Parameters::SemiVariableTable semiVariableTable = param->getSemiVariableTable();
  118 + if(! semiVariableTable.tabHeader.empty()){
  119 + std::stringstream head;
  120 + head.str("");
  121 + head<<"mode"<<" ";
  122 + for (auto h :semiVariableTable.tabHeader){
  123 + head<<h<<" ";
  124 + }
  125 + PUSHINFO(infoMap, "",head.str());
  126 + }
  127 + for(auto v:semiVariableTable.tabValues){
  128 + std::ostringstream values;
  129 + values<<std::to_string(v.first)<<" ";
  130 + // Convert all doubles to string ","
  131 + std::copy(v.second.begin(), v.second.end(),
  132 + std::ostream_iterator<double>(values, " "));
  133 + PUSHINFO(infoMap, "",values.str());
  134 + values.str("");
  135 + }
  136 +
116 137  
117 138 //adjout des info de tables
118 139 /**
... ...
src/Info/ParamTable.cc
  Diff comments   View file @b629519
... ... @@ -216,36 +216,7 @@ void ParamTable::addVariableTableInfo(ParameterManager * parameterManager, int d
216 216 ParameterSPtr pParam = parameterManager->getParameter(linkedParam.second);
217 217 std::map<std::string, boost::shared_ptr<std::vector<double>>> infoList =pParam->getInfoList();
218 218 if(! infoList.empty()){
219   - int nenergy;
220   - std::map<std::string, boost::shared_ptr<std::vector<double>>>::iterator it = infoList.find("nenergy");
221   - nenergy = (int)(*it->second)[0];
222   - int nmass;
223   - std::map<std::string, boost::shared_ptr<std::vector<double>>>::iterator it2 = infoList.find("nmass");
224   - nmass = (int)(*it2->second)[0];
225   - int nswp;
226   - std::map<std::string, boost::shared_ptr<std::vector<double>>>::iterator it3 = infoList.find("nswp");
227   - nswp = (int)(*it3->second)[0];
228   - std::ostringstream head;
229   - head.str("");
230   - head << "# mode ";
231   - for(int j=0; j<nmass; j++){
232   - for(int l=0; l<nenergy; l++){
233   - head<<_tableName<<"["<<j<<","<<l<<"]";
234   - }
235   - }
236   - PUSHINFO(tableInfo, "", head.str());
237   - std::ostringstream values;
238   -
239   - for(int k= 0; k<nswp; k++){
240   - for(int e= 0; e<nenergy*nmass; e++){
241   - std::string energyLevel="energy_" + std::to_string(e);
242   - it = infoList.find(energyLevel);
243   - values<<std::to_string(e)<<(*it->second)[e];
244   - }
245   - PUSHINFO(tableInfo,"",values.str());
246   - values.str("");
247   - }
248   -
  219 + // pour l'instant rien
249 220 }
250 221 i++;
251 222 }
... ...