Add methods for TP CCD

aklotz
1 parent e10c7309
Showing 2 changed files with 41 additions and 16 deletions Show diff stats
gui/tp_audine_elec/main.cpp
gui/tp_audine_elec/tp_audine_elec.py
@@ -184,7 +184,6 @@ int tp_zi_zh(struct camprop *cam)
    return 0;
 }
  
-
 /*
 tp_read_pel_fast2(struct camprop *cam) --
   Lecture rapide d'un pixel : decalage du registre horizontal
@@ -425,7 +424,7 @@ void mc_savefits(struct camprop *cam, char *filename)
       }
       fwrite(&value0,1,sizeof(unsigned short),f);
    }
-   int n= (cam->h*cam->w) % 2880;
+   int n= (cam->h*cam->w) % 2880 -1;
    //printf("big_endian=%d n=%d",big_endian, n);
    value0=(float)0.;
    for (k=0;k<n;k++) {
@@ -449,12 +448,12 @@ int main(int argc, char* argv[])
     int binning = 1;
     if(argc < 3)
     {
-        printf("ERR 1 : Not enough command line parameters\: method exptime binningn");
+        printf("ERR 1 : Not enough command line parameters\n: method exptime binningn");
         //exit(1);
     } else {
-        strcpy(method,argv[0]);
-        exptime = atof(argv[1]);
-        binning = atoi(argv[2]);
+        strcpy(method,argv[1]);
+        exptime = atof(argv[2]);
+        binning = atoi(argv[3]);
     }
     printf("ERR 0 : %s %f %d\n", method, exptime, binning);
  
@@ -523,7 +522,22 @@ int main(int argc, char* argv[])
       for (int i = 0; i <1; i++) {
          tp_zi_zh(&cam);
       }
-
+   } else if (strcmp(method, "fast_line")==0) {
+      for (int i = 0; i <1; i++) {
+         tp_fast_line(&cam);
+      }
+   } else if (strcmp(method, "read_pel_fast")==0) {
+      for (int i = 0; i <1; i++) {
+         tp_read_pel_fast(&cam);
+      }
+   } else if (strcmp(method, "read_pel_fast2")==0) {
+      for (int i = 0; i <1; i++) {
+         tp_read_pel_fast2(&cam);
+      }
+   } else if (strcmp(method, "fast_vidage")==0) {
+      for (int i = 0; i <1; i++) {
+         tp_fast_vidage(&cam);
+      }
    } else if (strcmp(method, "square_signal")==0) {
        for (int i = 0; i < 100000; i++) {
            float tphiV=2.0;
@@ -49,10 +49,13 @@ if __name__ == &quot;__main__&quot;:
             except yaml.YAMLError as exc:
                 print(exc)
  
+    methods = ["full_frame", "zi_zh", "fast_line", "read_pel_fast", "read_pel_fast2", "fast_vidage", "square_signal"]
+
     infos = {}
-    infos['demarrer_acq'] = "Appuyez sur le bouton Acquisition pour prendre une image"
+    infos['demarrer_acq'] = "Appuyez sur le bouton Acquisition pour envoyer des signaux à la caméra"
     infos['acq_en_cours'] = "Acquisition en cours. Attendre quelques secondes... Prendre des mesures à l'oscilloscope"
     infos['acq_impossible'] = "Acquisition impossible sur cet OS. Utiliser un Raspberry PI"
+    infos['bad_method'] = f"Method not found amonsgt {methods}"
     var = {}
  
     def save_config():
@@ -82,17 +85,22 @@ if __name__ == &quot;__main__&quot;:
         global widgets
         global infos
         global var
+        global methods
         widgets["button_loadima_1"].configure(state= tk.DISABLED)
         widgets["button_saveima_1"].configure(state= tk.DISABLED)
         widgets["button_acq"].configure(state= tk.DISABLED)
         var['info'].set(infos['acq_en_cours'])
         # ---
         method = var_method.get()
-        meth = "full_frame"
-        if method=="zi_zh":
-            meth = "zi_zh"
-        elif method=="square_signal":
-            meth = "square_signal"
+        if method in methods:
+            meth = method
+        else:
+            var['info'].set(infos['bad_method'])
+            tkroot.update()
+            time.sleep(5)
+            var['info'].set(infos['demarrer_acq'])
+            tkroot.update()
+            return
         # ---
         expo = var_exp.get()
         if expo < 0:
@@ -127,7 +135,10 @@ if __name__ == &quot;__main__&quot;:
             stdo = res.stdout
             print(stdo)
             #lstdos = str(stdo).split("\\n")
-            image = True
+            if meth == "full_frame":
+                image = True
+            else:
+                time.sleep(1)
         else:
             var['info'].set(infos['acq_impossible'])
             tkroot.update()
@@ -182,11 +193,11 @@ if __name__ == &quot;__main__&quot;:
     label1.pack(side = tk.LEFT, padx=2)
     # ---
     var_method = tk.StringVar()
-    var_method.set("FullFrame")
+    var_method.set(methods[0])
     label_method = tk.Label(frame1m, text="Method")
     label_method.pack(side = tk.LEFT)
     entry_method = ttk.Combobox(frame1m, textvariable=var_method, width=12)
-    entry_method['values'] = ["full_frame", "zi_zh", "square_signal"]
+    entry_method['values'] = methods
     entry_method['state'] = 'readonly'
     entry_method.pack(side = tk.LEFT)
     #entry_method('<<ComboboxSelected>>', var_method)