Merge branch 'master' of https://code.df.uba.ar/nnunez/artiq_experiments

analisis/plots/20250704_CPT_bladetrap_frontales/CPT_BLADETRAP_FRONTALES.py

+# -*- coding: utf-8 -*-
+"""
+Created on Tue May 20 10:59:18 2025
+
+@author: Carolina
+"""
+
+# -*- coding: utf-8 -*-
+"""
+Created on Sun May 18 19:12:45 2025
+
+@author: Carolina
+"""
+
+import h5py
+import matplotlib.pyplot as plt
+import numpy as np
+import sys
+import re
+import ast
+from scipy.optimize import curve_fit
+import os
+from scipy import interpolate
+
+
+os.chdir('/home/nico/Documents/artiq_experiments/analisis/plots/20250704_CPT_bladetrap_frontales/Data')
+
+def SeeKeys(files):
+    for i, fname in enumerate(files.split()):
+        data = h5py.File(fname+'.h5', 'r') # Leo el h5: Recordar que nuestros datos estan en 'datasets'
+        print(fname)
+        print(list(data['datasets'].keys()))
+
+Counts = []
+Freqs = []
+AmpTisa = []
+UVCPTAmp = []
+No_measures = []
+Voltages = []
+
+CPT_FILES = "000022559-IR_Scan_simple"
+
+for i, fname in enumerate(CPT_FILES.split()):
+    print(str(i) + ' - ' + fname)
+    print(i)
+    print(fname)
+    #print(fname)
+    data = h5py.File(fname+'.h5', 'r') # Leo el h5: Recordar que nuestros datos estan en 'datasets'
+
+    Freqs.append(np.array(data['datasets']['IR1_Frequencies']))
+    Counts.append(np.array(data['datasets']['counts_spectrum']))
+    #AmpTisa.append(np.array(data['datasets']['TISA_CPT_amp']))
+    print(np.array(data['datasets']['no_measures']))
+    
+    
+#%%
+
+
+# index = [7, 1, 4, 6]
+index = [6]
+amp = [0.05, 0.04, 0.03, 0.02]
+
+for i in index:
+    plt.plot([2*f*1e-6 for f in Freqs[i]],Counts[i],'o-')
+    
\ No newline at end of file

artiq_master/last_rid.pyon

-23277
+23293

artiq_master/repository/Tests/ReadCameraTrigg.py

@@ -64,7 +64,7 @@ class ReadCameraTrigg(EnvExperiment):
         
         
         self.setattr_argument("t_exp",
-                             NumberValue(1*ms, unit='s', scale=s, min=1*us, max=500*ms),
+                             NumberValue(1000*us, unit='us', scale=us, min=1*us, max=500*ms),
                             "Experiment params")
         
         
@@ -76,8 +76,14 @@ class ReadCameraTrigg(EnvExperiment):
         self.setattr_argument("N",
                                   NumberValue(10, min=1, max=10000, ndecimals=0, step=1),
                               "Experiment params")
-        print('lolo')
-    
+        
+        self.setattr_argument("time_width",
+                          NumberValue(1*ms, unit='ms', scale=ms, min=1*ms, max=500*ms),
+                      "Trigger params")
+
+        self.setattr_argument("time_delay",
+                          NumberValue(1*ms, unit='ms', scale=ms, min=1*ms, max=500*ms),
+                      "Trigger params")        
 
         
     @rpc
@@ -153,6 +159,14 @@ class ReadCameraTrigg(EnvExperiment):
         
         self.run2()
 
+    @kernel
+    def fire_trigger(self):
+        "Envio y medicion de pulsos"
+        self.camera_trigger.on()
+        delay(self.time_width)
+        self.camera_trigger.off()
+        delay(self.time_delay)
+
     @kernel
     def run2(self): 
         #Inicializacion artiq