ae file with several sets

wetb/hawc2/ae_file.py

@@ -112,12 +112,11 @@ class AEFile(object):
         lptr = 1
         self.ae_sets = {}
         for _ in range(1, nsets + 1):
-            for _ in range(nsets):
-                set_nr, n_rows = [int(v) for v in lines[lptr].split()[:2]]
-                lptr += 1
-                data = np.array([[float(v) for v in l.split()[:4]] for l in lines[lptr:lptr + n_rows]])
-                self.ae_sets[set_nr] = data
-                lptr += n_rows
+            set_nr, n_rows = [int(v) for v in lines[lptr].split()[:2]]
+            lptr += 1
+            data = np.array([[float(v) for v in l.split()[:4]] for l in lines[lptr:lptr + n_rows]])
+            self.ae_sets[set_nr] = data
+            lptr += n_rows
 
 
 def main():

wetb/hawc2/tests/test_ae_file.py

@@ -84,6 +84,10 @@ class TestAEFile(unittest.TestCase):
         ae2 = AEFile(fn)
         assert str(ae) == str(ae2)
 
+    def test_multiple_sets(self):
+        ae = AEFile(testfilepath + 'ae_files/HAWC2_ae.dat')
+        self.assertEqual(len(ae.ae_sets), 2)
+
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']

wetb/hawc2/tests/test_files/ae_files/HAWC2_ae.dat

+2 
+1  3
+0.0000E+00	5.3800E+00	1.0000E+02	1	;
+2.0000E+00	5.3800E+00	1.0000E+02	1	;
+4.7120E+00	5.3800E+00	9.6915E+01	1	;
+2  3
+0.0000E+00	5.3800E+00	1.0000E+02	1	;
+2.0000E+00	5.3800E+00	1.0000E+02	1	;
+4.7120E+00	5.3800E+00	9.6915E+01	1	;