status

001a_store_recalculated.py

@@ -14,6 +14,7 @@
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-r', help='random', action='store_true')
+parser.add_argument('--filln', help='specify fill number')
 args = parser.parse_args()
 
 re_file = re.compile('cryo_data_fill_(\d{4,}).h5')
@@ -27,6 +28,11 @@
     if info is not None:
         filln = int(info.group(1))
 
+	if args.filln:
+	    if not int(filln)==int(args.filln):
+		#print 'Skipped fill', filln
+		continue  
+
         for use_dP in use_dPs:
             if filln < 3600:
                 new_version = -1

001b_special_store_recalculated.py

@@ -12,6 +12,7 @@
 parser = argparse.ArgumentParser()
 parser.add_argument('-r', help='random', action='store_true')
 parser.add_argument('--reverse', action='store_true')
+parser.add_argument('--filln', help='specify fill number')
 args = parser.parse_args()
 
 re_file = re.compile('special_data_fill_(\d{4,}).h5')
@@ -26,6 +27,12 @@
     info = re_file.search(atd_file)
     if info != None:
         filln = int(info.group(1))
+
+        if args.filln:
+            if not int(filln)==int(args.filln):
+                #print 'Skipped fill', filln
+                continue
+
         this_qbs_file = h5_storage.get_special_qbs_file(filln)
         if not os.path.isfile(this_qbs_file):
             time_0 = time.time()

qbs_fill.py

@@ -121,7 +121,7 @@ def get_fill_dict(filln, version=default_version, use_dP=True):
     # Remove new special instrumented cell for older fills
     if filln <= 5456:
         regex = re.compile('^QRLAB_31L2_QBS943_\w\w.POSST$')
-        varlist_tmb = filter(lambda x: regex.match(x) == None, varlist_tmb)
+        varlist_tmb = filter(lambda x: regex.match(x) is None, varlist_tmb)
 
     for varname in varlist_tmb:
         tvl = tm.timber_variable_list()
@@ -130,6 +130,13 @@ def get_fill_dict(filln, version=default_version, use_dP=True):
             cell = varname.split('_')[1]
             tvl.values = qbs_special.dictionary[cell+special_id]
             tvl.t_stamps = qbs_special.timestamps
+            for beam in (1,2):
+                tvl2 = tm.timber_variable_list()
+                tvl2.values = qbs_special.dictionary[cell+special_id+'_%i' % beam]
+                tvl2.t_stamps = qbs_special.timestamps
+                tvl2.ms = np.zeros_like(tvl2.t_stamps)
+                output[varname+'_B%i' % beam] = tvl2
+
         elif varname.startswith('QRLEB_05L4'):
             tvl.values = qbs_ob.dictionary['05L4_947_comb']
             tvl.t_stamps = qbs_ob.timestamps