Prechádzať zdrojové kódy

added shiftFMC2 to Logfile

kapture2 4 rokov pred
rodič
commit
b9a15daea5

+ 5 - 0
KCG/base/backend/DataSet.py

@@ -676,6 +676,11 @@ class DataSet(object):
                 self.workingChannels = np.array([float(v) for v in self.log['Working Channels'][1:-1].split(',')])
             except:
                 self.workingChannels = None
+                
+            try:
+                self.shiftFMC2 = int(self.log['shiftFMC2'])
+            except:
+                pass
             #print('get good')
             return True
         except:

+ 2 - 1
KCG/base/log.py

@@ -72,7 +72,8 @@ class MeasurementLogger(object):
             ["ADC Delays", [bif.bk_get_config, (BOARDID, 'chip_delay')]],
             ["Delay Cascade", [bif.bk_get_config, (BOARDID, 'delay_cascade')]],
             ["Delay Cascade 25ps", [bif.bk_get_config, (BOARDID, 'delay_cascade_25')]],
-            ["Working Channels", [lambda x: config.working_channels, (1)]]
+            ["Working Channels", [lambda x: config.working_channels, (1)]],
+            ["shiftFMC2", [lambda x: config.shiftFMC2, (1)]]
             #["ADC 1 Delay", [bif.bk_get_config, (BOARDID, 'chip_delay', 0)]],
             #["ADC 2 Delay", [bif.bk_get_config, (BOARDID, 'chip_delay', 1)]],
             #["ADC 3 Delay", [bif.bk_get_config, (BOARDID, 'chip_delay', 2)]],

+ 2 - 1
KCG/default_config.cfg

@@ -90,7 +90,8 @@ default_log_entries = [
     "25ps Delay 2",
     "Delay Cascade",
     "Delay Cascade 25ps",
-    "Working Channels"
+    "Working Channels",
+    "shiftFMC2"
     ]
 
 

+ 2 - 0
KCG/widgets/ConfigSetup.py

@@ -260,6 +260,8 @@ class ConfigSetup(kcgw.KCGWidgets):
                             '"T/H Delay 2" \n'
                             '"Delay Cascade" \n'
                             '"Delay Cascade 2" \n'
+                            '"Working Channels"\n'
+                            '"shiftFMC2"\n'
                             'NOTE: These entries have to match the aforementioned strings exactly'
                     ]
     machine_configs = ['bunches_per_turn',