diff --git a/config/config.properties b/config/config.properties index e1ad9cf9..8b8d8e1a 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Sun May 29 13:11:54 CEST 2022 +#Mon Jun 13 11:17:52 CEST 2022 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -26,7 +26,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index d83c6058..1415b985 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Mon May 30 11:51:29 CEST 2022 -pgroup=p19371 -proposal=GeTe -proposer=heinrich_m +#Mon Jun 13 11:17:52 CEST 2022 +pgroup=p17274 +proposal=bl-dev +proposer=bl-dev prefix= -sample=GeTe VA2418 -authors=Martin Heinrich +sample=FEDS +authors=Matthias Muntwiler diff --git a/config/variables.properties b/config/variables.properties index 2a8feedc..88e035e6 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Mon May 30 12:43:42 CEST 2022 -LastRunDate=220530 -FileSequentialNumber=12875 -DaySequentialNumber=10 +#Mon Jun 13 17:35:18 CEST 2022 +LastRunDate=220613 +FileSequentialNumber=12888 +DaySequentialNumber=13 diff --git a/script/optics/FrontEndBladeScan2021.py b/script/optics/FrontEndBladeScan2021.py index e228dcb9..9d8f4a70 100644 --- a/script/optics/FrontEndBladeScan2021.py +++ b/script/optics/FrontEndBladeScan2021.py @@ -43,24 +43,24 @@ time.sleep(5.0) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=my_before_readout, after_read=after_readout) #cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=FLY_TIME, before_read=my_before_readout, after_read = after_readout, check_positions = False) -FrontendHSize.write(2.0) -FrontendVSize.write(2.0) +FrontendHSize.write(1.0) +FrontendVSize.write(1.0) time.sleep(10.0) -STARTPOS = (-4.0) -ENDPOS = (+4.0) +STARTPOS = (-5.0) +ENDPOS = (+5.0) STEPS = 0.1 POSITIONERS = (FrontendBladeRing) FrontendBladeRing.write(STARTPOS) -FrontendBladeWall.write(-4.0) +FrontendBladeWall.write(-5.0) time.sleep(5.0) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=my_before_readout, after_read=after_readout) #cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=FLY_TIME, before_read=my_before_readout, after_read = after_readout, check_positions = False) POSITIONERS = (FrontendBladeWall) FrontendBladeWall.write(STARTPOS) -FrontendBladeRing.write(+4.0) +FrontendBladeRing.write(+5.0) time.sleep(5.0) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=my_before_readout, after_read=after_readout) #cscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, time=FLY_TIME, before_read=my_before_readout, after_read = after_readout, check_positions = False)