diff --git a/cristallina.py b/cristallina.py index be0e780..d214826 100755 --- a/cristallina.py +++ b/cristallina.py @@ -193,7 +193,7 @@ from stand.time import Time adjs_for_spreadsheet = { - "Time": Time(), + "Time": str(Time()), "T_reg": T_reg, "T_plato": T_plato, "T_chip":T_chip, @@ -308,15 +308,17 @@ DAQS = multiple_daqs.generate_DAQS(instrument, pgroup, bs_channels, pv_channels, # required fraction defines ammount of data recorded to save the step and move on to the next one check_intensity_gas_monitor = PVCondition( "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", - vmin=400, + vmin=100, vmax=2000, wait_time=0.5, required_fraction=0.8, ) -scan = Scanner(default_acquisitions=[daq], condition=check_intensity_gas_monitor) +scan = Scanner(default_acquisitions=[daq], condition=None) gui = GUI(scan, show_goto=True, show_spec=True) +from exp_temp import SAT + logger.info(f"Running at {instrument} with pgroup {pgroup}. Experiment type: {experiment_type}.") logger.info("Loading finished.")