fix sequence of file_structure check when processing sample names

latools/latools.py

@@ -279,7 +279,9 @@ def __init__(self, data_path, errorhunt=False, config='DEFAULT',
         data.sort(key=lambda d: d.uTime[0])
 
         # process sample names
-        if (names == 'file_names') | (names == 'metadata_names'):
+        if file_structure == 'long':
+            samples = np.array([s.sample for s in data], dtype=object)  
+        elif (names == 'file_names') | (names == 'metadata_names'):
             samples = np.array([s.sample.replace(' ', '') for s in data], dtype=object)  # get all sample names
             # if duplicates, rename them
             usamples, ucounts = np.unique(samples, return_counts=True)
@@ -292,8 +294,6 @@ def __init__(self, data_path, errorhunt=False, config='DEFAULT',
                     samples[ind] = new  # rename in samples
                     for s, ns in zip([data[i] for i in np.where(ind)[0]], new):
                         s.sample = ns  # rename in D objects
-        elif file_structure == 'long':
-            samples = np.array([s.sample for s in data], dtype=object)
         else:
             samples = np.arange(len(data))  # assign a range of numbers
             for i, s in enumerate(samples):