taper data : read also original id from fable

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

zUtil_Taper/gtTaperConvertFableOutputToDCT.m

@@ -47,6 +47,11 @@ cmd = [bash_script ' ' fullfile(pathtofiles,map_file)];
 [~,msg]=unix(cmd);
 disp(msg)
 
+fid = fopen(fullfile(pathtofiles,'ids.txt'));
+C = textscan(fid, '%*s %d');
+fclose(fid);
+A2 = cell2mat(C);
+
 fid = fopen(fullfile(pathtofiles,'npeaks.txt'));
 C = textscan(fid, '%*s %d');
 fclose(fid);
@@ -90,10 +95,19 @@ A10 = cell2mat(C);
 
 grain = [];
 
-for ii = 1:length(A)
+for ii = 1:length(cen)
     grain{ii}.id       = ii;
+    grain{ii}.ind      = A2(ii);
     grain{ii}.center   = cen(ii,:);
     grain{ii}.R_vector = rod(ii,:);
+    grain{ii}.R_onedge = false;
+    grain{ii}.g        = Rod2g( grain{ii}.R_vector );
+    grain{ii}.euler    = gtMathsRod2Euler( grain{ii}.R_vector );
+    grain{ii}.U        = [U(ii,1:3);U(ii,4:6);U(ii,7:9)];
+    grain{ii}.eps      = eps(ii,:);
+    grain{ii}.strainT  = [eps(ii,1) eps(ii,6) eps(ii,5); ...
+                          eps(ii,6) eps(ii,2) eps(ii,4); ...
+                          eps(ii,5) eps(ii,4) eps(ii,3)];
     grain{ii}.npeaks   = A3(ii);
     grain{ii}.allint   = A4(ii);
     grain{ii}.median   = A5(ii);
@@ -105,14 +119,6 @@ for ii = 1:length(A)
     grain{ii}.stat.intmean  = double(grain{ii}.allint);
     grain{ii}.stat.bbxsmean = 1;
     grain{ii}.stat.bbysmean = 1;
-    grain{ii}.R_onedge = false;
-    grain{ii}.g        = Rod2g( grain{ii}.R_vector );
-    grain{ii}.euler    = gtMathsRod2Euler( grain{ii}.R_vector );
-    grain{ii}.U        = [U(ii,1:3);U(ii,4:6);U(ii,7:9)];
-    grain{ii}.eps      = eps(ii,:);
-    grain{ii}.strainT  = [eps(ii,1) eps(ii,6) eps(ii,5); ...
-                          eps(ii,6) eps(ii,2) eps(ii,4); ...
-                          eps(ii,5) eps(ii,4) eps(ii,3)];
 end
 
 rvec = gtIndexAllGrainValues(grain,'R_vector',[],1:3,[]);

zUtil_Taper/script_generate_files.sh

@@ -37,6 +37,8 @@ then
 
   #less $FILE | grep Rod > rodrigues.txt
   #less $FILE | grep trans > centers.txt
+  less $FILE | grep name > names.txt
+  less names.txt | awk -F":" '{print $1}' > ids.txt
   less $FILE | grep npks > npeaks.txt
   less $FILE | grep intensity > intensities.txt
   less intensities.txt | awk -F", " '{print $1}' | awk -F"= " '{print $2}' > sum_of_all.txt