Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55624a99af |
2 changed files with 7 additions and 6 deletions
|
|
@ -27,6 +27,7 @@ class step_config(unit_config):
|
||||||
ix1_thr=None, ix2_thr=None,
|
ix1_thr=None, ix2_thr=None,
|
||||||
temperature=-40, env='FAR',
|
temperature=-40, env='FAR',
|
||||||
name = "", dp_flag=0, version=0,
|
name = "", dp_flag=0, version=0,
|
||||||
|
min_dt=20,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
|
|
||||||
if ix1_thr is None:
|
if ix1_thr is None:
|
||||||
|
|
@ -77,7 +78,7 @@ class step_config(unit_config):
|
||||||
close = False
|
close = False
|
||||||
|
|
||||||
self.ppss = step_ppss.step_ppss(
|
self.ppss = step_ppss.step_ppss(
|
||||||
large=large, small=small,
|
large=large, small=small, min_dt=min_dt,
|
||||||
dps = self.dps,
|
dps = self.dps,
|
||||||
ix1_thr=ix1_thr, ix2_thr=ix2_thr,
|
ix1_thr=ix1_thr, ix2_thr=ix2_thr,
|
||||||
close=close, model=self.model)
|
close=close, model=self.model)
|
||||||
|
|
|
||||||
|
|
@ -166,15 +166,15 @@ class step_ppss(ppss_table):
|
||||||
thrs_us1 = thrs_us0 + 2 * incr + 2 * incr
|
thrs_us1 = thrs_us0 + 2 * incr + 2 * incr
|
||||||
self += ppss_items(thrs_us1, ix_conf_modulus, ix_thresholds(ix2_thr, ix=2),incr=incr, IX_THR1=True)
|
self += ppss_items(thrs_us1, ix_conf_modulus, ix_thresholds(ix2_thr, ix=2),incr=incr, IX_THR1=True)
|
||||||
|
|
||||||
def do_step_config(self, small=True, large=True):
|
def do_step_config(self, small=True, large=True, min_dt=0, **kwargs):
|
||||||
conf_us = 1400
|
conf_us = 1400
|
||||||
step_conf_modulus = modulus_always
|
step_conf_modulus = modulus_always
|
||||||
if not large:
|
if not large:
|
||||||
self += ppss_item(conf_us, step_conf_modulus, step_config_l1_l2(max_large=0, max_small=15, max_bg=1, max_sum=16, min_dt=0, read_delay=24), L1L2=True)
|
self += ppss_item(conf_us, step_conf_modulus, step_config_l1_l2(max_large=0, max_small=15, max_bg=1, max_sum=16, min_dt=min_dt, read_delay=24), L1L2=True)
|
||||||
elif not small:
|
elif not small:
|
||||||
self += ppss_item(conf_us, step_conf_modulus, step_config_l1_l2(max_large=15, max_small=0, max_bg=1, max_sum=16, min_dt=0, read_delay=24), L1L2=True)
|
self += ppss_item(conf_us, step_conf_modulus, step_config_l1_l2(max_large=15, max_small=0, max_bg=1, max_sum=16, min_dt=min_dt, read_delay=24), L1L2=True)
|
||||||
else:
|
else:
|
||||||
self += ppss_item(conf_us, step_conf_modulus, step_config_l1_l2(max_large=15, max_small=15, max_bg=2, max_sum=32, min_dt=0, read_delay=24), L1L2=True)
|
self += ppss_item(conf_us, step_conf_modulus, step_config_l1_l2(max_large=15, max_small=15, max_bg=2, max_sum=32, min_dt=min_dt, read_delay=24), L1L2=True)
|
||||||
self += ppss_item(conf_us+10, step_conf_modulus, step_config_all_acq(all=(0,0), acq=(1,5)), ALLACQ=True)
|
self += ppss_item(conf_us+10, step_conf_modulus, step_config_all_acq(all=(0,0), acq=(1,5)), ALLACQ=True)
|
||||||
|
|
||||||
def make_HK_table(self):
|
def make_HK_table(self):
|
||||||
|
|
@ -219,7 +219,7 @@ class step_ppss(ppss_table):
|
||||||
self.do_init()
|
self.do_init()
|
||||||
self.do_insertion_slots()
|
self.do_insertion_slots()
|
||||||
self.do_ix_config(small=small, large=large, **kwargs)
|
self.do_ix_config(small=small, large=large, **kwargs)
|
||||||
self.do_step_config(small=small, large=large)
|
self.do_step_config(small=small, large=large, **kwargs)
|
||||||
self.do_hk()
|
self.do_hk()
|
||||||
self.do_pha()
|
self.do_pha()
|
||||||
if self.dps:
|
if self.dps:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue