CDPP / AMDA_IHM

Commit bc0f89a8f31cef0235dd55151347662ff75abc0b

Authored by Elena.Budnik
1 parent a8bb25b8
Exists in master and in 96 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

correctNan for 2 dims

Showing 1 changed file with 17 additions and 7 deletions   Show diff stats
Inline Side-by-side
update_amda/correctNan.php
  Diff comments   View file @bc0f89a
... ... @@ -4,21 +4,31 @@
4 4  
5 5 $info = new DomDocument("1.0");
6 6 // $infoName = $argv[1];
7   - $pattern = "info_psp_om*.xml";
  7 + $pattern = "info_psp_loic_*.xml";
8 8 foreach (glob(AMDA_INTERNAL_METADATA."/PARAM_INFO_PREDEFINED/".$pattern) as $infoName) {
9 9 $info->load($infoName);
10 10  
11 11 $dimensions = $info->getElementsByTagName("dimensions")->item(0);
12 12  
13 13 $dim_1 = $dimensions->getAttribute("dim_1");
14   - $channels = $info->getElementsByTagName("channel");
  14 + $dim_2 = null;
  15 + if ($dimensions->hasAttribute("dim_2"))
  16 + $dim_2 = $dimensions->getAttribute("dim_2");
15 17  
16   - if ($dim_1 != $channels->length) {
17   - $dimensions->setAttribute("dim_1", $channels->length);
18   - echo $infoName.PHP_EOL;
19   - echo $dim_1." ".$channels->length.PHP_EOL;
20   - }
  18 +
  19 + $tables = $info->getElementsByTagName("table");
21 20  
  21 + foreach ($tables as $table) {
  22 + $channels = $table->getElementsByTagName("channel");
  23 + $dim = $table->getAttribute("relatedDim");
  24 + if ( $dim == "dim_1" ) $dim_ = $dim_1;
  25 + if ( $dim == "dim_2" ) $dim_ = $dim_2;
  26 + if ($dim_ != $channels->length) {
  27 + $dimensions->setAttribute($dim, $channels->length);
  28 + echo $infoName.PHP_EOL;
  29 + echo $dim_." ".$channels->length.PHP_EOL;
  30 + }
  31 + }
22 32 $info->save($infoName);
23 33 }
24 34  
... ...