Closedown

config/config.properties

@@ -1,4 +1,4 @@
-#Tue Feb 01 16:23:50 CET 2022
+#Mon Feb 14 14:06:02 CET 2022
 autoSaveScanData=true
 simulation=false
 commandExecutionEvents=false
@@ -26,7 +26,7 @@ dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
-dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name}
+dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name}
 serverEnabled=false
 dataScanReleaseRecords=true
 depthDimension=2

config/settings.properties

@@ -1,7 +1,7 @@
-#Tue Feb 01 16:23:50 CET 2022
-pgroup=p17274
-proposal=test
-proposer=bl-dev
+#Tue Feb 15 18:26:09 CET 2022
+pgroup=p19371
+proposal=GeTe
+proposer=heinrich_m
 prefix=
-sample=software test
-authors=matthias muntwiler
+sample=GeMnTe VA2122-2
+authors=Martin Heinrich

config/variables.properties

@@ -1,4 +1,4 @@
-#Wed Feb 02 16:55:39 CET 2022
-LastRunDate=220202
-FileSequentialNumber=10875
-DaySequentialNumber=4
+#Tue Feb 15 20:11:35 CET 2022
+LastRunDate=220215
+FileSequentialNumber=11050
+DaySequentialNumber=13

script/test/FindCenter.py

@@ -14,7 +14,7 @@ START_POS = 0.0
 # coarse scan range = estimated size of the sample + margins
 COARSE_RANGE = 10.0
 # scienta dwell time (fixed mode)
-DWELL_TIME = 0.5
+DWELL_TIME = 0.1
 
 
 # --- do not edit below ---
@@ -25,15 +25,23 @@ ZIGZAG = False
 ENDSCAN = False
 
 SENSORS = (Counts, SampleCurrent, RefCurrent, MachineCurrent)
-MOTORS = ManipulatorY
+MOTORS = (ManipulatorY)
 RANGE = (START_POS + COARSE_RANGE / 2., START_POS - COARSE_RANGE / 2.)
 
 Scienta.setExposure(DWELL_TIME)
-scienta_time = 3.25 + DWELL_TIME
-print "scienta time: ", scienta_time
+#scienta_time = DWELL_TIME + 0.1
 
+# time per scienta acquisition in seconds
+trig_scienta()
+time1 = time.time()
+trig_scienta()
+time.sleep(0.01)
+time2 = time.time()
+scienta_time = (time2 - time1) + 1.
+print "step time: ", scienta_time        
+        
 STEP = 0.25
-SPEED = STEP / scienta_time
+SPEED = MOTORS[0].getSpeed()
 fly_time = abs(RANGE[1] - RANGE[0]) / SPEED
 STEPS = int(fly_time / scienta_time) + 1