Merge remote-tracking branch 'origin/master' into joschka_dev

First working 2d fit
Start fitting 2d
2023-07-26 09:52:41 +02:00 · 2023-07-26 09:41:51 +02:00 · 2023-07-20 20:34:19 +02:00 · 2023-07-20 10:19:32 +02:00
8 changed files with 5731 additions and 2096 deletions
--- a/Analyser/FitAnalyser.py
+++ b/Analyser/FitAnalyser.py
@ -89,7 +89,7 @@ def ThomasFermi_2d(x, y=0.0, centerx=0.0, centery=0.0, amplitude=1.0, sigmax=1.0

 def polylog(power, numerator):
    
-    order = 20
+    order = 2
    
    dataShape = numerator.shape
    numerator = np.tile(numerator, (order, 1))
@ -111,7 +111,7 @@ def polylog2_2d(x, y=0.0, centerx=0.0, centery=0.0, amplitude=1.0, sigmax=1.0, s

 def density_profile_BEC_2d(x, y=0.0, BEC_amplitude=1.0, thermal_amplitude=1.0, BEC_centerx=0.0, BEC_centery=0.0, thermal_centerx=0.0, thermal_centery=0.0, 
                        BEC_sigmax=1.0, BEC_sigmay=1.0, thermal_sigmax=1.0, thermal_sigmay=1.0):
-    
+
    return ThomasFermi_2d(x=x, y=y, centerx=BEC_centerx, centery=BEC_centery, 
                          amplitude=BEC_amplitude, sigmax=BEC_sigmax, sigmay=BEC_sigmay
            ) + polylog2_2d(x=x, y=y, centerx=thermal_centerx, centery=thermal_centery, 
--- a/Joschka/Fitting.ipynb
+++ b/Joschka/Fitting.ipynb
--- a/Joschka/Function
+++ b/Joschka/Function
--- a/Joschka/Parameter
+++ b/Joschka/Parameter
--- a/guessing_new_data.ipynb
+++ b/guessing_new_data.ipynb
--- a/Joschka/Parameter_guessing_comp.ipynb
+++ b/Joschka/Parameter_guessing_comp.ipynb
--- a/Joschka/fit_test_20230703.ipynb
+++ b/Joschka/fit_test_20230703.ipynb
--- a/fit_test_20230703.ipynb
+++ b/fit_test_20230703.ipynb
Author	SHA1	Message	Date
Joschka	1b72580476	Merge remote-tracking branch 'origin/master' into joschka_dev	2023-07-26 09:52:41 +02:00
Joschka	cd6cb974c7	First working 2d fit	2023-07-26 09:41:51 +02:00
Joschka	ade2304ccf	Start fitting 2d	2023-07-20 20:34:19 +02:00
Joschka	64a7a6eb28	Added parameter guessing for diff data + start fitting 2d	2023-07-20 10:19:32 +02:00