main.py

@@ -217,26 +217,9 @@ def make_rpm_graph():
     makeGraph(graph, False, figSavePath='./images/{0}.png')
 
 if __name__ == '__main__':
-    print("Generating Tables")
+    print("Generating RPM Graph")
-    if False:
+    make_rpm_graph()
-        for d in (data_508rpm, data_1000rpm):
+    print("Generated")
-            print(f"Generating: {d["rpm"]}")
-            for i in range(len(PITOT_PLACEMENT)):
-                out_str = f"{i+1:d}"
-                for aoa in d["AoA"]:
-                    sheet = d["data"][f"{aoa} AoA"]
-                    pitot_height_inch = sheet.iloc[4:23, 11]
-                    out_str += f" & {pitot_height_inch.iloc[i]:.3f}"
-                out_str += "\\\\"
-
-                print(out_str)
-
-        exit()
-
-    if False:
-        print("Generating RPM Graph")
-        make_rpm_graph()
-        print("Generated")
 
     print("Loading Data & Generating Pressure Graphs")
     data = {}
@@ -246,28 +229,11 @@ if __name__ == '__main__':
         for aoa in tqdm(raw_data["AoA"], position=1):
             sheet = raw_data["data"][f"{aoa} AoA"]
 
-            aoa_data[aoa] = make_pressure_graph(sheet, aoa, raw_data["rpm"], raw_data["airSpeed"], False)
+            aoa_data[aoa] = make_pressure_graph(sheet, aoa, raw_data["rpm"], raw_data["airSpeed"], True)
             cp_pain_data.append(aoa_data[aoa])
 
         data[raw_data["rpm"]] = aoa_data
 
-        if True:
-            d = data[raw_data["rpm"]]
-            print(f"Generating: {raw_data["rpm"]}")
-            for i in range(len(PITOT_PLACEMENT)):
-                out_str = f"{i+1:d}"
-                for aoa in d:
-
-                    this_data = d[aoa]
-                    pressure = this_data[0]
-
-                    out_str += f" & {pressure.iloc[i]:.3f}"
-                out_str += "\\\\"
-
-                print(out_str)
-
-            
-
         if True:
             # All
             graph = {