Commit e8e37b51 authored by Vlatko, Carolina's avatar Vlatko, Carolina

actualizacion codigo modulacion rf

parent 67edbc87
...@@ -190,9 +190,13 @@ class FluorescenceCorrelation(EnvExperiment): ...@@ -190,9 +190,13 @@ class FluorescenceCorrelation(EnvExperiment):
## Datos ## Datos
self.set_dataset("time_stamps", [], broadcast=True, archive=True) self.set_dataset("time_stamps", [], broadcast=True, archive=True)
self.set_dataset("tiem_stamps_corrected", [], broadcast=True, archive=True) #self.set_dataset("time_stamps_corrected", [], broadcast=True, archive=True)
self.set_dataset("counts", [], broadcast=True, archive=True) self.set_dataset("counts", [], broadcast=True, archive=True)
self.set_dataset("counts_err", [], broadcast=True, archive=True)
# Datos postprocesado
self.set_dataset("fit_params", [], broadcast=True, archive=True)
self.set_dataset("x_data", [], broadcast=True, archive=True)
self.set_dataset("y_data", [], broadcast=True, archive=True)
# Parámetros # Parámetros
self.set_dataset("f_rf", self.f_rf, broadcast=False, archive=True) self.set_dataset("f_rf", self.f_rf, broadcast=False, archive=True)
...@@ -543,12 +547,15 @@ class FluorescenceCorrelation(EnvExperiment): ...@@ -543,12 +547,15 @@ class FluorescenceCorrelation(EnvExperiment):
x_extended = np.concatenate([bin_edges[:-1] + i * self.tau_rf for i in range(3)]) x_extended = np.concatenate([bin_edges[:-1] + i * self.tau_rf for i in range(3)])
y_extended = np.tile(hist, 3) y_extended = np.tile(hist, 3)
x_extended_dense = np.arange(np.min(x_extended),np.max(x_extended),0.1*(x_extended[1]-x_extended[0])) # x_extended_dense = np.arange(np.min(x_extended),np.max(x_extended),0.1*(x_extended[1]-x_extended[0]))
params, _ = curve_fit(self.sinusoidal, x_extended, y_extended, p0=[max(y_extended), 2*np.pi/self.tau_rf, 0, np.mean(y_extended)]) params, _ = curve_fit(self.sinusoidal, x_extended, y_extended, p0=[max(y_extended), 2*np.pi/self.tau_rf, 0, np.mean(y_extended)])
# amps.append(np.abs(params[0]))
return x_extended, y_extended, params self.append_to_dataset("fit_params", params )
self.append_to_dataset("x_data", x_extended )
self.append_to_dataset("y_data", y_extended )
return
@rpc @rpc
def run(self): def run(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment