From 5388f964529dc7cb230d58404c6bf3b0212aa564 Mon Sep 17 00:00:00 2001
From: snizzleorg <universaldilettant@gmail.com>
Date: Fri, 5 Apr 2024 20:03:08 +0200
Subject: [PATCH] Update g2_from_file.py

---
 demos/g2_from_file.py | 60 ++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 43 deletions(-)

diff --git a/demos/g2_from_file.py b/demos/g2_from_file.py
index 7f985ad..f7befa8 100644
--- a/demos/g2_from_file.py
+++ b/demos/g2_from_file.py
@@ -2,8 +2,6 @@
 from matplotlib import pyplot as plt
 import click
 from pathlib import Path
-import csv
-import json
 import pandas as pd
 
 
@@ -14,55 +12,31 @@
 @click.option('--windowsize', '-ws', type=int, default=10000, help='size of the correlation window in ps (default: 100000)')
 @click.option('--binsize', '-bs', type=int, default=10, help='size of the correlation bin size in ps (default: 10)')
 def g2correlation(filename, a=1, b=2, windowsize=10000, binsize=10):
-    sn = snAPI(libType=LibType.Undefined)
+    sn = snAPI()
     sn.getFileDevice(filename)
     sn.correlation.setG2Parameters(a, b, windowsize, binsize)
     sn.correlation.measure(waitFinished=True)
     g2, lagtimes = sn.correlation.getG2Data()
-
-    plt.plot(lagtimes, g2, linewidth=2.0, label='g(2)')
-    plt.xlabel('Time [s]')
-    plt.ylabel('g(2)')
-    plt.legend()
-    plt.title("g(2)")
-    
-    plt.savefig(Path(filename).with_suffix('.' + 'png'), format='png')
-
-    # Save data to csv
-    with open(Path(filename).with_suffix('.' + 'csv'), mode='w', newline='') as file:
-        writer = csv.writer(file)
     
-        # Write the header row
-        writer.writerow(['lagtime', 'g2'])
-    
-        # Write the data rows using writerows() and zip()
-        writer.writerows(zip(lagtimes, g2))
-    
-    # Save data to json
-    # Combine x_values and y_values into a list of dictionaries
-    data_dic = [{'lagtime': x, 'g2': y} for x, y in zip(lagtimes, g2)]
-
-    # Specify the file name
-    json_file = Path(filename).with_suffix('.' + 'json')
-
-    # Write the data to a JSON file
-    with open(json_file, 'w') as file:
-        json.dump(data_dic, file)
-
-    # Save to Excel
-    # Combine x_values and y_values into a DataFrame
-    df = pd.DataFrame(data_dic)
-
+    df = pd.DataFrame([{'lagtime': x, 'g2': y} for x, y in zip(lagtimes, g2)])
     # Drop rows where either 'X' or 'Y' value is zero
     df = df[(df != 0).all(1)]
 
-    # Specify the file name
-    excel_file = Path(filename).with_suffix('.' + 'xlsx')
-
-    # Write the data to an Excel file
-    df.to_excel(excel_file, index=False)  
-
+    # Plot the DataFrame
+    df.plot(x='lagtime', y='g2', label=f'{filename}')
+    plt.xlabel('lagtime (s)')
+    plt.ylabel('g(2) amplitude')
+    plt.title("g(2) correlation")
 
+    # Save the plot to a PDF file   
+    plt.savefig(Path(filename).with_suffix('.' + 'pdf'), format='pdf')
+    # Save the plot to a PNG file   
+    plt.savefig(Path(filename).with_suffix('.' + 'png'), format='png')
+    # Save the g2-correlation to csv
+    df.to_csv(Path(filename).with_suffix('.' + 'csv'))
+    # Save the g2-correlation to Excel
+    df.to_excel(Path(filename).with_suffix('.' + 'xlsx'))
+    # Save the g2-correlation to json
+    df.to_json(Path(filename).with_suffix('.' + 'json'))
 if(__name__ == "__main__"):
-
     g2correlation()