From 23c8a573d766eb2f48c58da8e5152b668529876a Mon Sep 17 00:00:00 2001
From: Ivan Usov <ivan.usov@psi.ch>
Date: Fri, 16 Oct 2020 15:53:30 +0200
Subject: [PATCH] Use integer keys for measurements

---
 pyzebra/comm_export.py | 6 +++---
 pyzebra/load_1D.py     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyzebra/comm_export.py b/pyzebra/comm_export.py
index 59af5a7..3ab2324 100644
--- a/pyzebra/comm_export.py
+++ b/pyzebra/comm_export.py
@@ -30,11 +30,11 @@ def export_comm(data, path, lorentz=False):
         padding = [4, 6, 10, 8]
 
     with open(str(path + extension), "w") as out_file:
-        for keys, meas in data["meas"].items():
+        for key, meas in data["meas"].items():
             if "fit" not in meas:
-                print("Measurement skipped - no fit value for:", keys)
+                print("Measurement skipped - no fit value for:", key)
                 continue
-            meas_number_str = f"{keys[1:]:{align}{padding[0]}}"
+            meas_number_str = f"{key:{align}{padding[0]}}"
             h_str = f'{int(meas["h_index"]):{padding[1]}}'
             k_str = f'{int(meas["k_index"]):{padding[1]}}'
             l_str = f'{int(meas["l_index"]):{padding[1]}}'
diff --git a/pyzebra/load_1D.py b/pyzebra/load_1D.py
index c5e9856..cb2ef7a 100644
--- a/pyzebra/load_1D.py
+++ b/pyzebra/load_1D.py
@@ -152,7 +152,7 @@ def parse_1D(fileobj, data_type):
                     int(next_line.split()[0]),
                 )
                 d["Counts"] = counts
-                measurements[str("M" + str(measurement_number))] = d
+                measurements[measurement_number] = d
 
                 if all(decimal):
                     metadata["indices"] = "hkl"