CDPP / AMDA_Kernel

Commit c057fb1bfca01603c1af7bbaecb1325071c97324

Authored by Hacene SI HADJ MOHAND
2 parents a3eb6f22 fdc384b2
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

Merge branch 'master' into rm_6616

Showing 3 changed files with 4 additions and 1 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Download/FileWriterASCIIAbstract.cc
  Diff comments   View file @c057fb1
... ... @@ -108,6 +108,7 @@ bool FileWriterASCIIAbstract::addParameter(ParamProperties* paramProp, AMDA::Com
108 108 //init field working structure
109 109 _fieldInfoMap[paramProp->getOutputId()].name = paramInfo->getName();
110 110 _fieldInfoMap[paramProp->getOutputId()].ucd = paramInfo->getUcd();
  111 + _fieldInfoMap[paramProp->getOutputId()].unit = paramInfo->getUnits();
111 112 _fieldInfoMap[paramProp->getOutputId()].type = type;
112 113 _fieldInfoMap[paramProp->getOutputId()].dimSize1 = dim1Size;
113 114 _fieldInfoMap[paramProp->getOutputId()].dimSize2 = dim2Size;
... ...
src/ParamOutputImpl/Download/FileWriterASCIIAbstract.hh
  Diff comments   View file @c057fb1
... ... @@ -40,6 +40,7 @@ public:
40 40 {
41 41 std::string name;
42 42 std::string ucd;
  43 + std::string unit;
43 44 FileDataType type;
44 45 int dimSize1;
45 46 int dimSize2;
... ...
src/ParamOutputImpl/Download/FileWriterASCIIVOTable.cc
  Diff comments   View file @c057fb1
... ... @@ -140,7 +140,8 @@ void FileWriterASCIIVOTable::writeFieldDescription(std::string paramId)
140 140 _outputFile << " <FIELD name=\"";
141 141 _outputFile << _fieldInfoMap[paramId].name << "\" ID=\"";
142 142 _outputFile << paramId << "\" ucd=\"";
143   - _outputFile << _fieldInfoMap[paramId].ucd << "\" datatype=\"";
  143 + _outputFile << _fieldInfoMap[paramId].ucd << "\" unit=\"";
  144 + _outputFile << _fieldInfoMap[paramId].unit << "\" datatype=\"";
144 145  
145 146 switch (_fieldInfoMap[paramId].type)
146 147 {
... ...