Merge branch 'main' of gitlab-ssh.irstea.fr:theophile.terraz/adists_sediment_cores into main

sed_cores/sediment_cores.py

@@ -170,7 +170,7 @@ if extract_adists_data:
 if extract_adists_data:
     if (not os.path.isdir(adists_extracted_data_dir)):
         os.mkdir(adists_extracted_data_dir)
-    os.chdir(adists_extracted_data_dir)
+    # os.chdir(adists_extracted_data_dir)
     print("Extracting data from Adis-TS to CSV files...")
 
     output = ""
@@ -178,7 +178,7 @@ if extract_adists_data:
     for bed in list_beds:
         for file in list_files:
             for i,pk in enumerate(list_pk):
-                os.system( adists+" -b "+adists_bin_data_dir+"/"+file+".bin "+bed+"dt "+str(pk)+" "+file+"_"+bed+str(i)+output)
+                os.system( adists+" -b "+adists_bin_data_dir+"/"+file+".bin "+bed+"dt "+str(pk)+" "+adists_extracted_data_dir+"/"+file+"_"+bed+str(i)+output)
 
     os.chdir(cwd)
 
@@ -403,7 +403,7 @@ for bed in list_beds:
             else:
                 l += 1
         for layer in layers[bed][pk]:
-            if layers[1] > 0.0:
+            if layer[1] > 0.0:
                 for s in range(nb_sediments):
                     # on transforme les masses en proportions pour l'affichage
                     layer[s+2] /= layer[1]